zhangyuqian 10 сар өмнө
parent
commit
adf30f1754

+ 6 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerActivityUI.cs

@@ -8,18 +8,18 @@ namespace UI.OpenServerActivity
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GGraph m_holderSmallBg;
         public GButton m_btnBack;
         public GGraph m_holderTitle;
-        public GGraph m_holderFog;
         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 GGraph m_holderSmallBgTx;
+        public GGraph m_holderSmallBg;
         public GButton m_buttonNewYearLogin;
         public Transition m_openEff;
         public const string URL = "ui://b8ha2mnsdedg0";
@@ -70,31 +70,30 @@ 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_holderFog = (GGraph)comp.GetChild("holderFog");
             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_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_holderFog = null;
             m_timeText = null;
             m_ruleBtn = null;
             m_btnTenShu = null;
+            m_holderFog = null;
             m_btnAnswerTianmen.Dispose();
             m_btnAnswerTianmen = null;
             m_btnMingTong.Dispose();
@@ -104,6 +103,7 @@ namespace UI.OpenServerActivity
             m_btnHeaven.Dispose();
             m_btnHeaven = null;
             m_holderSmallBgTx = null;
+            m_holderSmallBg = null;
             m_buttonNewYearLogin = null;
             m_openEff = null;
             if(disposeTarget && target != null)

+ 5 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -147,6 +147,11 @@ namespace GFGGame
                 item.m_loaIcon.url = ResPathUtil.GetActivityPath("gg_banner_lc_aliz", "png"); ;
                 item.m_loaTitle.visible = false;
             }
+            else if (openCfg.id == 508)
+            {
+                item.m_loaIcon.url = ResPathUtil.GetActivityPath("hdbn_xslc_dmdhdwn", "png"); ;
+                item.m_loaTitle.visible = false;
+            }
             else
             {
                 item.target.visible = false;

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerActivityView.cs

@@ -57,9 +57,9 @@ namespace GFGGame
 
         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()

BIN
GameClient/Assets/ResIn/UI/OpenServerActivity/OpenServerActivity_fui.bytes