国庆活动提交

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: 9a0e78b7a098c0747b4479e09a646e5b
+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: 7f1c0982a9daac444b1e2049c7839d61
+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: 46d697d64b4717141bf57f7e73599243
+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: c0fedd7045b4a6e4ea0f6b7d8d66c295
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -15,10 +15,10 @@ namespace UI.OpenServerActivity
         public GTextField m_timeText;
         public GButton m_ruleBtn;
         public GButton m_btnTenShu;
-        public GButton m_btnAnswerTianmen;
-        public GButton m_btnMingTong;
-        public GButton m_btnNineZhouPool;
-        public GButton m_btnHeaven;
+        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;
@@ -77,10 +77,10 @@ namespace UI.OpenServerActivity
             m_timeText = (GTextField)comp.GetChild("timeText");
             m_ruleBtn = (GButton)comp.GetChild("ruleBtn");
             m_btnTenShu = (GButton)comp.GetChild("btnTenShu");
-            m_btnAnswerTianmen = (GButton)comp.GetChild("btnAnswerTianmen");
-            m_btnMingTong = (GButton)comp.GetChild("btnMingTong");
-            m_btnNineZhouPool = (GButton)comp.GetChild("btnNineZhouPool");
-            m_btnHeaven = (GButton)comp.GetChild("btnHeaven");
+            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");
@@ -95,9 +95,13 @@ namespace UI.OpenServerActivity
             m_timeText = null;
             m_ruleBtn = null;
             m_btnTenShu = null;
+            m_btnAnswerTianmen.Dispose();
             m_btnAnswerTianmen = null;
+            m_btnMingTong.Dispose();
             m_btnMingTong = null;
+            m_btnNineZhouPool.Dispose();
             m_btnNineZhouPool = null;
+            m_btnHeaven.Dispose();
             m_btnHeaven = null;
             m_holderSmallBgTx = null;
             m_buttonNewYearLogin = null;

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

@@ -46,11 +46,11 @@ 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();
         }
@@ -110,8 +110,8 @@ 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_btnHeaven, MiniGameDateManager.Instance.GetRewardRot());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnAnswerTianmen.target, RedDotDataManager.Instance.GetOpenServerStoryRed(), "", -80, 100);
             RedDotController.Instance.SetComRedDot(_ui.m_buttonNewYearLogin, ActivityDataManager.Instance.CanGetNewYearLoginRed(), "", 0, 0);
         }
 
@@ -151,22 +151,29 @@ namespace GFGGame
         private void OnClickBtnHeaven()
         {
             //小游戏入口
-            if (JudgeActivityExpire())
-                ViewManager.Show<MergeGameView>();
+            _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()
@@ -177,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()