Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 Core/GameEngine/Login/Launch.cs

@@ -39,9 +39,8 @@
        Screen.sleepTimeout = SleepTimeout.NeverSleep;



        ShaderUtility.InitGlobalParams();



        SoundPlayer.CreateSoundPlayer();

        SoundPlayer.Instance.PlayLoginMusic();



        SystemSetting.Instance.SetSoundVolume(SystemSetting.Instance.GetSoundVolume());

        SystemSetting.Instance.SetSoundEffect(SystemSetting.Instance.GetSoundEffect());

        SystemSetting.Instance.SetGameFps(SystemSetting.Instance.GetGameFps());

@@ -54,10 +53,85 @@
        DebugUtility.Instance.Init();

        GlobalTimeEvent.Instance.Begin();



#if UNITY_ANDROID && !UNITY_EDITOR

        if (!SDKUtility.builtinAssetCopyFinished)

        {

            SDKUtility.Instance.CopyOneAsset("builtin_assetbundle");

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

            SDKUtility.Instance.CopyOneAsset("builtin/music");

            SDKUtility.Instance.CopyOneAsset("builtin/music.manifest");

            SDKUtility.Instance.CopyOneAsset("builtin/prefabs");

            SDKUtility.Instance.CopyOneAsset("builtin/prefabs.manifest");

            SDKUtility.Instance.CopyOneAsset("builtin/sprite");

            SDKUtility.Instance.CopyOneAsset("builtin/sprite.manifest");

            SDKUtility.Instance.CopyOneAsset("config/Contact.txt");

            SDKUtility.Instance.CopyOneAsset("config/HelpInfo.txt");

            SDKUtility.Instance.CopyOneAsset("config/PriorBundle.txt");

            SDKUtility.Instance.CopyOneAsset("config/PriorLanguage.txt");



            LocalSave.SetString("BuiltInAssetCopyCompleted_Android", VersionConfig.Get().version);

        }

#endif



#if UNITY_IOS && !UNITY_EDITOR

        if (!VersionUtility.Instance.InIosAuditTime())

        {

            if (!SDKUtility.builtinAssetCopyFinished)

            {

                var targetDirectory = ResourcesPath.Instance.ExternalStorePath;

                if (!Directory.Exists(targetDirectory))

                {

                    Directory.CreateDirectory(targetDirectory);

                }



                var fileNames = new List<string>();

                var files = new List<FileInfo>();

                FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, "builtin"), files);

                foreach (var file in files)

                {

                    var name = Path.GetFileName(file.FullName);

                    fileNames.Add(StringUtility.Contact("builtin", Path.DirectorySeparatorChar, name));

                }



                fileNames.Add("builtin_assetbundle");

                fileNames.Add("builtin_assetbundle.manifest");



                var configFiles = new List<FileInfo>();

                FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, "config"), configFiles);

                foreach (var file in configFiles)

                {

                    var name = Path.GetFileName(file.FullName);

                    fileNames.Add(StringUtility.Contact("config", Path.DirectorySeparatorChar, name));

                }



                foreach (var item in fileNames)

                {

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

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



                    var destDirectoryName = Path.GetDirectoryName(toPath);

                    if (!Directory.Exists(destDirectoryName))

                    {

                        Directory.CreateDirectory(destDirectoryName);

                    }



                    File.Copy(fromPath, toPath, true);

                }

            }

        }



        LocalSave.SetString("BuiltInAssetCopyCompleted_IOS", VersionConfig.Get().version);

#endif



        if (!AssetSource.builtInFromEditor)

        {

            AssetBundleUtility.Instance.InitBuiltInAsset();

        }

    }



    void Start()

    {

        SoundPlayer.Instance.PlayLoginMusic();

        Config.Instance.PreLoadConfigs();

        ServerListCenter.Instance.RequestJumpUrl();



@@ -140,7 +214,7 @@
        }

#endif



#if UNITY_IOS 
#if UNITY_IOS

        if (!VersionUtility.Instance.InIosAuditTime())

        {

            m_CurrentStage = LaunchStage.ClientVersion;

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

            }

        }



#endif



#if UNITY_IOS && !UNITY_EDITOR