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

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

@@ -174,7 +174,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW });
+                        ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, new object[] { typeof(StoryChapterListView).FullName});
 
                         //ViewManager.Show<StoryChapterView>(StudioDataManager.Instance.luckyBoxFilingChapterId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData });
 

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

@@ -65,7 +65,6 @@ namespace GFGGame
             ActivityGlobalSProxy.ReqCloseActivity(activityId).Coroutine();
         }
 
-        //RemoveActivityInfo
         public void RemoveActivityInfo(int activityId)
         {
             if (!activityInfos.ContainsKey(activityId)) return;

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

@@ -314,7 +314,11 @@ namespace GFGGame
                 if (CheckIsRightTime(mySkillLvlCfg, currentTime, roundId))
                 {
                     bool isProbability = UnityEngine.Random.Range(0, 10000) < mySkillLvlCfg.probability;
-                    if (mySkillLvlCfg.beginTime == SkillBeginTime.FIGHT_BEGIN && roundTimes != null && roundId < roundTimes[i]) isProbability = true;
+                    if ((mySkillLvlCfg.beginTime == currentTime || roundId == mySkillLvlCfg.beginTime) && roundTimes != null /*&& roundId < roundTimes[i]*/) 
+                        isProbability = true;
+                    else
+                        isProbability = false;
+
                     if (isProbability) skillCfgs.Add(mySkillLvlCfg);
                 }
             }
@@ -329,6 +333,7 @@ namespace GFGGame
           || skillLvlCfg.beginTime == SkillBeginTime.ERVERY_ROUND_BEGIN && currentTime == SkillBeginTime.ERVERY_ROUND_BEGIN
           || skillLvlCfg.beginTime == SkillBeginTime.ERVERY_ROUND_END && currentTime == SkillBeginTime.ERVERY_ROUND_END
           || skillLvlCfg.beginTime == SkillBeginTime.ALL_PERFECT_START && currentTime == SkillBeginTime.ALL_PERFECT_START
+          || skillLvlCfg.beginTime == SkillBeginTime.FIGHT_BEGIN && currentTime == SkillBeginTime.FIGHT_BEGIN
           || skillLvlCfg.beginTime <= SkillBeginTime.ROUND_6 && currentTime == SkillBeginTime.ERVERY_ROUND_BEGIN && roundId == skillLvlCfg.beginTime)
             {
                 return true;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComProBonus2.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ComProBonus2
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtDay;
+        public GImage m_imgGot;
+        public const string URL = "ui://t8nwuj7ievdh27";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ComProBonus2";
+        private static UI_ComProBonus2 _proxy;
+
+        public static UI_ComProBonus2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComProBonus2();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComProBonus2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComProBonus2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtDay = (GTextField)comp.GetChild("txtDay");
+            m_imgGot = (GImage)comp.GetChild("imgGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtDay = null;
+            m_imgGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ViewName.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ComProBonus2.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ed0e22ca246e36d4ea44105bbc1550b0
+guid: b061a72bb278ff444a6e65c1061821b0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DBGiftItem.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_DBGiftItem
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://t8nwuj7ievdh28";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "DBGiftItem";
+        private static UI_DBGiftItem _proxy;
+
+        public static UI_DBGiftItem Create(GObject gObject = null)
+        {
+            var ui = new UI_DBGiftItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_DBGiftItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DBGiftItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DBGiftItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_GiftDetailUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_GiftDetailUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GComponent m_bg;
+        public GTextField m_txtLock;
+        public GTextField m_txtWeekGiftBag;
+        public GList m_listWeekGiftBag;
+        public GButton m_btnGetWeekGiftBag;
+        public const string URL = "ui://t8nwuj7ievdh2a";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "GiftDetailUI";
+        private static UI_GiftDetailUI _proxy;
+
+        public static UI_GiftDetailUI Create(GObject gObject = null)
+        {
+            var ui = new UI_GiftDetailUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_GiftDetailUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_GiftDetailUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_c1 = comp.GetController("c1");
+            m_bg = (GComponent)comp.GetChild("bg");
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_txtWeekGiftBag = (GTextField)comp.GetChild("txtWeekGiftBag");
+            m_listWeekGiftBag = (GList)comp.GetChild("listWeekGiftBag");
+            m_btnGetWeekGiftBag = (GButton)comp.GetChild("btnGetWeekGiftBag");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_bg = null;
+            m_txtLock = null;
+            m_txtWeekGiftBag = null;
+            m_listWeekGiftBag = null;
+            m_btnGetWeekGiftBag = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_GiftDetailUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_LimitedRechargeDBGiftUI.cs

@@ -0,0 +1,97 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_LimitedRechargeDBGiftUI
+    {
+        public GComponent target;
+        public UI_ProgressBar2 m_progress;
+        public UI_DBGiftItem m_DBGiftItem1;
+        public UI_DBGiftItem m_DBGiftItem2;
+        public UI_DBGiftItem m_DBGiftItem3;
+        public UI_DBGiftItem m_DBGiftItem4;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public GButton m_btnTest;
+        public const string URL = "ui://t8nwuj7ievdh25";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "LimitedRechargeDBGiftUI";
+        private static UI_LimitedRechargeDBGiftUI _proxy;
+
+        public static UI_LimitedRechargeDBGiftUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LimitedRechargeDBGiftUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_LimitedRechargeDBGiftUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LimitedRechargeDBGiftUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_progress = (UI_ProgressBar2)UI_ProgressBar2.Create(comp.GetChild("progress"));
+            m_DBGiftItem1 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem1"));
+            m_DBGiftItem2 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem2"));
+            m_DBGiftItem3 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem3"));
+            m_DBGiftItem4 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem4"));
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+            m_btnTest = (GButton)comp.GetChild("btnTest");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_progress.Dispose();
+            m_progress = null;
+            m_DBGiftItem1.Dispose();
+            m_DBGiftItem1 = null;
+            m_DBGiftItem2.Dispose();
+            m_DBGiftItem2 = null;
+            m_DBGiftItem3.Dispose();
+            m_DBGiftItem3 = null;
+            m_DBGiftItem4.Dispose();
+            m_DBGiftItem4 = null;
+            m_txtTime = null;
+            m_grpTime = null;
+            m_btnTest = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_LimitedRechargeDBGiftUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ProgressBar2.cs

@@ -0,0 +1,93 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ProgressBar2
+    {
+        public GProgressBar target;
+        public UI_ComProBonus2 m_comProBonus0;
+        public UI_ComProBonus2 m_comProBonus1;
+        public UI_ComProBonus2 m_comProBonus2;
+        public UI_ComProBonus2 m_comProBonus3;
+        public GGroup m_comProBonusGroup;
+        public GGraph m_holder;
+        public GGraph m_holderReward;
+        public const string URL = "ui://t8nwuj7ievdh26";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ProgressBar2";
+        private static UI_ProgressBar2 _proxy;
+
+        public static UI_ProgressBar2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ProgressBar2();
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ProgressBar2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ProgressBar2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)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_comProBonus0 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus0"));
+            m_comProBonus1 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus1"));
+            m_comProBonus2 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus2"));
+            m_comProBonus3 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus3"));
+            m_comProBonusGroup = (GGroup)comp.GetChild("comProBonusGroup");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holderReward = (GGraph)comp.GetChild("holderReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comProBonus0.Dispose();
+            m_comProBonus0 = null;
+            m_comProBonus1.Dispose();
+            m_comProBonus1 = null;
+            m_comProBonus2.Dispose();
+            m_comProBonus2 = null;
+            m_comProBonus3.Dispose();
+            m_comProBonus3 = null;
+            m_comProBonusGroup = null;
+            m_holder = null;
+            m_holderReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ProgressBar2.cs.meta

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

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

@@ -8,6 +8,7 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_FlipOpenType;
         public GGraph m_holder;
         public GGraph m_holder1;
         public GLoader m_icon;
@@ -62,6 +63,7 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_FlipOpenType = comp.GetController("FlipOpenType");
             m_holder = (GGraph)comp.GetChild("holder");
             m_holder1 = (GGraph)comp.GetChild("holder1");
             m_icon = (GLoader)comp.GetChild("icon");
@@ -72,6 +74,7 @@ namespace UI.LuckyBox
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_FlipOpenType = null;
             m_holder = null;
             m_holder1 = null;
             m_icon = null;

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

@@ -23,7 +23,7 @@ namespace UI.LuckyBox
         public UI_LuckyBoxBonusShowItem m_item7;
         public UI_LuckyBoxBonusShowItem m_item8;
         public UI_LuckyBoxBonusShowItem m_item9;
-        public GGroup m_grpItems;
+        public GButton m_BtnPass;
         public Transition m_t0;
         public Transition m_t1;
         public const string URL = "ui://drx9d1use050tf3";
@@ -89,7 +89,7 @@ namespace UI.LuckyBox
             m_item7 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item7"));
             m_item8 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item8"));
             m_item9 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item9"));
-            m_grpItems = (GGroup)comp.GetChild("grpItems");
+            m_BtnPass = (GButton)comp.GetChild("BtnPass");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
         }
@@ -122,7 +122,7 @@ namespace UI.LuckyBox
             m_item8 = null;
             m_item9.Dispose();
             m_item9 = null;
-            m_grpItems = null;
+            m_BtnPass = null;
             m_t0 = null;
             m_t1 = null;
             if(disposeTarget && target != null)

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

@@ -17,9 +17,6 @@ namespace UI.Main
         public UI_ButtonModle1 m_btnZhaiXing;
         public UI_ButtonModle1 m_btnHaiZhiShi;
         public GGraph m_BottomEffectHolder;
-        public UI_BtnModle m_btnFirstRecharge;
-        public UI_BtnModle m_btnGiftBag1;
-        public UI_BtnModle m_btnGiftBag2;
         public UI_ComponentHeadBar m_headBar;
         public GButton m_btnYouJian;
         public GButton m_btnGongGao;
@@ -29,6 +26,10 @@ namespace UI.Main
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle2 m_btnActivityDay7;
         public UI_BtnModle2 m_btnActivityLuckyBox;
+        public UI_BtnModle2 m_btnLimitedRechargeDBGift;
+        public UI_BtnModle m_btnFirstRecharge;
+        public UI_BtnModle m_btnGiftBag1;
+        public UI_BtnModle m_btnGiftBag2;
         public GGroup m_grpLeft;
         public GButton m_loaLeft;
         public UI_ButtonModle7 m_btn1;
@@ -102,9 +103,6 @@ namespace UI.Main
             m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
             m_btnHaiZhiShi = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHaiZhiShi"));
             m_BottomEffectHolder = (GGraph)comp.GetChild("BottomEffectHolder");
-            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_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_btnYouJian = (GButton)comp.GetChild("btnYouJian");
             m_btnGongGao = (GButton)comp.GetChild("btnGongGao");
@@ -114,6 +112,10 @@ namespace UI.Main
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
+            m_btnLimitedRechargeDBGift = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnLimitedRechargeDBGift"));
+            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_grpLeft = (GGroup)comp.GetChild("grpLeft");
             m_loaLeft = (GButton)comp.GetChild("loaLeft");
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
@@ -149,12 +151,6 @@ namespace UI.Main
             m_btnHaiZhiShi.Dispose();
             m_btnHaiZhiShi = null;
             m_BottomEffectHolder = null;
-            m_btnFirstRecharge.Dispose();
-            m_btnFirstRecharge = null;
-            m_btnGiftBag1.Dispose();
-            m_btnGiftBag1 = null;
-            m_btnGiftBag2.Dispose();
-            m_btnGiftBag2 = null;
             m_headBar.Dispose();
             m_headBar = null;
             m_btnYouJian = null;
@@ -170,6 +166,14 @@ namespace UI.Main
             m_btnActivityDay7 = null;
             m_btnActivityLuckyBox.Dispose();
             m_btnActivityLuckyBox = null;
+            m_btnLimitedRechargeDBGift.Dispose();
+            m_btnLimitedRechargeDBGift = null;
+            m_btnFirstRecharge.Dispose();
+            m_btnFirstRecharge = null;
+            m_btnGiftBag1.Dispose();
+            m_btnGiftBag1 = null;
+            m_btnGiftBag2.Dispose();
+            m_btnGiftBag2 = null;
             m_grpLeft = null;
             m_loaLeft = null;
             m_btn1.Dispose();

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

@@ -11,6 +11,7 @@ namespace GFGGame
         {
             LeagueDataManager.Instance.TeaPartyId = message.TeapartyId;
             LeagueDataManager.Instance.TeaPartyStatus = message.Status;
+            LeagueDataManager.Instance.TeaPartyCloseTime = message.TeaPartyCloseTime;
             EventAgent.DispatchEvent(ConstMessage.TEA_PARTY_STATU);
             await ETTask.CompletedTask;
         }

GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -140,7 +140,7 @@ namespace GFGGame
 
         private void OnClickListCardItem(EventContext context)
         {
-            ViewManager.Show<CardFosterView>((context.data as GObject).data, new object[] { ViewName.CARD_DETAIL_VIEW, _ui.m_listRole.selectedIndex });
+            ViewManager.Show<CardFosterView>((context.data as GObject).data, new object[] { typeof(CardDetailView).FullName, _ui.m_listRole.selectedIndex });
             // this.Clear();
 
         }
@@ -168,11 +168,11 @@ namespace GFGGame
         /*******************************************************监听函数**************************************************/
         private void OnclickBtnFilter()
         {
-            ViewManager.Show<CardFilterView>(null, new object[] { ViewName.CARD_DETAIL_VIEW, _ui.m_listRole.selectedIndex });
+            ViewManager.Show<CardFilterView>(null, new object[] {typeof(CardDetailView).FullName, _ui.m_listRole.selectedIndex });
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.CARD_DETAIL_VIEW);
+            ViewManager.GoBackFrom(typeof(CardDetailView).FullName);
             _startInAnim = true;
         }
 

GameClient/Assets/Game/HotUpdate/Views/Card/CardFilterView.cs

@@ -180,7 +180,7 @@ namespace GFGGame
 
         private void OnClickBtnGo()
         {
-            // ViewManager.GoBackFrom(ViewName.CARD_FILTER_VIEW);
+             //ViewManager.GoBackFrom(typeof(CardFilterView).FullName);
             EventAgent.DispatchEvent(ConstMessage.CARD_FILTER);
             this.Hide();
         }

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -469,7 +469,7 @@ namespace GFGGame
 
                 if (ItemDataManager.GetItemNum(itemId) == 0)
                 {
-                    object[] sourceDatas = new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } };
+                    object[] sourceDatas = new object[] { itemId, new object[] { typeof(CardFosterView).FullName, _cardData } };
                     GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
                 }
             }
@@ -675,7 +675,7 @@ namespace GFGGame
                     if (_showLv - lv >= 1)
                     {
                         // this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
-                        ViewManager.Show<CardUpView>(new object[] { _cardData.scores, "lv", lv, _showLv , _cardData.id }, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
+                        ViewManager.Show<CardUpView>(new object[] { _cardData.scores, "lv", lv, _showLv , _cardData.id }, new object[] { typeof(CardFosterView).FullName, _cardData });
                     }
                     this.UpdateCommon();
                     this.UpdateUpLvView(false, 0, 0, true);
@@ -870,8 +870,8 @@ namespace GFGGame
         {
             int itemId = int.Parse(UI_ComStarConsume.Proxy(_comFosterBottom.m_listStarConsume.GetChildAt(index)).target.data.ToString());
 
-            //ViewManager.Show<ApproachOfItemView>(new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } });
-            object[] sourceDatas = new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } };
+            //ViewManager.Show<ApproachOfItemView>(new object[] { itemId, new object[] { typeof(CardFosterView).FullName, _cardData } });
+            object[] sourceDatas = new object[] { itemId, new object[] { typeof(CardFosterView).FullName, _cardData } };
             GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
         }
 
