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

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -235,5 +235,8 @@ namespace GFGGame
 
         //新年红包领取加倍按钮
         public const string NEW_YEAR_RED_ENVELOPE_INFO = "NEW_YEAR_RED_ENVELOPE_INFO";
+
+        //快速完成关卡
+        public const string FIGHT_QUICKLY = "FIGHT_QUICKLY";
     }
 }

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

@@ -327,6 +327,7 @@ namespace GFGGame
             LeagueDataManager.Instance.Clear();
             ActivityAfuGiftDataManager.Instance.Clear();
             FightDataManager.Instance.Clear();
+            NewYearRedEnvelopeDataManager.Instance.Clear();
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();

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

@@ -18,6 +18,8 @@ namespace GFGGame
             limitStlycActBonusState.Clear();
             allLimitStlycTimes = 0;
             lastActLimitStlycId = 0;
+
+            NewYearLoginInfoDic.Clear();
         }
 
         /**********************************************************活动*************************************************/

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

@@ -6,8 +6,12 @@
         public static int ItemId = 0;  //红包奖励物品
         public static long ItemNum = 0;  //奖励数量（单倍）
 
-
-
+        public void Clear()
+        {
+            Status = RedPacketStatus.None;
+            ItemId = 0;
+            ItemNum = 0;
+        }
 
         public bool CheckNewYearRedEnvelopeRed()
         {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GetSuitItemUI.cs

@@ -11,6 +11,7 @@ namespace UI.CommonGame
         public GGraph m_holderEffect;
         public GGraph m_holder;
         public GTextField m_txtName;
+        public GLoader m_icon;
         public GComponent m_item;
         public const string URL = "ui://eg2y0ldptu965e";
         public const string PACKAGE_NAME = "CommonGame";
@@ -63,6 +64,7 @@ namespace UI.CommonGame
             m_holderEffect = (GGraph)comp.GetChild("holderEffect");
             m_holder = (GGraph)comp.GetChild("holder");
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_icon = (GLoader)comp.GetChild("icon");
             m_item = (GComponent)comp.GetChild("item");
         }
         public void Dispose(bool disposeTarget = false)
@@ -71,6 +73,7 @@ namespace UI.CommonGame
             m_holderEffect = null;
             m_holder = null;
             m_txtName = null;
+            m_icon = null;
             m_item = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button5.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_Button5
