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

River Jiang

2020-10-21 c1d12cdfd23933a0db431a70ff5e145924864782

 Assets/Scripts/Json/JsonDataCenter.cs

@@ -177,7 +177,7 @@
                            OpponentMgr.instance.ResetCurrency(currency);

                        if (EndlessLevelManager.instanceExists)
                            EndlessLevelManager.instance.ResetCurrency(5000);
                            EndlessLevelManager.instance.ResetCurrency(currency);
                        break;
                    case "skilltime":
                        // 设置技能塔出现时间