@@ -1002,7 +1002,7 @@ namespace GFGGame
 
         private void OpenCardUp(string strType)
         {
-            ViewManager.Show<CardUpView>(new object[] { _cardData.scores, strType, _cardData.star - 1, _cardData.star, _cardData.id }, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
+            ViewManager.Show<CardUpView>(new object[] { _cardData.scores, strType, _cardData.star - 1, _cardData.star, _cardData.id }, new object[] { typeof(CardFosterView).FullName, _cardData });
         }
         /***********************************************************升技能***************************************************/
 
@@ -1232,7 +1232,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.CARD_FOSTER_VIEW);
+            ViewManager.GoBackFrom(typeof(CardFosterView).FullName);
             this._selectTab = 0;
         }
         private void UpdateRedDot()

GameClient/Assets/Game/HotUpdate/Views/Card/CardMoodView.cs

@@ -86,7 +86,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
 
-            ViewManager.GoBackFrom(ViewName.CARD_Mood_VIEW);
+            ViewManager.GoBackFrom(typeof(CardMoodView).FullName);
 
         }
 

GameClient/Assets/Game/HotUpdate/Views/Card/CardShowView.cs

@@ -47,7 +47,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
 
-            ViewManager.GoBackFrom(ViewName.CARD_SHOW_VIEW);
+            ViewManager.GoBackFrom(typeof(CardShowView).FullName);
             EventAgent.DispatchEvent(ConstMessage.PLAT_CARDFOSTER_T1);
             _ui.target.scrollPane.SetPercX(0.5f, true);
 

GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -123,8 +123,8 @@ namespace GFGGame
             int itemId = int.Parse(comStarConsume.target.data.ToString());
             UI_ComStarConsume.ProxyEnd();
             CardData cardData = CardDataManager.GetCardDataById(_cardId);
-            //ViewManager.Show<ApproachOfItemView>(new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, cardData } });
-            object[] sourceDatas = new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, cardData } };
+            //ViewManager.Show<ApproachOfItemView>(new object[] { itemId, new object[] { typeof(CardFosterView).FullName, cardData } });
+            object[] sourceDatas = new object[] { itemId, new object[] { typeof(CardFosterView).FullName, cardData } };
             GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
         }
         private async void OnClickBtnUp()

GameClient/Assets/Game/HotUpdate/Views/Card/CardView.cs

@@ -46,7 +46,7 @@ namespace GFGGame
         /*******************************************************¼àÌýº¯Êý**************************************************/
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.CARD_VIEW);
+            ViewManager.GoBackFrom(typeof(CardView).FullName);
             _ui.m_c1.selectedIndex = 0;
             _ui.m_t0.Stop(true, false);
         }
@@ -63,7 +63,7 @@ namespace GFGGame
             });
             _ui.m_t0.SetHook("open", () =>
             {
-                ViewManager.Show<CardDetailView>(null, new object[] { ViewName.CARD_VIEW, this.viewData });
+                ViewManager.Show<CardDetailView>(null, new object[] { typeof(CardView).FullName, this.viewData });
             });
         }
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -198,7 +198,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.CLOTHING_SHOP_VIEW);
+            ViewManager.GoBackFrom(typeof(ClothingShopView).FullName);
             this.Hide();
 
         }

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -136,7 +136,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.CLOTHING_SYNTHETIC_VIEW);
+            ViewManager.GoBackFrom(typeof(ClothingSyntheticView).FullName);
         }
 
         private void OnClickListClothingItem(EventContext context)
@@ -348,7 +348,7 @@ namespace GFGGame
             int index = (int)(context.data as GObject).data;
             _ui.m_listMaterias.selectedIndex = index;
             ItemData itemData = _materiarsOfSelectedItem[index];
-            object[] sourceDatas = new object[] { itemData.id, new object[] { ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { _suitId, _selectedItemId } }, (int)itemData.num };
+            object[] sourceDatas = new object[] { itemData.id, new object[] { typeof(ClothingSyntheticView).FullName, new object[] { _suitId, _selectedItemId } }, (int)itemData.num };
             GoodsItemTipsController.ShowItemTips(itemData.id, sourceDatas);
         }
 

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -76,7 +76,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.SUIT_SYNTHETIC_LIST_VIEW);
+            ViewManager.GoBackFrom(typeof(SuitSyntheticView).FullName);
         }
 
         private void OnClickListMenuItem()
@@ -168,7 +168,7 @@ namespace GFGGame
             {
                 if (!isLock)
                 {
-                    ViewManager.Show<ClothingSyntheticView>(new object[] { suitId }, new object[] { ViewName.SUIT_SYNTHETIC_LIST_VIEW, suitId });
+                    ViewManager.Show<ClothingSyntheticView>(new object[] { suitId }, new object[] { typeof(SuitSyntheticView).FullName, suitId });
                 }
             });
             RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetClothingSyntheticRed(suitId), "", 0, 0);

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/GetSuitItemController.cs

