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

chenxin

2020-12-17 df8c6633500f6c1c752f8a60025cda0e9909644c

 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs

@@ -67,7 +67,14 @@

        if (root == null)
        {
             if (Application.platform == RuntimePlatform.WindowsEditor ||
            Application.platform == RuntimePlatform.WindowsPlayer)
                {
                    GameConfig.useSDK = false;
                }

            root = new GameObject("ManagerRoot");

            root.AddComponent<DoNotDestory>();
            root.AddComponent<MasterSocket>();
            root.AddComponent<TDAA_SDKManager>();