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

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/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/League/UI_LeagueSkillUpUI.cs

@@ -16,6 +16,7 @@ namespace UI.League
         public UI_ComSkillUp m_comSkill;
         public GGraph m_holderSkill;
         public GGraph m_holderScore;
+        public GButton m_btnRule;
         public Transition m_t0;
         public Transition m_t1;
         public const string URL = "ui://tw70qm9dpvb45c";
@@ -74,6 +75,7 @@ namespace UI.League
             m_comSkill = (UI_ComSkillUp)UI_ComSkillUp.Create(comp.GetChild("comSkill"));
             m_holderSkill = (GGraph)comp.GetChild("holderSkill");
             m_holderScore = (GGraph)comp.GetChild("holderScore");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
         }
@@ -89,6 +91,7 @@ namespace UI.League
             m_comSkill = null;
             m_holderSkill = null;
             m_holderScore = null;
+            m_btnRule = null;
             m_t0 = null;
             m_t1 = null;
             if(disposeTarget && target != null)

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/ClothingSynthetic/ClothingSyntheticView.cs

@@ -321,8 +321,6 @@ namespace GFGGame
             long num = ItemDataManager.GetItemNum(itemData.id);
             ItemCfg materialCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
             bool isDressUp = materialCfg.itemType == ConstItemType.DRESS_UP;
-            if (isDressUp)
-                num -= 1;
             long numSynthetic = Math.Max(num, 0);
             listItem.m_txtProgess.text = numSynthetic + "/" + itemData.num;
             listItem.m_loaderIcon.visible = true;

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,13 +37,13 @@ namespace GFGGame
             base.OnInit();
             _ui = UI_RewardUI.Create();
             this.viewCom = _ui.target;
-            this.viewCom.Center();
-            this.modal = true;
+            //this.viewCom.Center();
+            //this.modal = true;
             //viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            isfullScreen = true;
 
-            _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()
         {
@@ -71,27 +72,38 @@ namespace GFGGame
                 }
             }
             _listItemDatas.AddRange(suitPart);
+            //_ui.m_listReward.SetVirtual();  //有虚拟列表的时候，没有办法居中显示列表
 
-            //_ui.m_listReward.SetVirtual();
-            _ui.m_listReward.numItems = _listItemDatas.Count;
-
-            _ui.m_listReward.ResizeToFit();
-            if (_ui.m_listReward.height > maxHeight)
-            {
-                _ui.m_listReward.height = maxHeight;
-            }
-
-            Timers.inst.Add(1f, 1, OnTimerUpdate, 1);
+            _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");
         }
 
         private void OnTimerUpdate(object param)
         {
+            counTime += 1;
+            if (counTime == 1)
+            {
+                _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXHD");
+            }
+            else if (counTime == 2)
+            {
+                _ui.m_comList.m_listReward.numItems = _listItemDatas.Count;
 
-            Timers.inst.Remove(OnTimerUpdate);
-            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXHD");
-
+                _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);
+            }
         }
 
         protected override void OnHide()
@@ -99,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)
@@ -147,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/League/LeagueAnswerView.cs

@@ -1,6 +1,7 @@
 using System.Text.RegularExpressions;
 using ET;
 using FairyGUI;
+using Hutool;
 using UI.League;
 using UnityEngine;
 
@@ -18,6 +19,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -36,10 +38,12 @@ namespace GFGGame
             _ui.m_btnRank.onClick.Add(OnBtnRankClick);
             _ui.m_btnAnswer.onClick.Add(OnBtnAnswerClick);
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -56,12 +60,13 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-
         }
+
         private void OnBtnRankClick()
         {
             ViewManager.Show<LeagueAnswerRankView>();
         }
+
         private void OnBtnAnswerClick()
         {
             Hide();
@@ -70,18 +75,21 @@ namespace GFGGame
 
         private void UpdateView()
         {
-
-            OtherRoleInfoData lastNO1 = LeagueDataManager.Instance.GetMemberRoleInfo(LeagueDataManager.Instance.LeagueData.LastWeekAnswerNO1Id);
+            OtherRoleInfoData lastNO1 =
+                LeagueDataManager.Instance.GetMemberRoleInfo(LeagueDataManager.Instance.LeagueData.LastWeekAnswerNO1Id);
             _ui.m_comHead.target.visible = false;
             if (lastNO1 != null)
             {
-                ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(lastNO1.headId == 0 ? ConstItemID.HEADID : lastNO1.headId);
+                ItemCfg headCfg =
+                    ItemCfgArray.Instance.GetCfg(lastNO1.headId == 0 ? ConstItemID.HEADID : lastNO1.headId);
                 _ui.m_comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
                 _ui.m_comHead.target.visible = true;
             }
+
             _ui.m_txtName.text = lastNO1 == null ? "虚位以待" : lastNO1.roleName;
             _ui.m_txtRule.text = TextDescCfgArray.Instance.GetCfg(300008).text;
-            if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.End)
+            if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) ==
+                LeagueQuestionStatus.End)
             {
                 _ui.m_btnAnswer.visible = false;
                 _ui.m_txtTime.visible = true;
@@ -93,18 +101,24 @@ namespace GFGGame
                 _ui.m_txtTime.visible = false;
             }
         }
+
         private void UpdateTime(object param)
         {
+            int curIndex = DateUtil.GetNearestStartTimeIndex(GlobalCfgArray.globalCfg.leagueQuestionCloseTimeArr);
             long curTime = TimeHelper.ServerNow();
-            long endTime = TimeUtil.GetNextTime(GlobalCfgArray.globalCfg.leagueQuestionStartTimeArr[0]);//暂时
-            if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) > LeagueQuestionStatus.End
-            || endTime - curTime < 0)
+            var questionStartTimeStr = GlobalCfgArray.globalCfg.leagueQuestionStartTimeArr[curIndex];
+            long endTime =TimeHelper.ServerNow() > TimeUtil.GetCurDayTime(questionStartTimeStr)
+                ? TimeUtil.GetNextTime(questionStartTimeStr)
+                : TimeUtil.GetCurDayTime(questionStartTimeStr);
+            if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) >
+                LeagueQuestionStatus.End
+                || endTime - curTime < 0)
             {
                 Timers.inst.Remove(UpdateTime);
                 return;
             }
-            _ui.m_txtTime.text = string.Format("{0}后开启", TimeUtil.FormattingTimeTo_HHmmss((endTime - curTime)));
 
+            _ui.m_txtTime.text = string.Format("{0}后开启", TimeUtil.FormattingTimeTo_HHmmss((endTime - curTime)));
         }
     }
 }

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

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
+using Hutool;
 using UI.League;
 using UnityEngine;
 
@@ -135,15 +136,17 @@ namespace GFGGame
             long curTime = TimeHelper.ServerNow();
             long endTime = 0;
             string str = "";
+            //leagueQuestionStartTimeArr与leagueQuestionCloseTimeArr与leagueQuestionEndTimeArr数组长度相同，且索引对应。跟曾威定的
+            int curIndex = DateUtil.GetNearestStartTimeIndex(GlobalCfgArray.globalCfg.leagueQuestionCloseTimeArr);
             if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.End
             || LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.AnswerEnd)
             {
-                endTime = TimeUtil.GetCurDayTime(GlobalCfgArray.globalCfg.leagueQuestionCloseTimeArr[0]);//暂时
+                endTime = TimeUtil.GetCurDayTime(GlobalCfgArray.globalCfg.leagueQuestionCloseTimeArr[curIndex]);
                 str = "房间剩余时间 ";
             }
             else
             {
-                endTime = TimeUtil.GetCurDayTime(GlobalCfgArray.globalCfg.leagueQuestionEndTimeArr[0]);//暂时
+                endTime = TimeUtil.GetCurDayTime(GlobalCfgArray.globalCfg.leagueQuestionEndTimeArr[curIndex]);
                 str = "活动剩余时间 ";
             }
             if (endTime - curTime < 0 && LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.End)
@@ -290,7 +293,14 @@ namespace GFGGame
             LeagueQuestionCfg cfg = LeagueQuestionCfgArray.Instance.GetCfg(questionId); ;
             UI_Button123 item = UI_Button123.Proxy(obj);
             int data = index + 1;
+
             item.target.title = string.Format("{0}.{1}", data, cfg.answerArr[index]);
+            //测试 正确答案
+           // if (data == int.Parse(cfg.answerCorrect))
+           // {
+            //    item.target.title = string.Format("{0}.{1} 正确", data, cfg.answerArr[index]);
+            //}
+            
             string myAnswer = _dataManager.LastAnswerRoleData.MyAnswer;
             bool isAnswer = !string.IsNullOrEmpty(_dataManager.LastAnswerRoleData.MyAnswer) && _dataManager.LastAnswerRoleData.LastQuestionId == _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId);
             item.target.touchable = !isAnswer;

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

@@ -60,6 +60,8 @@ namespace GFGGame
             _ui.m_comSkill.m_list.scrollPane.decelerationRate = 0.8f;
             _ui.m_comSkill.m_btnLeft.onClick.Add(OnBtnLeftClick);
             _ui.m_comSkill.m_btnRight.onClick.Add(OnBtnRightClick);
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnRule.data = 300017;
 
             _valueBarController = new ValueBarController(_ui.m_comValue);
 

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

@@ -1,5 +1,6 @@
 using ET;
 using FairyGUI;
+using Hutool;
 using UI.League;
 using UnityEngine;
 
@@ -172,11 +173,16 @@ namespace GFGGame
         }
         private void UpdateTime(object param)
         {
-            if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.End)
+            if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) ==
+                LeagueQuestionStatus.End)
             {
+                int curIndex = DateUtil.GetNearestStartTimeIndex(GlobalCfgArray.globalCfg.leagueQuestionCloseTimeArr);
+                var questionStartTimeStr = GlobalCfgArray.globalCfg.leagueQuestionStartTimeArr[curIndex];
+                var endTime = TimeUtil.GetNextTime(questionStartTimeStr);
+
                 long curTime = TimeHelper.ServerNow();
-                long endTime = TimeUtil.GetNextTime(GlobalCfgArray.globalCfg.leagueQuestionStartTimeArr[0]);//暂时
-                _ui.m_btnAnswer.m_txtTime.text = string.Format("{0}后开启", TimeUtil.FormattingTimeTo_HHmmss((endTime - curTime)));
+                _ui.m_btnAnswer.m_txtTime.text =
+                    string.Format("{0}后开启", TimeUtil.FormattingTimeTo_HHmmss((endTime - curTime)));
             }
             else
             {

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

@@ -12,8 +12,7 @@ namespace GFGGame
         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, EffectUI> _effList = new Dictionary<int, EffectUI>();
-        private int countEff = 0;
+        private List<EffectUI> _effList = new List<EffectUI>();
 
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
@@ -90,7 +89,6 @@ namespace GFGGame
                 EffectUIPool.Recycle(_effList[key]);
                 _effList[key] = null;
             }
-            countEff = 0;
             _effList.Clear();
         
             EffectUIPool.Recycle(_effectUI4);
@@ -118,8 +116,7 @@ namespace GFGGame
             {
                 GGraph holder = itemCfg.rarity == 3 ? item.m_comIcon.m_holder : item.m_comIcon.m_holder1;
                 EffectUI _effectUI = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", resPath);
-                _effList.Add(countEff , _effectUI);
-                countEff += 1;
+                _effList.Add(_effectUI);
             }
             if (countType == 1 && itemCfg.rarity > 2 && _effectUI4 == null)
             {

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/MainStory/StoryChapterListView.cs

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