新春活动显示修改

GameClient/Assets/Game/HotUpdate/Data/ActivityTeaDataManager.cs

@@ -8,7 +8,11 @@ namespace Assets.Game.HotUpdate.Data
 {
     public class ActivityTeaDataManager : SingletonBase<ActivityTeaDataManager>
     {
-        public List<ItemSyntheticProto> ItemSynthetics = new List<ItemSyntheticProto>(); 
+        public List<ItemSyntheticProto> ItemSynthetics = new List<ItemSyntheticProto>();
+
+
+        /**********************************************************新春活动*************************************************/
+        public List<NpcVisitProto> NpcInfoList = new List<NpcVisitProto>();
 
         public bool CheckOpen()
         {
@@ -29,5 +33,20 @@ namespace Assets.Game.HotUpdate.Data
             var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(id);
             return activityInfo.EndTime;
         }
+
+        public bool GetRewardRed()
+        {
+            RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
+           int time = limitData.TotalPlayMax - limitData.PlayTimes;
+
+            foreach (NpcVisitProto t in NpcInfoList)
+            {
+                if (t.RewrdStatus == 1 || (t.UnlockStatus == 1 && time>0 ))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Data/MiniGameDateManager.cs

@@ -11,7 +11,28 @@ namespace GFGGame
         public List<ItemInfoProto> itemList = new List<ItemInfoProto>();
         public List<GameInfoProto> gameinfoList = new List<GameInfoProto>();
 
-        /**********************************************************新春活动_暂用*************************************************/
-        public List<NpcVisitProto> NpcInfoList = new List<NpcVisitProto>();
+        public bool GetRewardRot()
+        {
+            foreach(GameInfoProto t in gameinfoList)
+            {
+                if(t.FirstPassRewardStatus == 1)
+                {
+                    return true;
+                }
+                if(t.StarRewardStatus.Count > 0 )
+                {
+                    for(int i = 0; i<t.StarRewardStatus.Count;i++)
+                    {
+                        if(t.StarRewardStatus[i] == 1)
+                        {
+                            return true;
+                        }
+                    }
+                } 
+            }
+            return false;
+        }
+
     }
+
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityTeaMainUI.cs

@@ -11,13 +11,13 @@ namespace UI.ActivityAfternoonTea
         public GButton m_btnBack;
         public GLoader m_titleBg;
         public GLoader m_oneTimeIcon;
-        public GLoader m_oneViewIcon;
+        public GButton m_oneViewIcon;
         public GLoader m_oneNameIcon;
         public GLoader m_twoTimeIcon;
-        public GLoader m_twoViewIcon;
+        public GButton m_twoViewIcon;
         public GLoader m_twoNameIcon;
         public GLoader m_threeTimeIcon;
-        public GLoader m_threeViewIcon;
+        public GButton m_threeViewIcon;
         public GLoader m_threeNameIcon;
         public const string URL = "ui://wpsqkdbznjon0";
         public const string PACKAGE_NAME = "ActivityAfternoonTea";
@@ -70,13 +70,13 @@ namespace UI.ActivityAfternoonTea
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_titleBg = (GLoader)comp.GetChild("titleBg");
             m_oneTimeIcon = (GLoader)comp.GetChild("oneTimeIcon");
-            m_oneViewIcon = (GLoader)comp.GetChild("oneViewIcon");
+            m_oneViewIcon = (GButton)comp.GetChild("oneViewIcon");
             m_oneNameIcon = (GLoader)comp.GetChild("oneNameIcon");
             m_twoTimeIcon = (GLoader)comp.GetChild("twoTimeIcon");
-            m_twoViewIcon = (GLoader)comp.GetChild("twoViewIcon");
+            m_twoViewIcon = (GButton)comp.GetChild("twoViewIcon");
             m_twoNameIcon = (GLoader)comp.GetChild("twoNameIcon");
             m_threeTimeIcon = (GLoader)comp.GetChild("threeTimeIcon");
-            m_threeViewIcon = (GLoader)comp.GetChild("threeViewIcon");
+            m_threeViewIcon = (GButton)comp.GetChild("threeViewIcon");
             m_threeNameIcon = (GLoader)comp.GetChild("threeNameIcon");
         }
         public void Dispose(bool disposeTarget = false)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVIsitItemUI.cs

@@ -13,7 +13,7 @@ namespace UI.ActivityAfternoonTea
         public GLoader m_lockIcon;
         public GTextField m_name;
         public GTextField m_lockTitle;
-        public UI_Component1 m_visitBtn;
+        public UI_Button22 m_visitBtn;
         public GGroup m_visitG;
         public GGroup m_unLock;
         public const string URL = "ui://wpsqkdbznjonl";
@@ -69,7 +69,7 @@ namespace UI.ActivityAfternoonTea
             m_lockIcon = (GLoader)comp.GetChild("lockIcon");
             m_name = (GTextField)comp.GetChild("name");
             m_lockTitle = (GTextField)comp.GetChild("lockTitle");
-            m_visitBtn = (UI_Component1)UI_Component1.Create(comp.GetChild("visitBtn"));
+            m_visitBtn = (UI_Button22)UI_Button22.Create(comp.GetChild("visitBtn"));
             m_visitG = (GGroup)comp.GetChild("visitG");
             m_unLock = (GGroup)comp.GetChild("unLock");
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_ActivityVIsitRewardItemUI.cs

@@ -12,9 +12,9 @@ namespace UI.ActivityAfternoonTea
         public GTextField m_txtDesc;
         public GList m_listTaskReward;
         public GTextField m_txtCount;
-        public GLoader m_GotBtn;
-        public GLoader m_ComeBt;
-        public GLoader m_GetRewardBt;
+        public UI_Button23 m_ComeBt;
+        public UI_Button23 m_GetRewardBt;
+        public UI_Button23 m_GotBtn;
         public const string URL = "ui://wpsqkdbznjonk";
         public const string PACKAGE_NAME = "ActivityAfternoonTea";
         public const string RES_NAME = "ActivityVIsitRewardItemUI";
@@ -67,9 +67,9 @@ namespace UI.ActivityAfternoonTea
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_listTaskReward = (GList)comp.GetChild("listTaskReward");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_GotBtn = (GLoader)comp.GetChild("GotBtn");
-            m_ComeBt = (GLoader)comp.GetChild("ComeBt");
-            m_GetRewardBt = (GLoader)comp.GetChild("GetRewardBt");
+            m_ComeBt = (UI_Button23)UI_Button23.Create(comp.GetChild("ComeBt"));
+            m_GetRewardBt = (UI_Button23)UI_Button23.Create(comp.GetChild("GetRewardBt"));
+            m_GotBtn = (UI_Button23)UI_Button23.Create(comp.GetChild("GotBtn"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,9 +78,12 @@ namespace UI.ActivityAfternoonTea
             m_txtDesc = null;
             m_listTaskReward = null;
             m_txtCount = null;
-            m_GotBtn = null;
+            m_ComeBt.Dispose();
             m_ComeBt = null;
+            m_GetRewardBt.Dispose();
             m_GetRewardBt = null;
+            m_GotBtn.Dispose();
+            m_GotBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_Button22.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_Button22
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GTextField m_titleLock;
+        public const string URL = "ui://wpsqkdbzqbf42r";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "Button22";
+        private static UI_Button22 _proxy;
+
+        public static UI_Button22 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button22();
+            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_Button22 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button22();
+            }
+            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_c1 = comp.GetController("c1");
+            m_titleLock = (GTextField)comp.GetChild("titleLock");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_titleLock = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_Component1.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_Button22.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 10947dcfb85d38342a3035710bf33744
+guid: 51f4e98c0a9f0a545bd182f304a2e2a8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_Button23.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityAfternoonTea
+{
+    public partial class UI_Button23
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://wpsqkdbzqbf42v";
+        public const string PACKAGE_NAME = "ActivityAfternoonTea";
+        public const string RES_NAME = "Button23";
+        private static UI_Button23 _proxy;
+
+        public static UI_Button23 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button23();
+            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_Button23 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button23();
+            }
+            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_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_Button23.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityAfternoonTea/UI_Component1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_Component2.cs

@@ -2,20 +2,20 @@
 
 using FairyGUI;
 
-namespace UI.ActivityAfternoonTea
+namespace UI.MiniGame
 {
-    public partial class UI_Component1
+    public partial class UI_Component2
     {
         public GComponent target;
-        public GLoader m_visitBtn;
-        public const string URL = "ui://wpsqkdbzqbf42o";
-        public const string PACKAGE_NAME = "ActivityAfternoonTea";
-        public const string RES_NAME = "Component1";
-        private static UI_Component1 _proxy;
+        public GLoader m_rewardBtn;
+        public const string URL = "ui://wgkh30qjqbf42u";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "Component2";
+        private static UI_Component2 _proxy;
 
-        public static UI_Component1 Create(GObject gObject = null)
+        public static UI_Component2 Create(GObject gObject = null)
         {
-            var ui = new UI_Component1();
+            var ui = new UI_Component2();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.ActivityAfternoonTea
             return ui;
         }
 
-        public static UI_Component1 Proxy(GObject gObject = null)
+        public static UI_Component2 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Component1();
+                _proxy = new UI_Component2();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,11 +55,11 @@ namespace UI.ActivityAfternoonTea
 
         private void Init(GComponent comp)
         {
-            m_visitBtn = (GLoader)comp.GetChild("visitBtn");
+            m_rewardBtn = (GLoader)comp.GetChild("rewardBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_visitBtn = null;
+            m_rewardBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_Component2.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_GameStartUI.cs

@@ -9,7 +9,7 @@ namespace UI.MiniGame
         public GComponent target;
         public GLoader m_bg;
         public GLoader m_btnBack;
-        public GLoader m_rewardBtn;
+        public UI_Component2 m_rewardBtn;
         public GLoader m_shopBtn;
         public GLoader m_ticket;
         public GLoader m_addIcon;
@@ -75,7 +75,7 @@ namespace UI.MiniGame
         {
             m_bg = (GLoader)comp.GetChild("bg");
             m_btnBack = (GLoader)comp.GetChild("btnBack");
-            m_rewardBtn = (GLoader)comp.GetChild("rewardBtn");
+            m_rewardBtn = (UI_Component2)UI_Component2.Create(comp.GetChild("rewardBtn"));
             m_shopBtn = (GLoader)comp.GetChild("shopBtn");
             m_ticket = (GLoader)comp.GetChild("ticket");
             m_addIcon = (GLoader)comp.GetChild("addIcon");
@@ -97,6 +97,7 @@ namespace UI.MiniGame
         {
             m_bg = null;
             m_btnBack = null;
+            m_rewardBtn.Dispose();
             m_rewardBtn = null;
             m_shopBtn = null;
             m_ticket = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityTeaSProxy.cs

@@ -9,17 +9,17 @@ namespace GFGGame
     {
         protected override async ETTask Run(Session session, S2C_PushNpcVisits message)
         {
-            MiniGameDateManager.Instance.NpcInfoList = message.NpcVisits;
+            ActivityTeaDataManager.Instance.NpcInfoList = message.NpcVisits;
             await ETTask.CompletedTask;
         }
     }
     public class ActivityTeaSProxy
     {
-        public static async ETTask<bool> ReqGetNPCVisitInfo(int id)
+        public static async ETTask<bool> ReqGetNPCVisitInfo(int id = 5004)
         {
             var response = (S2C_GetNpcVisits) await MessageHelper.SendToServer(new C2S_GetNpcVisits { ActivityId = id });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
-            MiniGameDateManager.Instance.NpcInfoList = response.NpcVisits;
+            ActivityTeaDataManager.Instance.NpcInfoList = response.NpcVisits;
             return true;
         }
 

GameClient/Assets/Game/HotUpdate/ServerProxy/CommonSProxy.cs

@@ -62,6 +62,7 @@ namespace GFGGame
                     await ActivitySProxy.ReqSevenDayLoginInfos();
                     await ActivityGlobalSProxy.GetActivityInfo();
                     await ActivityAfuGiftSProxy.GetAfuGiftInfo();
+                    await ActivityTeaSProxy.ReqGetNPCVisitInfo();
                     ActivityDataManager.Instance.todayActivityTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity);
                     ActivityDataManager.Instance.todayMonthlyCardTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity);
                     EventAgent.DispatchEvent(ConstMessage.RESET_DAILY_DATA);

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaMainView.cs

@@ -42,7 +42,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            RedDotController.Instance.SetComRedDot(_ui.m_twoViewIcon, ActivityTeaDataManager.Instance.GetRewardRed());
         }
 
         protected override void OnHide()
@@ -50,6 +50,17 @@ namespace GFGGame
             base.OnHide();
         }
 
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+
         private void OnClickBtnBack()
         {
             ViewManager.GoBackFrom(typeof(ActivityTeaMainView).FullName);
@@ -62,8 +73,9 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
                 return;
             }
-            //小游戏入口
-            ViewManager.Show<ActivityHuaRongDaoEntryView>(5003);
+
+                //小游戏入口
+                ViewManager.Show<ActivityHuaRongDaoEntryView>(5003);
         }
 
         private async void OnClickBtnVisitView()
@@ -75,8 +87,10 @@ namespace GFGGame
             }
             var result = await ActivityTeaSProxy.ReqGetNPCVisitInfo(5004);
             if (!result) return;
-            //拜访入口
-            ViewManager.Show<ActivityTeaVisitView>();
+
+                //拜访入口
+                ViewManager.Show<ActivityTeaVisitView>();
+
         }
 
         private void OnClickBtnMergeView()
@@ -86,8 +100,9 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("活动未在开启时间");
                 return;
             }
-            //合成入口
-            ViewManager.Show<ActivitySyntheticView>();
+
+                //合成入口
+                ViewManager.Show<ActivitySyntheticView>();
         }
 
     }

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaVisitView.cs

