复刻锦绣万卷

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

@@ -32,7 +32,6 @@ namespace UI.Main
         public UI_BtnModle2 m_btnGetYuanXiao;
         public UI_BtnModle2 m_btnActivityFYJY;
         public UI_BtnModle2 m_btnActivityZQ;
-        public UI_BtnModle2 m_btnActivityXDMH;
         public GTextField m_serverTime;
         public GLoader m_loaGuidestudio;
         public UI_ComAd m_comListAd;
@@ -50,7 +49,6 @@ namespace UI.Main
         public UI_BtnModle1 m_btnDailyWelfare;
         public UI_BtnModle1 m_btnNewPlayerReward;
         public UI_BtnModle3 m_btnSevenReward;
-        public UI_BtnModle1 m_btnTapTapJump;
         public UI_BtnModle1 m_btnPearRebate;
         public UI_BtnModle1 m_btnNewYearRedEnvelope;
         public UI_BtnModle1 m_btnActivityDay7;
@@ -132,7 +130,6 @@ namespace UI.Main
             m_btnGetYuanXiao = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnGetYuanXiao"));
             m_btnActivityFYJY = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityFYJY"));
             m_btnActivityZQ = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityZQ"));
-            m_btnActivityXDMH = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityXDMH"));
             m_serverTime = (GTextField)comp.GetChild("serverTime");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
@@ -150,7 +147,6 @@ namespace UI.Main
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
             m_btnNewPlayerReward = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnNewPlayerReward"));
             m_btnSevenReward = (UI_BtnModle3)UI_BtnModle3.Create(comp.GetChild("btnSevenReward"));
-            m_btnTapTapJump = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnTapTapJump"));
             m_btnPearRebate = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnPearRebate"));
             m_btnNewYearRedEnvelope = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnNewYearRedEnvelope"));
             m_btnActivityDay7 = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityDay7"));
@@ -202,8 +198,6 @@ namespace UI.Main
             m_btnActivityFYJY = null;
             m_btnActivityZQ.Dispose();
             m_btnActivityZQ = null;
-            m_btnActivityXDMH.Dispose();
-            m_btnActivityXDMH = null;
             m_serverTime = null;
             m_loaGuidestudio = null;
             m_comListAd.Dispose();
@@ -236,8 +230,6 @@ namespace UI.Main
             m_btnNewPlayerReward = null;
             m_btnSevenReward.Dispose();
             m_btnSevenReward = null;
-            m_btnTapTapJump.Dispose();
-            m_btnTapTapJump = null;
             m_btnPearRebate.Dispose();
             m_btnPearRebate = null;
             m_btnNewYearRedEnvelope.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_BtnAnswerTianmen.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_BtnAnswerTianmen
+    {
+        public GButton target;
+        public Transition m_t0;
+        public const string URL = "ui://b8ha2mnsdedgc";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "BtnAnswerTianmen";
+        private static UI_BtnAnswerTianmen _proxy;
+
+        public static UI_BtnAnswerTianmen Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnAnswerTianmen();
+            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_BtnAnswerTianmen Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnAnswerTianmen();
+            }
+            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_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_BtnAnswerTianmen.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_BtnHeaven.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_BtnHeaven
+    {
+        public GButton target;
+        public Transition m_t0;
+        public const string URL = "ui://b8ha2mnsdedga";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "BtnHeaven";
+        private static UI_BtnHeaven _proxy;
+
+        public static UI_BtnHeaven Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnHeaven();
+            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_BtnHeaven Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnHeaven();
+            }
+            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_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_BtnHeaven.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_BtnMingTong.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_BtnMingTong
+    {
+        public GButton target;
+        public Transition m_t0;
+        public const string URL = "ui://b8ha2mnsdedgb";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "BtnMingTong";
+        private static UI_BtnMingTong _proxy;
+
+        public static UI_BtnMingTong Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnMingTong();
+            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_BtnMingTong Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnMingTong();
+            }
+            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_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_BtnMingTong.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_BtnNineZhouPool.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_BtnNineZhouPool
+    {
+        public GButton target;
+        public Transition m_t0;
+        public const string URL = "ui://b8ha2mnsdedg9";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "BtnNineZhouPool";
+        private static UI_BtnNineZhouPool _proxy;
+
+        public static UI_BtnNineZhouPool Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnNineZhouPool();
+            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_BtnNineZhouPool Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnNineZhouPool();
+            }
+            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_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_BtnNineZhouPool.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerActivityUI.cs

