招财进宝活动提交

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

@@ -240,6 +240,7 @@ namespace GFGGame
             FriendSProxy.ReqAllFriendInfos().Coroutine();
             ActivityAfuGiftSProxy.GetAfuGiftInfo().Coroutine();
             ActivityTeaSProxy.ReqGetNPCVisitInfo().Coroutine();
+            ActivitySProxy.ReqActivityZCJBInfo().Coroutine();
             MiniGameProxy.ReqGetChallengeReward().Coroutine();
 
             PoemPhotoSProxy.ReqAllPhotoInfos().Coroutine();

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

@@ -239,5 +239,40 @@ namespace GFGGame
                 return ConstBonusStatus.CAN_NOT_GET;
             }
         }
+
+        //招财进宝活动
+        public List<int> ActivityZCJBList = new List<int>();
+        public bool CheckZCJBRed()
+        {
+            foreach(int i in ActivityDataManager.Instance.ActivityZCJBList)
+            {
+                if(i == 1)
+                {
+                    return true;
+                }
+            }
+            ItemData numItem;
+            long num;
+            if(BagDataManager.Instance.GetBagData().TryGetValue(3000023, out numItem))
+            {
+                num = numItem.num;
+            }
+            else
+            {
+                num = 0;
+            }
+
+            for (int i = 0; i < ActivityDressCfgArray.Instance.dataArray.Length - 1; i++)
+            {
+                    if (i == ActivityDataManager.Instance.ActivityZCJBList.Count)
+                    {
+                        if (num >= ActivityDressCfgArray.Instance.dataArray[i].comsumeArr[0][1])
+                        {
+                            return true;
+                        }
+                    }
+            }
+            return false;
+        }
     }
 }

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

@@ -11,6 +11,8 @@ namespace GFGGame
         public List<ItemInfoProto> itemList = new List<ItemInfoProto>();
         public List<GameInfoProto> gameinfoList = new List<GameInfoProto>();
 
+        public bool CHECK_TIPS = false; //提示弹窗是否打开
+
         //合成游戏
         public int taskID = 40001;
 

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

@@ -140,6 +140,11 @@ namespace GFGGame
             ViewManager.Show(VIEW_NAME, PROPERTY_SELECT_INDEX);
         }
 