@@ -54,7 +54,7 @@ namespace GFGGame
 
 
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
-            time = limitData.TotalPlayMax - limitData.PlayTimes;
+            time = limitData.TotalPlayMax - limitData.BuyTimes;
             _ui.m_visitNum.text = "当前拜访次数：" + time + "/" + limitData.TotalPlayMax;
 
             _ui.m_taskList.numItems = ActivityVisitCfgArray.Instance.dataArray.Length;
@@ -91,9 +91,9 @@ namespace GFGGame
 
             if (index != 0)
             {
-                item.m_unLock.visible = MiniGameDateManager.Instance.NpcInfoList[index].UnlockStatus == 0 ? true : false;
-                item.m_lockTitle.visible = MiniGameDateManager.Instance.NpcInfoList[index].UnlockStatus == 0 ? true : false;
-                item.m_visitG.visible = MiniGameDateManager.Instance.NpcInfoList[index].UnlockStatus == 0 ? false : true;
+                item.m_unLock.visible = ActivityTeaDataManager.Instance.NpcInfoList[index].UnlockStatus == 0 ? true : false;
+                item.m_lockTitle.visible = ActivityTeaDataManager.Instance.NpcInfoList[index].UnlockStatus == 0 ? true : false;
+                item.m_visitG.visible = ActivityTeaDataManager.Instance.NpcInfoList[index].UnlockStatus == 0 ? false : true;
             }
             else
             {
@@ -101,13 +101,14 @@ namespace GFGGame
                 item.m_lockTitle.visible = false;
                 item.m_visitG.visible = true;
             }
-            item.m_lockIcon.visible = MiniGameDateManager.Instance.NpcInfoList[index].RewrdStatus == 2 ? true : false;
-            item.m_rewardIcon.visible = MiniGameDateManager.Instance.NpcInfoList[index].RewrdStatus == 2 ? false : true;
+            item.m_lockIcon.visible = ActivityTeaDataManager.Instance.NpcInfoList[index].RewrdStatus == 2 ? true : false;
+            item.m_rewardIcon.visible = ActivityTeaDataManager.Instance.NpcInfoList[index].RewrdStatus == 2 ? false : true;
 
             if (item.m_visitBtn.target.visible == true)
             {
-                item.m_c1.selectedIndex = MiniGameDateManager.Instance.NpcInfoList[index].UnlockStatus == 1 ? 1 : 0;
-                RedDotController.Instance.SetComRedDot(item.m_visitBtn.target, (MiniGameDateManager.Instance.NpcInfoList[index].UnlockStatus == 1 && time > 0));
+                item.m_c1.selectedIndex = ActivityTeaDataManager.Instance.NpcInfoList[index].UnlockStatus == 1 ? 1 : 0;
+                RedDotController.Instance.SetComRedDot(item.m_visitBtn.target, (ActivityTeaDataManager.Instance.NpcInfoList[index].UnlockStatus == 1 && time > 0));
+                RedDotController.Instance.SetComRedDot(item.m_visitBtn.target, ActivityTeaDataManager.Instance.NpcInfoList[index].RewrdStatus == 1);
             }
             if(item.m_visitBtn.target.data == null)
             {
@@ -120,7 +121,7 @@ namespace GFGGame
         {
             if (!(context.sender is GObject btnVisit)) return;
             int itemID = (int)btnVisit.data;
-            if (MiniGameDateManager.Instance.NpcInfoList[itemID].UnlockStatus == 1)
+            if (ActivityTeaDataManager.Instance.NpcInfoList[itemID].UnlockStatus == 1)
             {
                 bool result = await ActivityTeaSProxy.ReqUnLockNPCVisit(5004,itemID+1);
                 if (!result) return;

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityVisitNpcView.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using UI.ActivityAfternoonTea;
 using UI.Task;
+using Assets.Game.HotUpdate.Data;
 using ET;
 
 namespace GFGGame
@@ -106,7 +107,7 @@ namespace GFGGame
         }
         private async void OnClickRewardTIps()
         {
-            if (MiniGameDateManager.Instance.NpcInfoList[npcId].RewrdStatus == 1)
+            if (ActivityTeaDataManager.Instance.NpcInfoList[npcId].RewrdStatus == 1)
             {
                 bool result = await ActivityTeaSProxy.ReqGetNPCVisitReward(activityId, npcId + 1);
                 if (!result) return;
@@ -122,7 +123,7 @@ namespace GFGGame
 
         private void GetRewardState()
         {
-            foreach (NpcVisitProto t in MiniGameDateManager.Instance.NpcInfoList)
+            foreach (NpcVisitProto t in ActivityTeaDataManager.Instance.NpcInfoList)
             {
                 if (t.NpcId == npcId + 1)
                 {
@@ -136,7 +137,7 @@ namespace GFGGame
                         case 1:
                             canGetReward = true;
                             _ui.m_gotReward.visible = false;
-                            RedDotController.Instance.SetComRedDot(_ui.m_taskIcon.target, MiniGameDateManager.Instance.NpcInfoList[npcId].RewrdStatus == 1);
+                            RedDotController.Instance.SetComRedDot(_ui.m_taskIcon.target, ActivityTeaDataManager.Instance.NpcInfoList[npcId].RewrdStatus == 1);
                             break;
                         case 2:
                             canGetReward = false;
@@ -167,17 +168,17 @@ namespace GFGGame
             item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(taskCfg.id);
             item.m_txtCount.text =
                 $"{TaskDataManager.Instance.GetTaskProgressById(taskCfg.id)}/{taskCfg.GetTargetCount()}";
-            if (item.m_GetRewardBt.data == null)
+            if (item.m_GetRewardBt.target.data == null)
             {
-                item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
+                item.m_GetRewardBt.target.onClick.Add(OnBtnGetClick);
             }
-            item.m_GetRewardBt.data = taskCfg.id;
+            item.m_GetRewardBt.target.data = taskCfg.id;
 
-            if (item.m_ComeBt.data == null)
+            if (item.m_ComeBt.target.data == null)
             {
-                item.m_ComeBt.onClick.Add(OnBtnGoClick);
+                item.m_ComeBt.target.onClick.Add(OnBtnGoClick);
             }
-            item.m_ComeBt.data = taskCfg;
+            item.m_ComeBt.target.data = taskCfg;
 
             if (item.m_listTaskReward.data == null)
             {
@@ -197,7 +198,7 @@ namespace GFGGame
             if (!result) return;
             bool res = await ActivityTeaSProxy.ReqGetNPCVisitInfo(activityId);
             if (!res) return;
-            RedDotController.Instance.SetComRedDot(_ui.m_taskIcon.target, MiniGameDateManager.Instance.NpcInfoList[npcId].RewrdStatus == 1);
+            RedDotController.Instance.SetComRedDot(_ui.m_taskIcon.target, ActivityTeaDataManager.Instance.NpcInfoList[npcId].RewrdStatus == 1);
             _ui.m_taskList.numItems = ActivityVisitCfgArray.Instance.dataArray[npcId].taskIdArr.Length;
         }
         private void OnBtnGoClick(EventContext context)

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

@@ -923,8 +923,15 @@ namespace GFGGame
             if (redPointUpdateFrame == 18)
                 RedDotController.Instance.SetComRedDot(_ui.m_btnHaiZhiShi.target, RedDotDataManager.Instance.GetFieldRed(), "", 13, -12);
 
+            // 新春活动
+            if (_ui.m_btnTea.target.visible)
+            {
+                if (redPointUpdateFrame == 19)
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnTea.target, ActivityTeaDataManager.Instance.GetRewardRed(), "", -43, 2);
+            }
+
             redPointUpdateFrame++;
-            if(redPointUpdateFrame > 18)
+            if(redPointUpdateFrame > 20)
             {
                 redPointUpdateFrame = -1;
             }

GameClient/Assets/Game/HotUpdate/Views/MiniGame/FlipGameView.cs

@@ -245,10 +245,10 @@ namespace GFGGame
             _ui.m_barEffect.x = _ui.m_ScareBar.width;
 
             _ui.m_cardList.touchable = true;
-            ////计时器
-            //Timers.inst.Add(1.0f, 0, UpdateTime);
-            ////进度条计时器
-            //Timers.inst.Add(0.1f, 0, UpdateBar);
+            //计时器
+            Timers.inst.Add(1.0f, 0, UpdateTime);
+            //进度条计时器
+            Timers.inst.Add(0.1f, 0, UpdateBar);
         }
 
         private void UpdateList()

GameClient/Assets/Game/HotUpdate/Views/MiniGame/GameStartView.cs

@@ -60,7 +60,7 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_shopBtn.onClick.Add(OnClickBtnShop);
             _ui.m_addIcon.onClick.Add(OnClickBtnAdd);
-            _ui.m_rewardBtn.onClick.Add(OnClickBtnReward);
+            _ui.m_rewardBtn.target.onClick.Add(OnClickBtnReward);
             _ui.m_tipsOne.onClick.Add(RuleController.ShowRuleView);
             _ui.m_tipsTwo.onClick.Add(RuleController.ShowRuleView);
 
@@ -76,8 +76,8 @@ namespace GFGGame
             activityGameDate = ActivityOpenCfgArray.Instance.GetCfgsBytype(ConstLimitTimeActivityType.ActLimitStlyc);
             GetGameIdByActivityDate();
             UpdateChallengeBtn();
-            UpdateView();
             ReqChallageReward();
+            UpdateView();
         }
         protected override void AddEventListener()
         {
@@ -99,11 +99,11 @@ namespace GFGGame
         {
             if(ChallengeList.Count == 0)
             {
-                _ui.m_rewardBtn.visible = false;
+                _ui.m_rewardBtn.target.visible = false;
             }
             else
             {
-                _ui.m_rewardBtn.visible = true;
+                _ui.m_rewardBtn.target.visible = true;
             }
             _ui.m_ticket.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(3000017).res);
             _ui.m_needNum1.text = NumTicketOne.ToString();
@@ -144,6 +144,7 @@ namespace GFGGame
         {
             var result = await MiniGameProxy.ReqGetChallengeReward(activityGameDate[0].id);
             if (!result) return;
+            RedDotController.Instance.SetComRedDot(_ui.m_rewardBtn.target, MiniGameDateManager.Instance.GetRewardRot());
         }
         private void OnClickBtnAdd()
         {