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

client_Hale

2019-06-19 bc61068f2a5675a1bda5c9ab5fe8cad6fee5fe80

 Assets/Editor/Tool/ClientPackage.cs

@@ -169,7 +169,7 @@


        if (halfPackages.Count > 0)

        {

            Config.Instance.LoadPriorBundleConfig();

            PriorBundleConfig.Init(true);



            var fromFiles = new List<FileInfo>();

            FileExtersion.GetAllDirectoryFileInfos(_assetBundlePath, fromFiles);

@@ -278,19 +278,14 @@
                {

                    Directory.CreateDirectory(directory);

                }

#if UNITY_ANDROID



                var extension = Path.GetExtension(item.FullName);

                if (extension == ".meta")

                {

                    continue;

                }



                to = to + ".7z";

                SevenZipUtility.Compress(item.FullName, to);

                UnityEditor.EditorUtility.DisplayProgressBar("正在压缩资源", item.Name, (float)completeCount / totalCount);

#elif UNITY_IOS

                File.Copy(item.FullName,to,true);

#endif

                File.Copy(item.FullName, to, true);

                completeCount++;

            }



@@ -321,19 +316,14 @@
                {

                    Directory.CreateDirectory(directory);

                }

#if UNITY_ANDROID



                var extension = Path.GetExtension(item.FullName);

                if (extension == ".meta")

                {

                    continue;

                }



                to = to + ".7z";

                SevenZipUtility.Compress(item.FullName, to);

                UnityEditor.EditorUtility.DisplayProgressBar("正在压缩资源", item.Name, (float)completeCount / totalCount);

#elif UNITY_IOS

                File.Copy(item.FullName,to,true);

#endif

                File.Copy(item.FullName, to, true);

                completeCount++;

            }



@@ -458,7 +448,7 @@
        DateTime outTime;

        var correct = DateTime.TryParse(auditOutTime, out outTime);

        var directory = Application.dataPath + Path.DirectorySeparatorChar + "Resources/Config";

        if (Directory.Exists(directory))

        if (!Directory.Exists(directory))

        {

            Directory.CreateDirectory(directory);

        }

@@ -508,6 +498,7 @@
            EditorUtility.SetDirty(newVersionConfig);



            SetIconAndSplashImage(versionName);

            SetCreateRoleAnimation();



            PlayerSettings.companyName = "TheSecondWorld";

            PlayerSettings.productName = newVersionConfig.productName;

@@ -587,6 +578,22 @@
        }

    }



    public static void SetCreateRoleAnimation()

    {

        var from = "Assets/Editor/Video/CreateRoleMovie.mp4";

        var to = "Assets/StreamingAssets/CreateRoleMovie.mp4";



        if (!Directory.Exists(Application.dataPath + "StreamingAssets"))

        {

            Directory.CreateDirectory(Application.dataPath + "StreamingAssets");

        }



        if (AssetDatabase.LoadAssetAtPath<UnityEngine.Video.VideoClip>(to) == null)

        {

            AssetDatabase.CopyAsset(from, to);

        }

    }



    static BuildTargetGroup GetBuildTarget()

    {

#if UNITY_ANDROID