每周特惠

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

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

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

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

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

@@ -7,11 +7,13 @@ namespace UI.ActivityMain
     public partial class UI_WeeklyGiftTipsUI
     {
         public GComponent target;
-        public GTextField m_titleText;
         public GTextField m_descText;
         public GList m_rewardList;
-        public UI_Button15 m_buyBtn;
+        public GButton m_buyBtn;
+        public GTextField m_timeText;
         public GLoader m_backBtn;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
         public Transition m_t0;
         public const string URL = "ui://4ht5s77udm9g39";
         public const string PACKAGE_NAME = "ActivityMain";
@@ -60,21 +62,24 @@ namespace UI.ActivityMain
 
         private void Init(GComponent comp)
         {
-            m_titleText = (GTextField)comp.GetChild("titleText");
             m_descText = (GTextField)comp.GetChild("descText");
             m_rewardList = (GList)comp.GetChild("rewardList");
-            m_buyBtn = (UI_Button15)UI_Button15.Create(comp.GetChild("buyBtn"));
+            m_buyBtn = (GButton)comp.GetChild("buyBtn");
+            m_timeText = (GTextField)comp.GetChild("timeText");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_titleText = null;
             m_descText = null;
             m_rewardList = null;
-            m_buyBtn.Dispose();
             m_buyBtn = null;
+            m_timeText = null;
             m_backBtn = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

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

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using ET;
 using static GFGGame.ShopSProxy;
 using UI.CommonGame;
+using System.Text.RegularExpressions;
 
 namespace GFGGame
 {
@@ -12,9 +13,14 @@ namespace GFGGame
     {
         private UI_WeeklyGiftTipsUI _ui;
         private int giftShopId = 0;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
         public override void Dispose()
         {
-
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -30,11 +36,15 @@ namespace GFGGame
             this.viewCom = _ui.target;
             modal = true;
             this.viewCom.Center();
+            //邊框左上角特效
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderLeftTop, "ui_Activity", "Com_window_L_up");
+            //邊框右下角特效
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderRightDowm, "ui_Activity", "Com_window_R_Down");
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
             _ui.m_rewardList.itemRenderer = ListItemRender;
             _ui.m_rewardList.onClickItem.Add(OnListSelectorItemClick);
             _ui.m_backBtn.onClick.Add(OnClickChange);
-            _ui.m_buyBtn.target.onClick.Add(OnClickBuy);
+            _ui.m_buyBtn.onClick.Add(OnClickBuy);
         }
         protected override void OnShown()
         {
@@ -51,6 +61,16 @@ namespace GFGGame
             {
                 _ui.m_rewardList.numItems = 0;
             }
+            string pattern = @"\[([^\[\]]+)\]";  // 正则表达式模式
+            // 创建Regex对象
+            Regex regex = new Regex(pattern);
+
+            // 匹配文本中的所有结果
+            MatchCollection matchesOpen = regex.Matches(activityCfg.openTime);
+            MatchCollection matchesEnd = regex.Matches(activityCfg.endTime);
+            string openTime = matchesOpen[0].Groups[1].Value +"." + matchesOpen[1].Groups[1].Value + "." + matchesOpen[2].Groups[1].Value;
+            string endTime = matchesEnd[0].Groups[1].Value + "." + matchesEnd[1].Groups[1].Value + "." + matchesEnd[2].Groups[1].Value;
+            _ui.m_timeText.text = string.Format("本期特供时间：{0}-{1}", openTime, endTime);
             UpdateBtn();
         }
         protected override void OnHide()
@@ -110,15 +130,14 @@ namespace GFGGame
             if (remainBuyNum == 0)
             {
                 //已售完
-                _ui.m_buyBtn.target.visible = false;
+                _ui.m_buyBtn.visible = false;
             }
             else
             {
                 //未售完
-                _ui.m_buyBtn.target.visible = true;
+                _ui.m_buyBtn.visible = true;
             }
-            _ui.m_buyBtn.m_descText.text = string.Format("{0}元购买", shopCfg.configPrice);
-            _ui.m_descText.text = string.Format("限购次数：{0}/{1}", ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id) ,shopCfg.maxBuyNum);
+            _ui.m_descText.text = string.Format("库存剩余：{0}/{1}", ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id) ,shopCfg.maxBuyNum);
         }
     }
 }

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

@@ -655,7 +655,7 @@ namespace GFGGame
 
                 _ui.m_btnGiftBag2.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
             }
-
+            _ui.m_btnWeeklyGift.m_c1.selectedIndex = 0;
             if (_ui.m_btnGiftBag2.target.visible)
             {
                 _ui.m_btnWeeklyGift.target.visible = false;