@@ -25,6 +25,13 @@ namespace GFGGame
             }
         }
 
+        public static bool GetSuitWaitingToId(int itemId)
+        {
+            int suitId = SuitCfgArray.Instance.GetSuitIdOfItem(itemId);
+            int index = _waitingToShowSuit.IndexOf(suitId);
+            return index >= 0;
+        }
+
         public static int TryShow(int itemId)
         {
             int suitId = 0;

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

@@ -11,7 +11,7 @@ namespace GFGGame
         private object[] _viewData;
 
         private int _itemId;
-        private object[] _fromeViewDatas;
+        private object[] _fromViewDatas;
         private int _needCount;//需求总量
         private List<string[]> _approachDatas = new List<string[]>();
 
@@ -33,7 +33,7 @@ namespace GFGGame
                 _ui.m_list.numItems = 0;
             }
             _approachDatas.Clear();
-            _fromeViewDatas = null;
+            _fromViewDatas = null;
         }
         public void OnInit(GComponent component)
         {
@@ -45,7 +45,7 @@ namespace GFGGame
         {
             _viewData = viewData;
             _itemId = (int)viewData[0];
-            _fromeViewDatas = viewData[1] as object[];
+            _fromViewDatas = viewData[1] as object[];
             // _needCount = viewData.Length > 2 ? (int)viewData[2] : 0;
             int needCount = viewData.Length > 2 ? (int)viewData[2] : 0;
             _needCount = (int)needCount;
@@ -167,11 +167,11 @@ namespace GFGGame
                     //     isJump = false;
                     //     break;
                     // }
-                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, _fromeViewDatas, true, true);
+                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, _fromViewDatas, true, true);
                     break;
                 case ConstFunctionId.FU_ZHUANG_DECOMPOSE:
                     // this.Hide();
-                    isJump = ViewManager.Show<ClothingDecomposeView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<ClothingDecomposeView>(null, _fromViewDatas);
                     break;
                 case ConstFunctionId.STORE:
 
@@ -226,7 +226,7 @@ namespace GFGGame
                         if (studioCfg.funId == typeof(StudioFilingView).Name)
                         {
                             StudioDataManager.Instance.filingChapterId = studioCfg.id;
-                            ViewManager.Show<StudioFilingView>(null, _fromeViewDatas);
+                            ViewManager.Show<StudioFilingView>(null, _fromViewDatas);
                             MainStoryDataManager.currentLevelCfgId = levelCfg.id;
                             InstanceZonesController.ShowLevelView(levelCfg.id, StudioDataManager.Instance.OnFinishFilingStoryLevel, _itemId, _needCount);
                             isJump = true;
@@ -248,7 +248,7 @@ namespace GFGGame
                             }
                             string viewName = "GFGGame." + studioCfg.funId;
 
-                            ViewManager.Show(viewName, StudioDataManager.Instance.PROPERTY_SELECT_INDEX, _fromeViewDatas);
+                            ViewManager.Show(viewName, StudioDataManager.Instance.PROPERTY_SELECT_INDEX, _fromViewDatas);
                             StudioDataManager.Instance.VIEW_NAME = viewName;
                             InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStudioStoryLevel, _itemId, _needCount);
                             isJump = true;
@@ -259,7 +259,7 @@ namespace GFGGame
                     {
                         // if (levelCfg.type == ConstInstanceZonesType.Story)
                         // {
-                        if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(ViewName.STORY_CHAPTER_VIEW))
+                        if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterView).FullName))
                         {
                             break;
                         }
@@ -269,12 +269,12 @@ namespace GFGGame
                             break;
                         }
 
-                        if ((string)_fromeViewDatas[0] == ViewName.DRESS_UP_FIGHT_VIEW)
+                        if ((string)_fromViewDatas[0] == typeof(DressUpFightView).FullName)
                         {
                             //从战斗换装必需品来源跳转到剧情界面，在剧情界面点返回后直接返回章节界面，无需返回换装界面
-                            _fromeViewDatas = null;
+                            _fromViewDatas = null;
                         }
-                        isJump = ViewManager.Show<StoryChapterView>(levelCfg.chapterId, _fromeViewDatas, true);
+                        isJump = ViewManager.Show<StoryChapterView>(levelCfg.chapterId, _fromViewDatas, true);
                         StoryController.ShowLevelView(levelCfgId, _itemId, _needCount);
                         break;
                     }
@@ -288,46 +288,46 @@ namespace GFGGame
                         bool isPass = InstanceZonesDataManager.CheckLevelPass(suitCfg.syntheticStoryLevelId);
                         if (suitCfg.syntheticStoryLevelId > 0 && !isPass)
                         {
-                            isJump = ViewManager.Show<SuitSyntheticView>(suitId, _fromeViewDatas);
+                            isJump = ViewManager.Show<SuitSyntheticView>(suitId, _fromViewDatas);
                         }
                         else
                         {
-                            isJump = ViewManager.Show<ClothingSyntheticView>(new object[] { suitId, _itemId }, _fromeViewDatas);
+                            isJump = ViewManager.Show<ClothingSyntheticView>(new object[] { suitId, _itemId }, _fromViewDatas);
                         }
                     }
                     break;
                 case ConstFunctionId.ZHAI_XING:
                     // this.Hide();
-                    isJump = ViewManager.Show<LuckyBoxView>(null, _fromeViewDatas, true);
+                    isJump = ViewManager.Show<LuckyBoxView>(null, _fromViewDatas, true);
                     break;
                 case ConstFunctionId.TAO_ZHUANG_TU_JIAN:
                     isJump = false;
-                    if (ViewManager.isViewOpen(ViewName.SUIT_GUIDE_VIEW))
+                    if (ViewManager.isViewOpen(typeof(SuitGuideView).FullName))
                     {
                         return;
                     }
-                    isJump = ViewManager.Show<SuitGuideView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<SuitGuideView>(null, _fromViewDatas);
 
                     break;
                 case ConstFunctionId.TAO_ZHUANG_HE_CHENG:
                     isJump = ViewManager.Show<SuitSyntheticView>();
                     break;
                 case ConstFunctionId.SUIT_FOSTER:
-                    isJump = ViewManager.Show<ClothingListView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<ClothingListView>(null, _fromViewDatas);
                     break;
                 case ConstFunctionId.DAILY_TASK:
-                    isJump = ViewManager.Show<TaskView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<TaskView>(null, _fromViewDatas);
                     break;
                 case ConstFunctionId.WEEKLY_TASK:
-                    isJump = ViewManager.Show<TaskView>(new object[] { 1 }, _fromeViewDatas);
+                    isJump = ViewManager.Show<TaskView>(new object[] { 1 }, _fromViewDatas);
                     break;
                 case ConstFunctionId.LEAGUE_PRAY:
-                    isJump = ViewManager.Show<LeaguePrayView>(null, _fromeViewDatas);
+                    isJump = ViewManager.Show<LeaguePrayView>(null, _fromViewDatas);
                     break;
                 case ConstFunctionId.LEAGUE_ANSWER:
                     if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
                     {
-                        ViewManager.Show<LeagueView>(null, _fromeViewDatas);
+                        ViewManager.Show<LeagueView>(null, _fromViewDatas);
                         isJump = ViewManager.Show<LeagueAnswerView>();
                     }
                     else

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

@@ -73,15 +73,15 @@ namespace GFGGame
 
         private void OnClickBg()
         {
-            int suitId = GetSuitItemController.TryShow(0);
-            if (suitId > 0)
-            {
-                UpdateView(suitId);
-            }
-            else
-            {
+            //int suitId = GetSuitItemController.TryShow(0);
+            //if (suitId > 0)
+            //{
+            //    UpdateView(suitId);
+            //}
+            //else
+            //{
                 Hide();
-            }
+            //}
         }
 
         private void UpdateItem(int itemdId)

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/GiftDetailView.cs

@@ -0,0 +1,10 @@
+using System.Collections;
+using UnityEngine;
+
+namespace Assets.Game.HotUpdate.Views.DailyWelfare
+{
+    public class GiftDetailView : MonoBehaviour
+    {
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/GiftDetailView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs

@@ -86,7 +86,7 @@ namespace GFGGame
         private void UpdateView()
         {
             _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_activityId);
-            _rechargeCfgs = SoreCfg(_rechargeCfgs);
+            _rechargeCfgs = SortCfg(_rechargeCfgs);
             _ui.m_list.numItems = _rechargeCfgs.Count;
             ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xslc_banner_" + openCfg.res);
@@ -100,7 +100,7 @@ namespace GFGGame
             item.m_txtTitle.text = string.Format("活动期间累计获得{0}会员积分({1}/{2})", _rechargeCfgs[index].value, limitChargeExp, _rechargeCfgs[index].value);
             if (limitChargeExp >= _rechargeCfgs[index].value)
             {
-                item.m_c1.selectedIndex = _activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].id) >= 0 ? 2 : 1;
+                item.m_c1.selectedIndex = _activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].id) >= 0 ? 2 : 1; 
             }
             else
             {
@@ -139,7 +139,7 @@ namespace GFGGame
             int id = (int)obj.data;
             ActivityGlobalSProxy.ReqGetActivityBonus(_activityId, id).Coroutine();
         }
