摘星许愿池，茶话会红点修改，雅集退出提示等

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -118,6 +118,7 @@ namespace GFGGame
             await ActivityGlobalSProxy.GetActivityInfo();
             await LuckyBoxSProxy.ReqGetLuckyBoxRotatingInfo();
             await LeagueSproxy.GetTeapartyInfos();
+            await LeagueSproxy.GetTeapartyMatchingInfos(RoleDataManager.roleId);
 
             GameGlobal.lastLoginTime = StorageDataManager.Instance.GetStorageValue(ConstStorageId.LAST_LOGIN_TIME);
             long lastTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);

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

@@ -303,8 +303,12 @@ namespace GFGGame
         //茶话会个人奖励当前状态
         public int CheckTeaPartyPersonRewardStatu(int targetScore)
         {
-            var roleTeapartyInfo = LeagueDataManager.Instance.RoleTeapartyInfo;
             var teapartyRewardRoleCfg = TeapartyRewardRoleCfgArray.Instance.dataArray;
+            if (teapartyRewardRoleCfg == null)
+                return 0;
+            var roleTeapartyInfo = LeagueDataManager.Instance.RoleTeapartyInfo;
+            if (roleTeapartyInfo == null || roleTeapartyInfo.PerAwardStatusVs == null)
+                return 0;
             for (int i = 0; i < teapartyRewardRoleCfg.Length; i++)
             {
                 if (teapartyRewardRoleCfg[i].targetScore == targetScore)
@@ -338,15 +342,35 @@ namespace GFGGame
             return 0;
         }
 
+        //茶话会奖励是否可以领取
+        public bool CheckTeaPartyRewardCanGet()
+        {
+            var teapartyRewardRoleCfg = TeapartyRewardRoleCfgArray.Instance.dataArray;
+            var teapartyRewardLeagueCfgs = TeapartyRewardLeagueCfgArray.Instance.GetCfgsByid(LeagueDataManager.Instance.TeaPartyId);
+
+            foreach (var cfg in teapartyRewardRoleCfg)
+            {
+                if (CheckTeaPartyPersonRewardCanGet(cfg.targetScore))
+                    return true;
+            }
+            foreach (var cfg in teapartyRewardLeagueCfgs)
+            {
+                if (CheckTeaPartyLeagueRewardCanGet(cfg.targetScore))
+                return true;
+            }
+
+            return false;
+        }
+
         //主界面雅集提示语判断
         public string CheckLeagueMainTips()
         {
-            if(LeagueDataManager.Instance.Type == LeagueJoinType.Join && LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesOpen && !LeagueDataManager.Instance.RoleTeapartyInfo.Status)
-                return "茶话会挑战中...";
-
             if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.Open || LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.WaitNext)
                 return "雅集夜宴进行中...";
 
+            if (LeagueDataManager.Instance.Type == LeagueJoinType.Join && LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesOpen && !LeagueDataManager.Instance.RoleTeapartyInfo.Status)
+                return "茶话会挑战中...";
+
             return "";
         }
     }

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

@@ -22,6 +22,8 @@ namespace GFGGame
         public int RotatingId = 0;//轮换活动id。0为未开启
         public long startTime = 1668873600000;
         public long endTime = 1672156799000;
+        public List<int> KsActivityId = new List<int>(); //活动ids--只存放开启中的许愿池活动id 
+        public List<bool> VsStatus = new List<bool>(); //true已进行许愿 false未进行许愿
 
         //存储奖池免费时间，大于存储时间免费
         public Dictionary<int, long> luckyBoxFreeTimeMillDic = new Dictionary<int, long>();

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

@@ -635,7 +635,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetLeagueRed()
         {
-            return GetLeagueMemberJoinRed() || LeagueDataManager.Instance.Type == LeagueJoinType.UnJoin || GetLeagueGiftBoxRed() || GetLeaguePrayRed();
+            return GetLeagueMemberJoinRed() || LeagueDataManager.Instance.Type == LeagueJoinType.UnJoin || GetLeagueGiftBoxRed() || GetLeaguePrayRed() || GetLeagueTeaPartyRed();
         }
         /// <summary>
         /// 联盟-成员申请
@@ -669,6 +669,15 @@ namespace GFGGame
         {
             return LeagueDataManager.Instance.GetPrayTimesByType(LeaguePrayType.First) == 0;
         }
