Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

GameClient/Assets/Game/HotUpdate/Data/Cache/StoryBonusDataCache.cs

@@ -16,24 +16,28 @@ namespace GFGGame
             {
                 bonusList.AddRange(bonusData.bonusOnce);
             }
-            if (bonusData.bonusBase != null)
-            {
-                bonusList.AddRange(bonusData.bonusBase);
-            }
-            if (bonusData.bonusRandom != null && bonusData.bonusRandom.Count > 0)
+            else
             {
-                if (doRandom)
-                {
-                    StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelID);
-                    StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
-                    List<ItemData> randomList = DropOutDataCache.GetDropItemDatas(fightCfg.bonusRandomArr, true);
-                    bonusList.AddRange(randomList);
-                }
-                else
+                if (bonusData.bonusRandom != null && bonusData.bonusRandom.Count > 0)
                 {
-                    bonusList.AddRange(bonusData.bonusRandom);
+                    if (doRandom)
+                    {
+                        StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelID);
+                        StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+                        List<ItemData> randomList = DropOutDataCache.GetDropItemDatas(fightCfg.bonusRandomArr, true);
+                        bonusList.AddRange(randomList);
+                    }
+                    else
+                    {
+                        bonusList.AddRange(bonusData.bonusRandom);
+                    }
                 }
             }
+            if (bonusData.bonusBase != null)
+            {
+                bonusList.AddRange(bonusData.bonusBase);
+            }
+            
             return bonusList;
         }
 

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

@@ -53,17 +53,17 @@ namespace GFGGame
             {
                 _wrapper.wrapTarget = null;
             }
-            if(this.viewCom != null && this.viewCom.root == null)
+            if (this.viewCom == null || this.viewCom.root == null)
             {
 
                 Timers.inst.CallLater((object param) =>
                 {
                     GetSuitItemController.TryShow(0);
                 });
-                GuideController.HideGuide();
-                GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FIRST);
-                GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FULL);
             }
+            GuideController.HideGuide();
+            GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FIRST);
+            GuideController.TryCompleteGuide(ConstGuideId.GET_SUIT_ITEM_VIEW_FULL);
         }
 
         private void OnClickBg()