Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

liuzhiwei

2020-11-26 243d65af53aae9e3084f20ea9c5815f5b29df09e

 Assets/Scripts/Json/JsonDataCenter.cs

@@ -261,14 +261,13 @@
        /// </summary>
        private static void InitData()
        {
            // 必须在EndlessPortData初始化之前
            int guide = PlayerPrefs.GetInt("GemBattleGuide");
            GameConfig.IsNewbie = guide == 0;
            EndlessEnemyData.Init();
            EndlessPortData.Init();
            EndlessBuffData.Init();
            EndlessBossData.Init();
            EndlessBossSkillData.Init();
            //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.JsonDataReadDone);

            GameConfig.JsonReadDone = true;
        }
    }
}