+        public void OnFinishZCJBStoryLevel(int levelCfgId, bool firstPass, bool success)
+        {
+            ViewManager.Show<ActivityZCJBChapterView>(new object[] { 61001, 2 });
+        }
+
         public void OnFinishFilingStoryLevel(int levelCfgId, bool firstPass, bool success)
         {
             ViewManager.Show<StudioFilingView>(MainStoryDataManager.currentChapterCfgId, true);

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityRewardItemUI.cs

@@ -0,0 +1,81 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_ActivityRewardItemUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GList m_List;
+        public UI_Button7 m_RewardBtn;
+        public GTextField m_rewardName;
+        public const string URL = "ui://4ht5s77uqbf4u";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "ActivityRewardItemUI";
+        private static UI_ActivityRewardItemUI _proxy;
+
+        public static UI_ActivityRewardItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityRewardItemUI();
+            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_ActivityRewardItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityRewardItemUI();
+            }
+            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_bg = (GLoader)comp.GetChild("bg");
+            m_List = (GList)comp.GetChild("List");
+            m_RewardBtn = (UI_Button7)UI_Button7.Create(comp.GetChild("RewardBtn"));
+            m_rewardName = (GTextField)comp.GetChild("rewardName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_List = null;
+            m_RewardBtn.Dispose();
+            m_RewardBtn = null;
+            m_rewardName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityRewardItemUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityZCJB.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_ActivityZCJB
+    {
+        public GComponent target;
+        public GLoader m_btnChange;
+        public GLoader m_icon;
+        public GButton m_rewardBTn;
+        public GTextField m_activityTime;
+        public GLoader m_backBtn;
+        public GLoader m_viewBtn;
+        public const string URL = "ui://4ht5s77uqbf4l";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "ActivityZCJB";
+        private static UI_ActivityZCJB _proxy;
+
+        public static UI_ActivityZCJB Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityZCJB();
+            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_ActivityZCJB Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityZCJB();
+            }
+            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_btnChange = (GLoader)comp.GetChild("btnChange");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_rewardBTn = (GButton)comp.GetChild("rewardBTn");
+            m_activityTime = (GTextField)comp.GetChild("activityTime");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_viewBtn = (GLoader)comp.GetChild("viewBtn");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnChange = null;
+            m_icon = null;
+            m_rewardBTn = null;
+            m_activityTime = null;
+            m_backBtn = null;
+            m_viewBtn = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityZCJB.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityZCJBRewardUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_ActivityZCJBRewardUI
+    {
+        public GComponent target;
+        public GLoader m_back;
+        public GLoader m_loaBg;
+        public GList m_List;
+        public GTextField m_num;
+        public GLoader m_backBtn;
+        public const string URL = "ui://4ht5s77uqbf4m";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "ActivityZCJBRewardUI";
+        private static UI_ActivityZCJBRewardUI _proxy;
+
+        public static UI_ActivityZCJBRewardUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityZCJBRewardUI();
+            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_ActivityZCJBRewardUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityZCJBRewardUI();
+            }
+            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_back = (GLoader)comp.GetChild("back");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_List = (GList)comp.GetChild("List");
+            m_num = (GTextField)comp.GetChild("num");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_back = null;
+            m_loaBg = null;
+            m_List = null;
+            m_num = null;
+            m_backBtn = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityZCJBRewardUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button7.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_Button7.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ComItem000.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_ComItem000
+    {
+        public GComponent target;
+        public GComponent m_comItemIcon;
+        public GTextField m_txtName;
+        public const string URL = "ui://4ht5s77uqbf4v";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "ComItem000";
+        private static UI_ComItem000 _proxy;
+
+        public static UI_ComItem000 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComItem000();
+            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_ComItem000 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComItem000();
+            }
+            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_comItemIcon = (GComponent)comp.GetChild("comItemIcon");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comItemIcon = null;
+            m_txtName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ComItem000.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZCJBExchangeTips.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_ZCJBExchangeTips
+    {
+        public GComponent target;
+        public GTextField m_timesText;
+        public const string URL = "ui://4ht5s77uqbf4t";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "ZCJBExchangeTips";
+        private static UI_ZCJBExchangeTips _proxy;
+
+        public static UI_ZCJBExchangeTips Create(GObject gObject = null)
+        {
+            var ui = new UI_ZCJBExchangeTips();
+            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_ZCJBExchangeTips Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ZCJBExchangeTips();
+            }
+            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_timesText = (GTextField)comp.GetChild("timesText");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_timesText = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZCJBExchangeTips.cs.meta

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

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

@@ -11,6 +11,8 @@ namespace UI.CommonGame
         public Controller m_style;
         public GLoader m_loaIcon;
         public GTextField m_txtNeed;
+        public GTextField m_limitNum;
+        public GLoader m_addBtn;
         public const string URL = "ui://eg2y0ldpn3xha1";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComCostCurrency";
@@ -62,6 +64,8 @@ namespace UI.CommonGame
             m_style = comp.GetController("style");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtNeed = (GTextField)comp.GetChild("txtNeed");
+            m_limitNum = (GTextField)comp.GetChild("limitNum");
+            m_addBtn = (GLoader)comp.GetChild("addBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +73,8 @@ namespace UI.CommonGame
             m_style = null;
             m_loaIcon = null;
             m_txtNeed = null;
+            m_limitNum = null;
+            m_addBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -20,11 +20,15 @@ namespace UI.Main
         public GTextField m_txtChapterName2;
         public GTextField m_txtChapterName3;
         public GTextField m_txtChapterName4;
+        public GGroup m_selectChapter;
         public UI_CompBonusBox m_bonusBox3;
         public UI_CompBonusBox m_bonusBox2;
         public UI_CompBonusBox m_bonusBox1;
         public GTextField m_txtStarCount;
+        public GGroup m_bonusBox;
         public GLoader m_switchChapter;
+        public GTextField m_ZCJBTimeText;
+        public GGroup m_ActivityZCJB;
         public Transition m_t0;
         public const string URL = "ui://mfvz4q8km7n51u";
         public const string PACKAGE_NAME = "Main";
@@ -86,11 +90,15 @@ namespace UI.Main
             m_txtChapterName2 = (GTextField)comp.GetChild("txtChapterName2");
             m_txtChapterName3 = (GTextField)comp.GetChild("txtChapterName3");
             m_txtChapterName4 = (GTextField)comp.GetChild("txtChapterName4");
+            m_selectChapter = (GGroup)comp.GetChild("selectChapter");
             m_bonusBox3 = (UI_CompBonusBox)UI_CompBonusBox.Create(comp.GetChild("bonusBox3"));
             m_bonusBox2 = (UI_CompBonusBox)UI_CompBonusBox.Create(comp.GetChild("bonusBox2"));
             m_bonusBox1 = (UI_CompBonusBox)UI_CompBonusBox.Create(comp.GetChild("bonusBox1"));
             m_txtStarCount = (GTextField)comp.GetChild("txtStarCount");
+            m_bonusBox = (GGroup)comp.GetChild("bonusBox");
             m_switchChapter = (GLoader)comp.GetChild("switchChapter");
+            m_ZCJBTimeText = (GTextField)comp.GetChild("ZCJBTimeText");
+            m_ActivityZCJB = (GGroup)comp.GetChild("ActivityZCJB");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
@@ -109,6 +117,7 @@ namespace UI.Main
             m_txtChapterName2 = null;
             m_txtChapterName3 = null;
             m_txtChapterName4 = null;
+            m_selectChapter = null;
             m_bonusBox3.Dispose();
             m_bonusBox3 = null;
             m_bonusBox2.Dispose();
@@ -116,7 +125,10 @@ namespace UI.Main
             m_bonusBox1.Dispose();
             m_bonusBox1 = null;
             m_txtStarCount = null;
+            m_bonusBox = null;
             m_switchChapter = null;
+            m_ZCJBTimeText = null;
+            m_ActivityZCJB = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

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

@@ -243,6 +243,38 @@ namespace GFGGame
             }
             return false;
         }
+
+        //招财进宝活动
+        public static async ETTask<bool> ReqActivityZCJBInfo(int id = 5006)
+        {
+            S2C_GetDressRewrdStatusList response = null;
+            response = (S2C_GetDressRewrdStatusList)await MessageHelper.SendToServer(new C2S_GetDressRewrdStatusList() { ActivityId = id });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                   ActivityDataManager.Instance.ActivityZCJBList = response.RewrdIds;
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static async ETTask<bool> ReqActivityZCJBReward(int id,int rewardId)
+        {
+            S2C_GetDressRewrd response = null;
+            response = (S2C_GetDressRewrd)await MessageHelper.SendToServer(new C2S_GetDressRewrd() { ActivityId = id ,RewrdId = rewardId});
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ActivityDataManager.Instance.ActivityZCJBList = response.RewrdIds;
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
+                    return true;
+                }
+            }
+            return false;
+        }
+
     }
 }
 