-        private List<ActivityRechargeCfg> SoreCfg(List<ActivityRechargeCfg> rechargeCfgs)
+        private List<ActivityRechargeCfg> SortCfg(List<ActivityRechargeCfg> rechargeCfgs)
         {
             rechargeCfgs.Sort((ActivityRechargeCfg a, ActivityRechargeCfg b) =>
             {

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitedRechargeDBGiftView.cs

@@ -0,0 +1,228 @@
+using ET;
+using FairyGUI;
+using System;
+using System.Collections.Generic;
+using UI.DailyWelfare;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class LimitedRechargeDBGiftView : BaseWindow
+    {
+        private UI_LimitedRechargeDBGiftUI _ui;
+
+        private int _minProgressOffset = 6;
+        private int _maxProgressOffset = -8;
+        private ActivityInfo _activityInfo;
+        private ActivityRecharge2Cfg[] _rechargeCfgs;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LimitedRechargeDBGiftUI.PACKAGE_NAME;
+            _ui = UI_LimitedRechargeDBGiftUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_btnTest.onClick.Add(OnClickBtnTest);
+            _rechargeCfgs = ActivityRecharge2CfgArray.Instance.dataArray;
+            InitProgressValueList();
+            InitReward();
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.ACTIVITY_REWARD_ADD, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.ACTIVITY_COUNT_VALUE_CHANGE, UpdateView);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_REWARD_ADD, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_COUNT_VALUE_CHANGE, UpdateView);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            UpdateView();
+            UpdateProgress();
+            Timers.inst.Add(1, 0, UpdateTime);
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            Timers.inst.Remove(UpdateTime);
+        }
+
+        private void OnClickBtnTest(EventContext context)
+        {
+            UpdateProgress();
+        }
+
+
+        private int[] _progressValuePart;
+        private int _partNum = 4;
+
+        private void InitProgressValueList()
+        {
+            _progressValuePart = new int[_partNum];
+            _ui.m_progress.target.max = _rechargeCfgs[_rechargeCfgs.Length - 1].value;
+            int max = (int)_ui.m_progress.target.max;
+            int average = (int)Mathf.Ceil((float)(_ui.m_progress.target.max / (_partNum - 1)));
+
+            _progressValuePart[0] = 0;
+            _progressValuePart[_partNum - 1] = max;
+            for (int i = 1; i < _partNum - 1; i++)
+            {
+                _progressValuePart[i] = i * average;
+            }
+        }
+
+        /// <summary>
+        /// 初始化奖励的UI
+        /// </summary>
+        private void InitReward()
+        {
+            // 包子图
+
+            // 大奖icon
+
+        }
+
+        private void UpdateProgress()
+        {
+            int max = (int)_ui.m_progress.target.max;
+            long count = _activityInfo.CountValue;
+
+            // 确定count的区间
+            if (count == 0 || count == max)
+            {
+                _ui.m_progress.target.value = count;
+            }
+            else
+            {
+                int index = 1;
+                for (; index < _progressValuePart.Length; index++)
+                {
+                    if (count < _progressValuePart[index])
+                    {
+                        --index;
+                        break;
+                    }
+                }
+
+                // 计算进度条最小取值和最大取值，避免因为图标遮挡造成视觉错误
+                int minProgressValue = _progressValuePart[index] + _minProgressOffset;
+                int maxProgressValue = _progressValuePart[index + 1] + _maxProgressOffset;
+
+                if (count == _progressValuePart[index] || count == _progressValuePart[index + 1])
+                {
+                    _ui.m_progress.target.value = count;
+                }
+                else
+                {
+                    _ui.m_progress.target.value = Mathf.Clamp(count, minProgressValue, maxProgressValue);
+                }
+
+                // 检测玩家是否领取奖励
+                UpdateRewardState(index);
+            }
+        }
+
+        private void UpdateTime(object param)
+        {
+            long curTime = TimeHelper.ServerNow();
+            long endTime = _activityInfo.EndTime;
+            _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+        }
+
+        private void UpdateView()
+        {
+            _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.DBGift);
+            UpdateProgress();
+        }
+
+        private struct GetState
+        {
+            public int index;
+            public bool canGet;
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="index">玩家可领取的最大奖励index</param>
+        private void UpdateRewardState(int index)
+        {
+            GComponent comProBonusGroup = _ui.m_progress.m_comProBonusGroup.asCom;
+
+            for(int i = 0; i < _partNum; i++)
+            {
+                bool arrive = (i <= index);
+                UI_ComProBonus2 bonus = UI_ComProBonus2.Proxy(comProBonusGroup.GetChildAt(i));
+                bonus.target.data = new GetState
+                {
+                    index = i,
+                    canGet = arrive
+                };
+
+                // 玩家已经达到的奖励
+                if (arrive)
+                {
+                    // 已领
+                    if (_activityInfo.GetRewards.IndexOf(_rechargeCfgs[i].id) > 0)
+                    {
+                        bonus.m_imgGot.visible = true;
+                        bonus.target.touchable = false;
+                        // 隐藏红点
+                        RedDotController.Instance.SetComRedDot(bonus.target, false);
+                    }
+                    // 未领
+                    else
+                    {
+                        bonus.m_imgGot.visible = false;
+                        // 显示红点
+                        RedDotController.Instance.SetComRedDot(bonus.target, true);
+                    }
+                }
+                bonus.target.onClick.Set(OnClickGift);
+                UI_ComProBonus2.ProxyEnd();
+            }
+        }
+
+        private void OnClickGift(EventContext eventContext)
+        {
+            GObject gObject = (GObject)eventContext.data;
+            GetState getState = (GetState)gObject.data;
+
+            if (getState.canGet)
+            {
+                ActivityGlobalSProxy.ReqGetActivityBonus(_activityInfo.ActivityId, _rechargeCfgs[getState.index].id).Coroutine();
+            }
+            else
+            {
+                // 显示奖励详细列表
+                //ViewManager.Show<UI_GiftDetailUI>
+            }
+        }
+    }
+
+}

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitedRechargeDBGiftView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs

@@ -972,7 +972,7 @@ namespace GFGGame
 
         private void OnClickBtnSearch()
         {
-            ViewManager.Show<DressFilterView>(false, new object[] { ViewName.DRESS_UP_VIEW });
+            ViewManager.Show<DressFilterView>(false, new object[] { typeof(DressUpView).FullName});
         }
         private void OnClickBtnLastStep()
         {

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -314,12 +314,12 @@ namespace GFGGame
             }
             else if (_levelCfg.type == ConstInstanceZonesType.Field)
             {
-                ViewManager.GoBackFrom(ViewName.DRESS_UP_FIGHT_VIEW);
+                ViewManager.GoBackFrom(typeof(DressUpFightView).FullName);
             }
             else
             {
-                // ViewManager.GoBackFrom(ViewName.STORY_CHAPTER_VIEW);
-                ViewManager.Show<StoryChapterView>(_levelCfg.chapterId);//, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW }
+                 //ViewManager.GoBackFrom(typeof(StoryChapterView).FullName);
+                ViewManager.Show<StoryChapterView>(_levelCfg.chapterId);//, new object[] { typeof(StoryChapterListView).FullName}
             }
             //MyDressUpHelper.dressUpObj.TakeOffAll();
 
@@ -1329,7 +1329,7 @@ namespace GFGGame
 
         private void OnClickBtnSearch()
         {
-            ViewManager.Show<DressFilterView>(false, new object[] { ViewName.DRESS_UP_VIEW });
+            ViewManager.Show<DressFilterView>(false, new object[] { typeof(DressUpView).FullName});
         }
         private void OnClickBtnAutoPlay()
         {
@@ -1350,7 +1350,7 @@ namespace GFGGame
             else
             {
                 int itemId = (int)_ui.m_compNeed.target.data;
-                object[] sourceDatas = new object[] { itemId, new object[] { ViewName.DRESS_UP_FIGHT_VIEW, this.viewData }, 1 };
+                object[] sourceDatas = new object[] { itemId, new object[] { typeof(DressUpFightView).FullName, this.viewData }, 1 };
                 GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
             }
         }

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -453,7 +453,7 @@ namespace GFGGame
         }
         private void OnClickBtnSearch()
         {
-            ViewManager.Show<DressFilterView>(true, new object[] { ViewName.DRESS_UP_VIEW });
+            ViewManager.Show<DressFilterView>(true, new object[] { typeof(DressUpView).FullName});
         }
 
 

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpGuideView.cs

@@ -16,7 +16,6 @@ namespace GFGGame
         private UI_DressUpGuideUI _ui;
         private List<int> _itemIdList;
         private bool _startInAnim;
-        private bool first = true;
 
         // 上次点击单选按钮的index
         private struct LastClickIndex
@@ -311,7 +310,7 @@ namespace GFGGame
 
         private void OnClickBtnSearch()
         {
-            ViewManager.Show<DressFilterView>(false, new object[] { ViewName.DRESS_UP_VIEW });
+            ViewManager.Show<DressFilterView>(false, new object[] {typeof(DressUpView).FullName});
         }
 
         private void FilterItems(EventContext context)

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs

@@ -74,7 +74,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             _startInAnim = true;
-            ViewManager.GoBackFrom(ViewName.FIELD_GUIDE_VIEW);
+            ViewManager.GoBackFrom(typeof(FieldGuideView).FullName);
             HideAllRedDot();
         }
 
@@ -129,19 +129,19 @@ namespace GFGGame
             switch (id)
             {
                 case ConstFieldGuideId.SUIT_GUIDE:
-                    ViewManager.Show<SuitGuideView>(null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    ViewManager.Show<SuitGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
                     break;
                 case ConstFieldGuideId.CHAPTER_ITEM:
-                    ViewManager.Show<ChapterItemGuideView>(null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    ViewManager.Show<ChapterItemGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
                     break;
                 case ConstFieldGuideId.TRAVEL_GUIDE:
-                    ViewManager.Show<TravelGuideView>(null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    ViewManager.Show<TravelGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
                     break;
                 case ConstFieldGuideId.DRESS_UP_GUIDE:
-                    ViewManager.Show<DressUpGuideView>(null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    ViewManager.Show<DressUpGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
                     break;
                 case ConstFieldGuideId.CARD_GUIDE:
-                    ViewManager.Show<CardGuideView>(null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    ViewManager.Show<CardGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
                     break;
             }
         }

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

@@ -155,7 +155,7 @@ namespace GFGGame
             item.target.data = typeId;
             item.target.onClick.Add(() =>
             {
-                ViewManager.Show<SuitGuideDetailView>(typeId, new object[] { ViewName.SUIT_GUIDE_VIEW, this.viewData });
+                ViewManager.Show<SuitGuideDetailView>(typeId, new object[] { typeof(SuitGuideView).FullName, this.viewData });
             });
 
             _suitTypeItems.Add(item);
@@ -198,14 +198,14 @@ namespace GFGGame
         {
             GObject obj = eventContext.data as GObject;
             int index = _ui.m_suitType2Items.GetChildIndex(obj);
-            ViewManager.Show<SuitGuideDetailView>(_menuTypeAllDataDic[_ui.m_c1.selectedIndex + 1][index], new object[] { ViewName.SUIT_GUIDE_VIEW, this.viewData });
+            ViewManager.Show<SuitGuideDetailView>(_menuTypeAllDataDic[_ui.m_c1.selectedIndex + 1][index], new object[] { typeof(SuitGuideView).FullName, this.viewData });
         }
 
         private void OnClickBtnBack()
         {
             UpdateItemsByType(1);
             _ui.m_suitTypeItems.target.scrollPane.ScrollTop();
-            ViewManager.GoBackFrom(ViewName.SUIT_GUIDE_VIEW);
+            ViewManager.GoBackFrom(typeof(SuitGuideView).FullName);
         }
 
         private IEnumerator UpdateRedDot()

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitPartsDetailView.cs

@@ -94,7 +94,7 @@ namespace GFGGame
             else
             {
                 // this.Hide();
-                //ViewManager.Show<ApproachOfItemView>(new object[] { itemId, new object[] { ViewName.SUIT_GUIDE_VIEW, this.viewData } });
+                //ViewManager.Show<ApproachOfItemView>(new object[] { itemId, new object[] { typeof(SuitGuideView).FullName, this.viewData } });
                 object[] goBackDatas = ViewManager.GetGoBackDatas(typeof(SuitPartsDetailView).Name);
                 object[] sourceDatas = new object[] { itemId, goBackDatas, 1 };
                 GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);

GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnswerView.cs

@@ -81,16 +81,16 @@ namespace GFGGame
         private void OnBtnAnswerClick()
         {
             Hide();
-            ViewManager.Show<LeagueAnsweringView>(null, new object[] { });
+            ViewManager.Show<LeagueAnsweringView>();
         }
 
         private void OnBtnTeaPartyClick()
         {
             Hide();
             if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo && !LeagueDataManager.Instance.RoleTeapartyInfo.IsComplete && LeagueDataManager.Instance.RoleTeapartyInfo.Status)
-                ViewManager.Show<LeagueTeaPartyShowView>();
-            else
-                ViewManager.Show<LeagueTeaPartyView>();
+                ViewManager.Show<LeagueTeaPartyShowView>(null, new object[] { typeof(LeagueView).FullName, null });
+            else 
+                ViewManager.Show<LeagueTeaPartyView>(null, new object[] { typeof(LeagueView).FullName, null });
         }
         
         private void UpdateView()

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyOverView.cs

@@ -70,7 +70,6 @@ namespace GFGGame
         {
             base.OnHide();
             Timers.inst.Remove(UpdateTime);
-            ViewManager.Show<LeagueTeaPartyView>();
         }
 
         protected override void RemoveEventListener()
@@ -94,7 +93,7 @@ namespace GFGGame
 
         private void OnBtnBackClick()
         {
-            ViewManager.GoBackFrom(typeof(LeagueView).FullName);
+            ViewManager.GoBackFrom(typeof(LeagueTeaPartyOverView).FullName);
         }
 
         private void OnBtnRewardClick()

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyRewardView.cs

@@ -64,11 +64,6 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.TEA_PARTY_REWARD, UpTeaPartyRewardData);
         }
 
-        private void OnBtnBackClick()
-        {
-            ViewManager.GoBackFrom(typeof(LeagueView).FullName);
-        }
-
         //½ÇÉ«ÆÀÑ¡½±Àø
         private void SetPersonScoreList()
         {

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyShowView.cs

@@ -87,23 +87,19 @@ namespace GFGGame
 
         private void OnBtnBackClick()
         {
-            ViewManager.GoBackFrom(typeof(LeagueView).FullName);
+            ViewManager.GoBackFrom(typeof(LeagueTeaPartyShowView).FullName);
         }
 
         private void openNextView()
         {
-            if (LeagueDataManager.Instance.RoleContainerList.Count > 0)
-            {
-                string stroyStartID = "50001";
-                ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, true }, null, true);
-            }
-            else
-                ViewManager.Show<LeagueTeaPartyOverView>();
+            var openCfg = TeapartyOpenCfgArray.Instance.GetCfg(LeagueDataManager.Instance.TeaPartyId);
+            string stroyStartID = openCfg.storyId.ToString();
+            ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, true }, null, true);
         }
 
         private static void OnCompletePriorStoryDialog(bool isSkip, object param)
         {
-            ViewManager.Show<LeagueTeaPartyOverView>();
+            ViewManager.Show<LeagueTeaPartyOverView>(null, new object[] { typeof(LeagueView).FullName, null });
         }
 
         private void UpdateTime(object param)

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyView.cs

@@ -12,6 +12,7 @@ namespace GFGGame
         private UI_LeagueTeaPartyUI _ui;
         private List<TeapartyRoleCfg> teapartyRoleCfg;
         private List<GObject> TeaPartyItemObj = new List<GObject>();
