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

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/ActivityDay7/ActivityDay7View.cs

@@ -255,14 +255,14 @@ namespace GFGGame
             var get = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(id);
             if (get)
             {
-                PromptController.Instance.ShowFloatTextPrompt("已领取过了");
+                GoodsItemTipsController.ShowItemTips(activity7DaysCfg.bonusArr[0][0]);
                 return;
             }
             //判断积分是否够
             var score = ActivityDay7DataManager.Instance.GetScore();
             if (score < activity7DaysCfg.score)
             {
-                PromptController.Instance.ShowFloatTextPrompt("积分还不够");
+                GoodsItemTipsController.ShowItemTips(activity7DaysCfg.bonusArr[0][0]);
                 return;
             }
             var result = await ActivityDay7SProxy.ReqGetActivityDay7Reward(activity7DaysCfg);