@@ -12,14 +12,13 @@ namespace UI.OpenServerActivity
         public GButton m_btnBack;
         public GGraph m_holderTitle;
         public GGraph m_holderFog;
-        public GButton m_btnAnswerTianmen;
-        public GButton m_btnMingTong;
-        public GButton m_btnHeaven;
-        public GButton m_btnNineZhouPool;
+        public GTextField m_timeText;
+        public GButton m_ruleBtn;
         public GButton m_btnTenShu;
-        public GTextField m_txtDay;
-        public GTextField m_txtHour;
-        public GTextField m_txtMinute;
+        public UI_BtnAnswerTianmen m_btnAnswerTianmen;
+        public UI_BtnMingTong m_btnMingTong;
+        public UI_BtnNineZhouPool m_btnNineZhouPool;
+        public UI_BtnHeaven m_btnHeaven;
         public GGraph m_holderSmallBgTx;
         public GButton m_buttonNewYearLogin;
         public Transition m_openEff;
@@ -75,14 +74,13 @@ namespace UI.OpenServerActivity
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_holderTitle = (GGraph)comp.GetChild("holderTitle");
             m_holderFog = (GGraph)comp.GetChild("holderFog");
-            m_btnAnswerTianmen = (GButton)comp.GetChild("btnAnswerTianmen");
-            m_btnMingTong = (GButton)comp.GetChild("btnMingTong");
-            m_btnHeaven = (GButton)comp.GetChild("btnHeaven");
-            m_btnNineZhouPool = (GButton)comp.GetChild("btnNineZhouPool");
+            m_timeText = (GTextField)comp.GetChild("timeText");
+            m_ruleBtn = (GButton)comp.GetChild("ruleBtn");
             m_btnTenShu = (GButton)comp.GetChild("btnTenShu");
-            m_txtDay = (GTextField)comp.GetChild("txtDay");
-            m_txtHour = (GTextField)comp.GetChild("txtHour");
-            m_txtMinute = (GTextField)comp.GetChild("txtMinute");
+            m_btnAnswerTianmen = (UI_BtnAnswerTianmen)UI_BtnAnswerTianmen.Create(comp.GetChild("btnAnswerTianmen"));
+            m_btnMingTong = (UI_BtnMingTong)UI_BtnMingTong.Create(comp.GetChild("btnMingTong"));
+            m_btnNineZhouPool = (UI_BtnNineZhouPool)UI_BtnNineZhouPool.Create(comp.GetChild("btnNineZhouPool"));
+            m_btnHeaven = (UI_BtnHeaven)UI_BtnHeaven.Create(comp.GetChild("btnHeaven"));
             m_holderSmallBgTx = (GGraph)comp.GetChild("holderSmallBgTx");
             m_buttonNewYearLogin = (GButton)comp.GetChild("buttonNewYearLogin");
             m_openEff = comp.GetTransition("openEff");
@@ -94,14 +92,17 @@ namespace UI.OpenServerActivity
             m_btnBack = null;
             m_holderTitle = null;
             m_holderFog = null;
+            m_timeText = null;
+            m_ruleBtn = null;
+            m_btnTenShu = null;
+            m_btnAnswerTianmen.Dispose();
             m_btnAnswerTianmen = null;
+            m_btnMingTong.Dispose();
             m_btnMingTong = null;
-            m_btnHeaven = null;
+            m_btnNineZhouPool.Dispose();
             m_btnNineZhouPool = null;
-            m_btnTenShu = null;
-            m_txtDay = null;
-            m_txtHour = null;
-            m_txtMinute = null;
+            m_btnHeaven.Dispose();
+            m_btnHeaven = null;
             m_holderSmallBgTx = null;
             m_buttonNewYearLogin = null;
             m_openEff = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerStoryUI.cs

@@ -8,6 +8,7 @@ namespace UI.OpenServerActivity
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GComponent m_valueBar;
         public GButton m_btnBack;
         public GList m_list;
         public const string URL = "ui://b8ha2mnspll2g";
