Merge remote-tracking branch 'remotes/origin/master' into dev

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -3,6 +3,7 @@ using ET;
 using FairyGUI;
 using System.Collections.Generic;
 using UI.ActivityThemeLuckyBox;
+using UnityEngine;
 
 namespace GFGGame
 {
@@ -67,6 +68,11 @@ namespace GFGGame
             if(_activityId == 5)
             {
                 _ui.m_card.target.visible = true;
+                float width = 2560;
+                float height = 1920;
+                float proportion = width / height;
+                float targetWidth = proportion * _ui.target.height;
+                _ui.m_card.m_ComCardImgRes.target.width = targetWidth;
                 _ui.m_card.m_ComCardImgRes.m_loaCard.url = ResPathUtil.GetBgImgPath("bg_jfyl");
             }
             else