Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_client

yyl

昨天 0f5f8ee064c8c5ae775a275a726ad8b6b0c1d94f

 Assets/Launch/Launch.cs

@@ -91,6 +91,7 @@
        _hotUpdateAss = System.AppDomain.CurrentDomain.GetAssemblies().First(a => a.GetName().Name == "Main");

        Type type = _hotUpdateAss.GetType("InGameDownTestUtility");

        LocalResManager.Instance.isPCTestDownLoad = (bool)type.GetMethod("GetReadVerionEx").Invoke(null, null);

        LocalResManager.Instance.isOpenDownLoad = (bool)type.GetMethod("GetDownloadEnable").Invoke(null, null);

#endif

        SDKInit();

        LocalResManager.Instance.Init();

@@ -102,7 +103,7 @@
#if !UNITY_EDITOR

            LocalResManager.step = LocalResManager.LoadDllStep.RequestVersion;

#else

            if (LocalResManager.Instance.isPCTestDownLoad)

            if (LocalResManager.Instance.isOpenDownLoad)

            {

                LocalResManager.step = LocalResManager.LoadDllStep.RequestVersion;

            }