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

client_Hale

2019-06-19 bc61068f2a5675a1bda5c9ab5fe8cad6fee5fe80

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

 Assets/Editor/Tool/ClientPackage.cs

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

            }




 Assets/Editor/Tool/UpdateAssetBundleName.cs

@@ -46,31 +46,28 @@


public class UpdateUIWindowSetting

{

    static string rootPath = Application.dataPath + "/ResourcesOut/UI/Window";

    static string assetRelativePath = "Assets/ResourcesOut/UI/Window";



    static string rootPath2 = Application.dataPath + "/ResourcesOut/UI/PriorityWindow";

    static string assetRelativePath2 = "Assets/ResourcesOut/UI/PriorityWindow";



    [MenuItem("程序/设置资源包名/更新Window(All) AssetBundleName")]

    public static void SetAllUIWindowAssetBundleName()

    {

        var allFiles = new DirectoryInfo(rootPath).GetFiles("*.prefab", SearchOption.TopDirectoryOnly);

        foreach (var file in allFiles)

        var guids = AssetDatabase.FindAssets("t:prefab", new string[] { assetRelativePath });

        foreach (var guid in guids)

        {

            var importerPath = assetRelativePath + Path.DirectorySeparatorChar + file.Name;

            var importer = AssetImporter.GetAtPath(importerPath);

            var path = AssetDatabase.GUIDToAssetPath(guid);

            var importer = AssetImporter.GetAtPath(path);

            importer.assetBundleName = "ui/window";



            EditorUtility.SetDirty(importer);

        }



        allFiles = new DirectoryInfo(rootPath2).GetFiles("*.prefab", SearchOption.TopDirectoryOnly);

        foreach (var file in allFiles)

        guids = AssetDatabase.FindAssets("t:prefab", new string[] { assetRelativePath2 });

        foreach (var guid in guids)

        {

            var importerPath = assetRelativePath2 + Path.DirectorySeparatorChar + file.Name;

            var importer = AssetImporter.GetAtPath(importerPath);

            importer.assetBundleName = "ui/prioritywindow";

            var path = AssetDatabase.GUIDToAssetPath(guid);

            var importer = AssetImporter.GetAtPath(path);

            importer.assetBundleName = StringUtility.Contact("ui/prioritywindow/", Path.GetFileNameWithoutExtension(path).ToLower());



            EditorUtility.SetDirty(importer);

        }