@@ -58,12 +59,14 @@ namespace UI.OpenServerActivity
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_valueBar = null;
             m_btnBack = null;
             m_list = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerTaskListItem.cs

@@ -0,0 +1,101 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_OpenServerTaskListItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public Controller m_c3;
+        public GTextField m_txtDesc;
+        public GTextField m_txtCount;
+        public GList m_listTaskReward;
+        public GButton m_GetRewardBt;
+        public GButton m_ComeBt;
+        public GButton m_GetRewardBt1;
+        public GProgressBar m_taskBar;
+        public GGraph m_holderfTaskEff;
+        public const string URL = "ui://b8ha2mnsjazg1w";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "OpenServerTaskListItem";
+        private static UI_OpenServerTaskListItem _proxy;
+
+        public static UI_OpenServerTaskListItem Create(GObject gObject = null)
+        {
+            var ui = new UI_OpenServerTaskListItem();
+            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_OpenServerTaskListItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_OpenServerTaskListItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_c3 = comp.GetController("c3");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_listTaskReward = (GList)comp.GetChild("listTaskReward");
+            m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
+            m_ComeBt = (GButton)comp.GetChild("ComeBt");
+            m_GetRewardBt1 = (GButton)comp.GetChild("GetRewardBt1");
+            m_taskBar = (GProgressBar)comp.GetChild("taskBar");
+            m_holderfTaskEff = (GGraph)comp.GetChild("holderfTaskEff");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_c3 = null;
+            m_txtDesc = null;
+            m_txtCount = null;
+            m_listTaskReward = null;
+            m_GetRewardBt = null;
+            m_ComeBt = null;
+            m_GetRewardBt1 = null;
+            m_taskBar = null;
+            m_holderfTaskEff = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerTaskListItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerTaskUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_OpenServerTaskUI
+    {
+        public GComponent target;
+        public GLoader m_backBtn;
+        public GLoader m_loaBg;
+        public GList m_TaskList;
+        public const string URL = "ui://b8ha2mnsjazg1v";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "OpenServerTaskUI";
+        private static UI_OpenServerTaskUI _proxy;
+
+        public static UI_OpenServerTaskUI Create(GObject gObject = null)
+        {
+            var ui = new UI_OpenServerTaskUI();
+            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_OpenServerTaskUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_OpenServerTaskUI();
+            }
+            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_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_TaskList = (GList)comp.GetChild("TaskList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_backBtn = null;
+            m_loaBg = null;
+            m_TaskList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerTaskUI.cs.meta

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

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

@@ -58,14 +58,14 @@ namespace GFGGame
             }
             else if(_actLimitTsy == 1)
             {
-                _ui.m_showType.selectedIndex = 2;
+                _ui.m_showType.selectedIndex = 3;
             }
             else
             {
                 _ui.m_showType.selectedIndex = 0;
             }
             
-            _ui.m_showType.selectedIndex = 2;
+            _ui.m_showType.selectedIndex = 1;
 
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);

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

@@ -146,11 +146,11 @@ namespace GFGGame
             _ui.m_btnNewPlayerReward.target.onClick.Add(OnClickNewPlayerReward);
             _ui.m_btnSevenReward.target.onClick.Add(OnClickSevenReward);
             _ui.m_btnPearRebate.target.onClick.Add(OnClickPearRabate);
-            _ui.m_btnTapTapJump.target.onClick.Add(OnClickTapTapJump);
+            //_ui.m_btnTapTapJump.target.onClick.Add(OnClickTapTapJump);
             _btnGallery.onClick.Add(OnClickGallery);
             _btnPoem.onClick.Add(OnClickPoem);
 
-            _ui.m_btnActivityXDMH.target.onClick.Add(OnClickBtnXDMH);
+            //_ui.m_btnActivityXDMH.target.onClick.Add(OnClickBtnXDMH);
 
             _ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
             _ui.m_comListAd.m_listAd.SetVirtualAndLoop();
@@ -366,7 +366,7 @@ namespace GFGGame
         //限定盲盒按钮显示
         private void RefreshBtnXdmhActivity()
         {
-            _ui.m_btnActivityXDMH.target.visible = ActivityGlobalDataManager.Instance.IsActivityOpen(10302);
+           // _ui.m_btnActivityXDMH.target.visible = ActivityGlobalDataManager.Instance.IsActivityOpen(10302);
         }
 
         private void RefreshBtnActivityFYJY()
@@ -610,7 +610,7 @@ namespace GFGGame
                 QDDouYouManagerIos.Instance.Share();
             }
 #else
