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

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

@@ -18,7 +18,8 @@ namespace GFGGame
         private int _pageIndex; //当前页码,需要显示的数据的索引
         private List<GGraph> _graphList = new List<GGraph>();
         private List<EffectUI> _effectUIList = new List<EffectUI>();
-
+        private List<EffectUI> _effect1UIList = new List<EffectUI>();
+        
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
         private EffectUI _effectUI3;
@@ -158,6 +159,7 @@ namespace GFGGame
             _ui.m_txtBoxResidueTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), data.EndTime);
             _ui.m_list.data = data.ShopCfgIds;
             _ui.m_list.itemRenderer = ListItemRender;
+            DestroyObjectFromView();
             _ui.m_list.numItems = data.ShopCfgIds.Count;
             _ui.m_list.visible = true;
         }
@@ -232,8 +234,7 @@ namespace GFGGame
                 uiItem.m_btnBuy.m_txtOldPrice.visible = false;
                 uiItem.m_btnBuy.m_txtNewPrice.visible = false;
                 uiItem.m_btnBuy.m_loaIcon.visible = false;
-                if(uiItem.m_holderBtn != null)
-                    uiItem.m_holderBtn.visible = false;
+                //uiItem.m_holderBtn.visible = false;
             }
             else
             {
@@ -245,8 +246,14 @@ namespace GFGGame
                 uiItem.m_btnBuy.m_txtOldPrice.visible = true;
                 uiItem.m_btnBuy.m_txtNewPrice.visible = true;
                 uiItem.m_btnBuy.m_loaIcon.visible = true;
-                if (uiItem.m_holderBtn != null)
-                    uiItem.m_holderBtn.visible = true;
+                //uiItem.m_holderBtn.visible = true;
+
+                //if (!_graphList.Contains(uiItem.m_holderBtn))
+                //{
+                EffectUI _effectUI1 = EffectUIPool.CreateEffectUI(uiItem.m_holderBtn, "ui_Activity", "Prefer_button_buy");
+                //_graphList.Add(uiItem.m_holderBtn);
+                _effect1UIList.Add(_effectUI1);
+                //}
             }
 
             uiItem.m_comDiscount.m_txtDiscountNum.text =
@@ -259,17 +266,11 @@ namespace GFGGame
 
             //if (!_graphList.Contains(uiItem.m_holderZheKou))
             //{
-            //    EffectUI _effectUI = EffectUIPool.CreateEffectUI(uiItem.m_holderZheKou, "ui_Activity", "Prefer_but_zhekou");
-            //    _graphList.Add(uiItem.m_holderZheKou);
-            //    _effectUIList.Add(_effectUI);
+                EffectUI _effectUI = EffectUIPool.CreateEffectUI(uiItem.m_holderZheKou, "ui_Activity", "Prefer_but_zhekou");
+                //_graphList.Add(uiItem.m_holderZheKou);
+                _effectUIList.Add(_effectUI);
             //}
 
-            //if (!_graphList.Contains(uiItem.m_holderBtn))
-            //{
-            //    EffectUI _effectUI = EffectUIPool.CreateEffectUI(uiItem.m_holderBtn, "ui_Activity", "Prefer_button_buy");
-            //    _graphList.Add(uiItem.m_holderBtn);
-            //    _effectUIList.Add(_effectUI);
-            //}
 
             uiItem.m_t0.Play();
 
@@ -389,6 +390,13 @@ namespace GFGGame
             }
             _effectUIList.Clear();
 
+            for (int i = 0; i < _effect1UIList.Count; i++)
+            {
+                EffectUIPool.Recycle(_effect1UIList[i]);
+                _effect1UIList[i] = null;
+            }
+            _effect1UIList.Clear();
+            
             _graphList.Clear();
         }
 

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

@@ -154,16 +154,6 @@ namespace GFGGame
 
             Timers.inst.AddUpdate(CheckGuide);
 
-            //根据困难程度选择显示图片
-            currentDifficulty = _chapterID / 10000 - 1;
-            if (currentDifficulty == 1)
-            {
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zhangjie_bg");
-            }
-            else
-            {
-                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_zhuxian");
-            }
         }
 
         protected override void OnHide()
@@ -191,7 +181,7 @@ namespace GFGGame
         private void OnClickSwitchBack()
         {
             Timers.inst.Remove(SetContainerY);
-            ViewManager.Show<StoryChapterListView>(new object[] { currentDifficulty , newIndex }, new object[] { typeof(StoryChapterView).FullName, this.viewData });
+            ViewManager.Show<StoryChapterListView>(new object[] {Mathf.Max(0, currentDifficulty) , newIndex }, new object[] { typeof(StoryChapterView).FullName, this.viewData });
         }
 
         private void OnClickBtnHome()
@@ -251,6 +241,18 @@ namespace GFGGame
                 _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = true;
                 _ui.m_chapter.m_compChapterScroll.m_nextEffect.visible = true;
             }
+
+            //根据困难程度选择显示图片
+            currentDifficulty = _chapterID / 10000 - 1;
+            if (currentDifficulty == 1)
+            {
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zhangjie_bg");
+            }
+            else
+            {
+                currentDifficulty = 0;
+                _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_zhuxian");
+            }
             //_comEff.visible = false;
             //_effFirst.visible = false;
             for (int i = 0; i < 20; i++)
@@ -283,7 +285,7 @@ namespace GFGGame
                         {
                             levelItem.m_flower.target.visible = true;
                             int starCount = InstanceZonesDataManager.GetStarCountHistory(levelCfg.id);
-                            StoryUtil.UpdateStar(starCount, levelItem.m_flower.target,currentDifficulty);
+                            StoryUtil.UpdateStar(starCount, levelItem.m_flower.target,Mathf.Max(0, currentDifficulty));
                         }
                     }
                     else