Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/Arena/ArenaLoadingUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920">
   <displayList>
     <loader id="n0_rv09" name="loaBg" xy="0,-240" size="1080,2400" fill="scale">
-      <relation target="" sidePair="width-width,height-height"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <component id="n1_rv09" name="progressBar1" src="rv0955" fileName="components/ProgressBar2.xml" xy="95,1676" group="n4_rv09">
       <relation target="" sidePair="center-center,bottom-bottom"/>

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -182,6 +182,8 @@ namespace GFGGame
             ActivityGlobalDataManager.Instance.Clear();
             EnduringGiftBoxDataManager.Instance.Clear();
             LimitedTimeGiftBoxDataManager.Instance.Clear();
+            BattlePassTaskDataManager.Instance.Clear();
+            TaskDataManager.Instance.Clear();
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();

GameClient/Assets/Game/HotUpdate/Data/BattlePassTaskDataManager.cs

@@ -174,5 +174,16 @@ namespace GFGGame
             }
             return false;
         }
+
+        public void Clear()
+        {
+            SeasonId = 0;
+            IsBuy = false;
+            SeasonEndTime = 0;
+            selectionCache = null;
+            NormalRewards.Clear();
+            SuperRewards.Clear();
+            tempItems.Clear();
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Data/TaskDataManager.cs

@@ -151,9 +151,9 @@ namespace GFGGame
                     return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0], taskCfg.paramsArr[1]);
                 case ConstTaskType.FinishStory:
                 case ConstTaskType.FinishInstanceZones:
-                    {
-                        return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0]);
-                    }
+                {
+                    return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0]);
+                }
                 default: return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount());
             }
         }
@@ -188,5 +188,11 @@ namespace GFGGame
                     break;
             }
         }
+
+        public void Clear()
+        {
+            TaskInfosDic.Clear();
+            TaskType2TaskIdListDic.Clear();
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusView.cs

@@ -79,6 +79,7 @@ namespace GFGGame
             ShowBonusList();
 
             _ui.m_t0.Play(UpdateView);
+            //
         }
 
         protected override void OnHide()
@@ -137,9 +138,9 @@ namespace GFGGame
         {
 
             _ui.m_loaMask.visible = false;
-            int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
-            List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
-            ViewManager.Show<LuckyBoxNewDressView>(itemDatas);
+            // int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
+            // List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
+            // ViewManager.Show<LuckyBoxNewDressView>(itemDatas);
         }
         private void ShowBonusList()
         {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StorySkillView.cs

@@ -67,7 +67,7 @@ namespace GFGGame
                 if (string.IsNullOrEmpty(skillCfg.res))
                 {
                     res = ItemCfgArray.Instance.GetCfg(skillCfg.cardId).res;
-                    ET.Log.Error("技能" + skillCfg.skillId + "  未配资源");
+                    // ET.Log.Debug("技能" + skillCfg.skillId + "  未配资源");
                 }
                 _ui.m_comSkillShow.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(res);
                 _ui.m_comSkillShow.m_t0.timeScale = FightDataManager.Instance.fightSpeed;