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

client_Hale

2019-06-19 bc61068f2a5675a1bda5c9ab5fe8cad6fee5fe80

 Assets/Editor/Tool/ClientPackage.cs

@@ -6,7 +6,7 @@
using System.IO;

using System.Text.RegularExpressions;

using System.Text;

using TableConfig;



using Beebyte.Obfuscator;



public class ClientPackage

@@ -99,28 +99,63 @@


        if (smallPackages.Count > 0)

        {

            FileExtersion.DirectoryCopy(_assetBundlePath, ResourcesPath.Instance.StreamingAssetPath);



            var files = new List<FileInfo>();

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

            var builtInFiles = new List<FileInfo>();



            FileExtersion.GetAllDirectoryFileInfos(_assetBundlePath, files);

            foreach (var file in files)

            {

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

                if (fileName.Contains("builtin"))



                if (file.FullName.Contains("builtin"))

                {

                    builtInFiles.Add(file);

                    continue;

                }



                if (file.FullName.Contains("config/Contact.txt")

                    || file.FullName.Contains("config/HelpInfo.txt")

                    || file.FullName.Contains("config/PriorBundle.txt")

                    || file.FullName.Contains("config/PriorLanguage.txt"))

                if (file.FullName.Contains("Contact.txt")

                    || file.FullName.Contains("HelpInfo.txt")

                    || file.FullName.Contains("PriorBundle.txt")

                    || file.FullName.Contains("PriorLanguage.txt")

                    || file.FullName.Contains("ApkUpdateUrl.txt"))

                {

                    builtInFiles.Add(file);

                    continue;

                }



                File.Delete(file.FullName);

            }



            var totalCount = builtInFiles.Count;

            var completeCount = 0;

            foreach (var item in builtInFiles)

            {

                var directory = Path.GetDirectoryName(item.FullName);

                if (!Directory.Exists(directory))

                {

                    Directory.CreateDirectory(directory);

                }



                var relativePath = FileExtersion.GetFileRelativePath(_assetBundlePath, item.FullName);

                var to = StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, relativePath);

#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



                completeCount++;

            }



            EditorUtility.ClearProgressBar();



            for (int i = 0; i < smallPackages.Count; i++)

            {

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


        if (halfPackages.Count > 0)

        {

            Config.Instance.LoadPriorBundleConfig();

            PriorBundleConfig.Init(true);



            var fromFiles = new List<FileInfo>();

            FileExtersion.GetAllDirectoryFileInfos(_assetBundlePath, fromFiles);

@@ -236,28 +271,21 @@
            var completeCount = 0;

            foreach (var item in fromFiles)

            {

                var directory = Path.GetDirectoryName(item.FullName);

                var relativePath = FileExtersion.GetFileRelativePath(_assetBundlePath, item.FullName);

                var to = StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, relativePath);

                var directory = Path.GetDirectoryName(to);

                if (!Directory.Exists(directory))

                {

                    Directory.CreateDirectory(directory);

                }



                var relativePath = FileExtersion.GetFileRelativePath(_assetBundlePath, item.FullName);

                var to = StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, relativePath);

#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++;

            }



@@ -274,7 +302,31 @@


        if (bigPackages.Count > 0)

        {

            FileExtersion.DirectoryCopy(_assetBundlePath, ResourcesPath.Instance.StreamingAssetPath);

            var fromFiles = new List<FileInfo>();

            FileExtersion.GetAllDirectoryFileInfos(_assetBundlePath, fromFiles);



            var totalCount = fromFiles.Count;

            var completeCount = 0;

            foreach (var item in fromFiles)

            {

                var relativePath = FileExtersion.GetFileRelativePath(_assetBundlePath, item.FullName);

                var to = StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, relativePath);

                var directory = Path.GetDirectoryName(to);

                if (!Directory.Exists(directory))

                {

                    Directory.CreateDirectory(directory);

                }



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

                if (extension == ".meta")

                {

                    continue;

                }



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

                completeCount++;

            }



            for (int i = 0; i < bigPackages.Count; i++)

            {

#if UNITY_ANDROID

@@ -339,7 +391,7 @@
        PlayerSettings.Android.keystorePass = versionConfig.keystorePassword;

        PlayerSettings.Android.keyaliasName = versionConfig.keystoreAlias;

        PlayerSettings.Android.keyaliasPass = versionConfig.keystoreAliasPassword;

        // PlayerSettings.Android.targetSdkVersion = AndroidSdkVersions.AndroidApiLevel22;

        PlayerSettings.Android.targetSdkVersion = AndroidSdkVersions.AndroidApiLevel22;

        PlayerSettings.Android.bundleVersionCode = VersionConfig.GetVersionNumber(versionConfig.version);



        PlayerSettings.enableInternalProfiler = _development;

@@ -395,6 +447,11 @@


        DateTime outTime;

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

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

        if (!Directory.Exists(directory))

        {

            Directory.CreateDirectory(directory);

        }

        File.WriteAllText(Application.dataPath + Path.DirectorySeparatorChar + "Resources/Config/AuditTime.txt", correct ? auditOutTime : "");

        

        var option = AssetDatabase.LoadAssetAtPath<Options>("Assets/Editor/Beebyte/Obfuscator/ObfuscatorOptions.asset");

@@ -424,7 +481,7 @@
    {

        try

        {

            var newVersionConfigPath = StringUtility.Contact("Assets/Resources/ScriptableObject/Config/VersionConfig", ".asset");

            var newVersionConfigPath = StringUtility.Contact("Assets/Resources/VersionConfig", ".asset");

            var versionName = string.Empty;

            var fromVersionConfig = GetVersionConfig(_publisher, out versionName);

            var newVersionConfig = ScriptableObject.CreateInstance<VersionConfig>();

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



            SetIconAndSplashImage(versionName);

            SetCreateRoleAnimation();



            PlayerSettings.companyName = "TheSecondWorld";

            PlayerSettings.productName = newVersionConfig.productName;

@@ -452,13 +510,8 @@
            PlayerSettings.allowedAutorotateToPortraitUpsideDown = false;

            PlayerSettings.bundleVersion = VersionConfig.GetVersionNumber(newVersionConfig.version).ToString();



            var grachicSettings = new SerializedObject(AssetDatabase.LoadAllAssetsAtPath("ProjectSettings/GraphicsSettings.asset")[0]);

            var lightmapStripping = grachicSettings.FindProperty("m_LightmapStripping");

            lightmapStripping.intValue = 0;

            var fogStripping = grachicSettings.FindProperty("m_FogStripping");

            fogStripping.intValue = 0;



            grachicSettings.ApplyModifiedProperties();

            CSObjectWrapEditor.Generator.ClearAll();

            CSObjectWrapEditor.Generator.GenAll();

        }

        catch (Exception ex)

        {

@@ -525,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