+
+        /// <summary>
+        /// 联盟-茶话会
+        /// </summary>
+        /// <returns></returns>
+        public bool GetLeagueTeaPartyRed()
+        {
+            return LeagueDataManager.Instance.CheckTeaPartyRewardCanGet();
+        }
         /// <summary>
         /// 限时抽奖活动奖励
         /// </summary>

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

@@ -7,14 +7,20 @@ namespace UI.LuckyBox
     public partial class UI_ComBox1
     {
         public GComponent target;
+        public Controller m_showActivityType;
         public UI_ComModel m_comModel;
         public GLoader m_loaTitle;
         public GTextField m_txtTime;
         public GGroup m_grpTime;
         public GGroup m_grpTitle;
+        public GButton m_btnGiftBag;
+        public UI_ComBagTime m_comBagTime;
+        public GButton m_btnShop;
+        public GButton m_btnReward;
         public GButton m_btnPreview;
         public GTextField m_txtOwned;
         public UI_comLuckBoxBtn m_comLuckBoxBtn;
+        public GTextField m_txtCount;
         public const string URL = "ui://drx9d1usduuftcr";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox1";
@@ -62,27 +68,40 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
+            m_showActivityType = comp.GetController("showActivityType");
             m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
             m_loaTitle = (GLoader)comp.GetChild("loaTitle");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
             m_grpTitle = (GGroup)comp.GetChild("grpTitle");
+            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_btnPreview = (GButton)comp.GetChild("btnPreview");
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_comLuckBoxBtn = (UI_comLuckBoxBtn)UI_comLuckBoxBtn.Create(comp.GetChild("comLuckBoxBtn"));
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_showActivityType = null;
             m_comModel.Dispose();
             m_comModel = null;
             m_loaTitle = null;
             m_txtTime = null;
             m_grpTime = null;
             m_grpTitle = null;
+            m_btnGiftBag = null;
+            m_comBagTime.Dispose();
+            m_comBagTime = null;
+            m_btnShop = null;
+            m_btnReward = null;
             m_btnPreview = null;
             m_txtOwned = null;
             m_comLuckBoxBtn.Dispose();
             m_comLuckBoxBtn = null;
+            m_txtCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,12 +8,12 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public GGraph m_holder;
+        public GGraph m_holder1;
         public GLoader m_loaIcon;
         public GTextField m_txtDiscribe;
         public GLoader m_loaType;
         public GLoader m_loaProperty;
         public GTextField m_txtName;
-        public GGraph m_holder1;
         public const string URL = "ui://drx9d1usqdrt1a";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComCard";
@@ -62,22 +62,22 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
             m_loaType = (GLoader)comp.GetChild("loaType");
             m_loaProperty = (GLoader)comp.GetChild("loaProperty");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_holder = null;
+            m_holder1 = null;
             m_loaIcon = null;
             m_txtDiscribe = null;
             m_loaType = null;
             m_loaProperty = null;
             m_txtName = null;
-            m_holder1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_LuckyBoxWishUI
+    {
+        public GComponent target;
+        public GButton m_btnWish1;
+        public GButton m_btnWish2;
+        public const string URL = "ui://drx9d1usnlyjtqb";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "LuckyBoxWishUI";
+        private static UI_LuckyBoxWishUI _proxy;
+
+        public static UI_LuckyBoxWishUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LuckyBoxWishUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_LuckyBoxWishUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LuckyBoxWishUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_btnWish1 = (GButton)comp.GetChild("btnWish1");
+            m_btnWish2 = (GButton)comp.GetChild("btnWish2");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnWish1 = null;
+            m_btnWish2 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -11,6 +11,17 @@ namespace ET
             await ETTask.CompletedTask;
         }
     }
+
+    //活动开启服务端推送最新许愿记录
+    public class S2C_PushWishingPoolInfoHandler : AMHandler<S2C_PushWishingPoolInfo>
+    {
+        protected override async ETTask Run(Session session, S2C_PushWishingPoolInfo message)
+        {
+            LuckyBoxDataManager.Instance.KsActivityId = message.KsActivityId;
+            LuckyBoxDataManager.Instance.VsStatus = message.VsStatus;
+            await ETTask.CompletedTask;
+        }
+    }
 }
 
 namespace GFGGame
@@ -69,5 +80,40 @@ namespace GFGGame
                 }
             }
         }