GameClient/Assets/Game/HotUpdate/Utils/StoryUtil.cs

@@ -108,13 +108,13 @@ namespace GFGGame
                     {
                         obj.visible = i <= starCount;
                         
-                        if (currentIndex == 0)
+                        if (currentIndex == 1)
                         {
-                            (obj as GLoader).url = "ui://Main/tb_zx_pt_star";
+                            (obj as GLoader).url = "ui://Main/tb_zx_jy_star";
                         }
                         else
                         {
-                            (obj as GLoader).url = "ui://Main/tb_zx_jy_star";
+                            (obj as GLoader).url = "ui://Main/tb_zx_pt_star";
                         }
                     }
                 }

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs

@@ -0,0 +1,381 @@
+using FairyGUI;
+using UI.CommonGame;
+using UI.Main;
+using System.Collections.Generic;
+using UnityEngine;
+using System.Collections;
+using ET;
+
+namespace GFGGame
+{
+    public class ActivityZCJBChapterView : BaseWindow
+    {
+        private UI_StoryChapterUI _ui;
+        private int _chapterID;
+        private GComponent _compChapter;
+        private ValueBarController _valueBarController;
+        private GObject _unPasslevelItem;
+        private GObject _endLevelItem;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+        private EffectUI _effectUI3;
+        private EffectUI _effectUI4;
+        private GComponent _comEff;
+        private GComponent _effFirst;
+
+        //y轴移动索引
+        private float indexY;
+        private GameObject gamey;
+        //特效类型数组,这里后面可以二维数组，放向左和向右的
+        private string[] effArray = new string[2] { "ZJ_JuQing", "ZJ_ZD" };
+
+        private int currentDifficulty;
+        public override void Dispose()
+        {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
+            EffectUIPool.Recycle(_effectUI4);
+            _effectUI4 = null;
+            if (_comEff != null)
+            {
+                _comEff.RemoveFromParent();
+                _comEff.Dispose();
+            }
+            if (_effFirst != null)
+            {
+                _effFirst.RemoveFromParent();
+                _effFirst.Dispose();
+            }
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+            _ui = UI_StoryChapterUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            isReturnView = true;
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_btnHome.onClick.Add(OnClickBtnHome);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zcjb_gkbj");
+
+            //_comEff = new GComponent();
+            //_comEff = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComEff").asCom;
+            //_effectUI1 = EffectUIPool.CreateEffectUI(_comEff.GetChild("holder").asGraph, "ui_gk", "ui_gk_sg");
+
+            _effFirst = new GComponent();
+            _effFirst = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComEff").asCom;
+            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_zj", "ZX_BG_TX");
+            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_chapter.m_compChapterScroll.m_nextEffect, "ui_zj", "ZX_Next_Boat");
+
+        }
+        protected override void AddEventListener()
+        {
+            
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.target.touchable = false;
+            SuitFosterProxy.SendGetSuitInfos().Coroutine();
+            MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
+            if ((this.viewData as object[]) != null)
+            {
+                _chapterID = (int)(this.viewData as object[])[0];
+                currentDifficulty = (int)(this.viewData as object[])[1];
+            }
+            else
+            {
+                _chapterID = (int)this.viewData;
+            }
+            MainStoryDataManager.currentChapterCfgId = _chapterID;
+
+            //由于这里会切换特效，所以切换界面时进行清空
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            if (_effFirst != null)
+            {
+                _effFirst.RemoveFromParent();
+            }
+
+            ActivityFightCfg chapterCfg = ActivityFightCfgArray.Instance.GetCfg(_chapterID);
+            indexY = 111.0f * Mathf.Max(0, (float)StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterCfg.type, chapterCfg.subType, chapterCfg.id).Count - 5);
+            gamey = GameObject.Find("Stage/GRoot/Window - StoryChapterUI/ContentPane/CompChapter/Container/Container");
+            _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = false;
+            _ui.m_chapter.m_compChapterScroll.m_nextEffect.visible = false;
+
+            Timers.inst.StartCoroutine(InitChapter());
+
+            //Timers.inst.Add(0.2f, 1, SetContainerY);
+            _ui.m_chapter.m_compChapterScroll.target.y = 1;
+
+            _valueBarController.OnShown();
+
+                UI_ComponentValueBar valueBar = UI_ComponentValueBar.Proxy(_ui.m_valueBar);
+                valueBar.m_c1.selectedIndex = 12;
+                UI_ComponentValueBar.ProxyEnd();
+                _valueBarController.UpdateList(new List<int>() { 3000023, ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
+                _ui.m_selectChapter.visible = false;
+                _ui.m_switchChapter.visible = false;
+                _ui.m_bonusBox.visible = false;
+                _ui.m_ActivityZCJB.visible = true;
+                long timeActivity = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(17).EndTime - TimeHelper.ServerNow();
+                _ui.m_ZCJBTimeText.text = "剩余时间：" + (timeActivity > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(timeActivity) : TimeUtil.FormattingTimeTo_HHmmss(timeActivity));
+                Timers.inst.Add(60.0f, 0, UpdateActivityTime);
+            //
+            _ui.m_t0.SetHook("canHit", () => { _ui.target.touchable = true; });
+            _ui.m_t0.Play();
+
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            _unPasslevelItem = null;
+            _endLevelItem = null;
+            // _ui.m_chapter.RemoveChildren(0, 0, true);
+            GRoot.inst.touchable = true;
+            _valueBarController.OnHide();
+            Timers.inst.Remove(SetContainerY);
+            Timers.inst.Remove(UpdateActivityTime);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(ActivityZCJBChapterView).FullName);
+            //GameController.GoBackToMainView();
+        }
+
+        private void OnClickBtnHome()
+        {
+            GameController.GoBackToMainView();
+        }
+
+        private IEnumerator InitChapter()
+        {
+            ActivityFightCfg chapterCfg = ActivityFightCfgArray.Instance.GetCfg(_chapterID);
+            var list = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterCfg.type, chapterCfg.subType, chapterCfg.id);
+            int endLevel = 0;
+            int UnlockCount = 0;
+            _compChapter = _ui.m_chapter.m_compChapterScroll.target;
+            float starPosY = _ui.m_chapter.m_compChapterScroll.m_imgBegin.y;
+            int lineGap = 4500 / list.Count;
+
+            StoryLevelCfg lastLevelCfg = list[list.Count - 1];
+
+            //根据困难程度选择显示图片
+            currentDifficulty = chapterCfg.type;
+            if (currentDifficulty == 1)
+            {
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zcjb_gkbj");
+            }
+            else
+            {
+                currentDifficulty = 0;
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zcjb_gkbj");
+            }
+            //_comEff.visible = false;
+            //_effFirst.visible = false;
+            for (int i = 0; i < 20; i++)
+            {
+                GObject obj = _ui.m_chapter.m_compChapterScroll.target.GetChild("g" + (19 - i + 1));
+                obj.SetPosition(obj.x, starPosY - lineGap * i - 300, 0); ;
+                StoryLevelCfg levelCfg = i < list.Count ? list[i] : null;
+                UI_CompStoryLevelItem levelItem = UI_CompStoryLevelItem.Proxy(obj);
+                levelItem.m_fightBg.visible = true;
+                levelItem.m_loaDialogBg.visible = true;
+                if(levelCfg == null)
+                {
+                    levelItem.target.visible = false;
+                    continue;
+                }
+                if (i == 0 || InstanceZonesDataManager.CheckLevelPass(levelCfg.id - 1))
+                {
+                    UnlockCount++;
+                    levelItem.target.data = levelCfg;
+                    levelItem.target.visible = true;
+                    levelItem.target.onClick.Clear();
+                    levelItem.target.onClick.Add(OnListItemClick);
+                    string showId = "0-"+ (i+1);
+                    levelItem.m_txtFightOrder.text = showId;
+                    if (levelCfg.fightID.Length > 0)
+                    {
+                        levelItem.m_c1.selectedIndex = 1;
+                        int score = InstanceZonesDataManager.GetScoreHighest(levelCfg.id);
+                        if (score <= 0)
+                        {
+                            levelItem.m_flower.target.visible = false;
+                        }
+                        else
+                        {
+                            levelItem.m_flower.target.visible = true;
+                            int starCount = InstanceZonesDataManager.GetStarCountHistory(levelCfg.id);
+                            StoryUtil.UpdateStar(starCount, levelItem.m_flower.target, Mathf.Max(0, currentDifficulty));
+                        }
+                    }
+                    else
+                    {
+                        levelItem.m_c1.selectedIndex = 0;
+                        levelItem.m_flower.target.visible = false;
+                        levelItem.m_txtName.text = levelCfg.name;
+                        levelItem.m_comDialogBg.m_c1.selectedIndex = Random.Range(0, 10);
+
+                    }
+
+                    //根据困难程度选择显示图片
+                    if (currentDifficulty == 1)
+                    {
+                        levelItem.m_loaDialogBg.url = "ui://Main/zxian_btn_jq_jy";
+                        levelItem.m_fightBg.url = "ui://Main/zxian_btn_zd_jy";
+                        levelItem.m_txtFightOrder.text = string.Format("{0}", StringUtil.GetColorText(showId.ToString(), "#E3F8FF"));
+                        levelItem.m_fightIconA.alpha = 0;
+                        levelItem.m_fightIconB.alpha = 0;
+                        _ui.m_txtBg.url = "ui://Main/zxian_chapter_dec_jy";
+                        _ui.m_txtChapter.strokeColor = new Color(0.592f, 0.773f, 0.961f, 1.000f);
+                    }
+                    else
+                    {
+                        levelItem.m_loaDialogBg.url = "ui://Main/zxian_btn_jq";
+                        levelItem.m_fightBg.url = "ui://Main/zxian_btn_zd";
+                        levelItem.m_txtFightOrder.text = string.Format("{0}", StringUtil.GetColorText(showId.ToString(), "#FFEABF"));
+                        levelItem.m_fightIconA.alpha = 0;
+                        levelItem.m_fightIconB.alpha = 0;
+                        _ui.m_txtBg.url = "ui://Main/zxian_chapter_dec";
+                        _ui.m_txtChapter.strokeColor = new Color(1.000f, 0.686f, 0.318f, 1.000f);
+                    }
+
+                    levelItem.m_holder.visible = !InstanceZonesDataManager.CheckLevelPass(levelCfg.id);
+                    if (!InstanceZonesDataManager.CheckLevelPass(levelCfg.id))
+                    {
+                        //设置为解锁关卡
+                        MainStoryDataManager.currentLevelCfgId = levelCfg.id;
+                        _unPasslevelItem = levelItem.target;
+                        //levelItem.target.AddChild(_comEff);
+                        //_comEff.visible = true;
+
+                        //设置解锁特效
+                        string effName;
+                        if (currentDifficulty == 1)
+                        {
+                            effName = effArray[levelItem.m_c1.selectedIndex] + "_Bule";
+                        }
+                        else
+                        {
+                            effName = effArray[levelItem.m_c1.selectedIndex];
+                        }
+                        if (levelItem.m_c1.selectedIndex == 0)
+                        {
+                            if (levelItem.m_c2.selectedIndex == 0)
+                            {
+                                _effectUI2 = EffectUIPool.CreateEffectUI(_effFirst.GetChild("effect_jq_left").asGraph, "ui_zj", effName);
+                                _effFirst.GetChild("effect_jq_left").rotationY = 180;
+                            }
+                            else
+                            {
+                                _effectUI2 = EffectUIPool.CreateEffectUI(_effFirst.GetChild("effect_jq").asGraph, "ui_zj", effName);
+                                _effFirst.GetChild("effect_jq").rotationY = 0;
+                            }
+                        }
+                        else
+                        {
+                            _effectUI2 = EffectUIPool.CreateEffectUI(_effFirst.GetChild("effect_zd").asGraph, "ui_zj", effName);
+                            if (levelItem.m_c2.selectedIndex == 0)
+                            {
+                                _effFirst.GetChild("effect_zd").rotationY = 0;
+                            }
+                            else
+                            {
+                                _effFirst.GetChild("effect_zd").rotationY = 180;
+                            }
+                        }
+                        levelItem.target.AddChild(_effFirst);
+                        levelItem.m_fightBg.visible = false;
+                        levelItem.m_loaDialogBg.visible = false;
+                        levelItem.m_t0.Play();
+                        _effFirst.visible = true;
+                        //Timers.inst.Add(1.7f, 1, HideEffect, obj);
+                    }
+                    if (levelCfg.order > endLevel)
+                    {
+                        endLevel = levelCfg.order;
+                        _endLevelItem = levelItem.target;
+                    }
+                }
+                else
+                {
+                    levelItem.target.visible = false;
+                }
+                UI_CompStoryLevelItem.ProxyEnd();
+            }
+            yield return new WaitForEndOfFrame();
+
+            _ui.m_chapter.m_compChapterScroll.target.y = 0; //Mathf.Max(0, _ui.m_chapter.target.height - _ui.m_chapter.m_compChapterScroll.target.height);
+
+            if (gamey != null)
+                gamey.transform.position = new Vector3(0, indexY, 0);
+        }
+
+        private void SetContainerY(object param = null)
+        {
+            _ui.m_chapter.m_compChapterScroll.target.y = 1; //Mathf.Max(0, _ui.m_chapter.target.height - _ui.m_chapter.m_compChapterScroll.target.height - 1);
+        }
+
+        private void HideEffect(object param = null)
+        {
+            //_effFirst.visible = false;
+        }
+
+        private void OnListItemClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            StoryLevelCfg storyLevelCfg = (StoryLevelCfg)obj.data;
+            MainStoryDataManager.currentLevelCfgId = storyLevelCfg.id;
+            InstanceZonesController.ShowLevelView(storyLevelCfg.id, StudioDataManager.Instance.OnFinishZCJBStoryLevel);
+        }
+
+        private void OnClickLevelItem(EventContext context)
+        {
+
+            UI_CompStoryLevelItem levelItem = UI_CompStoryLevelItem.Proxy(context.sender as GObject);
+            int levelCfgId = (int)levelItem.target.data;
+            UI_CompStoryLevelItem.ProxyEnd();
+            StoryController.ShowLevelView(levelCfgId);
+        }
+
+        private void UpdateActivityTime(object param = null)
+        {
+            long timeActivity = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(17).EndTime - TimeHelper.ServerNow();
+            _ui.m_ZCJBTimeText.text = "剩余时间：" + (timeActivity > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(timeActivity) : TimeUtil.FormattingTimeTo_HHmmss(timeActivity));
+        }
+
+    }
+}
+

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBChapterView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs

