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

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

@@ -174,6 +174,10 @@ namespace GFGGame
         public static int GetPassLevelOrder(int type, int subType, int chapterId)
         {
             var levelCfgId = GetPassLevelCfgId(type, subType, chapterId);
+            if (levelCfgId == 0)
+            {
+                return 0;
+            }
             var levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
             if (levelCfg != null)
             {

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

@@ -50,7 +50,7 @@ namespace GFGGame
             set { _firstRewardsList = value; }
         }
 
-        private int _currentBoxId;
+        private int _currentBoxId = 2;
         public int currentBoxId
         {
             get