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

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -223,7 +223,7 @@ namespace GFGGame
         {
             return $"{ANIMATION_DIR_PATH}/Card/{res}/{res}.{extName}";
         }
-        public static string GetActivityPath(string res, string extName = "jpg")
+        public static string GetActivityPath(string res, string extName = "png")
         {
             return $"{TEXTURE_DIR_PATH}/Activity/Activity/{res}.{extName}";
         }

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs

@@ -11,6 +11,7 @@ namespace GFGGame
     public class ActivityZCJBRewardView : BaseWindow
     {
         private UI_ActivityZCJBRewardUI _ui;
+        private List<ActivityDressCfg> zcjbCfgList = new List<ActivityDressCfg>();
         private int lastGotIndex;
         public override void Dispose()
         {
@@ -37,7 +38,9 @@ namespace GFGGame
         {
             base.OnShown();
             UpdateList();
-            _ui.m_List.numItems = ActivityDressCfgArray.Instance.dataArray.Length;
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(17);
+            zcjbCfgList = ActivityDressCfgArray.Instance.GetCfgsByactivityId(activityId);
+            _ui.m_List.numItems = zcjbCfgList.Count;
             _ui.m_List.ScrollToView(Mathf.Max(0, ActivityDataManager.Instance.ActivityZCJBList.Count - 1), false, true);
         }
         protected override void OnHide()
@@ -48,10 +51,10 @@ namespace GFGGame
         private void RenderRewardList(int index, GObject obj)
         {
             UI_ActivityRewardItemUI item = UI_ActivityRewardItemUI.Proxy(obj);
-            ItemCfg costItem = ItemCfgArray.Instance.GetCfg(ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][0]);
+            ItemCfg costItem = ItemCfgArray.Instance.GetCfg(zcjbCfgList[index].comsumeArr[0][0]);
             ItemData numItem;
             long num;
-            if (BagDataManager.Instance.GetBagData().TryGetValue(ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][0], out numItem))
+            if (BagDataManager.Instance.GetBagData().TryGetValue(zcjbCfgList[index].comsumeArr[0][0], out numItem))
             {
                 num = numItem.num;
             }
@@ -73,7 +76,7 @@ namespace GFGGame
             }
             if(index == ActivityDataManager.Instance.ActivityZCJBList.Count)
             {
-                if(num >= ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][1])
+                if(num >= zcjbCfgList[index].comsumeArr[0][1])
                 {
                     item.m_RewardBtn.m_c1.selectedIndex = 1;
                     RedDotController.Instance.SetComRedDot(item.m_RewardBtn.target, true);
@@ -85,7 +88,7 @@ namespace GFGGame
                 }
             }
             //
-            item.m_rewardName.text = "使用" + costItem.name + "*"+ ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][1] + "兑换";
+            item.m_rewardName.text = "使用" + costItem.name + "*"+ zcjbCfgList[index].comsumeArr[0][1] + "兑换";
             if (item.m_RewardBtn.target.data == null)
             {
                 item.m_RewardBtn.target.onClick.Add(OnClickRewardBtn);
@@ -95,11 +98,11 @@ namespace GFGGame
             {
                 item.m_List.itemRenderer = RenderRewardItemList;
             }
-            item.m_List.data = ActivityDressCfgArray.Instance.dataArray[index].bonusArr;
-            item.m_List.numItems = ActivityDressCfgArray.Instance.dataArray[index].bonusArr.Length;
+            item.m_List.data = zcjbCfgList[index].bonusArr;
+            item.m_List.numItems = zcjbCfgList[index].bonusArr.Length;
 
             //最后一档特殊处理
-            //if(index == ActivityDressCfgArray.Instance.dataArray.Length - 1)
+            //if(index == zcjbCfgList.Length - 1)
             //{
             //    item.m_rewardNum.visible = true;
             //    int numChange = GameGlobal.myNumericComponent.GetAsInt(NumericType.ActivityDressLastGearRewrdNum);
@@ -126,7 +129,7 @@ namespace GFGGame
                 GetSuitItemController.TryShow(0);
                 EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                 UI_ActivityRewardItemUI.ProxyEnd();
-                _ui.m_List.numItems = ActivityDressCfgArray.Instance.dataArray.Length;
+                _ui.m_List.numItems = zcjbCfgList.Count;
                 UpdateList();
             }
             else if (item.m_RewardBtn.m_c1.selectedIndex == 0)
@@ -149,7 +152,7 @@ namespace GFGGame
         {
             ItemData numItem;
             long num;
-            if (BagDataManager.Instance.GetBagData().TryGetValue(ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0], out numItem))
+            if (BagDataManager.Instance.GetBagData().TryGetValue(zcjbCfgList[0].comsumeArr[0][0], out numItem))
             {
                 num = numItem.num;
             }
@@ -157,7 +160,7 @@ namespace GFGGame
             {
                 num = 0;
             }
-            ItemCfg item = ItemCfgArray.Instance.GetCfg(ActivityDressCfgArray.Instance.dataArray[0].comsumeArr[0][0]);
+            ItemCfg item = ItemCfgArray.Instance.GetCfg(zcjbCfgList[0].comsumeArr[0][0]);
             _ui.m_num.text = item.name+ ":" + num;
         }
 

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -747,7 +747,8 @@ namespace GFGGame
                 }
                 ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
                 _ui.m_btnActivityLuckyBox.target.title = activityOpenCfg.themeName;
-                _ui.m_btnActivityLuckyBox.target.icon = "ui://Main/zjm_icon_" + activityOpenCfg.res.Split('_')[1];
+                string path = "zjm_icon_" + activityOpenCfg.res.Split('_')[1];
+                _ui.m_btnActivityLuckyBox.target.icon = ResPathUtil.GetActivityPath(path,"png"); //"ui://Main/zjm_icon_" + activityOpenCfg.res.Split('_')[1];
                 //long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
                 //_ui.m_btnActivityLuckyBox.m_txtTime.text = time > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
             }

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioActivityView.cs

@@ -117,7 +117,7 @@ namespace GFGGame
                 item.m_loaItem.visible = false;
                 item.m_loaIcon.visible = true;
                 item.m_flow.visible = false;
-                item.m_loaIcon.url = string.Format("ui://Studio/{0}", _studioCfg.res);
+                item.m_loaIcon.url = ResPathUtil.GetActivityPath(_studioCfg.res,"png");
             }
             item.m_grpLock.visible = index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1].id);
             item.m_comFlower.target.visible = false;//.m_c1.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);