@@ -0,0 +1,137 @@
+using FairyGUI;
+using UI.ActivityMain;
+using System.Collections;
+using System.Collections.Generic;
+using ET;
+using UnityEngine;
+using System;
+
+namespace GFGGame
+{
+    public class ActivityZCJBRewardView : BaseWindow
+    {
+        private UI_ActivityZCJBRewardUI _ui;
+        private int lastGotIndex;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityZCJBRewardUI.PACKAGE_NAME;
+            _ui = UI_ActivityZCJBRewardUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_backBtn.onClick.Add(this.Hide);
+            _ui.m_List.itemRenderer = RenderRewardList;
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            UpdateList();
+            _ui.m_List.numItems = ActivityDressCfgArray.Instance.dataArray.Length;
+            _ui.m_List.ScrollToView(ActivityDataManager.Instance.ActivityZCJBList.Count, false, true);
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void RenderRewardList(int index, GObject obj)
+        {
+            UI_ActivityRewardItemUI item = UI_ActivityRewardItemUI.Proxy(obj);
+            ItemCfg costItem = ItemCfgArray.Instance.GetCfg(ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][0]);
+            ItemData numItem;
+            long num;
+            if (BagDataManager.Instance.GetBagData().TryGetValue(3000023, out numItem))
+            {
+                num = numItem.num;
+            }
+            else
+            {
+                num = 0;
+            }
+            //根据状态修改
+            if (index < ActivityDataManager.Instance.ActivityZCJBList.Count)
+            {
+                item.m_RewardBtn.m_c1.selectedIndex = 2;
+                RedDotController.Instance.SetComRedDot(item.m_RewardBtn.target, false);
+            }
+            else 
+            {
+                item.m_RewardBtn.m_c1.selectedIndex = 0;
+                RedDotController.Instance.SetComRedDot(item.m_RewardBtn.target, false);
+                //设置锁的样式
+            }
+            if(index == ActivityDataManager.Instance.ActivityZCJBList.Count)
+            {
+                if(num >= ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][1])
+                {
+                    item.m_RewardBtn.m_c1.selectedIndex = 1;
+                    RedDotController.Instance.SetComRedDot(item.m_RewardBtn.target, true);
+                }
+            }
+            //
+            item.m_rewardName.text = "消耗" + costItem.name + "*"+ ActivityDressCfgArray.Instance.dataArray[index].comsumeArr[0][1] + "兑换";
+            if (item.m_RewardBtn.target.data == null)
+            {
+                item.m_RewardBtn.target.onClick.Add(OnClickRewardBtn);
+            }
+            item.m_RewardBtn.target.data = index + 1;
+            if(item.m_List.data == null)
+            {
+                item.m_List.itemRenderer = RenderRewardItemList;
+            }
+            item.m_List.data = ActivityDressCfgArray.Instance.dataArray[index].bonusArr;
+            item.m_List.numItems = ActivityDressCfgArray.Instance.dataArray[index].bonusArr.Length;
+            UI_ActivityRewardItemUI.ProxyEnd();
+        }
+
+        private async void OnClickRewardBtn(EventContext context)
+        {
+            if (!(context.sender is GObject btnGet)) return;
+            int itemCfg = (int)btnGet.data;
+
+            UI_ActivityRewardItemUI item = UI_ActivityRewardItemUI.Proxy(_ui.m_List.GetChildAt(itemCfg - 1));
+            if(item.m_RewardBtn.m_c1.selectedIndex == 1)
+            {
+                bool result = await ActivitySProxy.ReqActivityZCJBReward(5006, itemCfg);
+                if (!result) return;
+                UI_ActivityRewardItemUI.ProxyEnd();
+                _ui.m_List.numItems = ActivityDressCfgArray.Instance.dataArray.Length;
+                UpdateList();
+            }
+        }
+
+        private void RenderRewardItemList(int index, GObject obj)
+        {
+            var rewards = (int[][])obj.parent.data;
+            ItemUtil.CreateItemView(rewards[index], obj as GComponent);
+        }
+
+        private void UpdateList()
+        {
+            ItemData numItem;
+            long num;
+            if (BagDataManager.Instance.GetBagData().TryGetValue(3000023, out numItem))
+            {
+                num = numItem.num;
+            }
+            else
+            {
+                num = 0;
+            }
+            _ui.m_num.text = "金元宝：" + num;
+        }
+
+    }
+}
+
+

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBView.cs

