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

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/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/Main/UI_MainUI.cs

@@ -31,6 +31,7 @@ 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;
@@ -40,7 +41,6 @@ namespace UI.Main
         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,6 +117,7 @@ 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"));
@@ -126,7 +127,6 @@ namespace UI.Main
             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,6 +172,8 @@ 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();
@@ -190,8 +192,6 @@ namespace UI.Main
             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/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/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()