浏览代码

新年红包补充

huangxiaoyue 1 年之前
父节点
当前提交
5504ebcff8

+ 3 - 0
GameClient/Assets/Game/HotUpdate/Data/NewYearRedEnvelopeDataManager.cs

@@ -6,6 +6,9 @@
         public static int ItemId = 0;  //红包奖励物品
         public static int ItemId = 0;  //红包奖励物品
         public static long ItemNum = 0;  //奖励数量(单倍)
         public static long ItemNum = 0;  //奖励数量(单倍)
 
 
+
+
+
         public bool CheckNewYearRedEnvelopeRed()
         public bool CheckNewYearRedEnvelopeRed()
         {
         {
             int actRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);
             int actRedPacketId = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.NewYearRedPacket);

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/NewYearRedEnvelope/UI_NewYearRedEnvelopeUI.cs

@@ -21,6 +21,7 @@ namespace UI.NewYearRedEnvelope
         public GGraph m_holderOpenBtn;
         public GGraph m_holderOpenBtn;
         public GComponent m_itemReward;
         public GComponent m_itemReward;
         public GRichTextField m_textGetNum;
         public GRichTextField m_textGetNum;
+        public GRichTextField m_txtGet;
         public const string URL = "ui://pt3t9f1ujsko0";
         public const string URL = "ui://pt3t9f1ujsko0";
         public const string PACKAGE_NAME = "NewYearRedEnvelope";
         public const string PACKAGE_NAME = "NewYearRedEnvelope";
         public const string RES_NAME = "NewYearRedEnvelopeUI";
         public const string RES_NAME = "NewYearRedEnvelopeUI";
@@ -82,6 +83,7 @@ namespace UI.NewYearRedEnvelope
             m_holderOpenBtn = (GGraph)comp.GetChild("holderOpenBtn");
             m_holderOpenBtn = (GGraph)comp.GetChild("holderOpenBtn");
             m_itemReward = (GComponent)comp.GetChild("itemReward");
             m_itemReward = (GComponent)comp.GetChild("itemReward");
             m_textGetNum = (GRichTextField)comp.GetChild("textGetNum");
             m_textGetNum = (GRichTextField)comp.GetChild("textGetNum");
+            m_txtGet = (GRichTextField)comp.GetChild("txtGet");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
@@ -100,6 +102,7 @@ namespace UI.NewYearRedEnvelope
             m_holderOpenBtn = null;
             m_holderOpenBtn = null;
             m_itemReward = null;
             m_itemReward = null;
             m_textGetNum = null;
             m_textGetNum = null;
+            m_txtGet = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 30 - 11
GameClient/Assets/Game/HotUpdate/Views/NewYearRedEnvelope/NewYearRedEnvelopeView.cs

