Merge commit 'd8cf63f1b6ab597f279ee106527379a50bfb63d2'

wangguan

2020-12-10 5f6fb6dccd1330b5b0bcb2d721167a6ac062f3ad

 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,24 +10,25 @@
{
    public class ManagerRoot : MonoBehaviour
    {

        //private bool canChangeScene = false;

        public void Awake()
        void Awake()
        {
            gameObject.AddComponent<DoNotDestory>();
            gameObject.AddComponent<MasterSocket>();
            gameObject.AddComponent<TDAA_SDKManager>();
            gameObject.AddComponent<AudioSourceManager>();
            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<SDKCallBack>();
                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>();

        }

        void Start()
        {
            AudioSourceManager.Ins.Play(AudioEnum.BGM1);
        }

        // public void AfterRead()