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

GameClient/Assets/Editor/Excel/ExcelConfig.cs

@@ -10,7 +10,7 @@ namespace GFGEditor
         /// 存放excel表文件夹的的路径
         /// </summary>
         //public const string excelsFolderPath = "../../../gfg/tools/Config";
-        public static string excelsFolderPath { get { return $"../../../gfg/tools/{excelsRootDirNameDressUp}/data/"; } }
+        public static string excelsFolderPath { get { return $"../../tools/{excelsRootDirNameDressUp}/data/"; } }
         /// <summary>
         /// 存放临时excel表文件夹的的路径
         /// </summary>

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

@@ -1,71 +0,0 @@
-/** 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

@@ -1,11 +0,0 @@
-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

@@ -1,71 +0,0 @@
-/** 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

@@ -1,11 +0,0 @@
-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

@@ -1,71 +0,0 @@
-/** 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

@@ -1,11 +0,0 @@
-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

@@ -1,71 +0,0 @@
-/** 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

@@ -1,11 +0,0 @@
-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

@@ -8,18 +8,19 @@ namespace UI.OpenServerActivity
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GGraph m_holderSmallBg;
         public GButton m_btnBack;
         public GGraph m_holderTitle;
-        public GTextField m_timeText;
-        public GButton m_ruleBtn;
-        public GButton m_btnTenShu;
         public GGraph m_holderFog;
-        public UI_BtnAnswerTianmen m_btnAnswerTianmen;
-        public UI_BtnMingTong m_btnMingTong;
-        public UI_BtnNineZhouPool m_btnNineZhouPool;
-        public UI_BtnHeaven m_btnHeaven;
+        public GButton m_btnAnswerTianmen;
+        public GButton m_btnMingTong;
+        public GButton m_btnHeaven;
+        public GButton m_btnNineZhouPool;
+        public GButton m_btnTenShu;
+        public GTextField m_txtDay;
+        public GTextField m_txtHour;
+        public GTextField m_txtMinute;
         public GGraph m_holderSmallBgTx;
-        public GGraph m_holderSmallBg;
         public GButton m_buttonNewYearLogin;
         public Transition m_openEff;
         public const string URL = "ui://b8ha2mnsdedg0";
@@ -70,40 +71,38 @@ namespace UI.OpenServerActivity
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_holderSmallBg = (GGraph)comp.GetChild("holderSmallBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_holderTitle = (GGraph)comp.GetChild("holderTitle");
-            m_timeText = (GTextField)comp.GetChild("timeText");
-            m_ruleBtn = (GButton)comp.GetChild("ruleBtn");
-            m_btnTenShu = (GButton)comp.GetChild("btnTenShu");
             m_holderFog = (GGraph)comp.GetChild("holderFog");
-            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_btnAnswerTianmen = (GButton)comp.GetChild("btnAnswerTianmen");
+            m_btnMingTong = (GButton)comp.GetChild("btnMingTong");
+            m_btnHeaven = (GButton)comp.GetChild("btnHeaven");
+            m_btnNineZhouPool = (GButton)comp.GetChild("btnNineZhouPool");
+            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_holderSmallBgTx = (GGraph)comp.GetChild("holderSmallBgTx");
-            m_holderSmallBg = (GGraph)comp.GetChild("holderSmallBg");
             m_buttonNewYearLogin = (GButton)comp.GetChild("buttonNewYearLogin");
             m_openEff = comp.GetTransition("openEff");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_holderSmallBg = null;
             m_btnBack = null;
             m_holderTitle = null;
-            m_timeText = null;
-            m_ruleBtn = null;
-            m_btnTenShu = null;
             m_holderFog = 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_btnNineZhouPool = null;
+            m_btnTenShu = null;
+            m_txtDay = null;
+            m_txtHour = null;
+            m_txtMinute = null;
             m_holderSmallBgTx = null;
-            m_holderSmallBg = null;
             m_buttonNewYearLogin = null;
             m_openEff = null;
             if(disposeTarget && target != null)

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

@@ -8,7 +8,6 @@ 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";
@@ -59,14 +58,12 @@ 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/Views/LuckyBox/LuckyBoxWishView.cs

@@ -31,16 +31,16 @@ namespace GFGGame
             this.viewCom.Center();
             this.modal = true;
 
-            _ui.m_btnWish1.data = 1;
+            _ui.m_btnWish1.data = 0;
             _ui.m_btnWish1.onClick.Add(OnClickBtnWish);
-            _ui.m_btnWish2.data = 0;
+            _ui.m_btnWish2.data = 1;
             _ui.m_btnWish2.onClick.Add(OnClickBtnWish);
             _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
             _ui.m_btnRule.data = 300024;
 
-            _ui.m_btnShow1.data = 1;
+            _ui.m_btnShow1.data = 0;
             _ui.m_btnShow1.onClick.Add(OnClickBtnShow);
-            _ui.m_btnShow2.data = 0;
+            _ui.m_btnShow2.data = 1;
             _ui.m_btnShow2.onClick.Add(OnClickBtnShow);
         }
         protected override void AddEventListener()
@@ -65,7 +65,7 @@ namespace GFGGame
                 _ui.m_showType.selectedIndex = 0;
             }
             
-            _ui.m_showType.selectedIndex = 3;
+            _ui.m_showType.selectedIndex = 4;
 
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);

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.target.onClick.Add(OnClickBtnHeaven);
-            _ui.m_btnMingTong.target.onClick.Add(OnClickBtnMingTong);
-            _ui.m_btnAnswerTianmen.target.onClick.Add(OnClickBtnAnswerTianmen);
+            _ui.m_btnHeaven.onClick.Add(OnClickBtnHeaven);
+            _ui.m_btnMingTong.onClick.Add(OnClickBtnMingTong);
+            _ui.m_btnAnswerTianmen.onClick.Add(OnClickBtnAnswerTianmen);
             _ui.m_btnTenShu.onClick.Add(OnClickBtnTenShu);
-            _ui.m_btnNineZhouPool.target.onClick.Add(OnClickBtnNineZhouPool);
+            _ui.m_btnNineZhouPool.onClick.Add(OnClickBtnNineZhouPool);
             _ui.m_buttonNewYearLogin.onClick.Add(OnClickButtonNewYearLogin);
             AddEffect();
         }
 
         private void AddEffect()
         {
-            _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");
+            //_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");
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_jxwj");
-            _ui.m_buttonNewYearLogin.visible = false;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("kfhd_sdcy_bg");
             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()), "");
-            //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);
+            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);
         }
 
         private void UpdateTime(object param)
@@ -141,6 +141,9 @@ 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()
@@ -151,29 +154,22 @@ namespace GFGGame
         private void OnClickBtnHeaven()
         {
             //小游戏入口
-            _ui.m_btnHeaven.m_t0.Play(() => {
-                if (JudgeActivityExpire())
-                    ViewManager.Show<MergeGameView>();
-            });
+            if (JudgeActivityExpire())
+                ViewManager.Show<GameStartView>();
         }
 
         private void OnClickBtnMingTong()
         {
             //副本入口
-            _ui.m_btnMingTong.m_t0.Play(() =>
-            {
-                if (JudgeActivityExpire())
-                    ViewManager.Show<OpenServerFightView>(ConstLimitTimeActivityType.ActLimitStlyc);
-            });
+            if (JudgeActivityExpire())
+                ViewManager.Show<OpenServerFightView>(ConstLimitTimeActivityType.ActLimitStlyc);
         }
 
         private void OnClickBtnAnswerTianmen()
         {
             //剧情入口
-            _ui.m_btnAnswerTianmen.m_t0.Play(()=> {
-                if (JudgeActivityExpire())
-                    ViewManager.Show<OpenServerStoryView>(ConstLimitTimeActivityType.ActLimitStlyc);
-            });
+            if (JudgeActivityExpire())
+                ViewManager.Show<OpenServerStoryView>(ConstLimitTimeActivityType.ActLimitStlyc);
         }
 
         private void OnClickBtnTenShu()
@@ -184,11 +180,8 @@ namespace GFGGame
 
         private void OnClickBtnNineZhouPool() 
         {
-            _ui.m_btnNineZhouPool.m_t0.Play(()=> {
-                if (JudgeActivityExpire())
-                    ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
-            });
-
+            if(JudgeActivityExpire())
+                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
         }
 
         private void OnClickButtonNewYearLogin()

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

@@ -51,7 +51,7 @@ namespace GFGGame
             _activityType = (int)this.viewData;
             StudioDataManager.Instance.VIEW_NAME = typeof(OpenServerFightView).FullName;
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _activityType;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_jxwj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_sdcy_gq");
             _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _activityFightCfg = ActivityFightCfgArray.Instance.GetCfg(_activityCfg.params3Arr[0]);

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>() {  3008010 });
+            // _valueBarController.OnShown();
+            // _valueBarController.UpdateList(new List<int>() {  ConstItemID.GET_TICKETS });
             _activityType = (int)this.viewData;
             StudioDataManager.Instance.VIEW_NAME = typeof(OpenServerStoryView).FullName;
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _activityType;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_jxwj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("sdcy_jq_bg");
             _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()

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

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 46bcb0f8097b27141b76134f5beea991
+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/LuckyBox/LuckyBox_atlas0_11.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 548d4e3bee572a24bbe65a64cc7bc550
+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: