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

FGUIProject/assets/Task/CombTaskUI.xml

@@ -18,7 +18,7 @@
       <item/>
     </list>
     <image id="n21_ids4" name="n21" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="176,883"/>
-    <text id="n22_ids4" name="n22" xy="438,880" size="215,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" letterSpacing="4" autoSize="none" text="每日5:00刷新"/>
+    <text id="n22_ids4" name="n22" xy="428,880" size="236,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" letterSpacing="4" autoSize="none" text="每日5:00刷新"/>
     <image id="n17_ids4" name="n17" src="uxxstm8" fileName="images/yeqian_db.png" xy="302,804" size="491,72"/>
     <component id="n25_ids4" name="n25" src="ids44e" fileName="components/TabButton.xml" xy="294,805" group="n27_ids4">
       <Button checked="true" controller="c1" page="0"/>

GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -37,6 +37,12 @@ namespace GFGGame
             _ui.m_SpecialReward.m_RewardList.itemRenderer = SpecialRewardRender;
         }
 
+        protected override void OnHide()
+        {
+            base.OnHide();
+            Timers.inst.Remove(UpdateTime);
+        }
+
 
         protected override void OnShown()
         {
@@ -55,6 +61,12 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.BATTLEPASS_LEVEL_CHANGE, SetBattlePassLevel);
         }
 
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.BATTLEPASS_LEVEL_CHANGE, SetBattlePassLevel);
+        }
+
 
         //开启通行证
         private void OnBtnOpenClick(EventContext context)