From 914b0ab6ff4b86a809fb0b6b206504e90612a92a Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 25 Dec 2020 10:52:17 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/Manager/ManagerRoot.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/Manager/ManagerRoot.cs b/Assets/Scripts/Manager/ManagerRoot.cs
index 5cba5ed..ddee027 100644
--- a/Assets/Scripts/Manager/ManagerRoot.cs
+++ b/Assets/Scripts/Manager/ManagerRoot.cs
@@ -15,18 +15,28 @@
GameObject root = GameObject.Find("ManagerRoot");
if (root == null)
{
+ if (Application.platform == RuntimePlatform.WindowsEditor ||
+ Application.platform == RuntimePlatform.WindowsPlayer)
+ {
+ GameConfig.useSDK = false;
+ GameConfig.OpenDebug = true;
+
+ }
+ Application.targetFrameRate = 60;
+ //Debug.Log("设置了帧数为60");
DOTween.Init(true, true, LogBehaviour.Verbose).SetCapacity(200, 10);
root = new GameObject("ManagerRoot");
- if (GameConfig.useSDK)
- root.AddComponent<SDKCallBack>();
+ // if (GameConfig.useSDK)
+ // root.AddComponent<SDKCallBack>();
root.AddComponent<DoNotDestory>();
root.AddComponent<MasterSocket>();
root.AddComponent<TDAA_SDKManager>();
root.AddComponent<AudioSourceManager>();
root.AddComponent<JsonDataReader>();
root.AddComponent<JsonDataInit>();
- root.AddComponent<ErrorLogOnGUIMyTools>();
+ root.AddComponent<LanguageManager>();
+ // root.AddComponent<ErrorLogOnGUIMyTools>();
}
//gameObject.AddComponent<JsonDataReader>();
--
Gitblit v1.9.1