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

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

@@ -850,6 +850,14 @@ namespace GFGGame
             return !MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignDay), TimeUtil.GetCurDay());
         }
         /// <summary>
+        /// 每日签到-是否签到
+        /// </summary>
+        /// <returns></returns>
+        public bool DailySignGot()
+        {
+           return !MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignDay), TimeUtil.GetCurDay());
+        }
+        /// <summary>
         /// 福利大厅-每日补给
         /// </summary>
         /// <returns></returns>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComDodgeStar.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterBottom.cs

@@ -37,10 +37,10 @@ namespace UI.Card
         public GButton m_btnRule;
         public GButton m_btnCheckAuto;
         public UI_ComStarItem m_comStarItem;
-        public UI_ComDodgeStar m_dodgeStar0;
-        public UI_ComDodgeStar m_dodgeStar1;
-        public UI_ComDodgeStar m_dodgeStar2;
-        public UI_ComDodgeStar m_dodgeStar3;
+        public GComponent m_dodgeStar0;
+        public GComponent m_dodgeStar1;
+        public GComponent m_dodgeStar2;
+        public GComponent m_dodgeStar3;
         public GList m_listShowCard;
         public GGroup m_grpStar;
         public GList m_listSkill;
@@ -135,10 +135,10 @@ namespace UI.Card
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_btnCheckAuto = (GButton)comp.GetChild("btnCheckAuto");
             m_comStarItem = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem"));
-            m_dodgeStar0 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar0"));
-            m_dodgeStar1 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar1"));
-            m_dodgeStar2 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar2"));
-            m_dodgeStar3 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar3"));
+            m_dodgeStar0 = (GComponent)comp.GetChild("dodgeStar0");
+            m_dodgeStar1 = (GComponent)comp.GetChild("dodgeStar1");
+            m_dodgeStar2 = (GComponent)comp.GetChild("dodgeStar2");
+            m_dodgeStar3 = (GComponent)comp.GetChild("dodgeStar3");
             m_listShowCard = (GList)comp.GetChild("listShowCard");
             m_grpStar = (GGroup)comp.GetChild("grpStar");
             m_listSkill = (GList)comp.GetChild("listSkill");
@@ -190,13 +190,9 @@ namespace UI.Card
             m_btnCheckAuto = null;
             m_comStarItem.Dispose();
             m_comStarItem = null;
-            m_dodgeStar0.Dispose();
             m_dodgeStar0 = null;
-            m_dodgeStar1.Dispose();
             m_dodgeStar1 = null;
-            m_dodgeStar2.Dispose();
             m_dodgeStar2 = null;
-            m_dodgeStar3.Dispose();
             m_dodgeStar3 = null;
             m_listShowCard = null;
             m_grpStar = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComCardMask.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCardMask.cs

@@ -2,14 +2,14 @@
 
 using FairyGUI;
 