+        Dictionary<int, int> TeapartyRoleIdList = new Dictionary<int, int>();
 
         public override void Dispose()
         {
@@ -123,15 +124,18 @@ namespace GFGGame
 
             string strAlertText = "";
             var roleContainerList = LeagueDataManager.Instance.RoleContainerList;
-            List<int> TeapartyRoleIdList = new List<int>();
+            int countRoleId = 0;
+            TeapartyRoleIdList.Clear();
             foreach (var info in roleContainerList) {
-                if (info.PerNum <= 0)
-                    TeapartyRoleIdList.Add(info.TeapartyRoleId);
+                if (info.PerNum <= 0) {
+                    TeapartyRoleIdList.Add(countRoleId,info.TeapartyRoleId);
+                    countRoleId += 1;
+                }
             }
             if (TeapartyRoleIdList.Count > 0) {
                 string strRoleName = "";
-                for (int index = 1; index < TeapartyRoleIdList.Count; index++) {
-                    strRoleName = strRoleName + teapartyRoleCfg[index].name;
+                for (int index = 0; index < TeapartyRoleIdList.Count; index++) {
+                    strRoleName = strRoleName + teapartyRoleCfg[TeapartyRoleIdList[index]-1].name;
                     if (index < TeapartyRoleIdList.Count - 1)
                         strRoleName = strRoleName + "、";
                 }
@@ -152,6 +156,7 @@ namespace GFGGame
             bool result = await LeagueSproxy.TeapartyStartChallenge(RoleDataManager.roleId);
             if (result)
             {
+                _ui.m_btnChallenge.grayed = LeagueDataManager.Instance.TeaPartyStatus != LeagueTeaPartyStatus.YesOpen;
                 TeaPartyStatuChange();
             }
         }
@@ -163,7 +168,7 @@ namespace GFGGame
         
         private void OnBtnBackClick()
         {
-            ViewManager.GoBackFrom(typeof(LeagueView).FullName);
+            ViewManager.GoBackFrom(typeof(LeagueTeaPartyView).FullName);
         }
 
         private void OnBtnDetailClick(EventContext context)
@@ -250,8 +255,8 @@ namespace GFGGame
         private void TeaPartyStatuChange()
         {
             if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo) {
-                if (LeagueDataManager.Instance.RoleTeapartyInfo.Status)
-                    ViewManager.Show<LeagueTeaPartyShowView>();
+                if (LeagueDataManager.Instance.RoleTeapartyInfo.Status && !LeagueDataManager.Instance.RoleTeapartyInfo.IsComplete) 
+                    ViewManager.Show<LeagueTeaPartyShowView>(null, new object[] { typeof(LeagueView).FullName, null });
                 else
                     OnBtnRewardClick();
             }

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

@@ -10,9 +10,17 @@ namespace GFGGame
     {
         private UI_LuckBoxBonusShowUI _ui;
         private List<ItemData> _rewardList = new List<ItemData>();
+        private List<ItemData> _rewardItemList = new List<ItemData>();
         private Dictionary<int , Dictionary<int, EffectUI>> _effListTen = new Dictionary<int, Dictionary<int, EffectUI>>();
         private Dictionary<int, EffectUI> _effList = new Dictionary<int, EffectUI>();
 
+        Dictionary<int, int> _itemIdList = new Dictionary<int, int>();
+        Dictionary<int, GComponent> _itemObjList = new Dictionary<int, GComponent>();
+        List<int> _recordOpenIndex = new List<int>();  //记录打开过得item位置
+        private int _countShow = 0;   //第几次展示
+        private int _countNewRecord = 0;  //展示步骤
+        private bool touchFlipOpen = true;   //禁用点击
+
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
         private EffectUI _effectUI3;
@@ -67,9 +75,11 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.onClick.Add(this.Hide);
+            _ui.m_loaBg.onClick.Add(OnClickLoaBg);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
 
+            _ui.m_BtnPass.onClick.Add(OnClickBtnPass);
+            
             UpdateEffect();
         }
         private void UpdateEffect()
@@ -82,6 +92,11 @@ namespace GFGGame
         {
             base.OnShown();
             _rewardList.AddRange(this.viewData as List<ItemData>);
+            _itemIdList.Clear();
+            _itemObjList.Clear();
+            _recordOpenIndex.Clear();
+            _ui.m_BtnPass.visible = true;
+
             if (_rewardList.Count == 1)
             {
                 _ui.m_c1.selectedIndex = 0;
@@ -102,59 +117,59 @@ namespace GFGGame
             _rewardList.Clear();
 
             base.OnHide();
-            GetSuitItemController.TryShow(0);
+            Timers.inst.Remove(UpDataTime);
+            Timers.inst.Remove(UpClickDataTime);
         }
 
         private void UpdateItem(GComponent com, int index, int countType)
         {
             UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(com);
-
             ItemData itemData = _rewardList[index];
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
             item.m_comIcon.m_c1.selectedIndex = itemCfg.rarity;
             item.m_comIcon.m_txtName.text = itemCfg.name;
             item.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
-            RarityIconController.UpdateRarityIcon(item.m_comIcon.m_rarity, itemData.id, false);
+            item.m_comIcon.m_FlipOpenType.selectedIndex = 1;
 
-            item.m_comIcon.m_holder.visible = false;
-            item.m_comIcon.m_holder1.visible = false;
+            //带特效的处理先注释
+            //item.m_comIcon.m_holder.visible = false;
+            //item.m_comIcon.m_holder1.visible = false;
+            //if (itemCfg.rarity > 2) { 
+            //    string resPath = itemCfg.rarity == ConstDressRarity.Rarity_TIANYI ? "CK_all_01" : "CK_all_02";
+            //    GGraph holder = itemCfg.rarity == 3 ? item.m_comIcon.m_holder : item.m_comIcon.m_holder1;
+            //    holder.visible = true;
+            //    if (countType == 10 && (!_effListTen.ContainsKey(index) ||
+            //        ((itemCfg.rarity == 3 && !_effListTen[index].ContainsKey(0)) || (itemCfg.rarity == 4 && !_effListTen[index].ContainsKey(1)))))
+            //    {
+            //        EffectUI _effectUI = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", resPath);
 
-            if (itemCfg.rarity > 2) { 
-                string resPath = itemCfg.rarity == ConstDressRarity.Rarity_TIANYI ? "CK_all_01" : "CK_all_02";
-                GGraph holder = itemCfg.rarity == 3 ? item.m_comIcon.m_holder : item.m_comIcon.m_holder1;
-                holder.visible = true;
-                if (countType == 10 && (!_effListTen.ContainsKey(index) ||
-                    ((itemCfg.rarity == 3 && !_effListTen[index].ContainsKey(0)) || (itemCfg.rarity == 4 && !_effListTen[index].ContainsKey(1)))))
-                {
-                    EffectUI _effectUI = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", resPath);
+            //        if (!_effListTen.ContainsKey(index))
+            //        {
+            //            Dictionary<int, EffectUI> effectList = new Dictionary<int, EffectUI>();
+            //            if (itemCfg.rarity == 3)
+            //                effectList.Add(0, _effectUI);
+            //            else if (itemCfg.rarity == 4)
+            //                effectList.Add(1, _effectUI);
+            //            _effListTen.Add(index, effectList);
+            //        }
+            //        else {
+            //            if (itemCfg.rarity == 3)
+            //                _effListTen[index].Add(0, _effectUI);
+            //            else if (itemCfg.rarity == 4)
+            //                _effListTen[index].Add(1, _effectUI);
+            //        }
+            //    }
 
-                    if (!_effListTen.ContainsKey(index))
-                    {
-                        Dictionary<int, EffectUI> effectList = new Dictionary<int, EffectUI>();
-                        if (itemCfg.rarity == 3)
-                            effectList.Add(0, _effectUI);
-                        else if (itemCfg.rarity == 4)
-                            effectList.Add(1, _effectUI);
-                        _effListTen.Add(index, effectList);
-                    }
-                    else {
-                        if (itemCfg.rarity == 3)
-                            _effListTen[index].Add(0, _effectUI);
-                        else if (itemCfg.rarity == 4)
-                            _effListTen[index].Add(1, _effectUI);
-                    }
-                }
-              
-                if (countType == 1 && 
-                    ((itemCfg.rarity == 3 && !_effList.ContainsKey(0)) || (itemCfg.rarity == 4 && !_effList.ContainsKey(1))))
-                {
-                    EffectUI _effectUI = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", resPath);
-                    if (itemCfg.rarity == 3)
-                        _effList.Add(0, _effectUI);
-                    else if (itemCfg.rarity == 4)
-                        _effList.Add(1, _effectUI);
-                }
-            }
+            //    if (countType == 1 && 
+            //        ((itemCfg.rarity == 3 && !_effList.ContainsKey(0)) || (itemCfg.rarity == 4 && !_effList.ContainsKey(1))))
+            //    {
+            //        EffectUI _effectUI = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", resPath);
+            //        if (itemCfg.rarity == 3)
+            //            _effList.Add(0, _effectUI);
+            //        else if (itemCfg.rarity == 4)
+            //            _effList.Add(1, _effectUI);
+            //    }
+            //}
 
             int count = 0;
             bool isFirst = false;
@@ -169,7 +184,10 @@ namespace GFGGame
             {
                 item.target.onClick.Add(ShowItemTips);
             }
-            item.target.data = itemCfg.id;
+            item.target.data = index;
+
+            _itemIdList.Add(index,itemCfg.id);
+            _itemObjList.Add(index, com);
 
             UI_LuckyBoxBonusShowItem.ProxyEnd();
         }
@@ -177,9 +195,132 @@ namespace GFGGame
         private void ShowItemTips(EventContext context)
         {
             GObject obj = context.sender as GObject;
-            int itemID = (int)obj.data;
+            int index = (int)obj.data;
+            TouchClickItem(index);
+            Timers.inst.Add(1f, 0, UpClickDataTime,index);
+        }
+
+        void TouchClickItem(int index)
+        {
+            if (!touchFlipOpen)
+                return;
+
+            ClickItem(index);
+        }
+
+        void ClickItem(int index)
+        {
+            if (!_recordOpenIndex.Contains(index)) {
+
+                //touchFlipOpen = false;
+
+                UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(_itemObjList[index]);
+                item.m_comIcon.m_FlipOpenType.selectedIndex = 0;
+
+                if (_recordOpenIndex.Count >= _rewardList.Count)
+                    _ui.m_BtnPass.visible = false;
+
+                //先翻开牌面
+                if (!item.m_comIcon.m_imgNew.visible)
+                {
+                    HideOtherShowWindow();
+                    _recordOpenIndex.Add(index);
+                    touchFlipOpen = true;
+                    return;
+                }
+                else {
+                    if (_countNewRecord <= 1) {
+                        HideOtherShowWindow();
+                        _countNewRecord += 1;
+                        return;
+                    }
+                }
 
-            GoodsItemTipsController.ShowItemTips(itemID);
+                if (item.m_comIcon.m_imgNew.visible && _countNewRecord >= 1)
+                {
+                    //判断是否有套装需要展示
+                    if (GetSuitItemController.GetSuitWaitingToId(_itemIdList[index]))
+                    {
+                        if (_countShow < 1)
+                        {
+                            ViewManager.Hide<GetSuitItemVIew>();
+                            _rewardItemList.Clear();
+                            _rewardItemList.Add(_rewardList[index]);
+                            ViewManager.Show<LuckyBoxNewDressView>(_rewardItemList);
+                            _countShow += 1;
+                        }
+                        else
+                        {
+                            ViewManager.Hide<LuckyBoxNewDressView>();
+                            ViewManager.Hide<LuckyBoxNewCardView>();
+                            GetSuitItemController.TryShow(_itemIdList[index]);
+                            _recordOpenIndex.Add(index);
+                            touchFlipOpen = true;
+                            _countShow = 0;
+                            _countNewRecord = 0;
+                        }
+                    }
+                    else
+                    {
+                        ViewManager.Hide<GetSuitItemVIew>();
+                        _rewardItemList.Clear();
+                        _rewardItemList.Add(_rewardList[index]);
+                        ViewManager.Show<LuckyBoxNewDressView>(_rewardItemList);
+                        _recordOpenIndex.Add(index);
+                        touchFlipOpen = true;
+                        _countNewRecord = 0;
+                    }
+                }
+                UI_LuckyBoxBonusShowItem.ProxyEnd();
+            }
+            else
+                GoodsItemTipsController.ShowItemTips(_itemIdList[index]);
+        }
+
+        private void OnClickLoaBg()
+        {
+            if (_recordOpenIndex.Count >= _rewardList.Count)
+                this.Hide();
+        }
+
+        private void OnClickBtnPass()
+        {
+            Timers.inst.Add(1f, 0, UpDataTime);
+        }
+
+        private void UpDataTime(object param = null)
+        {
+            if (_recordOpenIndex.Count >= _rewardList.Count) { 
+                Timers.inst.Remove(UpDataTime);
+                HideOtherShowWindow();
+            }
+
+            for (int i = 0; i < _rewardList.Count; i++)
+            {
+                if (!_recordOpenIndex.Contains(i)) {
+                    ClickItem(i);
+                    break;
+                }
+            }
+        }
+
+        private void UpClickDataTime(object param = null)
+        {
+            int index = (int)param;
+            if (_recordOpenIndex.Contains(index))
+            {
+                Timers.inst.Remove(UpClickDataTime);
+                HideOtherShowWindow();
+            }
+            else
+                ClickItem(index);
+        }
+
+        private void HideOtherShowWindow()
+        {
+            ViewManager.Hide<GetSuitItemVIew>();
+            ViewManager.Hide<LuckyBoxNewDressView>();
+            ViewManager.Hide<LuckyBoxNewCardView>();
         }
     }
 }

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

@@ -72,7 +72,7 @@ namespace GFGGame
             _rewardList.Clear();
             _rewardParamList.AddRange(this.viewData as List<ItemData>);
             _rewardList = this.viewData as List<ItemData>;
-            _ui.m_btnPass.visible = false;
+            //_ui.m_btnPass.visible = false;
             _newRewardList.Clear();
             _oldRewardList.Clear();
             for (int i = 0; i < _rewardList.Count; i++)
@@ -104,7 +104,7 @@ namespace GFGGame
                 EffectUIPool.Recycle(_effectUI6);
                 _effectUI6 = null;
             }
-            _ui.m_btnPass.visible = _newRewardList.Count <= 1;
+            //_ui.m_btnPass.visible = _newRewardList.Count <= 1;
             _rewardList = _newRewardList.Count > 0 ? _newRewardList : _oldRewardList;
 
             if (_rewardList.Count - 1 < 0) return;
@@ -160,19 +160,19 @@ namespace GFGGame
 
         private void OnClickBg()
         {
-            _ui.m_t_close.Play(() =>
-            {
-                _ui.m_comCard.m_holder.visible = false;
-                _ui.m_comCard.m_holder1.visible = false;
-                if (_newRewardList.Count == 0 && _oldRewardList.Count == 0)
-                {
+            //_ui.m_t_close.Play(() =>
+            //{
+                //_ui.m_comCard.m_holder.visible = false;
+                //_ui.m_comCard.m_holder1.visible = false;
+                //if (_newRewardList.Count == 0 && _oldRewardList.Count == 0)
+                //{
                     this.Hide();
-                }
-                else {
-                    _ui.m_t_open.Play();
-                    UpdateView();
-                }
-            });
+            //    }
+            //    else {
+            //        _ui.m_t_open.Play();
+            //        UpdateView();
+            //    }
+            //});
         }
         private int GetThisCount(int itemId, List<ItemData> rewards)
         {
@@ -208,7 +208,7 @@ namespace GFGGame
             _ui.m_t_open.Stop(true, false);
             _rewardList.Clear();
             base.OnHide();
-            ViewManager.Show<LuckyBoxBonusShowView>(_rewardParamList);
+            //ViewManager.Show<LuckyBoxBonusShowView>(_rewardParamList);
         }
     }
 }

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

@@ -341,8 +341,11 @@ namespace GFGGame
             {
 
                 RemoveListener();
-                // ViewManager.Show<LuckyBoxBonusView>(new object[] { _rewardList });
-                ViewManager.Show<LuckyBoxNewDressView>(_rewardList);
+                //ViewManager.Show<LuckyBoxBonusView>(new object[] { _rewardList });
+
+                ViewManager.Show<LuckyBoxBonusShowView>(_rewardList);
+
+                //ViewManager.Show<LuckyBoxNewDressView>(_rewardList);
                 this.Hide();
             }
         }

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

@@ -345,7 +345,7 @@ namespace GFGGame
 
                  if (result)
                  {
-                     ViewManager.Show<LuckyBoxStarView>(null, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
+                     ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxView).FullName, boxId });
                      LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
                  }
              });
@@ -375,7 +375,7 @@ namespace GFGGame
                 bool result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.TEN_TIME);
                 if (result)
                 {
-                    ViewManager.Show<LuckyBoxStarView>(null, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
+                    ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxView).FullName, boxId });
                     LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
 
                 }
@@ -410,7 +410,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             Reset();
-            ViewManager.GoBackFrom(ViewName.LUCKY_BOX_VIEW);
+            ViewManager.GoBackFrom(typeof(LuckyBoxView).FullName);
 
         }
 

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

@@ -101,7 +101,7 @@ namespace GFGGame
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(chapterID);
             if (MainStoryDataManager.CheckChapterUnlock(chapterID))
             {
-                ViewManager.Show<StoryChapterView>(chapterID, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW, new object[] { _ui.m_listType.selectedIndex } });
+                ViewManager.Show<StoryChapterView>(chapterID, new object[] { typeof(StoryChapterListView).FullName, new object[] { _ui.m_listType.selectedIndex } });
                 this.Hide();
             }
             else

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

@@ -112,7 +112,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.STORY_CHAPTER_VIEW);
+            ViewManager.GoBackFrom(typeof(StoryChapterView).FullName);
         }
 
         private void OnClickBtnHome()

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

@@ -41,13 +41,13 @@ namespace GFGGame
                 }
                 else
                 {
-                    ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW), true);
+                    ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
                 }
             }
             else
             {
                 //异常返回到关卡列表界面
-                ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW), true);
+                ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
             }
         }
 
@@ -60,7 +60,7 @@ namespace GFGGame
         private static void OnCompleteCardStoryDialog(bool isSkip, object param)
         {
             CardData cardData = param as CardData;
-            ViewManager.Show<CardFosterView>(cardData, new object[] { ViewName.CARD_DETAIL_VIEW }, true);
+            ViewManager.Show<CardFosterView>(cardData, new object[] { typeof(CardDetailView).FullName}, true);
             ViewManager.Show<CardStoryView>(cardData);
         }
 
@@ -75,7 +75,7 @@ namespace GFGGame
 
         private static void OnCompletePriorStoryDialog(bool isSkip, object param)
         {
-            ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW), true);
+            ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
         }
 
 

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

@@ -127,6 +127,7 @@ namespace GFGGame
             _ui.m_btnTravel.target.onClick.Add(OnClickBtnTravel);
             _ui.m_btnDailyWelfare.target.onClick.Add(OnClickBtnDailyWelfare);
             _ui.m_btnActivityLuckyBox.target.onClick.Add(OnClickBtnActivityLuckyBox);
+            _ui.m_btnLimitedRechargeDBGift.target.onClick.Add(OnClickBtnLimitedRechargeDBGift);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
@@ -412,7 +413,7 @@ namespace GFGGame
             // _ui.m_btnMain.m_holder1.visible = false;
             // this.Hide();
             ViewManager.Show<StoryChapterListView>(null,
-                new object[] { ViewName.MAINUI_VIEW, this.viewData });
+                new object[] { typeof(MainUIView).FullName, this.viewData });
             isOpen = false;
             ;
 
@@ -430,7 +431,7 @@ namespace GFGGame
             // {
             _ui.m_btnHuanZhuang.m_holder1.visible = false;
             this.Hide();
-            ViewManager.Show<DressUpView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<DressUpView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
             isOpen = false;
 
 
@@ -460,60 +461,34 @@ namespace GFGGame
             if (isOpen) return;
             isOpen = true;
             _ui.m_btnXiuFang.m_holder1.visible = true;
-            // Timers.inst.Add(effectTime, 1, (param) =>
-            // {
             _ui.m_btnXiuFang.m_holder1.visible = false;
-            ViewManager.Show<XiuFangView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<XiuFangView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
             isOpen = false;
-
-
-            // });
         }
 
         private void OnClickBtnDailyLogin()
         {
-            // if (isOpen) return;
-            // isOpen = true;
-            // _ui.m_btnDailyLogin.m_holder.visible = true;
-            // Timers.inst.Add(effectTime, 1, (param) =>
-            // {
-            //     _ui.m_btnDailyLogin.m_holder.visible = false;
-            // List<string> list = new List<string>();
-            // list.Add("StudioView");
-            // list.Add("XiuFangView");
-            // ViewManager.Show<FunctionOpenView>(list);
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 1);
 
-            ViewManager.Show<SevenDayLoginView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
-            //     isOpen = false;
-            // });
+            ViewManager.Show<SevenDayLoginView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnDailyWelfare()
         {
-            // if (isOpen) return;
-            // isOpen = true;
-            // _ui.m_btnDailyLogin.m_holder.visible = true;
-            // Timers.inst.Add(effectTime, 1, (param) =>
-            // {
-            //     _ui.m_btnDailyLogin.m_holder.visible = false;
-            // List<string> list = new List<string>();
-            // list.Add("StudioView");
-            // list.Add("XiuFangView");
-            // ViewManager.Show<FunctionOpenView>(list);
-            // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 1);
-
-            ViewManager.Show<DailyWelfareView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
-            //     isOpen = false;
-            // });
+            ViewManager.Show<DailyWelfareView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnActivityLuckyBox()
         {
-            ViewManager.Show<ActivityThemeLuckyBoxView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData },
+            ViewManager.Show<ActivityThemeLuckyBoxView>(null, new object[] { typeof(MainUIView).FullName, this.viewData },
                 true);
         }
 
+        private void OnClickBtnLimitedRechargeDBGift()
+        {
+            ViewManager.Show<LimitedRechargeDBGiftView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+        }
+
         private void OnClickBtnCiPai()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 1);
@@ -521,34 +496,31 @@ namespace GFGGame
             if (isOpen) return;
             isOpen = true;
             _ui.m_btnCiPai.m_holder1.visible = true;
-            // Timers.inst.Add(effectTime, 1, (param) =>
-            // {
             _ui.m_btnCiPai.m_holder1.visible = false;
 
             CardDataManager.isFilter = false;
-            ViewManager.Show<CardDetailView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<CardDetailView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
             isOpen = false;
 
-            // });
         }
 
         private void OnClickBtnStudio()
         {
-            ViewManager.Show<StudioView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<StudioView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnField()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
 
-            ViewManager.Show<FieldView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<FieldView>(null, new object[] {typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnPoem()
         {
             // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
 
-            ViewManager.Show<PoemView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<PoemView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnArena()
@@ -564,7 +536,7 @@ namespace GFGGame
                 return;
             }
 
-            ViewManager.Show<ArenaView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData }, true);
+            ViewManager.Show<ArenaView>(null, new object[] { typeof(MainUIView).FullName, this.viewData }, true);
             ViewManager.Show<ArenaLoadingView>();
 
         }
@@ -573,12 +545,12 @@ namespace GFGGame
         {
             // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
 
-            ViewManager.Show<TravelView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<TravelView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnBag()
         {
-            ViewManager.Show<BagView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<BagView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnLeague()
@@ -604,13 +576,13 @@ namespace GFGGame
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
 
-            ViewManager.Show<StoreView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<StoreView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnTuJian()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TU_JIAN, 1);
-            ViewManager.Show<FieldGuideView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<FieldGuideView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnYouJian()
@@ -620,26 +592,25 @@ namespace GFGGame
 
         private void OnClickBtnHaoYou()
         {
-            ViewManager.Show<FriendView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData }, true);
+            ViewManager.Show<FriendView>(null, new object[] { typeof(MainUIView).FullName, this.viewData }, true);
         }
 
         private void OnClickBtnGongGao()
         {
-            // /null, new object[] { ViewName.MAINUI_VIEW, this.viewData }
             ViewManager.Show<NoticeView>();
         }
 
         private void OnClickBtnRenWu()
         {
-            ViewManager.Show<TaskView>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
-            // ViewManager.Show<ActivityDay7View>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<TaskView>(null, new[] { typeof(MainUIView).FullName, this.viewData });
+            // ViewManager.Show<ActivityDay7View>(null, new[] { typeof(MainUIView).FullName, this.viewData });
             // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 1);
             // ViewManager.Show<DailyTaskView>();
         }
 
         private void OnClickBtnDay7()
         {
-            ViewManager.Show<ActivityDay7View>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<ActivityDay7View>(null, new[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnFirstRecharge()
@@ -775,6 +746,7 @@ namespace GFGGame
                     _ui.m_btnGiftBag1.target.visible = true;
                 }
             }
+
         }
 
         private void Update(object param)
@@ -940,6 +912,9 @@ namespace GFGGame
         }
         private void CheckFunOpen()
         {
+            _ui.m_btnGiftBag1.target.visible = false;
+            _ui.m_btnGiftBag2.target.visible = false;
+
             _ui.m_btnXiuFang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
             _ui.m_btnHuanZhuang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
             _ui.m_btnCiPai.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);

GameClient/Assets/Game/HotUpdate/Views/ViewName.cs