-            _ui.m_btnTapTapJump.target.visible = false;
+           // _ui.m_btnTapTapJump.target.visible = false;
 #endif
         }
 
@@ -923,7 +923,7 @@ namespace GFGGame
 //#if PT_DouYouTap
 //            _ui.m_btnTapTapJump.target.visible = true;
 //#else
-            _ui.m_btnTapTapJump.target.visible = false;
+           // _ui.m_btnTapTapJump.target.visible = false;
 //#endif
             //是否是IOS,并且要验证版本
 //#if PT_IosLocal

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

@@ -46,36 +46,36 @@ namespace GFGGame
             isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_btnHeaven.onClick.Add(OnClickBtnHeaven);
-            _ui.m_btnMingTong.onClick.Add(OnClickBtnMingTong);
-            _ui.m_btnAnswerTianmen.onClick.Add(OnClickBtnAnswerTianmen);
+            _ui.m_btnHeaven.target.onClick.Add(OnClickBtnHeaven);
+            _ui.m_btnMingTong.target.onClick.Add(OnClickBtnMingTong);
+            _ui.m_btnAnswerTianmen.target.onClick.Add(OnClickBtnAnswerTianmen);
             _ui.m_btnTenShu.onClick.Add(OnClickBtnTenShu);
-            _ui.m_btnNineZhouPool.onClick.Add(OnClickBtnNineZhouPool);
+            _ui.m_btnNineZhouPool.target.onClick.Add(OnClickBtnNineZhouPool);
             _ui.m_buttonNewYearLogin.onClick.Add(OnClickButtonNewYearLogin);
             AddEffect();
         }
 
         private void AddEffect()
         {
-            //_effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderSmallBg, "ui_Activity", "NewAtv_Quad");
-            //_effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_holderSmallBgTx, "ui_Activity", "NewAtv_Quad_tx");
-            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_holderFog, "ui_Activity", "NewAtv_BG_tx");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderSmallBg, "ui_Activity", "JXWJ_All_tx/JXWJ_All_tx");
+            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_Activity", "JXWJ_Text/JXWJ_Text");
+            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_holderFog, "ui_Activity", "JXWJ_Button/JXWJ_Button");
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("kfhd_sdcy_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_jxwj");
+            _ui.m_buttonNewYearLogin.visible = false;
             RefreshTimeText();
             UpdateRedDot();
-            _ui.m_buttonNewYearLogin.visible = false;
             //RefreshButtonNewYearLogin();
             int actLimitId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
             ActivityOpenCfg activiyCfg = ActivityOpenCfgArray.Instance.GetCfg(actLimitId);
-            // if (activiyCfg != null)
-            // {
-            //     _ui.m_timeText.text = GetTImeText(activiyCfg.endTime);
-            // }
+            if (activiyCfg != null)
+            {
+                _ui.m_timeText.text = GetTImeText(activiyCfg.endTime);
+            }
             Timers.inst.Add(1, 0, UpdateTime);
             Timers.inst.Add(0.2f, 1, ShowEffTime);
         }
@@ -109,10 +109,10 @@ namespace GFGGame
 
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnTenShu, (RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || RedDotDataManager.Instance.GetGiftBagRewardRed() || RedDotDataManager.Instance.GetMeiRiTeHuiRed()), "", -100, 11);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnHeaven, MiniGameDateManager.Instance.GetRewardRot());
-            RedDotController.Instance.SetComRedDot(_ui.m_btnAnswerTianmen, RedDotDataManager.Instance.GetOpenServerStoryRed(), "", -80, 100);
-            RedDotController.Instance.SetComRedDot(_ui.m_buttonNewYearLogin, ActivityDataManager.Instance.CanGetNewYearLoginRed(), "", 0, 0);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTenShu, (RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || RedDotDataManager.Instance.GetGiftBagRewardRed() || RedDotDataManager.Instance.GetMeiRiTeHuiRed()), "");
+            //RedDotController.Instance.SetComRedDot(_ui.m_btnHeaven, MiniGameDateManager.Instance.GetRewardRot());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnAnswerTianmen.target, RedDotDataManager.Instance.GetOpenServerStoryRed(), "");
+            //RedDotController.Instance.SetComRedDot(_ui.m_buttonNewYearLogin, ActivityDataManager.Instance.CanGetNewYearLoginRed(), "", 0, 0);
         }
 
         private void UpdateTime(object param)
