Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-10-25 40c0ff877e23c73349e90d9c0b2c08514998e2e7

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Login/Launch.cs

@@ -32,6 +32,38 @@


    private void Awake()

    {

#if UNITY_ANDROID && !UNITY_EDITOR

        SDKUtility.Instance.CopyContent("builtin");

        SDKUtility.Instance.CopyContent("builtin_assetbundle");

        SDKUtility.Instance.CopyContent("builtin_assetbundle.manifest");

#endif



        #if UNITY_IOS && !UNITY_EDITOR

        if (!VersionUtility.Instance.InIosAuditTime())

        {

            if (!SDKUtility.Instance.AssetCopyFinished)

            {

                var targetDirectory = ResourcesPath.Instance.ExternalStorePath;

                if (!Directory.Exists(targetDirectory))

                {

                    Directory.CreateDirectory(targetDirectory);

                }



                var fileNames = new List<string>();

                fileNames.Add("builtin");

                fileNames.Add("builtin_assetbundle");

                fileNames.Add("builtin_assetbundle.manifest");



                foreach (var item in fileNames)

                {

                    var fromPath = StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, item);

                    var toPath = StringUtility.Contact(targetDirectory, item);

                    File.Copy(fromPath, toPath, true);

                }

            }

        }

        #endif



        ResourcesPath.Instance.Init();

        SnxxzGame.Instance.gameObject.name = "__SnxxzGame__";



@@ -140,7 +172,7 @@
        }

#endif



#if UNITY_IOS 
#if UNITY_IOS

        if (!VersionUtility.Instance.InIosAuditTime())

        {

            m_CurrentStage = LaunchStage.ClientVersion;

@@ -159,7 +191,6 @@
                }

            }

        }



#endif



#if UNITY_IOS && !UNITY_EDITOR