-namespace UI.Card
+namespace UI.CommonGame
 {
     public partial class UI_ComCardMask
     {
         public GComponent target;
         public GLoader m_loaCard;
-        public const string URL = "ui://7l6lvkayjzrr8n";
-        public const string PACKAGE_NAME = "Card";
+        public const string URL = "ui://eg2y0ldpjzrr8n";
+        public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComCardMask";
         private static UI_ComCardMask _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ComCardMask.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCardMask.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 90199ba5152ffee4d8e29452117cc5c4
+guid: b33d8b2d3d674424498ba79bbe292000
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComDodgeStar.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDodgeStar.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Card
+namespace UI.CommonGame
 {
     public partial class UI_ComDodgeStar
     {
@@ -10,8 +10,8 @@ namespace UI.Card
         public Controller m_lightType;
         public GGraph m_holderStarLight;
         public GGraph m_holderUpStarMove;
-        public const string URL = "ui://7l6lvkaym6batls";
-        public const string PACKAGE_NAME = "Card";
+        public const string URL = "ui://eg2y0ldpm6batls";
+        public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComDodgeStar";
         private static UI_ComDodgeStar _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDodgeStar.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComDodgeStar.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 41d45960cdebe2249a524f1a969628f4
+guid: 1b65e5636e9da424bb0845644b769882
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListCardItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListCardItem.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Card
+namespace UI.CommonGame
 {
     public partial class UI_ListCardItem
     {
@@ -18,8 +18,9 @@ namespace UI.Card
         public UI_ComDodgeStar m_dodgeStar1;
         public UI_ComDodgeStar m_dodgeStar2;
         public UI_ComDodgeStar m_dodgeStar3;
-        public const string URL = "ui://7l6lvkayojlzi";
-        public const string PACKAGE_NAME = "Card";
+        public GImage m_unlockMask;
+        public const string URL = "ui://eg2y0ldpojlzi";
+        public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ListCardItem";
         private static UI_ListCardItem _proxy;
 
@@ -76,6 +77,7 @@ namespace UI.Card
             m_dodgeStar1 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar1"));
             m_dodgeStar2 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar2"));
             m_dodgeStar3 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar3"));
+            m_unlockMask = (GImage)comp.GetChild("unlockMask");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -95,6 +97,7 @@ namespace UI.Card
             m_dodgeStar2 = null;
             m_dodgeStar3.Dispose();
             m_dodgeStar3 = null;
+            m_unlockMask = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListCardItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListCardItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6a8067523248e34498eb792b8fe5490a
+guid: 0fcd49ee8f267d04883b1cf7aee7c180
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_CardGuideComDodgeStar.cs

@@ -1,77 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.FieldGuide
-{
-    public partial class UI_CardGuideComDodgeStar
-    {
-        public GComponent target;
-        public Controller m_lightType;
-        public GGraph m_holderStarLight;
-        public GGraph m_holderUpStarMove;
-        public const string URL = "ui://vqq9h9h493pb4j";
-        public const string PACKAGE_NAME = "FieldGuide";
-        public const string RES_NAME = "CardGuideComDodgeStar";
-        private static UI_CardGuideComDodgeStar _proxy;
-
-        public static UI_CardGuideComDodgeStar Create(GObject gObject = null)
-        {
-            var ui = new UI_CardGuideComDodgeStar();
-            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_CardGuideComDodgeStar Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_CardGuideComDodgeStar();
-            }
-            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_lightType = comp.GetController("lightType");
-            m_holderStarLight = (GGraph)comp.GetChild("holderStarLight");
-            m_holderUpStarMove = (GGraph)comp.GetChild("holderUpStarMove");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_lightType = null;
-            m_holderStarLight = null;
-            m_holderUpStarMove = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ComCardMask.cs

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.FieldGuide
-{
-    public partial class UI_ComCardMask
-    {
-        public GComponent target;
-        public GLoader m_loaCard;
-        public const string URL = "ui://vqq9h9h493pb4h";
-        public const string PACKAGE_NAME = "FieldGuide";
-        public const string RES_NAME = "ComCardMask";
-        private static UI_ComCardMask _proxy;
-
-        public static UI_ComCardMask Create(GObject gObject = null)
-        {
-            var ui = new UI_ComCardMask();
-            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_ComCardMask Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComCardMask();
-            }
-            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_loaCard = (GLoader)comp.GetChild("loaCard");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaCard = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListCardGuideItem.cs

@@ -1,106 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.FieldGuide
-{
-    public partial class UI_ListCardGuideItem
-    {
-        public GComponent target;
-        public UI_ComCardMask m_comCard;
-        public GLoader m_loaBorder;
-        public GLoader m_loaRarity;
-        public GTextField m_txtLv;
-        public GTextField m_txtName;
-        public GLoader m_loaMainScore;
-        public UI_CardGuideComDodgeStar m_dodgeStar0;
-        public UI_CardGuideComDodgeStar m_dodgeStar1;
-        public UI_CardGuideComDodgeStar m_dodgeStar2;
-        public UI_CardGuideComDodgeStar m_dodgeStar3;
-        public GImage m_unlockMask;
-        public const string URL = "ui://vqq9h9h4nt1l5l";
-        public const string PACKAGE_NAME = "FieldGuide";
-        public const string RES_NAME = "ListCardGuideItem";
-        private static UI_ListCardGuideItem _proxy;
-
-        public static UI_ListCardGuideItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ListCardGuideItem();
-            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_ListCardGuideItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListCardGuideItem();
-            }
-            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_comCard = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCard"));
-            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
-            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_txtLv = (GTextField)comp.GetChild("txtLv");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
-            m_dodgeStar0 = (UI_CardGuideComDodgeStar)UI_CardGuideComDodgeStar.Create(comp.GetChild("dodgeStar0"));
-            m_dodgeStar1 = (UI_CardGuideComDodgeStar)UI_CardGuideComDodgeStar.Create(comp.GetChild("dodgeStar1"));
-            m_dodgeStar2 = (UI_CardGuideComDodgeStar)UI_CardGuideComDodgeStar.Create(comp.GetChild("dodgeStar2"));
-            m_dodgeStar3 = (UI_CardGuideComDodgeStar)UI_CardGuideComDodgeStar.Create(comp.GetChild("dodgeStar3"));
-            m_unlockMask = (GImage)comp.GetChild("unlockMask");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_comCard.Dispose();
-            m_comCard = null;
-            m_loaBorder = null;
-            m_loaRarity = null;
-            m_txtLv = null;
-            m_txtName = null;
-            m_loaMainScore = null;
-            m_dodgeStar0.Dispose();
-            m_dodgeStar0 = null;
-            m_dodgeStar1.Dispose();
-            m_dodgeStar1 = null;
-            m_dodgeStar2.Dispose();
-            m_dodgeStar2 = null;
-            m_dodgeStar3.Dispose();
-            m_dodgeStar3 = null;
-            m_unlockMask = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListCardGuideItem.cs.meta

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

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

@@ -15,10 +15,11 @@ namespace UI.LuckyBox
         public UI_ComCost2 m_comCostOne;
         public UI_ComCost2 m_comCostTen;
         public GButton m_btnBuyOne;
+        public GGraph m_btnBuyTen_eff;
         public GButton m_btnBuyTen;
         public GTextField m_txtRemainTimes;
+        public GGraph m_Special_eff;
         public GImage m_imgSpecial;
-        public GGraph m_holder;
         public GGroup m_grpSpecial;
         public const string URL = "ui://drx9d1usnjmn2p";
         public const string PACKAGE_NAME = "LuckyBox";
@@ -75,10 +76,11 @@ namespace UI.LuckyBox
             m_comCostOne = (UI_ComCost2)UI_ComCost2.Create(comp.GetChild("comCostOne"));
             m_comCostTen = (UI_ComCost2)UI_ComCost2.Create(comp.GetChild("comCostTen"));
             m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
+            m_btnBuyTen_eff = (GGraph)comp.GetChild("btnBuyTen_eff");
             m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+            m_Special_eff = (GGraph)comp.GetChild("Special_eff");
             m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
-            m_holder = (GGraph)comp.GetChild("holder");
             m_grpSpecial = (GGroup)comp.GetChild("grpSpecial");
         }
         public void Dispose(bool disposeTarget = false)
@@ -95,10 +97,11 @@ namespace UI.LuckyBox
             m_comCostTen.Dispose();
             m_comCostTen = null;
             m_btnBuyOne = null;
+            m_btnBuyTen_eff = null;
             m_btnBuyTen = null;
             m_txtRemainTimes = null;
+            m_Special_eff = null;
             m_imgSpecial = null;
-            m_holder = null;
             m_grpSpecial = null;
             if(disposeTarget && target != null)
             {

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

@@ -11,12 +11,16 @@ namespace UI.LuckyBox
         public Controller m_FlipOpenType;
         public GGraph m_holder;
         public GGraph m_holder1;
+        public GLoader m_frame;
+        public GGraph m_ui_eff;
         public GLoader m_icon;
+        public GGraph m_flip_eff;
         public GLoader m_rarity;
         public GImage m_imgNew;
         public GTextField m_txtName;
-        public Transition m_t0;
+        public GGraph m_click_eff;
         public Transition m_t1;
+        public Transition m_t0;
         public const string URL = "ui://drx9d1usdcrotaa";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "Component2";
@@ -68,12 +72,16 @@ namespace UI.LuckyBox
             m_FlipOpenType = comp.GetController("FlipOpenType");
             m_holder = (GGraph)comp.GetChild("holder");
             m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_frame = (GLoader)comp.GetChild("frame");
+            m_ui_eff = (GGraph)comp.GetChild("ui_eff");
             m_icon = (GLoader)comp.GetChild("icon");
+            m_flip_eff = (GGraph)comp.GetChild("flip_eff");
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_imgNew = (GImage)comp.GetChild("imgNew");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_t0 = comp.GetTransition("t0");
+            m_click_eff = (GGraph)comp.GetChild("click_eff");
             m_t1 = comp.GetTransition("t1");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -81,12 +89,16 @@ namespace UI.LuckyBox
             m_FlipOpenType = null;
             m_holder = null;
             m_holder1 = null;
+            m_frame = null;
+            m_ui_eff = null;
             m_icon = null;
+            m_flip_eff = null;
             m_rarity = null;
             m_imgNew = null;
             m_txtName = null;
-            m_t0 = null;
+            m_click_eff = null;
             m_t1 = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,6 +8,7 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public UI_Component2 m_comIcon;
+        public GGraph m_waitClick_eff;
         public Transition m_t0;
         public Transition m_t1;
         public Transition m_t2;
@@ -59,6 +60,7 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_comIcon = (UI_Component2)UI_Component2.Create(comp.GetChild("comIcon"));
+            m_waitClick_eff = (GGraph)comp.GetChild("waitClick_eff");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
@@ -67,6 +69,7 @@ namespace UI.LuckyBox
         {
             m_comIcon.Dispose();
             m_comIcon = null;
+            m_waitClick_eff = null;
             m_t0 = null;
             m_t1 = null;
             m_t2 = null;

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

@@ -15,6 +15,7 @@ namespace UI.LuckyBox
         public GButton m_btnPass;
         public Transition m_t_open;
         public Transition m_t_close;
+        public Transition m_t2;
         public const string URL = "ui://drx9d1usqdrt19";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckyBoxNewDressUI";
@@ -70,6 +71,7 @@ namespace UI.LuckyBox
             m_btnPass = (GButton)comp.GetChild("btnPass");
             m_t_open = comp.GetTransition("t_open");
             m_t_close = comp.GetTransition("t_close");
+            m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -82,6 +84,7 @@ namespace UI.LuckyBox
             m_btnPass = null;
             m_t_open = null;
             m_t_close = null;
+            m_t2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -16,6 +16,8 @@ namespace UI.LuckyBox
         public GGraph m_holder;
         public GGroup m_grpSpecial;
         public GTextField m_txtFreeTime;
+        public GGraph m_btnBuyTen_eff;
+        public GGraph m_Special_eff;
         public const string URL = "ui://drx9d1usdkohtf7";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "comLuckBoxBtn";
@@ -72,6 +74,8 @@ namespace UI.LuckyBox
             m_holder = (GGraph)comp.GetChild("holder");
             m_grpSpecial = (GGroup)comp.GetChild("grpSpecial");
             m_txtFreeTime = (GTextField)comp.GetChild("txtFreeTime");
+            m_btnBuyTen_eff = (GGraph)comp.GetChild("btnBuyTen_eff");
+            m_Special_eff = (GGraph)comp.GetChild("Special_eff");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -86,6 +90,8 @@ namespace UI.LuckyBox
             m_holder = null;
             m_grpSpecial = null;
             m_txtFreeTime = null;
+            m_btnBuyTen_eff = null;
+            m_Special_eff = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDodgeStar.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDodgeFightStar.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ComDodgeStar
+    public partial class UI_ComDodgeFightStar
     {
         public GComponent target;
         public Controller m_lightType;
         public const string URL = "ui://mfvz4q8km3wmftp";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComDodgeStar";
-        private static UI_ComDodgeStar _proxy;
+        public const string RES_NAME = "ComDodgeFightStar";
+        private static UI_ComDodgeFightStar _proxy;
 
-        public static UI_ComDodgeStar Create(GObject gObject = null)
+        public static UI_ComDodgeFightStar Create(GObject gObject = null)
         {
-            var ui = new UI_ComDodgeStar();
+            var ui = new UI_ComDodgeFightStar();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ComDodgeStar Proxy(GObject gObject = null)
+        public static UI_ComDodgeFightStar Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComDodgeStar();
+                _proxy = new UI_ComDodgeFightStar();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComCardMask.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDodgeFightStar.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b8ce7373cfaaf5a42bbc87b9d88cbe34
+guid: 90f7640f20ad36441a246a4cebfdc023
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardFightItem.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ListCardItem
+    public partial class UI_ListCardFightItem
     {
         public GButton target;
         public Controller m_starNumType;
@@ -14,18 +14,18 @@ namespace UI.Main
         public GLoader m_loaRarity;
         public GTextField m_txtName;
         public GTextField m_txtLv;
-        public UI_ComDodgeStar m_dodgeStar0;
-        public UI_ComDodgeStar m_dodgeStar1;
-        public UI_ComDodgeStar m_dodgeStar2;
-        public UI_ComDodgeStar m_dodgeStar3;
+        public UI_ComDodgeFightStar m_dodgeStar0;
+        public UI_ComDodgeFightStar m_dodgeStar1;
+        public UI_ComDodgeFightStar m_dodgeStar2;
+        public UI_ComDodgeFightStar m_dodgeStar3;
         public const string URL = "ui://mfvz4q8kr1a99f";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ListCardItem";
-        private static UI_ListCardItem _proxy;
+        public const string RES_NAME = "ListCardFightItem";
+        private static UI_ListCardFightItem _proxy;
 
-        public static UI_ListCardItem Create(GObject gObject = null)
+        public static UI_ListCardFightItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListCardItem();
+            var ui = new UI_ListCardFightItem();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -34,11 +34,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ListCardItem Proxy(GObject gObject = null)
+        public static UI_ListCardFightItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListCardItem();
+                _proxy = new UI_ListCardFightItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -72,10 +72,10 @@ namespace UI.Main
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
-            m_dodgeStar0 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar0"));
-            m_dodgeStar1 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar1"));
-            m_dodgeStar2 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar2"));
-            m_dodgeStar3 = (UI_ComDodgeStar)UI_ComDodgeStar.Create(comp.GetChild("dodgeStar3"));
+            m_dodgeStar0 = (UI_ComDodgeFightStar)UI_ComDodgeFightStar.Create(comp.GetChild("dodgeStar0"));
+            m_dodgeStar1 = (UI_ComDodgeFightStar)UI_ComDodgeFightStar.Create(comp.GetChild("dodgeStar1"));
+            m_dodgeStar2 = (UI_ComDodgeFightStar)UI_ComDodgeFightStar.Create(comp.GetChild("dodgeStar2"));
+            m_dodgeStar3 = (UI_ComDodgeFightStar)UI_ComDodgeFightStar.Create(comp.GetChild("dodgeStar3"));
         }
         public void Dispose(bool disposeTarget = false)
         {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_CardGuideComDodgeStar.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardFightItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d24f4fbda0505f24982ba557826750ce
+guid: 362deba4f94f61543aff5478e411c219
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardItem.cs.meta

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

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

@@ -85,7 +85,7 @@ namespace GFGGame
         private void RenderCardListItem(int index, GObject obj)
         {
             CardData data = CardDataManager.GetCardDataById(_cardList[index]);
-            UI_ListCardGuideItem listItem = UI_ListCardGuideItem.Proxy(obj);
+            UI_ListCardItem listItem = UI_ListCardItem.Proxy(obj);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_cardList[index]);
 
             // Have
@@ -94,11 +94,13 @@ namespace GFGGame
                 listItem.m_unlockMask.visible = false;
                 listItem.m_comCard.m_loaCard.url = ResPathUtil.GetCardIconPath(data.resources[data.resIndex]);
                 int starLevelDodge = data.star / 5;
+                listItem.m_starNumType.selectedIndex = data.itemCfg.starDescArr.Length - 1;
+                listItem.m_txtLv.visible = false;
                 for (int i = 0; i < 4; i++)
                 {
-                    UI_CardGuideComDodgeStar dodgeStar = UI_CardGuideComDodgeStar.Proxy(listItem.target.GetChild("dodgeStar" + i));
+                    UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(listItem.target.GetChild("dodgeStar" + i));
                     dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i) ? 1 : 0;
-                    UI_CardGuideComDodgeStar.ProxyEnd();
+                    UI_ComDodgeStar.ProxyEnd();
                 }
                 listItem.target.data = data;
             }
@@ -114,7 +116,7 @@ namespace GFGGame
             listItem.m_loaBorder.url = "ui://CommonGame/kp_kuang_" + itemCfg.rarity;//ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
             listItem.m_txtName.text = itemCfg.name;
 
-            UI_ListCardGuideItem.ProxyEnd();
+            UI_ListCardItem.ProxyEnd();
         }
 
         private void OnClickListCardItem(EventContext context)

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

@@ -11,22 +11,23 @@ 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, Dictionary<int, EffectUI>> _effListTen = new Dictionary<int, Dictionary<int, EffectUI>>();
         private Dictionary<int, EffectUI> _effList = new Dictionary<int, EffectUI>();
 
         private Dictionary<int, int> _itemIdList = new Dictionary<int, int>();
         private Dictionary<int, GComponent> _itemObjList = new Dictionary<int, GComponent>();
-        private List<int> _recordOpenIndex = new List<int>();  //记录打开过得item位置
-        private List<int> _recordTurnIndex = new List<int>();  //记录播放过item位置
-        private int _chooseIndex = -1;  //当前选中的index
-        private int _countShow = 0;   //第几次展示
-        private int _countNewRecord = 0;  //展示步骤
-        private bool _handClick = false;   //手动点击开启
-        private bool _AnimationWait = true;   //抽卡动画等待加载完毕
+        private List<int> _recordOpenIndex = new List<int>();  //璁板綍鎵撳紑杩囧緱item浣嶇疆
+        private List<int> _recordTurnIndex = new List<int>();  //璁板綍鎾�斁杩噄tem浣嶇疆
+        private int _chooseIndex = -1;  //褰撳墠閫変腑鐨刬ndex
+        private int _countShow = 0;   //绗�嚑娆″睍绀�
+        private int _countNewRecord = 0;  //灞曠ず姝ラ�
+        private bool _handClick = false;   //鎵嬪姩鐐瑰嚮寮€鍚�
+        private bool _AnimationWait = true;   //鎶藉崱鍔ㄧ敾绛夊緟鍔犺浇瀹屾瘯
 
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
         private EffectUI _effectUI3;
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
 
         public override void Dispose()
         {
@@ -37,7 +38,8 @@ namespace GFGGame
             EffectUIPool.Recycle(_effectUI3);
             _effectUI3 = null;
 
-            for (int key = 0; key < _effListTen.Count; key++) {
+            for (int key = 0; key < _effListTen.Count; key++)
+            {
                 if (_effListTen.ContainsKey(key))
                 {
                     for (int key1 = 0; key1 < _effListTen[key].Count; key1++)
@@ -82,7 +84,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
 
             _ui.m_BtnPass.onClick.Add(OnClickBtnPass);
-            
+
             UpdateEffect();
         }
         private void UpdateEffect()
@@ -110,7 +112,8 @@ namespace GFGGame
         {
             if (_chooseIndex != -1 && GetSuitItemController.GetSuitWaitingToId(_itemIdList[_chooseIndex]))
                 ClickItem(_chooseIndex);
-            else {
+            else
+            {
                 if (_handClick)
                 {
                     _handClick = false;
@@ -153,6 +156,13 @@ namespace GFGGame
             base.OnHide();
             Timers.inst.Remove(UpDataTime);
             Timers.inst.Remove(UpClickDataTime);
+
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+
+            _effectUIDic.Clear();
         }
 
         private void UpdateItem(GComponent com, int index, int countType)
@@ -166,7 +176,24 @@ namespace GFGGame
             item.m_comIcon.m_FlipOpenType.selectedIndex = 1;
             item.m_comIcon.m_t1.Play();
 
-            //带特效的处理先注释
+            // 鍦嗙洏鍑虹幇鏃剁瓑寰呯帺瀹剁偣鍑荤殑鐗规晥
+            switch (itemCfg.rarity)
+            {
+                case 1:
+
+                    break;
+                case 2:
+
+                    break;
+                case 3:
+                    _effectUIDic.Add("CK_Loop_Wait_Chen" + index, EffectUIPool.CreateEffectUI(item.m_waitClick_eff, "ui_LuckyBox", "CK_Loop_Wait_Chen"));
+                    break;
+                case 4:
+                    _effectUIDic.Add("CK_Loop_Wait_Jin" + index, EffectUIPool.CreateEffectUI(item.m_waitClick_eff, "ui_LuckyBox", "CK_Loop_Wait_Jin"));
+                    break;
+            }
+
+            //甯︾壒鏁堢殑澶勭悊鍏堟敞閲�
             //item.m_comIcon.m_holder.visible = false;
             //item.m_comIcon.m_holder1.visible = false;
             //if (itemCfg.rarity > 2) { 
@@ -221,7 +248,7 @@ namespace GFGGame
             }
             item.target.data = index;
 
-            _itemIdList.Add(index,itemCfg.id);
+            _itemIdList.Add(index, itemCfg.id);
             _itemObjList.Add(index, com);
 
             UI_LuckyBoxBonusShowItem.ProxyEnd();
@@ -240,7 +267,7 @@ namespace GFGGame
             _ui.m_touchFlipOpen.touchable = true;
             _handClick = true;
             ClickItem(index);
-            Timers.inst.Add(1f, 1, UpClickDataTime,index);
+            Timers.inst.Add(1f, 1, UpClickDataTime, index);
         }
 
         private void UpClickDataTime(object param = null)
@@ -263,7 +290,8 @@ namespace GFGGame
 
             if (!_recordOpenIndex.Contains(index))
                 TurnItem(index);
-            else {
+            else
+            {
                 if (!_recordTurnIndex.Contains(index))
                     ShowTurnItem(index);
                 else
@@ -278,7 +306,8 @@ namespace GFGGame
                 _chooseIndex = -1;
                 this.Hide();
             }
-            else {
+            else
+            {
                 for (int index = 0; index < _rewardList.Count; index++)
                 {
                     if (!_recordOpenIndex.Contains(index))
@@ -332,7 +361,8 @@ namespace GFGGame
             _ui.m_touchFlipOpen.touchable = true;
             for (int i = 0; i < _rewardList.Count; i++)
             {
-                if (!_recordTurnIndex.Contains(i)) {
+                if (!_recordTurnIndex.Contains(i))
+                {
                     ShowTurnItem(i);
                     break;
                 }
@@ -354,7 +384,7 @@ namespace GFGGame
 
             if (item.m_comIcon.m_imgNew.visible)
             {
-                //判断是否有套装需要展示
+                //鍒ゆ柇鏄�惁鏈夊�瑁呴渶瑕佸睍绀�
                 if (GetSuitItemController.GetSuitWaitingToId(_itemIdList[index]))
                 {
                     if (_countShow < 1)
@@ -365,7 +395,7 @@ namespace GFGGame
                         _rewardItemList.Add(_rewardList[index]);
                         ViewManager.Show<LuckyBoxNewDressView>(_rewardItemList);
                     }
-                    else 
+                    else
                     {
                         ViewManager.Hide<LuckyBoxNewDressView>();
                         ViewManager.Hide<LuckyBoxNewCardView>();
@@ -392,25 +422,67 @@ namespace GFGGame
                     _ui.m_touchFlipOpen.touchable = false;
                 }
             }
-            else {
+            else
+            {
                 _recordTurnIndex.Add(index);
                 _ui.m_touchFlipOpen.touchable = false;
             }
             UI_LuckyBoxBonusShowItem.ProxyEnd();
         }
-        
+
         private void TurnItem(int index)
         {
             if (!_recordOpenIndex.Contains(index))
             {
+                // 鍒犻櫎 鈥滅瓑寰呯炕寮€鈥� 鐨勭壒鏁�
+                if (_effectUIDic.ContainsKey("CK_Loop_Wait_Chen" + index))
+                {
+                    EffectUIPool.Recycle(_effectUIDic["CK_Loop_Wait_Chen" + index]);
+                    _effectUIDic.Remove("CK_Loop_Wait_Chen" + index);
+                }
+                if (_effectUIDic.ContainsKey("CK_Loop_Wait_Jin" + index))
+                {
+                    EffectUIPool.Recycle(_effectUIDic["CK_Loop_Wait_Jin" + index]);
+                    _effectUIDic.Remove("CK_Loop_Wait_Jin" + index);
+                }
+
+
+
                 UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(_itemObjList[index]);
                 if (!item.m_comIcon.m_imgNew.visible)
                     _recordTurnIndex.Add(index);
 
-                //先翻开牌面 
+                //鍏堢炕寮€鐗岄潰 
                 item.m_comIcon.m_FlipOpenType.selectedIndex = 0;
                 //item.m_t1.Play();
                 item.m_t2.Play();
+
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemIdList[index]);
+
+                // 鐐瑰嚮鐗规晥
+                _effectUIDic.Add("CK_Cirle_DJ" + index, EffectUIPool.CreateEffectUI(item.m_comIcon.m_click_eff, "ui_LuckyBox", "CK_Cirle_DJ"));
+                // 缈诲紑鐗规晥
+                switch (itemCfg.rarity)
+                {
+                    case 1:
+                        _effectUIDic.Add("CK_OpenAfter_LanHui_UI" + index, EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox", "CK_OpenAfter_HuiLan_UI"));
+                        _effectUIDic.Add("CK_OpenAfter_LanHui_TX" + index, EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox", "CK_OpenAfter_LanHui_TX"));
+                        break;
+                    case 2:
+                        _effectUIDic.Add("CK_OpenAfter_LanHui_UI" + index, EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox", "CK_OpenAfter_LanHui_UI"));
+                        _effectUIDic.Add("CK_OpenAfter_LanHui_TX" + index, EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox", "CK_OpenAfter_LanHui_TX"));
+                        break;
+                    case 3:
+                        _effectUIDic.Add("CK_OpenAfter_Chen_UI" + index, EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox", "CK_OpenAfter_Chen_UI"));
+                        _effectUIDic.Add("CK_OpenAfter_Chen_TX" + index, EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox", "CK_OpenAfter_Chen_TX"));
+                        break;
+                    case 4:
+                        _effectUIDic.Add("CK_OpenAfter_Jin_UI" + index, EffectUIPool.CreateEffectUI(item.m_comIcon.m_ui_eff, "ui_LuckyBox", "CK_OpenAfter_Jin_UI"));
+                        _effectUIDic.Add("CK_OpenAfter_Jin_TX" + index, EffectUIPool.CreateEffectUI(item.m_comIcon.m_flip_eff, "ui_LuckyBox", "CK_OpenAfter_Jin_TX"));
+                        break;
+                }
+
+
                 item.m_comIcon.m_t0.Play();
                 _recordOpenIndex.Add(index);
                 UI_LuckyBoxBonusShowItem.ProxyEnd();

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

@@ -15,8 +15,8 @@ namespace GFGGame
         private ValueBarController _valueBarController;
         private Dictionary<int, LuckyBoxController> _luckyBoxCtrl = new Dictionary<int, LuckyBoxController>();
 
-        private EffectUI _effectUI1;
-        private EffectUI _effectUI2;
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
+
         private DressUpObjUI _dressUpObjUIXiHe;
 
         private DressUpObjUI _dressUpObjUIChangXi;
@@ -28,8 +28,14 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            EffectUIPool.Recycle(_effectUI1);
-            _effectUI1 = null;
+
+            // Clear Effect
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+
+            _effectUIDic.Clear();
 
             if (_valueBarController != null)
             {
@@ -271,17 +277,30 @@ namespace GFGGame
 
             _luckyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnShown(LuckyBoxDataManager.Instance.currentBoxId);
 
-            comBox.m_comLuckBoxBtn.m_imgSpecial.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            if(boxId != LuckyBoxDataManager.BOX_ID_3)
+            {
+                if(!_effectUIDic.ContainsKey("Button_Text_DianCang" + boxId))
+                {
+                    _effectUIDic.Add("Button_Text_DianCang" + boxId, EffectUIPool.CreateEffectUI(comBox.m_comLuckBoxBtn.m_Special_eff, "ui_LuckyBox", "Button_Text_DianCang"));
+                }
+            }
+            else
+            {
+                if (_effectUIDic.ContainsKey("Button_Text_DianCang" + boxId))
+                {
+                    EffectUIPool.Recycle(_effectUIDic["Button_Text_DianCang" + boxId]);
+                    _effectUIDic.Remove("Button_Text_DianCang" + boxId);
+                }
+
+            }
+            //comBox.m_comLuckBoxBtn.m_imgSpecial.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+
             //GGraph holder = comBox.m_comLuckBoxBtn.m_btnBuyTen.GetChild("holder").asGraph;
             //holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
             comBox.m_comLuckBoxBtn.m_holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
 
-            if (_effectUI2 != null) {
-                EffectUIPool.Recycle(_effectUI2);
-                _effectUI2 = null;
-            }
+
             //_effectUI1 = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", "Button_Glow");
-            _effectUI2 = EffectUIPool.CreateEffectUI(comBox.m_comLuckBoxBtn.m_holder, "ui_LuckyBox", "but_text_dc");
 
             comBox.m_comLuckBoxBtn.m_comCostOne.m_txtCost.text = cfg.costNum.ToString();
             comBox.m_comLuckBoxBtn.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
@@ -297,6 +316,7 @@ namespace GFGGame
             if (comBox.m_comLuckBoxBtn.m_btnBuyTen.data == null)
             {
                 comBox.m_comLuckBoxBtn.m_btnBuyTen.onClick.Add(OnClickBtnBuyTen);
+                _effectUIDic.Add("Button_public" + boxId, EffectUIPool.CreateEffectUI(comBox.m_comLuckBoxBtn.m_btnBuyTen_eff, "ui_LuckyBox", "Button_public"));
             }
             comBox.m_comLuckBoxBtn.m_btnBuyTen.data = boxId;
 
@@ -574,9 +594,6 @@ namespace GFGGame
         {
             base.OnHide();
 
-            EffectUIPool.Recycle(_effectUI2);
-            _effectUI2 = null;
-
             _valueBarController.OnHide();
             foreach (int key in _luckyBoxCtrl.Keys)
             {

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

@@ -185,7 +185,7 @@ namespace GFGGame
         private void RenderListCardItem(int index, GObject obj)
         {
             CardData cardData = cardList[index];
-            UI_ListCardItem item = UI_ListCardItem.Proxy(obj); // obj as GButton;
+            UI_ListCardFightItem item = UI_ListCardFightItem.Proxy(obj); // obj as GButton;
             item.m_txtName.text = cardData.itemCfg.name;
             item.m_comCardMask.m_loaCard.asLoader.url =
                 ResPathUtil.GetCardIconPath(cardData.resources[cardData.resIndex]);
@@ -201,9 +201,9 @@ namespace GFGGame
             item.m_starNumType.selectedIndex = cardData.itemCfg.starDescArr.Length - 1;
             for (int i = 0; i < 4; i++)
             {
-                UI_ComDodgeStar dodgeStar = UI_ComDodgeStar.Proxy(item.target.GetChild("dodgeStar" + i));
+                UI_ComDodgeFightStar dodgeStar = UI_ComDodgeFightStar.Proxy(item.target.GetChild("dodgeStar" + i));
                 dodgeStar.m_lightType.selectedIndex = (starLevelDodge > i) ? 1 : 0;
-                UI_ComDodgeStar.ProxyEnd();
+                UI_ComDodgeFightStar.ProxyEnd();
             }
 
             // comStar.m_c1.selectedIndex = cardData.star;
@@ -213,7 +213,7 @@ namespace GFGGame
                 // _effects.Add(_effectUI);
             }
 
-            UI_ListCardItem.ProxyEnd();
+            UI_ListCardFightItem.ProxyEnd();
             // UI_ComStar.ProxyEnd();
         }
 

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

@@ -1066,7 +1066,7 @@ namespace GFGGame
             }
             if (GameGlobal.AutoDailySignView)
             {
-                if (RedDotDataManager.Instance.DailySignRed())
+                if (RedDotDataManager.Instance.DailySignGot())
                 {
                     ViewManager.Show<DailySignView>(new object[] { 1 });
                     return;

GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_3!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 7a68d7d95bb345048a147820cda47d3d
-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/FieldGuide/FieldGuide_atlas0_3.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: c6ac938cc4099f242970e77c176d88fd
-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/StreamingAssets/Bundles.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a71d610f561efe84fb231488f4db759b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: