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

liuzhiwei

2020-11-25 925d4b4b286a5d8dff4b62be0ceb25db0c45fedc

 Assets/Scripts/Json/JsonDataCenter.cs

@@ -270,7 +270,7 @@
            EndlessBossData.Init();
            EndlessBossSkillData.Init();
            //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.JsonDataReadDone);

            GameConfig.JsonReadDone = true;
        }
    }
}