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

client_Wu Xijin

2019-05-07 2eae0c6fbe0f30f3fdf34dd073b8f3618b899117

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

 Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs

@@ -401,6 +401,19 @@


            EditorGUILayout.Space();

#endif



#if UNITY_STANDALONE

            GUILayout.BeginHorizontal();

            EditorGUILayout.TextField("EXE Output Path", ApkOutputPath);

            if (GUILayout.Button("Browse", GUILayout.MaxWidth(75f)))

            {

                BrowseForApkOutput();

            }

            GUILayout.EndHorizontal();



            EditorGUILayout.Space();

#endif



            GUILayout.BeginHorizontal();

            EditorGUILayout.TextField("SDK Project Path", ClientPackage.SDK_PLUGIN_PROJECT);

            if (GUILayout.Button("Browse", GUILayout.MaxWidth(75f)))


 Core/GameEngine/Login/Launch.cs

@@ -362,50 +362,49 @@


        private void StandaloneCopyAsset()

        {

            if (!SDKUtility.builtinAssetCopyFinished)

            var targetDirectory = ResourcesPath.Instance.ExternalStorePath;

            if (!Directory.Exists(targetDirectory))

            {

                firstLaunch = true;

                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);



                if (File.Exists(toPath))

                {

                    Directory.CreateDirectory(targetDirectory);

                    continue;

                }



                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 destDirectoryName = Path.GetDirectoryName(toPath);

                if (!Directory.Exists(destDirectoryName))

                {

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

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

                    Directory.CreateDirectory(destDirectoryName);

                }



                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_IOSorStandalone", VersionConfig.Get().version);

                File.Copy(fromPath, toPath, true);

            }

        }



@@ -548,8 +547,10 @@
                        AndroidCopyAsset();

                        break;

                    case RuntimePlatform.IPhonePlayer:

                        IOSCopyAsset();

                        break;

                    case RuntimePlatform.WindowsPlayer:

                        IOSorStandaloneCopyAsset();

                        StandaloneCopyAsset();

                        break;

                }

            }

@@ -568,8 +569,7 @@
                        AndroidProcessCopyComplete();

                        break;

                    case RuntimePlatform.IPhonePlayer:

                    case RuntimePlatform.WindowsPlayer:

                        IOSorStandaloneProcessCopyComplete();

                        IOSProcessCopyComplete();

                        break;

                }

            }

@@ -625,7 +625,7 @@
            }

        }



        private void IOSorStandaloneCopyAsset()

        private void IOSCopyAsset()

        {

            if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 1)

            {

@@ -652,6 +652,52 @@
                            completedCount = 0;

                            totalCount = copyTasks.Count;

                        }



                        if (totalCount > 0)

                        {

                            done = false;

                            progress = 0f;

                        }

                        else

                        {

                            done = true;

                        }

                        break;

                    case InstalledAsset.NullAsset:

                        done = true;

                        break;

                }

            }

            else

            {

                done = true;

            }

        }



        private void StandaloneCopyAsset()

        {

            if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 1)

            {

                switch (VersionConfig.Get().assetAccess)

                {

                    case InstalledAsset.FullAsset:

                    case InstalledAsset.HalfAsset:

                    case InstalledAsset.IngoreDownLoad:

                        copyTasks = new List<FileInfo>();

                        FileExtersion.GetAllDirectoryFileInfos(ResourcesPath.Instance.StreamingAssetPath, copyTasks);



                        for (var i = copyTasks.Count - 1; i >= 0; i--)

                        {

                            var fileInfo = copyTasks[i];

                            var destPath = fileInfo.FullName.Replace(ResourcesPath.Instance.StreamingAssetPath, ResourcesPath.Instance.ExternalStorePath);

                            if (File.Exists(destPath))

                            {

                                copyTasks.RemoveAt(i);

                            }

                        }



                        completedCount = 0;

                        totalCount = copyTasks.Count;



                        if (totalCount > 0)

                        {

@@ -724,7 +770,7 @@
        {

        }



        private void IOSorStandaloneProcessCopyComplete()

        private void IOSProcessCopyComplete()

        {

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

        }