+    {
+        public GButton target;
+        public Controller m_buttonType;
+        public const string URL = "ui://drx9d1usmbf1taf";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "Button5";
+        private static UI_Button5 _proxy;
+
+        public static UI_Button5 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button5();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button5 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button5();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_buttonType = comp.GetController("buttonType");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_buttonType = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button5.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b9d4121ff4333574f9190457db24f70d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs

@@ -13,10 +13,10 @@ namespace UI.LuckyBox
         public GTextField m_txtTime;
         public GGroup m_grpTime;
         public GGroup m_grpTitle;
-        public GButton m_btnGiftBag;
+        public UI_Button5 m_btnGiftBag;
         public UI_ComBagTime m_comBagTime;
-        public GButton m_btnShop;
-        public GButton m_btnReward;
+        public UI_Button5 m_btnShop;
+        public UI_Button5 m_btnReward;
         public GButton m_btnPreview;
         public GTextField m_txtOwned;
         public UI_comLuckBoxBtn m_comLuckBoxBtn;
@@ -77,10 +77,10 @@ namespace UI.LuckyBox
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
             m_grpTitle = (GGroup)comp.GetChild("grpTitle");
-            m_btnGiftBag = (GButton)comp.GetChild("btnGiftBag");
+            m_btnGiftBag = (UI_Button5)UI_Button5.Create(comp.GetChild("btnGiftBag"));
             m_comBagTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comBagTime"));
-            m_btnShop = (GButton)comp.GetChild("btnShop");
-            m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_btnShop = (UI_Button5)UI_Button5.Create(comp.GetChild("btnShop"));
+            m_btnReward = (UI_Button5)UI_Button5.Create(comp.GetChild("btnReward"));
             m_btnPreview = (GButton)comp.GetChild("btnPreview");
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_comLuckBoxBtn = (UI_comLuckBoxBtn)UI_comLuckBoxBtn.Create(comp.GetChild("comLuckBoxBtn"));
@@ -98,10 +98,13 @@ namespace UI.LuckyBox
             m_txtTime = null;
             m_grpTime = null;
             m_grpTitle = null;
+            m_btnGiftBag.Dispose();
             m_btnGiftBag = null;
             m_comBagTime.Dispose();
             m_comBagTime = null;
+            m_btnShop.Dispose();
             m_btnShop = null;
+            m_btnReward.Dispose();
             m_btnReward = null;
             m_btnPreview = null;
             m_txtOwned = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxActivityUI.cs

@@ -15,10 +15,10 @@ namespace UI.LuckyBox
         public UI_Button9 m_btnLuckyDiscount;
         public UI_ComBagTime m_comDiscountTime;
         public GGroup m_comLuckyDiscount;
-        public GButton m_btnGiftBag;
+        public UI_Button5 m_btnGiftBag;
         public UI_ComBagTime m_comBagTime;
-        public GButton m_btnShop;
-        public GButton m_btnReward;
+        public UI_Button5 m_btnShop;
+        public UI_Button5 m_btnReward;
         public const string URL = "ui://drx9d1usmbf1tad";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckyBoxActivityUI";
@@ -74,10 +74,10 @@ namespace UI.LuckyBox
             m_btnLuckyDiscount = (UI_Button9)UI_Button9.Create(comp.GetChild("btnLuckyDiscount"));
             m_comDiscountTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comDiscountTime"));
             m_comLuckyDiscount = (GGroup)comp.GetChild("comLuckyDiscount");
-            m_btnGiftBag = (GButton)comp.GetChild("btnGiftBag");
+            m_btnGiftBag = (UI_Button5)UI_Button5.Create(comp.GetChild("btnGiftBag"));
             m_comBagTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comBagTime"));
-            m_btnShop = (GButton)comp.GetChild("btnShop");
-            m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_btnShop = (UI_Button5)UI_Button5.Create(comp.GetChild("btnShop"));
+            m_btnReward = (UI_Button5)UI_Button5.Create(comp.GetChild("btnReward"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -92,10 +92,13 @@ namespace UI.LuckyBox
             m_comDiscountTime.Dispose();
             m_comDiscountTime = null;
             m_comLuckyDiscount = null;
+            m_btnGiftBag.Dispose();
             m_btnGiftBag = null;
             m_comBagTime.Dispose();
             m_comBagTime = null;
+            m_btnShop.Dispose();
             m_btnShop = null;
+            m_btnReward.Dispose();
             m_btnReward = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -31,16 +31,16 @@ namespace UI.Main
         public UI_BtnModle m_btnFirstRecharge;
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
+        public UI_BtnModle1 m_btnShow;
         public UI_ButtonModle1 m_btnZhaiXing;
+        public UI_ButtonModleEffect m_btnMain;
         public UI_ButtonModle1 m_btnCiPai;
         public UI_ButtonModle1 m_btnXiuFang;
         public UI_ButtonModle1 m_btnHuanZhuang;
         public UI_ButtonModleEffect m_btnHaiZhiShi;
-        public UI_ButtonModleEffect m_btnMain;
         public UI_BtnModle1 m_btnNewYearRedEnvelope;
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle1 m_btnActivityDay7;
-        public UI_BtnModle1 m_btnShow;
         public GGroup m_AllUI;
         public GGraph m_touchMask;
         public Transition m_openViewAction;
@@ -117,16 +117,16 @@ namespace UI.Main
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
+            m_btnShow = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnShow"));
             m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
+            m_btnMain = (UI_ButtonModleEffect)UI_ButtonModleEffect.Create(comp.GetChild("btnMain"));
             m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
             m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
             m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
             m_btnHaiZhiShi = (UI_ButtonModleEffect)UI_ButtonModleEffect.Create(comp.GetChild("btnHaiZhiShi"));
-            m_btnMain = (UI_ButtonModleEffect)UI_ButtonModleEffect.Create(comp.GetChild("btnMain"));
             m_btnNewYearRedEnvelope = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnNewYearRedEnvelope"));
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityDay7 = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityDay7"));
-            m_btnShow = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnShow"));
             m_AllUI = (GGroup)comp.GetChild("AllUI");
             m_touchMask = (GGraph)comp.GetChild("touchMask");
             m_openViewAction = comp.GetTransition("openViewAction");
@@ -172,8 +172,12 @@ namespace UI.Main
             m_btnGiftBag1 = null;
             m_btnGiftBag2.Dispose();
             m_btnGiftBag2 = null;
+            m_btnShow.Dispose();
+            m_btnShow = null;
             m_btnZhaiXing.Dispose();
             m_btnZhaiXing = null;
+            m_btnMain.Dispose();
+            m_btnMain = null;
             m_btnCiPai.Dispose();
             m_btnCiPai = null;
             m_btnXiuFang.Dispose();
@@ -182,16 +186,12 @@ namespace UI.Main
             m_btnHuanZhuang = null;
             m_btnHaiZhiShi.Dispose();
             m_btnHaiZhiShi = null;
-            m_btnMain.Dispose();
-            m_btnMain = null;
             m_btnNewYearRedEnvelope.Dispose();
             m_btnNewYearRedEnvelope = null;
             m_btnDailyWelfare.Dispose();
             m_btnDailyWelfare = null;
             m_btnActivityDay7.Dispose();
             m_btnActivityDay7 = null;
-            m_btnShow.Dispose();
-            m_btnShow = null;
             m_AllUI = null;
             m_touchMask = null;
             m_openViewAction = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/CommonSProxy.cs

@@ -65,6 +65,7 @@ namespace GFGGame
                     await ActivityTeaSProxy.ReqGetNPCVisitInfo();
                     await MiniGameProxy.ReqGetChallengeReward();
                     ActivitySProxy.ReqGetActivitySignInfos().Coroutine();
+                    NewYearRedEnvelopeSProxy.ReqGetRedPacketInfo().Coroutine();
                     ActivityDataManager.Instance.todayActivityTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity);
                     ActivityDataManager.Instance.todayMonthlyCardTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity);
                     EventAgent.DispatchEvent(ConstMessage.RESET_DAILY_DATA);

GameClient/Assets/Game/HotUpdate/ServerProxy/InstanceZonesSProxy.cs

@@ -165,6 +165,10 @@ namespace GFGGame
                     {
                         allList.AddRange(baseBonusList);
                     }
+
+                    EventAgent.DispatchEvent(ConstMessage.FIGHT_QUICKLY);
+
+
                     // var index = 0;
                     // for (int i = 0; i < response.BonusLengths.Count; ++i)
                     // {

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityVisitNpcView.cs

@@ -67,7 +67,7 @@ namespace GFGGame
             if (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearVisit) == 0)
             {
                 PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-                this.Hide();
+                Timers.inst.Remove(UpdateView);
                 ViewManager.Show<ActivityTeaMainView>();
                 return;
             }
