From 24527952cd17dce067a4a6614f855ac3d1e53a64 Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Sat, 05 Dec 2020 12:05:45 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Scripts/Manager/ManagerRoot.cs | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/Assets/Scripts/Manager/ManagerRoot.cs b/Assets/Scripts/Manager/ManagerRoot.cs
index 7ea87fa..0ab1b30 100644
--- a/Assets/Scripts/Manager/ManagerRoot.cs
+++ b/Assets/Scripts/Manager/ManagerRoot.cs
@@ -1,6 +1,8 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using Core.Utilities;
+using DG.Tweening;
using Protobuf;
using UnityEngine;
@@ -8,18 +10,24 @@
{
public class ManagerRoot : MonoBehaviour
{
-
- //private bool canChangeScene = false;
-
- public void Awake()
+ void Awake()
{
- gameObject.AddComponent<DoNotDestory>();
- gameObject.AddComponent<MasterSocket>();
- gameObject.AddComponent<GA_SDK_Manager>();
+ GameObject root = GameObject.Find("ManagerRoot");
+ if (root == null)
+ {
+ DOTween.Init(true, true, LogBehaviour.Verbose).SetCapacity(200, 10);
- //gameObject.AddComponent<ErrorLogOnGUIMyTools>();
+ root = new GameObject("ManagerRoot");
+ root.AddComponent<DoNotDestory>();
+ root.AddComponent<MasterSocket>();
+ root.AddComponent<TDAA_SDKManager>();
+ root.AddComponent<AudioSourceManager>();
+ root.AddComponent<JsonDataReader>();
+ root.AddComponent<JsonDataInit>();
+ // root.AddComponent<ErrorLogOnGUIMyTools>();
+ }
+
//gameObject.AddComponent<JsonDataReader>();
-
}
// public void AfterRead()
--
Gitblit v1.9.1