@@ -15,12 +15,6 @@ namespace GFGGame
 
 
         public override void Dispose()
         public override void Dispose()
         {
         {
-            for (int i = 0; i < _effectUIList.Count; i++)
-            {
-                EffectUIPool.Recycle(_effectUIList[i]);
-            }
-            _effectUIList.Clear();
-
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();
@@ -46,6 +40,7 @@ namespace GFGGame
         protected override void OnShown()
         protected override void OnShown()
         {
         {
             base.OnShown();
             base.OnShown();
+            ET.Log.Debug("´òÓ¡²âÊÔ========9999999========" + NewYearRedEnvelopeDataManager.Status);
             if (NewYearRedEnvelopeDataManager.Status == RedPacketStatus.None)
             if (NewYearRedEnvelopeDataManager.Status == RedPacketStatus.None)
             {
             {
                 _ui.m_openType.selectedIndex = 0;
                 _ui.m_openType.selectedIndex = 0;
@@ -57,6 +52,8 @@ namespace GFGGame
             {
             {
                 RefreshOpenView();
                 RefreshOpenView();
                 RefreshViewInfo();
                 RefreshViewInfo();
+                if (NewYearRedEnvelopeDataManager.Status == RedPacketStatus.Open)
+                    againTimers();
             }
             }
             AddEffect();
             AddEffect();
             Timers.inst.Add(1, 0, UpdateTime);
             Timers.inst.Add(1, 0, UpdateTime);
@@ -86,12 +83,13 @@ namespace GFGGame
 
 
         private void RefreshViewInfo()
         private void RefreshViewInfo()
         {
         {
+            ET.Log.Debug("´òÓ¡²âÊÔ========yyyyyy========" + NewYearRedEnvelopeDataManager.Status);
             _ui.m_btnDoubleGet.target.visible = NewYearRedEnvelopeDataManager.Status != RedPacketStatus.Double;
             _ui.m_btnDoubleGet.target.visible = NewYearRedEnvelopeDataManager.Status != RedPacketStatus.Double;
         }
         }
 
 
         private void RefreshOpenView()
         private void RefreshOpenView()
         {
         {
-            _ui.m_openType.selectedIndex = 2;
+            _ui.m_openType.selectedIndex = 1;
             var titleIndex = PlayerPrefs.GetString("NewYearRedEnvelopeRamdomInt");
             var titleIndex = PlayerPrefs.GetString("NewYearRedEnvelopeRamdomInt");
             _ui.m_titleImgType.selectedIndex = Convert.ToInt32(titleIndex);
             _ui.m_titleImgType.selectedIndex = Convert.ToInt32(titleIndex);
             UI_ComItem item = UI_ComItem.Proxy(_ui.m_itemReward);
             UI_ComItem item = UI_ComItem.Proxy(_ui.m_itemReward);
@@ -140,7 +138,6 @@ namespace GFGGame
 
 
         private void OnClickBtnOpen(EventContext context)
         private void OnClickBtnOpen(EventContext context)
         {
         {
-            _ui.m_imgTitle.visible = false;
             ReqLeagueList();
             ReqLeagueList();
         }
         }
 
 
@@ -150,22 +147,44 @@ namespace GFGGame
             bool result = await NewYearRedEnvelopeSProxy.ReqOpenRedPacket(actRedPacketId);
             bool result = await NewYearRedEnvelopeSProxy.ReqOpenRedPacket(actRedPacketId);
             if (result)
             if (result)
             {
             {
-                _ui.m_openType.selectedIndex = 1;
-                Timers.inst.Add(0.7f, 0, UpdateOpenTime);
+                RefreshOpenView();
+                againTimers();
+                RefreshViewInfo();
             }
             }
         }
         }
 
 
+        private void againTimers()
+        {
+            Timers.inst.Remove(UpdateOpenTime);
+            Timers.inst.Remove(UpdateTextTime);
+            _ui.m_txtGet.visible = false;
+            _ui.m_imgTitle.visible = false;
+            Timers.inst.Add(0.5f, 1, UpdateOpenTime);
+            Timers.inst.Add(0.7f, 1, UpdateTextTime);
+        }
+
+        private void UpdateTextTime(object param)
+        {
+            _ui.m_txtGet.visible = true;
+        }
+
         private void UpdateOpenTime(object param)
         private void UpdateOpenTime(object param)
         {
         {
             _ui.m_imgTitle.visible = true;
             _ui.m_imgTitle.visible = true;
-            RefreshOpenView();
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()
         {
         {
+            for (int i = 0; i < _effectUIList.Count; i++)
+            {
+                EffectUIPool.Recycle(_effectUIList[i]);
+            }
+            _effectUIList.Clear();
+
             base.OnHide();
             base.OnHide();
             Timers.inst.Remove(UpdateTime);
             Timers.inst.Remove(UpdateTime);
             Timers.inst.Remove(UpdateOpenTime);
             Timers.inst.Remove(UpdateOpenTime);
+            Timers.inst.Remove(UpdateTextTime);
         }
         }
     }
     }
 }
 }

二进制
GameClient/Assets/ResIn/UI/NewYearRedEnvelope/NewYearRedEnvelope_fui.bytes