@@ -0,0 +1,60 @@
+using FairyGUI;
+using UI.ActivityMain;
+using System.Collections;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class ActivityZCJBView : BaseWindow
+    {
+        private UI_ActivityZCJB _ui;
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityZCJB.PACKAGE_NAME;
+            _ui = UI_ActivityZCJB.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            _ui.m_viewBtn.onClick.Add(OnBtnAdJump);
+            _ui.m_rewardBTn.onClick.Add(OnClickShowReward);
+            _ui.m_backBtn.onClick.Add(this.Hide);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            ReqInfo();
+            RedDotController.Instance.SetComRedDot(_ui.m_rewardBTn, ActivityDataManager.Instance.CheckZCJBRed(),"",-30);
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        private void OnBtnAdJump()
+        {
+            ActivityFightCfg chapterCfgs = ActivityFightCfgArray.Instance.GetCfg(61001);
+            ViewManager.Show<ActivityZCJBChapterView>(new object[] { chapterCfgs.id, 2 });
+        }
+        private void OnClickShowReward()
+        {
+            ViewManager.Show<ActivityZCJBRewardView>();
+        }
+        private async void ReqInfo()
+        {
+            bool result = await ActivitySProxy.ReqActivityZCJBInfo();
+            if (!result) return;
+        }
+    }
+}
+
+

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBView.cs.meta

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

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