@@ -1,55 +0,0 @@
-namespace GFGGame
-{
-    public class ViewName
-    {
-        public static string MAINUI_VIEW = "GFGGame.MainUIView";
-        public static string DRESS_UP_VIEW = "GFGGame.DressUpView";
-        public static string STORY_CHAPTER_LIST_VIEW = "GFGGame.StoryChapterListView";
-        public static string STORY_CHAPTER_VIEW = "GFGGame.StoryChapterView";
-        public static string STORY_DIALOG_VIEW = "GFGGame.StoryDialogView";
-        public static string STORY_LOOK_BACK_VIEW = "GFGGame.StoryLookBackView";
-        public static string CREATE_ROLE_VIEW = "GFGGame.CreateRoleView";
-        public static string STORY_LEVEL_INFO_VIEW = "GFGGame.StoryLevelInfoView";
-        public static string DRESS_UP_FIGHT_VIEW = "GFGGame.DressUpFightView";
-        public static string STORY_FIGHT_TARGET_VIEW = "GFGGame.StoryFightTargetView";
-        public static string STORY_FIGHT_SINGLE_VIEW = "GFGGame.StoryFightSingleView";
-        public static string STORY_FIGHT_TARGET_SCORE_VIEW = "GFGGame.StoryFightTargetScoreView";
-        public static string STORY_FIGHT_SINGLE_SCORE_VIEW = "GFGGame.StoryFightSingleScoreView";
-        public static string STORY_FIGHT_RESULT_VIEW = "GFGGame.StroyFightResultView";
-        public static string GET_BONUS_VIEW = "GFGGame.GetBonusView";
-        public static string GOODS_ITEM_TIPS_VIEW = "GFGGame.GoodsItemTipsView";
-        public static string DRESS_UP_ITEM_TIPS_VIEW = "GFGGame.DressUpItemTipsView";
-        public static string STORY_FIGHT_QUICKLY_VIEW = "GFGGame.StoryFightQuicklyView";
-        public static string RECHARGE_STORE_VIEW = "GFGGame.RechargeStoreView";
-        public static string ROLE_INFO_VIEW = "GFGGame.RoleInfoView";
-        public static string GM_PANEL_VIEW = "GFGGame.GMPanelView";
-        public static string GUIDE_VIEW = "GFGGame.GuideView";
-        public static string LUCKY_BOX_VIEW = "GFGGame.LuckyBoxView";
-        public static string LUCKY_BOX_BONUS_VIEW = "GFGGame.LuckyBoxBonusView";
-        public static string LUCKY_BOX_PRE_SHOW_VIEW = "GFGGame.LuckyBoxPreShowView";
-        public static string LUCKY_BOX_STAR_VIEW = "GFGGame.LuckyBoxStarView";
-        public static string GET_SUIT_ITEM_VIEW = "GFGGame.GetSuitItemVIew";
-        public static string CLOTHING_SHOP_VIEW = "GFGGame.ClothingShopView";
-        public static string BUY_COUNT_VIEW = "GFGGame.BuyCountView";
-        public static string FIELD_GUIDE_VIEW = "GFGGame.FieldGuideView";
-        public static string SUIT_GUIDE_VIEW = "GFGGame.SuitGuideView";
-        public static string SUIT_SHOW_VIEW = "GFGGame.SuitShowView";
-        public static string SUIT_PARTS_DETAIL_VIEW = "GFGGame.SuitPartsDetailView";
-        public static string BONUS_BOX_DETAIL_VIEW = "GFGGame.BonusBoxDetailView";
-        public static string XIU_FANG_VIEW = "GFGGame.XiuFangView";
-        public static string SUIT_SYNTHETIC_LIST_VIEW = "GFGGame.SuitSyntheticView";
-        public static string CLOTHING_SYNTHETIC_VIEW = "GFGGame.ClothingSyntheticView";
-        public static string APPROACH_OF_ITEM_VIEW = "GFGGame.ApproachOfItemView";
-        public static string CARD_VIEW = "GFGGame.CardView";
-        public static string CARD_DETAIL_VIEW = "GFGGame.CardDetailView";
-        public static string CARD_FOSTER_VIEW = "GFGGame.CardFosterView";
-        public static string CARD_FILTER_VIEW = "GFGGame.CardFilterView";
-        public static string CARD_STORY_VIEW = "GFGGame.CardStoryView";
-        public static string CARD_Mood_VIEW = "GFGGame.CardMoodView";
-        public static string CARD_SHOW_VIEW = "GFGGame.CardShowView";
-        public static string CARD_UP_VIEW = "GFGGame.CardUpView";
-        public static string LOG_VIEW = "GFGGame.LogView";
-        public static string DRESS_FILTER_VIEW = "GFGGame.DressFilterView";
-
-    }
-}

GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -76,27 +76,27 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             this.Hide();
-            ViewManager.GoBackFrom(ViewName.XIU_FANG_VIEW);
+            ViewManager.GoBackFrom(typeof(XiuFangView).FullName);
         }
 
         private void OnClickBtnClothingShop()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_DIAN, 1);
-            ViewManager.Show<ClothingShopView>(null, new object[] { ViewName.XIU_FANG_VIEW, this.viewData }, true, true);
+            ViewManager.Show<ClothingShopView>(null, new object[] { typeof(XiuFangView).FullName, this.viewData }, true, true);
         }
 
         private void OnClickBtnSuitSynthetic()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_HE_CHENG, 1);
 
-            ViewManager.Show<SuitSyntheticView>(null, new object[] { ViewName.XIU_FANG_VIEW, this.viewData });
+            ViewManager.Show<SuitSyntheticView>(null, new object[] { typeof(XiuFangView).FullName, this.viewData });
         }
 
         private void OnClickBtnClothingUpgrade()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_YANG_CHENG, 1);
 
-            ViewManager.Show<ClothingListView>(null, new object[] { ViewName.XIU_FANG_VIEW, this.viewData }, false, true);
+            ViewManager.Show<ClothingListView>(null, new object[] { typeof(XiuFangView).FullName, this.viewData }, false, true);
 
             // PromptController.Instance.ShowFloatTextPrompt("暂未开放", MessageType.WARNING);
         }
@@ -104,7 +104,7 @@ namespace GFGGame
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_FEN_JIE, 1);
 
-            ViewManager.Show<ClothingDecomposeView>(null, new object[] { ViewName.XIU_FANG_VIEW, this.viewData });
+            ViewManager.Show<ClothingDecomposeView>(null, new object[] { typeof(XiuFangView).FullName, this.viewData });
 
         }
         private void CheckGuide(object param)

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: ac70c4cb212f53c4c90a711661ed9a04
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 275b9c266fb64ad4496e0cd440d2a6d5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/ProjectSettings/ProjectSettings.asset

@@ -290,119 +290,101 @@ PlayerSettings:
   - m_BuildTarget: Android
     m_Icons:
     - m_Textures:
-      - {fileID: 2800000, guid: 978fed016f9b56e4a8528617eff32d6e, type: 3}
+      - {fileID: 0}
       m_Width: 192
       m_Height: 192
       m_Kind: 1
       m_SubKind: 
     - m_Textures:
-      - {fileID: 2800000, guid: 5eff9a5501ca29c4e8007f1b65ca1748, type: 3}
+      - {fileID: 0}
       m_Width: 144
       m_Height: 144
       m_Kind: 1
       m_SubKind: 
     - m_Textures:
-      - {fileID: 2800000, guid: 0d347e6493eef8041b0026e44f94e8a1, type: 3}
+      - {fileID: 0}
       m_Width: 96
       m_Height: 96
       m_Kind: 1
       m_SubKind: 
     - m_Textures:
-      - {fileID: 2800000, guid: 6562e2ef68afc89439253151e2ab04a1, type: 3}
+      - {fileID: 0}
       m_Width: 72
       m_Height: 72
       m_Kind: 1
       m_SubKind: 
     - m_Textures:
-      - {fileID: 2800000, guid: 393b7bc7ccda1b9478e1bc31eb644361, type: 3}
+      - {fileID: 0}
       m_Width: 48
       m_Height: 48
       m_Kind: 1
       m_SubKind: 
     - m_Textures:
-      - {fileID: 2800000, guid: 2360d3c3658c0a94abe552597dad62db, type: 3}
+      - {fileID: 0}
       m_Width: 36
       m_Height: 36
       m_Kind: 1
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 978fed016f9b56e4a8528617eff32d6e, type: 3}
-      m_Width: 192
-      m_Height: 192
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 5eff9a5501ca29c4e8007f1b65ca1748, type: 3}
-      m_Width: 144
-      m_Height: 144
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 0d347e6493eef8041b0026e44f94e8a1, type: 3}
-      m_Width: 96
-      m_Height: 96
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 6562e2ef68afc89439253151e2ab04a1, type: 3}
-      m_Width: 72
-      m_Height: 72
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 393b7bc7ccda1b9478e1bc31eb644361, type: 3}
-      m_Width: 48
-      m_Height: 48
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 2360d3c3658c0a94abe552597dad62db, type: 3}
-      m_Width: 36
-      m_Height: 36
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: a024f291e20fcc44a8ed7cb9f9576209, type: 3}
-      - {fileID: 2800000, guid: a024f291e20fcc44a8ed7cb9f9576209, type: 3}
+    - m_Textures: []
       m_Width: 432
       m_Height: 432
       m_Kind: 2
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 8f0ba66c6048e6648ad39b91c66b85b9, type: 3}
-      - {fileID: 2800000, guid: 8f0ba66c6048e6648ad39b91c66b85b9, type: 3}
+    - m_Textures: []
       m_Width: 324
       m_Height: 324
       m_Kind: 2
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 67b93944623caa347b5994415c74d7a2, type: 3}
-      - {fileID: 2800000, guid: 67b93944623caa347b5994415c74d7a2, type: 3}
+    - m_Textures: []
       m_Width: 216
       m_Height: 216
       m_Kind: 2
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 1f699c71eb143054aa755f84b80f282e, type: 3}
-      - {fileID: 2800000, guid: 1f699c71eb143054aa755f84b80f282e, type: 3}
+    - m_Textures: []
       m_Width: 162
       m_Height: 162
       m_Kind: 2
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: a47ddb3bc69596545bb924310b293443, type: 3}
-      - {fileID: 2800000, guid: a47ddb3bc69596545bb924310b293443, type: 3}
+    - m_Textures: []
       m_Width: 108
       m_Height: 108
       m_Kind: 2
       m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 7cd618144af7a18469edf149b4ed246a, type: 3}
-      - {fileID: 2800000, guid: 7cd618144af7a18469edf149b4ed246a, type: 3}
+    - m_Textures: []
       m_Width: 81
       m_Height: 81
       m_Kind: 2
       m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
   m_BuildTargetBatching: []
   m_BuildTargetSecurityBuild: []
   m_BuildTargetGraphicsJobs: