Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZCJBExchangeTips.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZCJBBuyTips.cs

@@ -4,18 +4,22 @@ using FairyGUI;
 
 namespace UI.ActivityMain
 {
-    public partial class UI_ZCJBExchangeTips
+    public partial class UI_ZCJBBuyTips
     {
         public GComponent target;
-        public GTextField m_timesText;
-        public const string URL = "ui://4ht5s77uqbf4t";
+        public GGraph m_graphBg;
+        public GTextField m_txtContent;
+        public GTextField m_txtTips;
+        public GButton m_btnLeft;
+        public GButton m_btnRight;
+        public const string URL = "ui://4ht5s77uqzw81c";
         public const string PACKAGE_NAME = "ActivityMain";
-        public const string RES_NAME = "ZCJBExchangeTips";
-        private static UI_ZCJBExchangeTips _proxy;
+        public const string RES_NAME = "ZCJBBuyTips";
+        private static UI_ZCJBBuyTips _proxy;
 
-        public static UI_ZCJBExchangeTips Create(GObject gObject = null)
+        public static UI_ZCJBBuyTips Create(GObject gObject = null)
         {
-            var ui = new UI_ZCJBExchangeTips();
+            var ui = new UI_ZCJBBuyTips();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +28,11 @@ namespace UI.ActivityMain
             return ui;
         }
 
-        public static UI_ZCJBExchangeTips Proxy(GObject gObject = null)
+        public static UI_ZCJBBuyTips Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ZCJBExchangeTips();
+                _proxy = new UI_ZCJBBuyTips();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,11 +59,19 @@ namespace UI.ActivityMain
 
         private void Init(GComponent comp)
         {
-            m_timesText = (GTextField)comp.GetChild("timesText");
+            m_graphBg = (GGraph)comp.GetChild("graphBg");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_btnLeft = (GButton)comp.GetChild("btnLeft");
+            m_btnRight = (GButton)comp.GetChild("btnRight");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_timesText = null;
+            m_graphBg = null;
+            m_txtContent = null;
+            m_txtTips = null;
+            m_btnLeft = null;
+            m_btnRight = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZCJBExchangeTips.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZCJBBuyTips.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5dcdc99b756d4b44e9b60e3ac8083d0e
+guid: 71cf84372afb30d45a3f7721c1ad3739
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button9.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button9.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxActivityUI.cs

@@ -12,12 +12,11 @@ namespace UI.LuckyBox
         public GButton m_btnBack;
         public GComponent m_valueBar;
         public GTextField m_txtTime;
-        public GButton m_btnLuckyDiscount;
+        public UI_Button9 m_btnLuckyDiscount;
         public GButton m_btnGiftBag;
         public UI_ComBagTime m_comBagTime;
         public GButton m_btnShop;
         public GButton m_btnReward;
-        public Transition m_btnLuckyDiscount_loop;
         public const string URL = "ui://drx9d1usmbf1tad";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckyBoxActivityUI";
@@ -70,12 +69,11 @@ namespace UI.LuckyBox
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_btnLuckyDiscount = (GButton)comp.GetChild("btnLuckyDiscount");
+            m_btnLuckyDiscount = (UI_Button9)UI_Button9.Create(comp.GetChild("btnLuckyDiscount"));
             m_btnGiftBag = (GButton)comp.GetChild("btnGiftBag");
             m_comBagTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comBagTime"));
             m_btnShop = (GButton)comp.GetChild("btnShop");
             m_btnReward = (GButton)comp.GetChild("btnReward");
-            m_btnLuckyDiscount_loop = comp.GetTransition("btnLuckyDiscount_loop");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -85,13 +83,13 @@ namespace UI.LuckyBox
             m_btnBack = null;
             m_valueBar = null;
             m_txtTime = null;
+            m_btnLuckyDiscount.Dispose();
             m_btnLuckyDiscount = null;
             m_btnGiftBag = null;
             m_comBagTime.Dispose();
             m_comBagTime = null;
             m_btnShop = null;
             m_btnReward = null;
-            m_btnLuckyDiscount_loop = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_comLuckBoxBtn.cs

@@ -14,7 +14,7 @@ namespace UI.LuckyBox
         public GButton m_btnBuyOne;
         public GButton m_btnBuyTen;
         public GButton m_btnBuyFifty;
-        public GTextField m_txtRemainTimes;
+        public GRichTextField m_txtRemainTimes;
         public GImage m_imgSpecial;
         public GGraph m_holder;
         public GGroup m_grpSpecial;
@@ -75,7 +75,7 @@ namespace UI.LuckyBox
             m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
             m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
             m_btnBuyFifty = (GButton)comp.GetChild("btnBuyFifty");
-            m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+            m_txtRemainTimes = (GRichTextField)comp.GetChild("txtRemainTimes");
             m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_holder = (GGraph)comp.GetChild("holder");
             m_grpSpecial = (GGroup)comp.GetChild("grpSpecial");

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

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using UI.ActivityMain;
+using FairyGUI;
+using UI.CommonGame;
+
+namespace GFGGame
+{
+    public class ZCJBBuyTipsView : BaseWindow
+    {
+        private UI_ZCJBBuyTips _ui;
+        private string Desc;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            BuyTipsController.Dispose();
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _ui = UI_ZCJBBuyTips.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+
+            _ui.m_btnRight.onClick.Add(OnClickBtnSure);
+            _ui.m_btnLeft.onClick.Add(OnClickBtnCancel);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            Desc = (string)(this.viewData as object[])[0];
+            UpdateView();
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, LimitChanged);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, LimitChanged);
+        }
+
+        private void UpdateView()
+        {
+            _ui.m_txtContent.text = Desc;
+            _ui.m_txtTips.text = "（购买的次数请及时使用，次日5：00重置）";
+        }
+
+        private void OnClickBtnSure()
+        {
+            RoleLimitSProxy.ReqBuyLimitPlayTimes(500, 1, 1).Coroutine();
+            EventAgent.DispatchEvent(ConstMessage.NUMERIC_CHANGE);
+        }
+        private void LimitChanged(EventContext context = null)
+        {
+            if ((int)context.data != 500)
+            {
+                return;
+            }
+            PromptController.Instance.ShowFloatTextPrompt("次数+1");
+        }
+
+        private void OnClickBtnCancel()
+        {
+            this.Hide();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ZCJBBuyTipsView.cs.meta

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

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

@@ -65,7 +65,7 @@ namespace GFGGame
             _ui.m_btnReward.onClick.Add(OnClickBtnReward);
             _ui.m_btnShop.onClick.Add(OnClickBtnShop);
             _ui.m_btnGiftBag.onClick.Add(OnClickBtnGiftBag);
-            _ui.m_btnLuckyDiscount.onClick.Add(OnClickBtnLuckyDiscount);
+            _ui.m_btnLuckyDiscount.target.onClick.Add(OnClickBtnLuckyDiscount);
             _effectUIDic.Add("Button_public", EffectUIPool.CreateEffectUI(_ui.m_comBox.m_btnBuyTen_eff, "ui_LuckyBox", "Button_public"));
             _effectUIDic.Add("Button_Text_DianCang", EffectUIPool.CreateEffectUI(_ui.m_comBox.m_Special_eff, "ui_LuckyBox", "Button_Text_DianCang"));
         }
@@ -197,8 +197,8 @@ namespace GFGGame
                 ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.LuckyDiscount);
             var list = activityInfoByTypeList
                 .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
-            _ui.m_btnLuckyDiscount.visible = ActivityDataManager.Instance.allLimitStlycTimes >= 20 && remainBuyNum != 0 && list.Count > 0;
-            if (LuckyBoxDataManager.Instance.OPEN_LUCKY_DISCONT && _ui.m_btnLuckyDiscount.visible) {
+            _ui.m_btnLuckyDiscount.target.visible = ActivityDataManager.Instance.allLimitStlycTimes >= 20 && remainBuyNum != 0 && list.Count > 0;
+            if (LuckyBoxDataManager.Instance.OPEN_LUCKY_DISCONT && _ui.m_btnLuckyDiscount.target.visible) {
                 LuckyBoxDataManager.Instance.OPEN_LUCKY_DISCONT = false;
                 ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.LuckyDiscount, this.viewData });
             }

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

@@ -20,6 +20,7 @@ namespace GFGGame
         private DressUpObjUI _dressUpObjUIXiHe;
 
         private DressUpObjUI _dressUpObjUIChangXi;
+        private string activityEndTime = "[2024][2][2][00:00]";
 
         Dictionary<int,GObject> _listActivityBtnObj = new Dictionary<int, GObject>();
 
@@ -180,7 +181,7 @@ namespace GFGGame
                 UpGiftBox(comBox);
             }
             else if (boxId == LuckyBoxDataManager.BOX_ID_2) { 
-                long endTime = TimeUtil.DateTimeToTimestamp("[2024][2][2][00:00]");
+                long endTime = TimeUtil.DateTimeToTimestamp(activityEndTime);
                 if (endTime < TimeHelper.ServerNow())
                     comBox.m_showActivityType.selectedIndex = 0;
                 else { 
@@ -452,7 +453,7 @@ namespace GFGGame
             GObject textField = item.asCom.GetChild("txtHasTime");
             if (textField == null) return;
             long curTime = TimeHelper.ServerNow();
-            long endTime = TimeUtil.DateTimeToTimestamp("[2024][2][2][00:00]");
+            long endTime = TimeUtil.DateTimeToTimestamp(activityEndTime);
             if (endTime < curTime)
             {
                 Timers.inst.Remove(UpdateImitateTime);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -357,7 +357,7 @@ namespace GFGGame
             UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(_ui.m_comCostCurrent);
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityFightCfgArray.Instance.GetCfg(61001).limit);
             int time = limitData.TotalPlayMax - limitData.PlayTimes;
-            com.m_limitNum.text = "今日免费次数：" + time + "/" + limitData.TotalPlayMax;
+            com.m_limitNum.text = "今日免费次数：" + time + "/" + limitData.MaxStorageCount;
             com.m_addBtn.onClick.Add(OnClickAddBtn);
             UI_ComCostCurrency.ProxyEnd();
         }
@@ -365,12 +365,7 @@ namespace GFGGame
         {
             string name = ItemCfgArray.Instance.GetCfg(LimitCfgArray.Instance.GetCfg(500).moneyId).name;
             string desc = string.Format("是否花费{0}{1}购买{2}次过关次数？", LimitCfgArray.Instance.GetCfg(500).moneyNumArr[0],name, 1);
-            AlertUI.Show(desc).SetLeftButton(true).SetRightButton(true, "购买", (object data) =>
-            {
-                RoleLimitSProxy.ReqBuyLimitPlayTimes(500, 1, 1).Coroutine();
-                EventAgent.DispatchEvent(ConstMessage.NOTICE_LIMIT_CHANGED);
-                EventAgent.DispatchEvent(ConstMessage.NUMERIC_CHANGE);
-            });
+            ViewManager.Show<ZCJBBuyTipsView>(new object[] { desc });
         }
         //******************//
         private void CheckGuide(object param)