@@ -208,6 +208,7 @@ namespace GFGGame
             }
             
             button.target.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(itemId).res);
+            button.target.icon = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(itemId).res,"png");
             switch (itemId)
             {
                 case ConstItemID.GOLD:

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

@@ -150,6 +150,31 @@ namespace GFGGame
 
             _valueBarController.OnShown();
 
+            //招财进宝活动
+            if (chapterCfg.subType == 2)
+            {
+                UI_ComponentValueBar valueBar = UI_ComponentValueBar.Proxy(_ui.m_valueBar);
+                valueBar.m_c1.selectedIndex = 12;
+                UI_ComponentValueBar.ProxyEnd();
+                _valueBarController.UpdateList(new List<int>() { ConstItemID.DIAMOND_PURPLE, ConstItemID.DIAMOND_RED });
+                _ui.m_selectChapter.visible = false;
+                _ui.m_switchChapter.visible = false;
+                _ui.m_bonusBox.visible = false;
+                _ui.m_ActivityZCJB.visible = true;
+                long timeActivity = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(17).EndTime - TimeHelper.ServerNow();
+                _ui.m_ZCJBTimeText.text = timeActivity > TimeUtil.SECOND_PER_DAY * 1000 ? TimeUtil.FormattingTimeTo_DDHHmm(timeActivity) : TimeUtil.FormattingTimeTo_HHmmss(timeActivity);
+            }
+            else
+            {
+                UI_ComponentValueBar valueBar = UI_ComponentValueBar.Proxy(_ui.m_valueBar);
+                valueBar.m_c1.selectedIndex = 1;
+                UI_ComponentValueBar.ProxyEnd();
+                _ui.m_selectChapter.visible = true;
+                _ui.m_switchChapter.visible = true;
+                _ui.m_bonusBox.visible = true;
+                _ui.m_ActivityZCJB.visible = false;
+            }
+            //
             _ui.m_t0.SetHook("canHit",()=> { _ui.target.touchable = true; });
             _ui.m_t0.Play();
             
@@ -246,7 +271,7 @@ namespace GFGGame
             }
 
             //根据困难程度选择显示图片
