Merge commit '8681be3c80a3b6837e578290fd2fef5bf6b14a14' into master

chenxin

2020-11-25 4e582c6a8eaf19976b93314ba896e542d7c732dd

 Assets/Scripts/Json/JsonDataCenter.cs

@@ -261,6 +261,8 @@
        /// </summary>
        private static void InitData()
        {
            int guide = PlayerPrefs.GetInt("GemBattleGuide");
            GameConfig.IsNewbie = guide == 0;
            // 必须在EndlessPortData初始化之前
            EndlessEnemyData.Init();
            EndlessPortData.Init();