+
+        //许愿池许愿记录
+        public static async ETTask<bool> ReqAddWishingPoolInfo(int suitId,int activityId)
+        {
+            S2C_AddWishingPoolInfo response = null;
+
+            response = (S2C_AddWishingPoolInfo)await MessageHelper.SendToServer(new C2S_AddWishingPoolInfo() { SuitId = suitId , ActivityId  = activityId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    int index = LuckyBoxDataManager.Instance.KsActivityId.IndexOf(response.ActivityId);
+                    LuckyBoxDataManager.Instance.VsStatus[index] = response.Status;
+                    return true;
+                }
+            }
+            return false;
+        }
+        
+        ////获取许愿池许愿记录
+        public static async ETTask<bool> ReqGetWishingPoolInfo()
+        {
+            S2C_GetWishingPoolInfo response = null;
+            response = (S2C_GetWishingPoolInfo)await MessageHelper.SendToServer(new C2S_GetWishingPoolInfo() { });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    LuckyBoxDataManager.Instance.KsActivityId = response.KsActivityId;
+                    LuckyBoxDataManager.Instance.VsStatus = response.VsStatus;
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberView.cs

@@ -112,32 +112,39 @@ namespace GFGGame
         //退出联盟
         private void OnBtnExitClick()
         {
+            long joinLeagueTime = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].JoinLeagueTime;
+            long curTime = TimeHelper.ServerNow();
+            long ms = (curTime - joinLeagueTime);
+
             if (LeagueDataManager.Instance.LeagueData.OwnerId == RoleDataManager.roleId)
             {
                 AlertUI.Show("一家之主不可无呀，先把会长职位给别人吧~").SetRightButton(true, "确认");
             }
-            else
+            else if (ms < TimeUtil.SECOND_PER_DAY * 1000)
             {
-                long joinLeagueTime = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].JoinLeagueTime;
-                long curTime = TimeHelper.ServerNow();
-                long ms = (curTime - joinLeagueTime);
-                if (ms < TimeUtil.SECOND_PER_DAY * 1000)
+                AlertUI.Show("您加入的时间不足一天").SetRightButton(true, "确认");
+            }
+            else if (LeagueDataManager.Instance.CheckTeaPartyRewardCanGet())
+            {
+                AlertUI.Show("当前茶话会奖励未领取无法退出雅集，是否前往领取！")
+                .SetLeftButton(true, "取消")
+                .SetRightButton(true, "确认", (object param) =>
                 {
-                    AlertUI.Show("您加入的时间不足一天").SetRightButton(true, "确认");
-                }
-                else
+                    ViewManager.Show<LeagueTeaPartyView>();
+                });
+            }
+            else
+            {
+                AlertUI.Show("您忍心退出雅集，离开小伙伴们吗？")
+                .SetLeftButton(true, "取消")
+                .SetRightButton(true, "确认", async (object param) =>
                 {
-                    AlertUI.Show("您忍心退出雅集，离开小伙伴们吗？")
-                    .SetLeftButton(true, "取消")
-                    .SetRightButton(true, "确认", async (object param) =>
+                    bool result = await LeagueSproxy.ReqQuitLeague();
+                    if (result)
                     {
-                        bool result = await LeagueSproxy.ReqQuitLeague();
-                        if (result)
-                        {
-                            ViewManager.Show<MainUIView>(null, null, true);
-                        }
-                    });
-                }
+                        ViewManager.Show<MainUIView>(null, null, true);
+                    }
+                });
             }
         }
         private void UpdateMember()

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyRewardView.cs

@@ -106,8 +106,7 @@ namespace GFGGame
                 TeapartyRewardRoleCfg cfg = (TeapartyRewardRoleCfg)item.target.data;
                 var state = LeagueDataManager.Instance.CheckTeaPartyPersonRewardStatu(cfg.targetScore);
                 item.m_c1.selectedIndex = state;
-                RedDotController.Instance.SetComRedDot(item.target,
-                    LeagueDataManager.Instance.CheckTeaPartyPersonRewardCanGet(cfg.targetScore), "", -90);
+                RedDotController.Instance.SetComRedDot(item.target,LeagueDataManager.Instance.CheckTeaPartyPersonRewardCanGet(cfg.targetScore), "", -90);
                 UI_LinessRewardProcessItemBt.ProxyEnd();
             });
         }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyView.cs

@@ -73,6 +73,7 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.TEA_PARTY_ROLE_CONTAINER, RefreshListTeaParty);
             EventAgent.AddEventListener(ConstMessage.TEA_PARTY_STATU, TeaPartyStatuChange);
+            EventAgent.AddEventListener(ConstMessage.TEA_PARTY_REWARD, ReferBtnRewardRed);
         }
 
         protected override void OnShown()
@@ -88,6 +89,7 @@ namespace GFGGame
 
             GetTeapartyMatchingInfos();
             GetRoleContainerInfos();
+            ReferBtnRewardRed();
         }
 
         protected override void OnHide()
@@ -102,6 +104,7 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.TEA_PARTY_ROLE_CONTAINER, RefreshListTeaParty);
             EventAgent.RemoveEventListener(ConstMessage.TEA_PARTY_STATU, TeaPartyStatuChange);
+            EventAgent.RemoveEventListener(ConstMessage.TEA_PARTY_REWARD, ReferBtnRewardRed);
         }
 
         private async void QuitTeapparty()
@@ -254,6 +257,8 @@ namespace GFGGame
 
         private void TeaPartyStatuChange()
         {
+            ReferBtnRewardRed();
+
             if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo) {
                 if (LeagueDataManager.Instance.RoleTeapartyInfo.Status && !LeagueDataManager.Instance.RoleTeapartyInfo.IsComplete) 
                     ViewManager.Show<LeagueTeaPartyShowView>(null, new object[] { typeof(LeagueView).FullName, null });
@@ -261,5 +266,10 @@ namespace GFGGame
                     OnBtnRewardClick();
             }
         }
+
+        private void ReferBtnRewardRed()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_btnReward, LeagueDataManager.Instance.CheckTeaPartyRewardCanGet(), "", 0);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -216,6 +216,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_btnMember.target, RedDotDataManager.Instance.GetLeagueMemberJoinRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnGift.target, RedDotDataManager.Instance.GetLeagueGiftBoxRed(), "", -120, 100);
             RedDotController.Instance.SetComRedDot(_ui.m_btnPray.target, RedDotDataManager.Instance.GetLeaguePrayRed(), "", -70, 60);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnParty.target, RedDotDataManager.Instance.GetLeagueTeaPartyRed(), "", -440, 60);
         }
 
         private async void GetTeapartyMatchingInfos()

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

@@ -134,7 +134,7 @@ namespace GFGGame
                     break;
             }
 
-            _ui.m_comCard.m_loaType.url = ResPathUtil.GetCommonGameResPath("hd_sxicon_" + itemCfg.rarity);
+            _ui.m_comCard.m_loaType.url = ResPathUtil.GetCommonGameResPath("hz_bq_shuxing_" + itemCfg.rarity);
             _ui.m_comCard.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             _ui.m_comCard.m_loaProperty.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + itemCfg.mainScore);
             _ui.m_comCard.m_txtName.text = itemCfg.name;

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

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using UnityEngine;
 using ET;
+using System.Linq;
 
 namespace GFGGame
 {
@@ -91,6 +92,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateListItemData);
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateListItemData);
             EventAgent.AddEventListener(ConstMessage.LUCKY_BOX_FREE_TIME_CHANGED, UpdateFreeInfo);
+
         }
         protected override void OnShown()
         {
@@ -100,6 +102,10 @@ namespace GFGGame
             LuckyBoxDataManager.Instance.luckyBoxIds.Add(LuckyBoxDataManager.BOX_ID_2);
             LuckyBoxDataManager.Instance.luckyBoxIds.Add(LuckyBoxDataManager.BOX_ID_3);
             _activeBoxId = 0;
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
+            if (activityId > 0)
+                GetWishingPoolInfo();
+
             if (LuckyBoxDataManager.Instance.RotatingId > 0)
             {
                 RotatingLuckyBoxCfg rotatingLuckyBox = RotatingLuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.RotatingId);
@@ -108,7 +114,7 @@ namespace GFGGame
                 LuckyBoxDataManager.Instance.luckyBoxIds.Insert(0, _activeBoxId);
             }
 
-            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
+            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[1];
             if (this.viewData != null)
             {
                 boxId = (int)this.viewData;
@@ -117,7 +123,7 @@ namespace GFGGame
             if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0) boxId = LuckyBoxDataManager.BOX_ID_2;
             LuckyBoxDataManager.Instance.currentBoxId = boxId;
 
-            if (_activeBoxId > 0) Timers.inst.Add(1, 0, CheckTime);
+            if (_activeBoxId > 0 || boxId == LuckyBoxDataManager.BOX_ID_2) Timers.inst.Add(1, 0, CheckTime);
 
             _valueBarController.OnShown();
             _valueBarController.Controller(4);
@@ -136,6 +142,17 @@ namespace GFGGame
             Timers.inst.Add(1f, 0, OnTimerUpdate, 1);
         }
 
+        private async void GetWishingPoolInfo()
+        {
+            bool result = await LuckyBoxSProxy.ReqGetWishingPoolInfo();
+            if (result)
+            {
+                int index = LuckyBoxDataManager.Instance.KsActivityId.IndexOf(5001);
+                if (index < 0 || !LuckyBoxDataManager.Instance.VsStatus[index])
+                    ViewManager.Show<LuckyBoxWishView>(ConstLimitTimeActivityType.ActLimitTsy);
+            }
+        }
+
         private void OnTimerUpdate(object param)
         {
             int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
@@ -212,6 +229,14 @@ namespace GFGGame
             GObject obj = _ui.m_listBg.GetChildAt(_curIndex);
             UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
 
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
+            if (activityId > 0 && boxId == LuckyBoxDataManager.BOX_ID_2) {
+                comBox.m_showActivityType.selectedIndex = 1;
+                UpGiftBox(comBox);
+            }
+            else
+                comBox.m_showActivityType.selectedIndex = 0;
+
             if (!_lcukyBoxCtrl.ContainsKey(boxId))
             {
                 _lcukyBoxCtrl.Add(boxId, new LuckyBoxController(comBox.m_comModel.target));
@@ -220,11 +245,11 @@ namespace GFGGame
             _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnShown(LuckyBoxDataManager.Instance.currentBoxId);
 
             comBox.m_comLuckBoxBtn.m_imgSpecial.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
-            GGraph holder = comBox.m_comLuckBoxBtn.m_btnBuyTen.GetChild("holder").asGraph;
-            holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            //GGraph holder = comBox.m_comLuckBoxBtn.m_btnBuyTen.GetChild("holder").asGraph;
+            //holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
             comBox.m_comLuckBoxBtn.m_holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
 
-            _effectUI1 = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", "Button_Glow");
+            //_effectUI1 = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", "Button_Glow");
             _effectUI2 = EffectUIPool.CreateEffectUI(comBox.m_comLuckBoxBtn.m_holder, "ui_LuckyBox", "but_text_dc");
 
             comBox.m_comLuckBoxBtn.m_comCostOne.m_txtCost.text = cfg.costNum.ToString();
@@ -250,9 +275,17 @@ namespace GFGGame
             }
             comBox.m_btnPreview.data = boxId;
 
+            if (comBox.m_btnReward.data == null)
+            {
+                comBox.m_btnReward.onClick.Add(OnClikcBtnReward);
+                comBox.m_btnShop.onClick.Add(OnClikcBtnShop);
+                comBox.m_btnGiftBag.onClick.Add(OnClikcBtnGiftBag);
+            }
+            comBox.m_btnReward.data = boxId;
+
             obj.data = boxId;
 
-            comBox.m_grpTime.visible = boxId == _activeBoxId;
+            comBox.m_grpTime.visible = (boxId == _activeBoxId || boxId == LuckyBoxDataManager.BOX_ID_2);
             if (boxId == _activeBoxId)
             {
                 long endTime = LuckyBoxDataManager.Instance.endTime;
@@ -271,6 +304,84 @@ namespace GFGGame
             UpdateListItemData();
             UpdateFreeInfo();
         }
+
+        private void OnClikcBtnReward()
+        {
+            ViewManager.Show<ActivityThemeLuckyBoxBonusView>();
+        }
+
+        private void OnClikcBtnShop()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY }, new object[] { typeof(LuckyBoxView).FullName });
+        }
+
+        //刷新摘星活动期间的数据
+        private void UpGiftBox(UI_ComBox1 comBox)
+        {
+            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
+            LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
+            comBox.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastDrawCount.ToString()).FlushVars();
+            comBox.m_txtCount.SetVar("name", cfg.name).FlushVars();
+
+            var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);
+            var list = activityInfoByTypeList.Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
+            if (list.Count == 0)
+            {
+                comBox.m_comBagTime.target.visible = false;
+                comBox.m_btnGiftBag.visible = false;
+            }
+            else
+            {
+                bool isSoldOut = true;
+                foreach (var activityInfo in list)
+                {
+                    ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
+                    var paramsArr = activityOpenCfg.paramsArr;
+                    foreach (var shopCfgId in paramsArr)
+                    {
+                        var shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
+                        var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfgId);
+                        //只要有一个商品还能购买，就不是售罄
+                        if (remainBuyNum > 0)
+                        {
+                            isSoldOut = false;
+                            break;
+                        }
+                    }
+                }
+
+                if (isSoldOut)
+                {
+                    comBox.m_comBagTime.target.visible = false;
+                    comBox.m_btnGiftBag.visible = false;
+                }
+                else
+                {
+                    comBox.m_comBagTime.m_txtGiftBagTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
+                    comBox.m_comBagTime.target.visible = true;
+                    comBox.m_btnGiftBag.visible = true;
+                }
+            }
+        }
+
+        //限时礼包按钮点击执行方法
+        private void OnClikcBtnGiftBag()
+        {
+            var activityInfoByTypeList =
+                ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);
+
+            var list = activityInfoByTypeList
+                .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
+            if (list.Count == 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+            }
+            else
+            {
+                ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.XSLB3, this.viewData });
+            }
+        }
+
         private void UpdateListItemData()
         {
             int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
@@ -285,28 +396,36 @@ namespace GFGGame
             UI_ComBox1.ProxyEnd();
         }
 