@@ -141,9 +141,6 @@ namespace GFGGame
             long time = TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow();
             string strTime = TimeUtil.FormattingTimeTo_DD_HH_mm(time);
             string[] str = strTime.Split(':');
-            _ui.m_txtDay.text = str[0];
-            _ui.m_txtHour.text = str[1];
-            _ui.m_txtMinute.text = str[2];
         }
 
         private void OnClickBtnBack()
@@ -154,22 +151,29 @@ namespace GFGGame
         private void OnClickBtnHeaven()
         {
             //小游戏入口
-            if (JudgeActivityExpire())
-                ViewManager.Show<GameStartView>();
+            _ui.m_btnHeaven.m_t0.Play(() => {
+                if (JudgeActivityExpire())
+                    ViewManager.Show<MergeGameView>();
+            });
         }
 
         private void OnClickBtnMingTong()
         {
             //副本入口
-            if (JudgeActivityExpire())
-                ViewManager.Show<OpenServerFightView>(ConstLimitTimeActivityType.ActLimitStlyc);
+            _ui.m_btnMingTong.m_t0.Play(() =>
+            {
+                if (JudgeActivityExpire())
+                    ViewManager.Show<OpenServerFightView>(ConstLimitTimeActivityType.ActLimitStlyc);
+            });
         }
 
         private void OnClickBtnAnswerTianmen()
         {
             //剧情入口
-            if (JudgeActivityExpire())
-                ViewManager.Show<OpenServerStoryView>(ConstLimitTimeActivityType.ActLimitStlyc);
+            _ui.m_btnAnswerTianmen.m_t0.Play(()=> {
+                if (JudgeActivityExpire())
+                    ViewManager.Show<OpenServerStoryView>(ConstLimitTimeActivityType.ActLimitStlyc);
+            });
         }
 
         private void OnClickBtnTenShu()
@@ -180,8 +184,11 @@ namespace GFGGame
 
         private void OnClickBtnNineZhouPool() 
         {
-            if(JudgeActivityExpire())
-                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
+            _ui.m_btnNineZhouPool.m_t0.Play(()=> {
+                if (JudgeActivityExpire())
+                    ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
+            });
+
         }
 
         private void OnClickButtonNewYearLogin()

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

@@ -13,15 +13,15 @@ namespace GFGGame
         private int _activityId;
         private int _activityType;
         private ActivityOpenCfg _activityCfg;
-        //private ValueBarController _valueBarController;
+        private ValueBarController _valueBarController;
 
         public override void Dispose()
         {
-            // if (_valueBarController != null)
-            // {
-            //     _valueBarController.Dispose();
-            //     _valueBarController = null;
-            // }
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
 
             if (_ui != null)
             {
@@ -45,7 +45,7 @@ namespace GFGGame
             isfullScreen = true;
             isReturnView = true;
 
-            //_valueBarController = new ValueBarController(_ui.m_valueBar);
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_list.itemRenderer = RenderListItem;
@@ -59,12 +59,12 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            // _valueBarController.OnShown();
-            // _valueBarController.UpdateList(new List<int>() {  ConstItemID.GET_TICKETS });
+            _valueBarController.OnShown();
+            _valueBarController.UpdateList(new List<int>() {  3008010 });
             _activityType = (int)this.viewData;
             StudioDataManager.Instance.VIEW_NAME = typeof(OpenServerStoryView).FullName;
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _activityType;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("sdcy_jq_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_jxwj");
             _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _storyLevelCfgs.Clear();
@@ -74,7 +74,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            //_valueBarController.OnHide();
+            _valueBarController.OnHide();
         }
 
         protected override void RemoveEventListener()