-            currentDifficulty = _chapterID / 10000 - 1;
+            currentDifficulty = chapterCfg.subType;
             if (currentDifficulty == 1)
             {
                 _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zhangjie_bg");
@@ -345,13 +370,13 @@ namespace GFGGame
 
                         //设置解锁特效
                         string effName;
-                        if (currentDifficulty == 0)
+                        if (currentDifficulty == 1)
                         {
-                            effName = effArray[levelItem.m_c1.selectedIndex];
+                            effName = effArray[levelItem.m_c1.selectedIndex] + "_Bule";  
                         }
                         else
                         {
-                            effName = effArray[levelItem.m_c1.selectedIndex] + "_Bule";
+                            effName = effArray[levelItem.m_c1.selectedIndex];
                         }
                         if(levelItem.m_c1.selectedIndex == 0)
                         {  

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

@@ -69,7 +69,6 @@ namespace GFGGame
             _storyType = levelCfg.subType;
             _ui.m_btnStart.touchable = true;
             UpdateView();
-
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -83,6 +82,7 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateBtnFightTimes);
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, UpdateVisitNum);
         }
         private void OnClickBtnStart()
         {
@@ -207,6 +207,16 @@ namespace GFGGame
             _ui.m_txtLevelDesc.text = levelCfg.desc;
             ItemUtil.UpdateItemNeedNum(_ui.m_comCostCurrent, ConstItemID.POWER, levelCfg.power);
             _ui.m_comCostCurrent.visible = levelCfg.power > 0;
+            //招财进宝活动
+            if(levelCfg.subType == 1 && levelCfg.type == 6)
+            {
+                EventAgent.AddEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, UpdateVisitNum);
+                _ui.m_comCostCurrent.visible = true;
+                UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(_ui.m_comCostCurrent);
+                com.m_c1.selectedIndex = 2;
+                UpdateVisitNum();
+                UI_ComCostCurrency.ProxyEnd();
+            }
             // _ui.m_txtPowerDesc.SetVar("power", "" + levelCfg.power).FlushVars();
             _ui.m_scoreType.url = "ui://CommonGame/kp_sx_" + fightCfg.scoreType;
             if (fightCfg.targetName != null && fightCfg.targetName.Length > 0)