-        private void UpdateEffect()
+        private void CheckTime(object param = null)
         {
+            if (LuckyBoxDataManager.Instance.currentBoxId == _activeBoxId)
+            {
+                if (LuckyBoxDataManager.Instance.currentBoxId != _activeBoxId) return;
+                long endTime = LuckyBoxDataManager.Instance.endTime;
+                long curTime = TimeHelper.ServerNow();
+                TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
 
+                GObject item = _ui.m_listBg.GetChildAt(0);
+                if (item == null) return;
+                GObject textField = item.asCom.GetChild("txtTime");
+                if (textField == null) return;
 
-
-        }
-        private void CheckTime(object param = null)
-        {
-            if (LuckyBoxDataManager.Instance.currentBoxId != _activeBoxId) return;
-            long endTime = LuckyBoxDataManager.Instance.endTime;
-            long curTime = TimeHelper.ServerNow();
-            TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
-
-            GObject item = _ui.m_listBg.GetChildAt(0);
-            if (item == null) return;
-            GObject textField = item.asCom.GetChild("txtTime");
-            if (textField == null) return;
-
-            long time = endTime - curTime;
-            string strTime = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
-            textField.asTextField.text = string.Format("活动时间:剩余{0}", strTime);
+                long time = endTime - curTime;
+                string strTime = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+                textField.asTextField.text = string.Format("活动时间:剩余{0}", strTime);
+            }
+            else if(LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_2)
+            {
+                GObject item = _ui.m_listBg.GetChildAt(1);
+                if (item == null) return;
+                GObject textField = item.asCom.GetChild("txtTime");
+                if (textField == null) return;
+                long time = 100;
+                string strTime = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+                textField.asTextField.text = string.Format("概率提升剩余:{0}", strTime);
+            }
         }
+
         private void updateBoxEffect()
         {
             if (isActiveBoxOpen)
@@ -411,7 +530,6 @@ namespace GFGGame
         {
             Reset();
             ViewManager.GoBackFrom(typeof(LuckyBoxView).FullName);
-
         }
 
         private void OnClickBtnHome()

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

@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.LuckyBox;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class LuckyBoxWishView : BaseWindow
+    {
+        private UI_LuckyBoxWishUI _ui;
+        private int _actLimitTsy = 0;
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LuckyBoxWishUI.PACKAGE_NAME;
+            _ui = UI_LuckyBoxWishUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+
+            _ui.m_btnWish1.data = 0;
+            _ui.m_btnWish1.onClick.Add(OnClickBtnWish);
+            _ui.m_btnWish1.data = 1;
+            _ui.m_btnWish2.onClick.Add(OnClickBtnWish);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _actLimitTsy = (int)this.viewData;
+        }
+        
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+
+        }
+
+        private void OnClickBtnWish(EventContext context)
+        {
+            int index = (int)(context.sender as GObject).data;
+            ReqAddWishingPoolInfo(index);
+            this.Hide();
+        }
+
+        private async void ReqAddWishingPoolInfo(int index)
+        {
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
+            bool result = await LuckyBoxSProxy.ReqAddWishingPoolInfo(activityOpenCfg.params2Arr[index], activityId);
+            if (result)
+            {
+             
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxWishView.cs.meta

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

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6!a.png.meta → GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ad77cebb0e32fc44dab1adf3b922b376
+guid: f7a026f73fde66348917ff91347c6fce
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_6.png.meta → GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7e440ce062f9c3143be85e1bb9f04ebd
+guid: c80f99287440c7c4bb71c5310e69e645
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}