Merge remote-tracking branch 'remotes/origin/master' into xiaojie

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -155,5 +155,7 @@ namespace GFGGame
         public const string GUIDE_VIEW_HIDE = "GUIDE_VIEW_HIDE";
         //每日重置
         public const string RESET_DAILY_DATA = "RESET_DAILY_DATA";
+
+        public const string LUCKY_BOX_FREE_TIME_CHANGED = "LUCKY_BOX_FREE_TIME_CHANGED";
     }
 }

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

@@ -204,6 +204,7 @@ namespace GFGGame
             EnduringGiftBoxSProxy.ReqGetAllGiftBagRebateStatus().Coroutine();
             ChatSProxy.ReqQueryChatMsg(ChatType.League).Coroutine();
             ChatSProxy.ReqQueryChatMsg(ChatType.LeagueQuestion).Coroutine();
+            LuckyBoxSProxy.ReqGetLuckyBoxInfo().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

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

@@ -38,7 +38,7 @@ namespace GFGGame
             if (itemInfoProto.Type == ConstItemType.DRESS_UP && itemID % GameConst.MAX_COUNT_EVERY_TYPE_ITEM > 0)
             {
                 DressUpMenuItemDataManager.Add(itemInfoProto);
-                if (!DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemInfoProto))
+                if (!DressUpMenuItemCfg1Array.Instance.CheckIsBackGroundType(itemInfoProto))
                 {
                     DecomposeDataManager.Instance.Add(itemID);
                 }

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using ET;
 
 namespace GFGGame
 {
@@ -22,6 +23,9 @@ namespace GFGGame
         public long startTime = 1668873600000;
         public long endTime = 1672156799000;
 
+        //存储奖池免费时间，大于存储时间免费
+        public Dictionary<int, long> luckyBoxFreeTimeMillDic = new Dictionary<int, long>();
+
 
         public int times = 0;
         public int luckyBoxIndex;
@@ -65,6 +69,30 @@ namespace GFGGame
                 }
             }
         }
+
+        public void InitServerData(S2C_GetLuckyBoxInfo response)
+        {
+            luckyBoxFreeTimeMillDic.Clear();
+            int count = response.KsLuckyBoxId.Count;
+            for(var i = 0; i < count; i++)
+            {
+                luckyBoxFreeTimeMillDic[response.KsLuckyBoxId[i]] = response.VsFreeTime[i];
+            }
+        }
+
+        public void UpdateFreeTime(int luckyBoxId, long freeTimeMill)
+        {
+            luckyBoxFreeTimeMillDic[luckyBoxId] = freeTimeMill;
+            EventAgent.DispatchEvent(ConstMessage.LUCKY_BOX_FREE_TIME_CHANGED);
+        }
+
+        //返回奖池免费时间，如果是0，则不免费,大约0并且当前时间大于存储时间则免费
+        public long GetFreeTime(int luckyBoxId)
+        {
+            luckyBoxFreeTimeMillDic.TryGetValue(luckyBoxId, out var freeTime);
+            return freeTime;
+        }
+
         public void InitData(int boxId)
         {
             LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);

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

@@ -283,7 +283,8 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetCardRed(int cardId)
         {
-            return GetCardStarReward(cardId) || GetCardUpStarRed(cardId) || GetCardSkillsRed(cardId) || GetCardUpLvRed(cardId);
+            // GetCardUpStarRed(cardId) || GetCardUpLvRed(cardId) ||
+            return GetCardStarReward(cardId) || GetCardSkillsRed(cardId) ;
         }
 
         /// <summary>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListCardStarRewardItem.cs

@@ -9,7 +9,7 @@ namespace UI.Card
         public GComponent target;
         public Controller m_c1;
         public GButton m_btnGet;
-        public GButton m_btnGot;
+        public GTextField m_txtGet;
         public GComponent m_comItem;
         public GTextField m_txtTitle;
         public GTextField m_txtTips;
@@ -62,7 +62,7 @@ namespace UI.Card
         {
             m_c1 = comp.GetController("c1");
             m_btnGet = (GButton)comp.GetChild("btnGet");
-            m_btnGot = (GButton)comp.GetChild("btnGot");
+            m_txtGet = (GTextField)comp.GetChild("txtGet");
             m_comItem = (GComponent)comp.GetChild("comItem");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
@@ -71,7 +71,7 @@ namespace UI.Card
         {
             m_c1 = null;
             m_btnGet = null;
-            m_btnGot = null;
+            m_txtGet = null;
             m_comItem = null;
             m_txtTitle = null;
             m_txtTips = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardList.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_RewardList
+    {
+        public GComponent target;
+        public GList m_listReward;
+        public const string URL = "ui://eg2y0ldpgo1ltow";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "RewardList";
+        private static UI_RewardList _proxy;
+
+        public static UI_RewardList Create(GObject gObject = null)
+        {
+            var ui = new UI_RewardList();
+            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_RewardList Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_RewardList();
+            }
+            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_listReward = (GList)comp.GetChild("listReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_listReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardList.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RewardUI.cs

@@ -7,8 +7,10 @@ namespace UI.CommonGame
     public partial class UI_RewardUI
     {
         public GComponent target;
+        public GGraph m_bg;
         public GGraph m_holderTitle;
-        public GList m_listReward;
+        public GGroup m_downTipsText;
+        public UI_RewardList m_comList;
         public GGroup m_grp;
         public const string URL = "ui://eg2y0ldpm9wm8q";
         public const string PACKAGE_NAME = "CommonGame";
@@ -57,14 +59,19 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
+            m_bg = (GGraph)comp.GetChild("bg");
             m_holderTitle = (GGraph)comp.GetChild("holderTitle");
-            m_listReward = (GList)comp.GetChild("listReward");
+            m_downTipsText = (GGroup)comp.GetChild("downTipsText");
+            m_comList = (UI_RewardList)UI_RewardList.Create(comp.GetChild("comList"));
             m_grp = (GGroup)comp.GetChild("grp");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
             m_holderTitle = null;
-            m_listReward = null;
+            m_downTipsText = null;
+            m_comList.Dispose();
+            m_comList = null;
             m_grp = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldUI.cs

@@ -21,6 +21,7 @@ namespace UI.Field
         public GProgressBar m_proTaskReward;
         public GLoader m_loaTaskReward;
         public GGroup m_grpTaskReward;
+        public GButton m_btnRule;
         public GTextField m_txtTime;
         public GGroup m_grpTime;
         public const string URL = "ui://5oh3t7988jo90";
@@ -84,6 +85,7 @@ namespace UI.Field
             m_proTaskReward = (GProgressBar)comp.GetChild("proTaskReward");
             m_loaTaskReward = (GLoader)comp.GetChild("loaTaskReward");
             m_grpTaskReward = (GGroup)comp.GetChild("grpTaskReward");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
         }
@@ -106,6 +108,7 @@ namespace UI.Field
             m_proTaskReward = null;
             m_loaTaskReward = null;
             m_grpTaskReward = null;
+            m_btnRule = null;
             m_txtTime = null;
             m_grpTime = null;
             if(disposeTarget && target != null)

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

@@ -22,6 +22,7 @@ namespace UI.LuckyBox
         public GImage m_imgSpecial;
         public GGraph m_holder;
         public GGroup m_grpSpecial;
+        public GTextField m_txtFreeTime;
         public const string URL = "ui://drx9d1usduuftcr";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox1";
@@ -84,6 +85,7 @@ namespace UI.LuckyBox
             m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_holder = (GGraph)comp.GetChild("holder");
             m_grpSpecial = (GGroup)comp.GetChild("grpSpecial");
+            m_txtFreeTime = (GTextField)comp.GetChild("txtFreeTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -105,6 +107,7 @@ namespace UI.LuckyBox
             m_imgSpecial = null;
             m_holder = null;
             m_grpSpecial = null;
+            m_txtFreeTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,8 +7,10 @@ namespace UI.LuckyBox
     public partial class UI_ComCost
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaCost;
         public GTextField m_txtCost;
+        public GTextField m_txtFree;
         public const string URL = "ui://drx9d1usvek812";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComCost";
@@ -56,13 +58,17 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaCost = (GLoader)comp.GetChild("loaCost");
             m_txtCost = (GTextField)comp.GetChild("txtCost");
+            m_txtFree = (GTextField)comp.GetChild("txtFree");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaCost = null;
             m_txtCost = null;
+            m_txtFree = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -1,15 +1,29 @@
 using ET;
+using GFGGame;
+
+namespace ET
+{
+    public class S2C_NoticeLuckyBoxFreeTimeHandler : AMHandler<S2C_NoticeLuckyBoxFreeTime>
+    {
+        protected override async ETTask Run(Session session, S2C_NoticeLuckyBoxFreeTime message)
+        {
+            LuckyBoxDataManager.Instance.UpdateFreeTime(message.LuckyBoxId, message.FreeTime);
+            await ETTask.CompletedTask;
+        }
+    }
+}
 
 namespace GFGGame
 {
+
     public class LuckyBoxSProxy
     {
 
         //抽奖
-        public static async ETTask<bool> ReqGetBonus(int luckyBoxId, int times)
+        public static async ETTask<bool> ReqGetBonus(int luckyBoxId, int times, bool free = false)
         {
             M2C_DrawLuckyBox response = null;
-            response = (M2C_DrawLuckyBox)await MessageHelper.SendToServer(new C2M_DrawLuckyBox() { LuckyBoxId = luckyBoxId, Times = times });
+            response = (M2C_DrawLuckyBox)await MessageHelper.SendToServer(new C2M_DrawLuckyBox() { LuckyBoxId = luckyBoxId, Times = times, Free = free });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
@@ -42,5 +56,19 @@ namespace GFGGame
             }
             return 0;
         }
+
+        //请求抽奖初始信息
+        public static async ETTask ReqGetLuckyBoxInfo()
+        {
+            S2C_GetLuckyBoxInfo response = null;
+            response = (S2C_GetLuckyBoxInfo)await MessageHelper.SendToServer(new C2S_GetLuckyBoxInfo() { });
+            if(response != null)
+            {
+                if(response.Error == ErrorCode.ERR_Success)
+                {
+                    LuckyBoxDataManager.Instance.InitServerData(response);
+                }
+            }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Bag/GiftBoxSelectorView.cs

@@ -65,6 +65,7 @@ namespace GFGGame
             _ui.m_btnCancel.onClick.Add(OnBtnCancelClick);
             _ui.m_list.itemRenderer = ListItemRender;
             _ui.m_btnSub.onClick.Add(OnBtnSubClick);
+            AddEffect();
         }
 
         protected override void AddEventListener()
@@ -83,8 +84,7 @@ namespace GFGGame
 
             UpdateView();
             UpdateList();
-            SetSelAllNum();
-            AddEffect();
+            SetSelAllNum(); 
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -23,7 +23,7 @@ namespace GFGGame
         private List<CardStarCfg> _cardStarRewards = new List<CardStarCfg>();
         private int _selectTab = 0;
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
-        private EffectUI _effectUI;
+        private EffectUI _effectUI1;
 
         private GObject _consumeSelectItem;//选中的材料item
         private int _consumeSelectIndex = 0;//0为减，1为加
@@ -58,8 +58,6 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
-            EffectUIPool.Recycle(_effectUI);
-            _effectUI = null;
 
             if (_ui != null)
             {
@@ -228,20 +226,20 @@ namespace GFGGame
         }
         private void UpdateCardRes()
         {
-            if (_effectUI != null)
+            if (_effectUI1 != null)
             {
-                EffectUIPool.Recycle(_effectUI);
-                _effectUI = null;
+                EffectUIPool.Recycle(_effectUI1);
+                _effectUI1 = null;
             }
             string resName = _cardData.resources[_cardData.resIndex];
             string resPath = ResPathUtil.GetCardAnimationPath(_cardData.resources[_cardData.resIndex]);
             if (_cardData.itemCfg.animationCardStar > 0 && _cardData.star >= _cardData.itemCfg.animationCardStar && Versions.Contains(resPath))
             {
-                _effectUI = new EffectUI();
-                _effectUI.Reset(_ui.m_comCard.m_comCardHolder.m_holder, resName, resName, 100, EffectUIType.Card);
+                _effectUI1 = new EffectUI();
+                _effectUI1.Reset(_ui.m_comCard.m_comCardHolder.m_holder, resName, resName, 100, EffectUIType.Card);
             }
 
-            if (_effectUI != null)
+            if (_effectUI1 != null)
             {
                 _ui.m_c1.selectedIndex = 1;
                 _ui.m_comCard.target.scrollPane.SetPercX(0.5f, false);
@@ -938,6 +936,9 @@ namespace GFGGame
         {
             base.OnHide();
 
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+
             Timers.inst.Remove(CheckGuide);
             Timers.inst.Remove(OnTimedEvent);
             UI_ComCostCurrency.ProxyEnd();

GameClient/Assets/Game/HotUpdate/Views/Card/CardStarRewardView.cs

@@ -72,6 +72,7 @@ namespace GFGGame
             }
             item.m_txtTips.visible = cardStarCfg.starLvl == cardData.itemCfg.animationCardStar;
             item.m_c1.selectedIndex = cardData.starRewardsState.ContainsKey(cardStarCfg.starLvl) ? cardData.starRewardsState[cardStarCfg.starLvl] : 0;
+
             if (item.m_btnGet.data == null)
             {
                 item.m_btnGet.onClick.Add(OnClickBtnGet);

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -63,8 +63,6 @@ namespace GFGGame
             _ui.m_listReward.onClickItem.Add(OnClickListRewardItem);
 
             // DecomposeDataManager.Instance.InitSuitSyntheticMaterias();
-
-
         }
 
         protected override void OnShown()

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs

@@ -68,7 +68,7 @@ namespace GFGGame
                     break;
                 }
             }
-            _ui.m_txtLock.text = cardItemCfg == null || cfg.cardStar == 0 ? "" : string.Format("卡牌【{0}】达到{1}星可养护", cardItemCfg.name, cfg.cardStar);
+            _ui.m_txtLock.text = cardItemCfg == null || cfg.cardStar == 0 ? "" : string.Format("词牌【{0}】达到{1}星可养护", cardItemCfg.name, cfg.cardStar);
             _ui.m_txtLock.visible = cardItemCfg != null && cfg.cardStar > 0;
             _ui.m_listMaterials.numItems = cfg.materialsArr.Length;
             long has = ItemDataManager.GetItemNum(cfg.costId);
@@ -134,7 +134,7 @@ namespace GFGGame
                 CardData cardData = CardDataManager.GetCardDataById(cardItemCfg.id);
                 if (cardData == null)
                 {
-                    PromptController.Instance.ShowFloatTextPrompt(string.Format("暂未获得卡牌【{0}】", cardItemCfg.name));
+                    PromptController.Instance.ShowFloatTextPrompt(string.Format("暂未获得词牌【{0}】", cardItemCfg.name));
                     return;
                 }
                 if (cardData.star < cfg.cardStar)

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -45,10 +45,8 @@ namespace GFGGame
             _effectUI1 = null;
             _propertyList.Clear();
             _addPropertyList.Clear();
-
         }
 
-
         protected override void OnInit()
         {
             base.OnInit();

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -318,7 +318,7 @@ namespace GFGGame
             ItemCfg materiasItemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
             listItem.m_txtName.text = ItemUtil.GetItemName(itemData.id);
             listItem.m_loaderIcon.url = ResPathUtil.GetIconPath(materiasItemCfg);
-            long num = ItemDataManager.GetItemNum(itemData.id) - 1;
+            long num = ItemDataManager.GetItemNum(itemData.id);
             ItemCfg materialCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
             bool isDressUp = materialCfg.itemType == ConstItemType.DRESS_UP;
             long numSynthetic = Math.Max(num, 0);

GameClient/Assets/Game/HotUpdate/Views/Common/ModalStatusView.cs

@@ -32,12 +32,12 @@ namespace GFGGame
 
         protected override void OnHide()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
             base.OnHide();
         }
         public override void Dispose()
         {
-            EffectUIPool.Recycle(_effectUI1);
-            _effectUI1 = null;
             if (_ui != null)
             {
                 _ui.Dispose();

GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -19,6 +19,7 @@ namespace GFGGame
         private const int maxHeight = 1030;
 
         private EffectUI _effectUI1;
+        private int counTime = 0;  //定时器计数
 
         public override void Dispose()
         {
@@ -36,14 +37,13 @@ namespace GFGGame
             base.OnInit();
             _ui = UI_RewardUI.Create();
             this.viewCom = _ui.target;
-            this.viewCom.Center();
-            this.modal = true;
-            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            //this.viewCom.Center();
+            //this.modal = true;
+            //viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            isfullScreen = true;
 
-            _ui.m_listReward.SetVirtual();
-            _ui.m_listReward.itemRenderer = RenderListRewardItem;
-
-            this.viewCom.onClick.Add(this.Hide);
+            _ui.m_comList.m_listReward.itemRenderer = RenderListRewardItem;
+            _ui.m_bg.onClick.Add(this.Hide);
         }
         protected override void OnShown()
         {
@@ -72,16 +72,38 @@ namespace GFGGame
                 }
             }
             _listItemDatas.AddRange(suitPart);
+            //_ui.m_listReward.SetVirtual();  //有虚拟列表的时候，没有办法居中显示列表
 
-            _ui.m_listReward.numItems = _listItemDatas.Count;
+            _ui.m_downTipsText.visible = false;
+            _ui.m_comList.m_listReward.numItems = 0;
+            counTime = 0;
+            Timers.inst.Add(0.1f, 3, OnTimerUpdate, 1);
+            //邊框左上角特效
+            //_effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXHD");
+        }
 
-            _ui.m_listReward.ResizeToFit();
-            if (_ui.m_listReward.height > maxHeight)
+        private void OnTimerUpdate(object param)
+        {
+            counTime += 1;
+            if (counTime == 1)
             {
-                _ui.m_listReward.height = maxHeight;
+                _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXHD");
+            }
+            else if (counTime == 2)
+            {
+                _ui.m_comList.m_listReward.numItems = _listItemDatas.Count;
+
+                _ui.m_comList.m_listReward.ResizeToFit();
+                if (_ui.m_comList.m_listReward.height > maxHeight)
+                {
+                    _ui.m_comList.m_listReward.height = maxHeight;
+                }
+            }
+            else if (counTime == 3)
+            {
+                _ui.m_downTipsText.visible = true;
+                Timers.inst.Remove(OnTimerUpdate);
             }
-            //邊框左上角特效
-            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXHD");
         }
 
         protected override void OnHide()
@@ -89,6 +111,8 @@ namespace GFGGame
             EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
 
+            Timers.inst.Remove(OnTimerUpdate);
+
             for (int i = 0; i < _effects.Count; i++)
             {
                 if (_effects[i] != null)
@@ -137,7 +161,7 @@ namespace GFGGame
 
             item.m_comRewardItem.m_imgOnceBonus.visible = _listItemDatas[index].isOnceBonus;
             //特效("ui_ck", "ui_ck_zl");
-            int childIndex = _ui.m_listReward.ItemIndexToChildIndex(index);
+            int childIndex = _ui.m_comList.m_listReward.ItemIndexToChildIndex(index);
             if (_effects.Count <= childIndex)
             {
                 EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holderReware, "ui_hd", "GXHD_WuPin");

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/EnduringGiftBoxView.cs

@@ -44,14 +44,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            EffectUIPool.Recycle(_effectUI1);
-            _effectUI1 = null;
-            EffectUIPool.Recycle(_effectUI2);
-            _effectUI2 = null;
-            EffectUIPool.Recycle(_effectUI3);
-            _effectUI3 = null;
-            EffectUIPool.Recycle(_effectUI4);
-            _effectUI4 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -530,6 +522,15 @@ namespace GFGGame
 
         protected override void OnHide()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
+            EffectUIPool.Recycle(_effectUI4);
+            _effectUI4 = null;
+
             this.RemoveEventListener();
             base.Hide();
             _onSuccess = null;

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/SpecialOfferGiftBoxView.cs

@@ -41,14 +41,7 @@ namespace GFGGame
         public override void Dispose()
         {
             base.Dispose();
-            EffectUIPool.Recycle(_effectUI1);
-            _effectUI1 = null;
-            EffectUIPool.Recycle(_effectUI2);
-            _effectUI2 = null;
-            EffectUIPool.Recycle(_effectUI3);
-            _effectUI3 = null;
-      
-            DestroyObjectFromView();
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -396,6 +389,15 @@ namespace GFGGame
 
         protected override void OnHide()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
+
+            DestroyObjectFromView();
+
             this.RemoveEventListener();
             base.Hide();
         }

GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -48,7 +48,8 @@ namespace GFGGame
             _ui.m_btn2.target.onClick.Add(OnDifficultyChange);
             // _ui.m_c1.onChanged.Add(OnDifficultyChange);
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
-
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnRule.data = 300016;
         }
         protected override void AddEventListener()
         {

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

@@ -11,7 +11,8 @@ namespace GFGGame
         private UI_LuckBoxBonusShowUI _ui;
         private List<ItemData> _rewardList = new List<ItemData>();
         // private List<GameObject> _gameobjects = new List<GameObject>();
-        private Dictionary<int, Dictionary<int, EffectUI>> _effList = new Dictionary<int, Dictionary<int, EffectUI>>();
+        //private Dictionary<int, Dictionary<int, EffectUI>> _effList = new Dictionary<int, Dictionary<int, EffectUI>>();
+        private List<EffectUI> _effList = new List<EffectUI>();
 
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
@@ -22,28 +23,18 @@ namespace GFGGame
         public override void Dispose()
         {
             base.Dispose();
-            // for (int i = 0; i < _gameobjects.Count; i++)
-            // {
-            //     SceneController.DestroyObjectFromView(_gameobjects[i], _wrappers[i]);
-
-            // }
-            foreach (int key in _effList.Keys)
-            {
-                foreach (int key1 in _effList[key].Keys)
-                {
-                    EffectUIPool.Recycle(_effList[key][key1]);
-                    _effList[key][key1] = null;
-                }
-            }
-            _effList.Clear();
             EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
             EffectUIPool.Recycle(_effectUI2);
             _effectUI2 = null;
             EffectUIPool.Recycle(_effectUI3);
             _effectUI3 = null;
-            EffectUIPool.Recycle(_effectUI4);
-            _effectUI4 = null;
+
+            // for (int i = 0; i < _gameobjects.Count; i++)
+            // {
+            //     SceneController.DestroyObjectFromView(_gameobjects[i], _wrappers[i]);
+
+            // }
 
             if (_ui != null)
             {
@@ -93,6 +84,16 @@ namespace GFGGame
 
         protected override void OnHide()
         {
+            for (int key = 0; key < _effList.Count; key++)
+            {
+                EffectUIPool.Recycle(_effList[key]);
+                _effList[key] = null;
+            }
+            _effList.Clear();
+        
+            EffectUIPool.Recycle(_effectUI4);
+            _effectUI4 = null;
+
             base.OnHide();
             _rewardList.Clear();
             GetSuitItemController.TryShow(0);
@@ -111,15 +112,11 @@ namespace GFGGame
 
             string resPath = itemCfg.rarity == ConstDressRarity.Rarity_TIANYI ? "CK_all_01" : "CK_all_02";
 
-            if (countType == 10 && itemCfg.rarity > 2 && (!_effList.ContainsKey(itemCfg.rarity) || !_effList[itemCfg.rarity].ContainsKey(index)))
+            if (countType == 10 && itemCfg.rarity > 2 )//&& (!_effList.ContainsKey(itemCfg.rarity) || !_effList[itemCfg.rarity].ContainsKey(index)))
             {
-                if (!_effList.ContainsKey(itemCfg.rarity))
-                {
-                    _effList[itemCfg.rarity] = new Dictionary<int, EffectUI>();
-                }
                 GGraph holder = itemCfg.rarity == 3 ? item.m_comIcon.m_holder : item.m_comIcon.m_holder1;
                 EffectUI _effectUI = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", resPath);
-                _effList[itemCfg.rarity][index] = _effectUI;
+                _effList.Add(_effectUI);
             }
             if (countType == 1 && itemCfg.rarity > 2 && _effectUI4 == null)
             {

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

@@ -7,7 +7,6 @@ using System.Linq;
 
 namespace GFGGame
 {
-
     public class LuckyBoxNewDressView : BaseWindow
     {
         private UI_LuckyBoxNewDressUI _ui;
@@ -36,10 +35,6 @@ namespace GFGGame
             _effectUI3 = null;
             EffectUIPool.Recycle(_effectUI4);
             _effectUI4 = null;
-            EffectUIPool.Recycle(_effectUI5);
-            _effectUI5 = null;
-            EffectUIPool.Recycle(_effectUI6);
-            _effectUI6 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -99,14 +94,22 @@ namespace GFGGame
         }
         private void UpdateView()
         {
+            if (_effectUI5 != null)
+            {
+                EffectUIPool.Recycle(_effectUI5);
+                _effectUI5 = null;
+            }
+            if (_effectUI6 != null)
+            {
+                EffectUIPool.Recycle(_effectUI6);
+                _effectUI6 = null;
+            }
             _ui.m_btnPass.visible = _newRewardList.Count <= 1;
             _rewardList = _newRewardList.Count > 0 ? _newRewardList : _oldRewardList;
 
             if (_rewardList.Count - 1 < 0) return;
             ItemData itemdata = _rewardList[_rewardList.Count - 1];
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemdata.id);
-            string resPath = "";
-            string resPath1 = "";
             switch (itemCfg.rarity)
             {
                 case ConstDressRarity.Rarity_TIANYI:
@@ -196,6 +199,10 @@ namespace GFGGame
 
         protected override void OnHide()
         {
+            EffectUIPool.Recycle(_effectUI5);
+            _effectUI5 = null;
+            EffectUIPool.Recycle(_effectUI6);
+            _effectUI6 = null;
             _ui.m_t_close.Stop(true, false);
             _ui.m_t_open.Stop(true, false);
             _rewardList.Clear();

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

@@ -21,7 +21,7 @@ namespace GFGGame
         // private List<GoWrapper> _wrappers = new List<GoWrapper>();
         // private List<GameObject> _gameObjects1 = new List<GameObject>();
         // private List<GoWrapper> _wrappers1 = new List<GoWrapper>();
-        private Dictionary<int, List<EffectUI>> dicEffect = new Dictionary<int, List<EffectUI>>();
+        private List<EffectUI> dicEffect = new List<EffectUI>();
         private List<EffectUI> effObj = new List<EffectUI>();
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
@@ -61,30 +61,27 @@ namespace GFGGame
                 for (int i = comStar.target.numChildren - 1; i >= 0; i--)
                 {
                     if (comStar.target.GetChildAt(i).name == "comLine") continue;
-                    comStar.target.RemoveChildAt(i);
+                    var starchild = comStar.target.RemoveChildAt(i);
+                    starchild.Dispose();
                 }
                 index++;
                 star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
                 UI_ComStar.ProxyEnd();
             }
-            foreach (int key in dicEffect.Keys)
+            for (int i = 0; i < dicEffect.Count; i++)
             {
-                List<EffectUI> value = dicEffect[key];
-                for (int i = 0; i < value.Count; i++)
-                {
-                    EffectUIPool.Recycle(value[i]);
-                    value[i] = null;
-                }
+                EffectUIPool.Recycle(dicEffect[i]);
+                dicEffect[i] = null;
             }
             for (int i = 0; i < effObj.Count; i++)
             {
                 EffectUIPool.Recycle(effObj[i]);
                 effObj[i] = null;
             }
-
             notClickComStars.Clear();
             clickComStars.Clear();
             dicEffect.Clear();
+            effObj.Clear();
 
             Timers.inst.Remove(CheckGuide);
             Debug.Log("OnHide  LuckyBoxStarView");
@@ -132,11 +129,13 @@ namespace GFGGame
             showGuide = GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX_LINE) <= 0;
 
             curComStar = null;
+            for (int i = 0; i < comStars.Count; i++) {
+                comStars.RemoveAt(i);
+            }
             comStars.Clear();
             int index = 0;
             GObject star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
 
-
             while (star != null && star.visible == true)
             {
                 UI_ComStar comStar = UI_ComStar.Proxy(star);
@@ -179,12 +178,8 @@ namespace GFGGame
             else
             {
                 gcom = UIPackage.CreateObject("LuckyBox", "ComHolder").asCom;
-                EffectUI _effectUI1 = EffectUIPool.CreateEffectUI(gcom.GetChild("holder").asGraph, "ui_LuckyBox", name);
-                if (!dicEffect.ContainsKey(index))
-                {
-                    dicEffect.Add(index, new List<EffectUI>());
-                }
-                dicEffect[index].Add(_effectUI1);
+                EffectUI _effectUI = EffectUIPool.CreateEffectUI(gcom.GetChild("holder").asGraph, "ui_LuckyBox", name);
+                dicEffect.Add(_effectUI);
             }
             return gcom;
         }
@@ -225,7 +220,6 @@ namespace GFGGame
                     // comStar.target.GetChildAt(1).asCom.visible = false;
                     string resPath = _isLuckyBox ? "LINE_Bule" : "LINE";
                     EffectUI _effectUI = EffectUIPool.CreateEffectUI(comStar.m_comLine.m_holder, "ui_LuckyBox", resPath);
-
                     effObj.Add(_effectUI);
                     UI_ComStar.ProxyEnd();
 

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

@@ -90,6 +90,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()
         {
@@ -130,6 +131,7 @@ namespace GFGGame
 
             OnListBgScroll();
             updateBoxEffect();
+            UpdateFreeInfo();
 
             Timers.inst.AddUpdate(CheckGuide);
         }
@@ -365,6 +367,7 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateListItemData);
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateListItemData);
+            EventAgent.RemoveEventListener(ConstMessage.LUCKY_BOX_FREE_TIME_CHANGED, UpdateFreeInfo);
         }
 
         private void OnClickBtnBack()
@@ -412,5 +415,10 @@ namespace GFGGame
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX);
             GuideController.TryCompleteGuideIndex(ConstGuideId.LUCKY_BOX, 2);
         }
+
+        private void UpdateFreeInfo()
+        {
+
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Mail/MailView.cs

@@ -27,6 +27,11 @@ namespace GFGGame
 
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -60,6 +65,7 @@ namespace GFGGame
             _ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
 
             mailDataMgr = MailDataManager.Instance;
+            AddEffect();
         }
         protected override void AddEventListener()
         {
@@ -76,7 +82,6 @@ namespace GFGGame
             base.OnShown();
             mailDataMgr.CurPage = 0;
             UpdateNormal();
-            AddEffect();
             _ui.m_openViewAction.Play();
         }
         private void UpdateNormal()
@@ -131,7 +136,6 @@ namespace GFGGame
             }
         }
 
-
         private async void RefreshMailInfo(bool needSort)
         {
             if (mailDataMgr.TotolCount == 0) return;
@@ -199,11 +203,6 @@ namespace GFGGame
         }
         protected override void OnHide()
         {
-            EffectUIPool.Recycle(_effectUI1);
-            _effectUI1 = null;
-            EffectUIPool.Recycle(_effectUI2);
-            _effectUI2 = null;
-
             base.OnHide();
         }
         protected override void RemoveEventListener()

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

@@ -69,6 +69,7 @@ namespace GFGGame
             base.OnHide();
 
             Timers.inst.Remove(CheckGuide);
+            Timers.inst.Remove(OnTimerUpdate);
         }
 
         private void OnClickBtnBack()

GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs

@@ -46,7 +46,7 @@ namespace GFGGame
             _ui.m_listNotice.itemRenderer = ListNoticeItemRender;
 
             _ui.m_c1.onChanged.Add(OnCtrlChange);
-
+            AddEffect();
         }
         protected override void AddEventListener()
         {
@@ -62,7 +62,6 @@ namespace GFGGame
             _ui.m_listNotice.visible = true;
             _ui.m_buttonCom.visible = true;
             OnCtrlChange();
-            AddEffect();
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeNameView.cs

@@ -38,7 +38,7 @@ namespace GFGGame
 
             _ui.m_btnSure.onClick.Add(OnClickBtnSureAsync);
             // _ui.m_btnDice.onClick.Add(RandomRoleName);
-
+            AddEffect();
         }
 
         protected override void OnShown()
@@ -48,8 +48,6 @@ namespace GFGGame
             _ui.m_txtNeed.text = string.Format("改名卡：{0}/{1}", ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.changeNameCostArr[0]), GlobalCfgArray.globalCfg.changeNameCostArr[1]);
             ItemCfg cfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
             _ui.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res); 
-
-            AddEffect();
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/SettingView.cs

@@ -39,6 +39,7 @@ namespace GFGGame
             _ui.m_btnLogout.onClick.Add(OnClickBtnLogout);
             _ui.m_btnSound.onClick.Add(OnClickBtnSound);
             _ui.m_btnMusic.onClick.Add(OnClickBtnMusic);
+            AddEffect();
         }
 
         protected override void OnShown()