@@ -90,8 +90,8 @@ namespace GFGGame
         protected override void OnHide()
         {
             EventAgent.RemoveEventListener(ConstMessage.NOTICE_BATCH_TASK_STATE_CHANGE, OnTasksChange);
-            base.OnHide();
             Timers.inst.Remove(UpdateView);
+            base.OnHide();
         }
 
         private void UpdateView(object param = null)

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -57,6 +57,14 @@ namespace GFGGame
             base.OnShown();
             GRoot.inst.touchable = true;
             int suitId = (int)viewData;
+            if(suitId == 202025)
+            {
+                _ui.m_icon.x = -600;
+            }
+            else
+            {
+                _ui.m_icon.x = 0;
+            }
             UpdateView(suitId);
         }
 

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

@@ -63,9 +63,9 @@ namespace GFGGame
             _luckyBoxCtrl = new LuckyBoxController(_ui.m_comBox.m_comModel.target);
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_btnReward.onClick.Add(OnClickBtnReward);
-            _ui.m_btnShop.onClick.Add(OnClickBtnShop);
-            _ui.m_btnGiftBag.onClick.Add(OnClickBtnGiftBag);
+            _ui.m_btnReward.target.onClick.Add(OnClickBtnReward);
+            _ui.m_btnShop.target.onClick.Add(OnClickBtnShop);
+            _ui.m_btnGiftBag.target.onClick.Add(OnClickBtnGiftBag);
             _ui.m_btnLuckyDiscount.target.onClick.Add(OnClickBtnLuckyDiscount);
             _effectUIDic.Add("Button_public", EffectUIPool.CreateEffectUI(_ui.m_comBox.m_btnBuyTen_eff, "ui_LuckyBox", "Button_public"));
             _effectUIDic.Add("Button_Text_DianCang", EffectUIPool.CreateEffectUI(_ui.m_comBox.m_Special_eff, "ui_LuckyBox", "Button_Text_DianCang"));
@@ -364,9 +364,9 @@ namespace GFGGame
 
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(_activityType), "", -18, 11);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnShop, RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -18, 11);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnGiftBag, RedDotDataManager.Instance.GetMeiRiTeHuiRed(), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnReward.target, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(_activityType), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnShop.target, RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnGiftBag.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed(), "", -18, 11);
         }
 
         protected override void UpdateToCheckGuide(object param)

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

@@ -245,13 +245,13 @@ namespace GFGGame
                 comBox.m_btnPreview.onClick.Add(OnClickBtnPreview);
             comBox.m_btnPreview.data = boxId;
 
-            if (comBox.m_btnReward.data == null)
+            if (comBox.m_btnReward.target.data == null)
             {
-                comBox.m_btnReward.onClick.Add(OnClikcBtnReward);
-                comBox.m_btnShop.onClick.Add(OnClikcBtnShop);
-                comBox.m_btnGiftBag.onClick.Add(OnClikcBtnGiftBag);
+                comBox.m_btnReward.target.onClick.Add(OnClikcBtnReward);
+                comBox.m_btnShop.target.onClick.Add(OnClikcBtnShop);
+                comBox.m_btnGiftBag.target.onClick.Add(OnClikcBtnGiftBag);
             }
-            comBox.m_btnReward.data = boxId;
+            comBox.m_btnReward.target.data = boxId;
 
             obj.data = boxId;
             comBox.m_grpTime.visible = (boxId == _activeBoxId);
@@ -337,7 +337,7 @@ namespace GFGGame
             if (_curIndex == 1) { 
                 GObject obj = _ui.m_listBg.GetChildAt(_curIndex);
                 UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
-                RedDotController.Instance.SetComRedDot(comBox.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy), "", -21, 18);
+                RedDotController.Instance.SetComRedDot(comBox.m_btnReward.target, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy), "", -21, 18);
 
                 comBox.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastTsyDrawCount.ToString()).FlushVars();
                 UI_ComBox1.ProxyEnd();
@@ -368,7 +368,7 @@ namespace GFGGame
             if (list.Count == 0)
             {
                 comBox.m_comBagTime.target.visible = false;
-                comBox.m_btnGiftBag.visible = false;
+                comBox.m_btnGiftBag.target.visible = false;
             }
             else
             {
@@ -393,13 +393,13 @@ namespace GFGGame
                 if (isSoldOut)
                 {
                     comBox.m_comBagTime.target.visible = false;
-                    comBox.m_btnGiftBag.visible = false;
+                    comBox.m_btnGiftBag.target.visible = false;
                 }
                 else
                 {
                     comBox.m_comBagTime.m_txtGiftBagTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
                     comBox.m_comBagTime.target.visible = true;
-                    comBox.m_btnGiftBag.visible = true;
+                    comBox.m_btnGiftBag.target.visible = true;
                 }
             }
             UpdateBtnReward();

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

@@ -672,7 +672,7 @@ namespace GFGGame
             }
 
             int activeNewYearRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
-            _ui.m_btnNewYearRedEnvelope.target.visible = (activeNewYearRedPacketId > 0 && NewYearRedEnvelopeDataManager.Status == RedPacketStatus.Double);
+            _ui.m_btnNewYearRedEnvelope.target.visible = (activeNewYearRedPacketId > 0 && NewYearRedEnvelopeDataManager.Status != RedPacketStatus.Double);
             _ui.m_btnActivityDay7.target.visible = ActivityDay7DataManager.Instance.CheckOpen();
             _ui.m_btnWanShiLi.target.visible = ActivityWanShiLiDataManager.Instance.CheckOpen();
             _ui.m_btnTea.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(12) == 0 ? false : true;
@@ -1113,6 +1113,7 @@ namespace GFGGame
             UpdateHead();
             UpdateBtnFirstRecharge();
             CheckAutoShowViews();
+            RefreshBtnNewYearRedEnvelope();
         }
         private void CheckAutoShowViews()
         {

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerFightView.cs

@@ -45,11 +45,6 @@ namespace GFGGame
             _ui.m_iconSuidAdd.onClick.Add(OnClickIconSuidAdd);
         }
 
-        protected override void AddEventListener()
-        {
-            base.AddEventListener();
-        }
-
         protected override void OnShown()
         {
             base.OnShown();
@@ -63,10 +58,15 @@ namespace GFGGame
             _storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_activityFightCfg.type, _activityFightCfg.subType, _activityCfg.params3Arr[0]);
             _ui.m_list.numItems = _storyLevelCfgs.Count;
             UpdateItem();
+            RefreshTxtFreeNum();
+            _ui.m_txtTitle.SetVar("name", _activityCfg.themeName).FlushVars();
+        }
+
+        private void RefreshTxtFreeNum()
+        {
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(_activityFightCfg.limit);
             int time = limitData.TotalPlayMax - limitData.PlayTimes;
             _ui.m_txtFreeNum.text = time + "/" + limitData.TotalPlayMax;
-            _ui.m_txtTitle.SetVar("name", _activityCfg.themeName).FlushVars();
         }
 
         protected override void OnHide()
@@ -74,9 +74,16 @@ namespace GFGGame
             base.OnHide();
         }
 
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.FIGHT_QUICKLY, RefreshTxtFreeNum);
+        }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.FIGHT_QUICKLY, RefreshTxtFreeNum);
         }
 
         private void OnClickBtnBack()