@@ -329,6 +339,29 @@ namespace GFGGame
         {
             _ui.m_grpAdditionDesc.visible = !_ui.m_grpAdditionDesc.visible;
         }
+
+        //招财进宝活动
+        private void UpdateVisitNum()
+        {
+            UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(_ui.m_comCostCurrent);
+            RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityFightCfgArray.Instance.GetCfg(61001).limit);
+            int time = limitData.TotalPlayMax - limitData.PlayTimes;
+            com.m_limitNum.text = "今日免费次数：" + time + "/" + limitData.TotalPlayMax;
+            com.m_addBtn.onClick.Add(OnClickAddBtn);
+            UI_ComCostCurrency.ProxyEnd();
+        }
+        private void OnClickAddBtn()
+        {
+            string name = ItemCfgArray.Instance.GetCfg(LimitCfgArray.Instance.GetCfg(500).moneyId).name;
+            string desc = string.Format("是否花费{0}{1}购买{2}次过关次数？", LimitCfgArray.Instance.GetCfg(500).moneyNumArr[0],name, 1);
+            AlertUI.Show(desc).SetLeftButton(true).SetRightButton(true, "购买", (object data) =>
+            {
+                RoleLimitSProxy.ReqBuyLimitPlayTimes(500, 1, 1).Coroutine();
+                EventAgent.DispatchEvent(ConstMessage.NOTICE_LIMIT_CHANGED);
+                EventAgent.DispatchEvent(ConstMessage.NUMERIC_CHANGE);
+            });
+        }
+        //******************//
         private void CheckGuide(object param)
         {
             if (

GameClient/Assets/Game/HotUpdate/Views/MiniGame/FlipGameView.cs

@@ -166,7 +166,7 @@ namespace GFGGame
                 var result = await MiniGameProxy.ReqMiniGameEnd(gameID, gameDate.type, timeIndex, false, activityGameDate[0].id, true);
                 if (!result) return;
                 this.Hide();
-            });
+            }).SetShowCheck(false);
         }
 
         private void ListCardItem(int index, GObject item)
@@ -183,7 +183,7 @@ namespace GFGGame
             _effectRemoveList.Add(_effectUI2);
             cardItem.m_removeEffect.visible = false;
 
-            cardItem.m_card.GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(CardCfgArray.Instance.dataArray[cardArray[index]].resName,"CardGame");
+            cardItem.m_card.GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(CardCfgArray.Instance.dataArray[cardArray[index]].resName,"FlipGame");
             if (cardItem.target.data == null)
             {
                 cardItem.target.onClick.Add(OnClickCardItem);

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 6af281eead1622246a786369e687873f
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ActivityMain/ActivityMain_atlas0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9b41798b7d74a0d4fba6ea45cc1ba051
+guid: 0a3e0eed9d6595142b1ae3c7a81e7ad4
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 1dd80d73443ec35419d63dafe6248a5f
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ActivityMain/ActivityMain_atlas0_1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fb4c77467664a9a45b4f0a6d0cc6dde3
+guid: 12afb7cfda9082b45bece8c8597b4c16
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 4ac94aef6762b0844a81844d86852baa
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ActivityMain/ActivityMain_atlas0_2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dd5e693af7ccbfa419246924a62dcade
+guid: 8276b37fc26141e44848cf34c4d54e3b
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_3!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: e8a4f7f9ea6eac24cb71ef6c45e1cf16
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ActivityMain/ActivityMain_atlas0_3.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 850a7b30f836e6641a4ac5cc71eeb528
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ActivityMain/ActivityMain_atlas0_4!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 0da4325dd4b1baa4a8b19dce7cfe0a5c
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ActivityMain/ActivityMain_atlas0_4.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: eeb4d50565d3baa4ab61c4ffc5417cd3
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ActivityMain/ActivityMain_fui.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a3663d7d455055c459411a945e8497b6
+guid: 879e98f9d7651a043914b99b41943992
 TextScriptImporter:
   externalObjects: {}
   userData: