Assets/Editor/Tool/ClientPackage.cs
@@ -22,13 +22,8 @@ } public static bool obfuscatorEnabled { get { return LocalSave.GetBool("obfuscatorEnabled", false); } get { return LocalSave.GetBool("obfuscatorEnabled",false); } set { LocalSave.SetBool("obfuscatorEnabled", value); } } public static int AssetPrior { get { return LocalSave.GetInt("HalfAssetPrior", 1); } set { LocalSave.SetInt("HalfAssetPrior", value); } } static string ANDROID_PLUGIN_PATH = Application.dataPath + "/Plugins/Android"; @@ -135,14 +130,11 @@ if (halfPackages.Count > 0) { Config.Instance.LoadPriorBundleConfig(); FileExtersion.DirectoryCopy(_assetBundlePath, ResourcesPath.Instance.StreamingAssetPath); var fromFiles = new List<FileInfo>(); FileExtersion.GetAllDirectoryFileInfos(_assetBundlePath, fromFiles); var excludeFileFullNames = new List<string>(); var tempFiles = new List<FileInfo>(); FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(_assetBundlePath, "/mob"), tempFiles); foreach (var file in tempFiles) var files = new List<FileInfo>(); FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, "mob"), files); foreach (var file in files) { var extersion = Path.GetExtension(file.FullName); var fileName = Path.GetFileName(file.FullName); @@ -151,16 +143,15 @@ fileName = fileName.Replace(extersion, ""); } var prior = PriorBundleConfig.GetAssetPrior(AssetVersion.AssetCategory.Mob, fileName); if (prior > AssetPrior) if (!PriorBundleConfig.mobs.Contains(fileName)) { excludeFileFullNames.Add(file.FullName); File.Delete(file.FullName); } } tempFiles.Clear(); FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(_assetBundlePath, "/maps"), tempFiles); foreach (var file in tempFiles) files.Clear(); FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, "maps"), files); foreach (var file in files) { var extersion = Path.GetExtension(file.FullName); var fileName = Path.GetFileName(file.FullName); @@ -169,16 +160,15 @@ fileName = fileName.Replace(extersion, ""); } var prior = PriorBundleConfig.GetAssetPrior(AssetVersion.AssetCategory.Scene, fileName); if (prior > AssetPrior) if (!PriorBundleConfig.scenes.Contains(fileName)) { excludeFileFullNames.Add(file.FullName); File.Delete(file.FullName); } } tempFiles.Clear(); FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(_assetBundlePath, "/audio"), tempFiles); foreach (var file in tempFiles) files.Clear(); FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, "audio"), files); foreach (var file in files) { var extersion = Path.GetExtension(file.FullName); var fileName = Path.GetFileName(file.FullName); @@ -187,16 +177,15 @@ fileName = fileName.Replace(extersion, ""); } var prior = PriorBundleConfig.GetAssetPrior(AssetVersion.AssetCategory.Audio, fileName); if (prior > AssetPrior) if (!PriorBundleConfig.audios.Contains(fileName)) { excludeFileFullNames.Add(file.FullName); File.Delete(file.FullName); } } tempFiles.Clear(); FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(_assetBundlePath, "/effect"), tempFiles); foreach (var file in tempFiles) files.Clear(); FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, "effect"), files); foreach (var file in files) { var extersion = Path.GetExtension(file.FullName); var fileName = Path.GetFileName(file.FullName); @@ -205,63 +194,12 @@ fileName = fileName.Replace(extersion, ""); } var prior = PriorBundleConfig.GetAssetPrior(AssetVersion.AssetCategory.Effect, fileName); if (prior > AssetPrior) if (!PriorBundleConfig.effects.Contains(fileName)) { excludeFileFullNames.Add(file.FullName); File.Delete(file.FullName); } } tempFiles.Clear(); FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(_assetBundlePath, "/ui/sprite"), tempFiles); foreach (var file in tempFiles) { var fileName = Path.GetFileName(file.FullName); if (fileName == "loadingbg") { excludeFileFullNames.Add(file.FullName); } } for (int i = fromFiles.Count - 1; i >= 0; i--) { var item = fromFiles[i]; if (excludeFileFullNames.Contains(item.FullName)) { fromFiles.RemoveAt(i); } } var totalCount = fromFiles.Count; var completeCount = 0; foreach (var item in fromFiles) { 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 < halfPackages.Count; i++) { #if UNITY_ANDROID @@ -339,7 +277,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; @@ -354,7 +292,7 @@ FileExtersion.DirectoryCopy(StringUtility.Contact(_sdkPath, "/ChannelDiff/Android/", versionConfig.appId), ANDROID_PLUGIN_PATH); var option = AssetDatabase.LoadAssetAtPath<Options>("Assets/Editor/Beebyte/Obfuscator/ObfuscatorOptions.asset"); if (option != null) if (option!=null) { option.enabled = obfuscatorEnabled; EditorUtility.SetDirty(option); Assets/Editor/Tool/ClientPackageExtension.cs
@@ -16,7 +16,6 @@ try { Debug.LogFormat("从命令行中解析出来的SDKPATH 是:{0}", parameters.sdkPath); ClientPackage.AssetPrior = 1; ClientPackage.BuildPublishers(parameters.sdkPath, parameters.assetbundlePath, parameters.outputPath, parameters.publishers, parameters.buildIndex, false, false); } catch (Exception ex) Assets/Plugins/Android/libs/armeabi-v7a/liblzma.soBinary files differ
Assets/Plugins/Android/libs/armeabi-v7a/liblzma.so.meta
File was deleted Assets/Plugins/Android/libs/x86/liblzma.soBinary files differ
Assets/Plugins/Android/libs/x86/liblzma.so.meta
File was deleted Assets/Plugins/Android/libs/x86_64.meta
File was deleted Assets/Plugins/Android/libs/x86_64/liblzma.zipBinary files differ
Assets/Plugins/Android/libs/x86_64/liblzma.zip.meta
File was deleted Assets/Plugins/SevenZip.meta
File was deleted Assets/Plugins/SevenZip/lzma.cs
File was deleted Assets/Plugins/SevenZip/lzma.cs.meta
File was deleted Assets/Plugins/iOS/bitcode.meta
File was deleted Assets/Plugins/iOS/bitcode/libbrotli.meta
File was deleted Assets/Plugins/iOS/bitcode/libfastlz.meta
File was deleted Assets/Plugins/iOS/bitcode/liblz4.meta
File was deleted Assets/Plugins/iOS/bitcode/liblzma.a-aggressive-bitcode.zipBinary files differ
Assets/Plugins/iOS/bitcode/liblzma.a-aggressive-bitcode.zip.meta
File was deleted Assets/Plugins/iOS/bitcode/liblzma.a-fastest-smallest-bitcode.zipBinary files differ
Assets/Plugins/iOS/bitcode/liblzma.a-fastest-smallest-bitcode.zip.meta
File was deleted Assets/Plugins/iOS/bitcode/liblzma.a-tvOS-bitcode.zipBinary files differ
Assets/Plugins/iOS/bitcode/liblzma.a-tvOS-bitcode.zip.meta
File was deleted Assets/Plugins/iOS/bitcode/liblzma.a-watchOS-bitcode.zipBinary files differ
Assets/Plugins/iOS/bitcode/liblzma.a-watchOS-bitcode.zip.meta
File was deleted Assets/Plugins/iOS/bitcode/liblzma.meta
File was deleted Assets/Plugins/iOS/bitcode/libzipw.meta
File was deleted Assets/Plugins/iOS/liblzma.aBinary files differ
Assets/Plugins/iOS/liblzma.a-simulator.zipBinary files differ
Assets/Plugins/iOS/liblzma.a-simulator.zip.meta
File was deleted Assets/Plugins/iOS/liblzma.a.aggresive.zipBinary files differ
Assets/Plugins/iOS/liblzma.a.aggresive.zip.meta
File was deleted Assets/Plugins/iOS/liblzma.a.fastest-smallest.zipBinary files differ
Assets/Plugins/iOS/liblzma.a.fastest-smallest.zip.meta
File was deleted Assets/Plugins/iOS/liblzma.a.fastest.zipBinary files differ
Assets/Plugins/iOS/liblzma.a.fastest.zip.meta
File was deleted Assets/Plugins/iOS/liblzma.a.meta
File was deleted Assets/Plugins/iOS/liblzma.smallest.zipBinary files differ
Assets/Plugins/iOS/liblzma.smallest.zip.meta
File was deleted Assets/Plugins/liblzma.bundle.meta
File was deleted Assets/Plugins/liblzma.bundle/Contents.meta
File was deleted Assets/Plugins/liblzma.bundle/Contents/Info.plist
File was deleted Assets/Plugins/liblzma.bundle/Contents/Info.plist.meta
File was deleted Assets/Plugins/liblzma.bundle/Contents/MacOS.meta
File was deleted Assets/Plugins/liblzma.bundle/Contents/MacOS/liblzmaBinary files differ
Assets/Plugins/liblzma.bundle/Contents/MacOS/liblzma.meta
File was deleted Assets/Plugins/x86.meta
File was deleted Assets/Plugins/x86/liblzma.dllBinary files differ
Assets/Plugins/x86/liblzma.dll.meta
File was deleted Assets/Plugins/x86/liblzma.soBinary files differ
Assets/Plugins/x86/liblzma.so.meta
File was deleted Assets/Plugins/x86_64.meta
File was deleted Assets/Plugins/x86_64/liblzma.dllBinary files differ
Assets/Plugins/x86_64/liblzma.dll.meta
File was deleted Assets/Plugins/x86_64/liblzma.soBinary files differ
Assets/Plugins/x86_64/liblzma.so.meta
File was deleted Assets/Resources/Config/PriorBundle.txt
@@ -1,107 +1,127 @@ int string int int id AssetABName AssetType Prior 唯一标识 资源ab包名 资源类型1.场景；2.npc资源；3.音效.4特效 优先级（优先级为1的随包;优先级不为1的进入后开始下载，下载优先级按照填写的数字由小到大） 1 createrole_001 1 1 2 level_login 1 1 3 map001_sjz 1 1 4 map002_yg 1 2 5 Map003_Yjsz 1 3 6 Map125_Shfb 1 3 7 map111_lqrz 1 1 8 Map113_Fyt 1 2 9 map128_fmt 1 2 10 Map119_Qlzf 1 3 11 createrole 2 1 12 prefab_race_a_fs 2 1 13 prefab_race_a_zs 2 1 14 prefab_race_P001 2 1 15 prefab_race_n001 2 1 16 prefab_race_M003 2 1 17 prefab_race_M001 2 1 18 prefab_race_M709 2 1 19 prefab_race_M004 2 1 20 prefab_race_M005 2 1 21 prefab_race_M006 2 1 22 prefab_race_M007 2 1 23 prefab_race_N034 2 1 24 prefab_race_N012 2 1 25 prefab_race_N003 2 1 26 prefab_race_M131 2 1 27 prefab_race_N010 2 1 28 prefab_race_M128 2 2 29 prefab_race_N013 2 2 30 prefab_race_M126 2 2 31 prefab_race_N015 2 2 32 prefab_race_M008 2 2 33 prefab_race_M704 2 2 34 prefab_race_M703 2 2 35 prefab_race_M012 2 2 36 prefab_race_M011 2 2 37 prefab_race_M013 2 2 38 prefab_race_M014 2 2 39 prefab_race_M135 2 2 40 prefab_race_N011 2 2 41 prefab_race_N017 2 2 42 prefab_race_M129 2 3 43 prefab_race_M132 2 3 44 prefab_race_M015 2 3 45 prefab_race_M017 2 3 46 prefab_race_M018 2 3 47 prefab_race_M016 2 3 48 prefab_race_M700 2 3 49 prefab_race_M701 2 3 50 prefab_race_M021 2 3 51 prefab_race_M063 2 3 52 prefab_race_M064 2 3 53 prefab_race_M065 2 3 54 prefab_race_M097 2 3 55 prefab_race_L004 2 3 56 prefab_race_M104 2 3 57 prefab_race_Sh01 2 1 58 prefab_race_Sh02 2 1 59 prefab_race_N031 2 2 60 prefab_race_N032 2 2 61 prefab_race_A_Zs00 2 1 62 prefab_race_A_Fs00 2 1 63 prefab_race_A_Zs00_Wq 2 1 64 prefab_race_A_Fs00_Wq 2 1 65 prefab_race_A_Zs00_fwq 2 1 66 prefab_race_A_Fs00_fwq 2 1 67 prefab_race_A_Zs01 2 1 68 prefab_race_A_Fs01 2 1 69 prefab_race_A_Zs01_Wq 2 1 70 prefab_race_A_Fs01_Wq 2 1 71 prefab_race_A_Zs01_fwq 2 1 72 prefab_race_A_Fs01_fwq 2 1 73 prefab_race_A_Zs02 2 2 74 prefab_race_A_Fs02 2 2 75 prefab_race_A_Zs02_Wq 2 2 76 prefab_race_A_Fs02_Wq 2 2 77 prefab_race_A_Zs02_fwq 2 2 78 prefab_race_A_Fs02_fwq 2 2 79 prefab_race_Zq04 2 1 80 Prefab_Race_B_Cw06 2 1 81 prefab_race_A_Zs99_Wq 2 2 82 prefab_race_A_Fs99_Wq 2 2 83 Prefab_Race_B_Cw09 2 2 84 prefab_race_Zq05 2 2 85 prefab_race_A_Zs_Cb01 2 1 86 prefab_race_A_Fs_Cb01 2 1 87 prefab_race_B_Cw02 2 2 88 prefab_race_Zq01 2 2 89 prefab_race_B_Cw16 2 2 90 prefab_race_ranshaoquan 2 2 91 prefab_race_Zq00 2 2 92 boss1 3 1 93 music1 3 1 94 role1 3 1 95 show1 3 1 96 speak1 3 1 97 ui1 3 1 98 bossskill1 4 1 99 cj 4 1 100 common1 4 1 101 debuff1 4 1 102 dsskill1 4 1 103 skill1 4 1 104 ui1 4 1 int string int id AssetABName AssetType 唯一标识 资源ab包名 资源类型1.场景；2.npc资源；3.音效.4特效 1 createrole_001 1 2 level_login 1 3 map000_xsdt 1 4 map001_sjz 1 5 map002_yg 1 6 Map003_Yjsz 1 7 Map125_Shfb 1 8 map111_lqrz 1 9 Map113_Fyt 1 10 map128_fmt 1 11 Map119_Qlzf 1 12 createrole 2 13 prefab_race_a_fs 2 14 prefab_race_a_zs 2 15 prefab_race_P001 2 16 prefab_race_n001 2 17 prefab_race_M152 2 18 prefab_race_L001 2 19 prefab_race_L002 2 20 prefab_race_L003 2 21 prefab_race_N017 2 22 prefab_race_N017a 2 23 prefab_race_N999 2 24 prefab_race_N002 2 25 prefab_race_M003 2 26 prefab_race_M001 2 27 prefab_race_M709 2 28 prefab_race_M004 2 29 prefab_race_M005 2 30 prefab_race_M006 2 31 prefab_race_M007 2 32 prefab_race_N034 2 33 prefab_race_N012 2 34 prefab_race_N003 2 35 prefab_race_M131 2 36 prefab_race_N010 2 37 prefab_race_M128 2 38 prefab_race_N013 2 39 prefab_race_M126 2 40 prefab_race_N015 2 41 prefab_race_M008 2 42 prefab_race_M704 2 43 prefab_race_M703 2 44 prefab_race_M012 2 45 prefab_race_M011 2 46 prefab_race_M013 2 47 prefab_race_M014 2 48 prefab_race_M135 2 49 prefab_race_N011 2 50 prefab_race_M129 2 51 prefab_race_M132 2 52 prefab_race_M015 2 53 prefab_race_M017 2 54 prefab_race_M018 2 55 prefab_race_M016 2 56 prefab_race_M700 2 57 prefab_race_M701 2 58 prefab_race_M021 2 59 prefab_race_M063 2 60 prefab_race_M064 2 61 prefab_race_M065 2 62 prefab_race_M097 2 63 prefab_race_L004 2 64 prefab_race_M104 2 65 prefab_race_Sh01 2 66 prefab_race_Sh02 2 67 prefab_race_N031 2 68 prefab_race_N032 2 69 prefab_race_A_Zs00 2 70 prefab_race_A_Fs00 2 71 prefab_race_A_Zs00_Wq 2 72 prefab_race_A_Fs00_Wq 2 73 prefab_race_A_Zs00_fwq 2 74 prefab_race_A_Fs00_fwq 2 75 prefab_race_A_Zs01 2 76 prefab_race_A_Fs01 2 77 prefab_race_A_Zs01_Wq 2 78 prefab_race_A_Fs01_Wq 2 79 prefab_race_A_Zs01_fwq 2 80 prefab_race_A_Fs01_fwq 2 81 prefab_race_A_Zs02 2 82 prefab_race_A_Fs02 2 83 prefab_race_A_Zs02_Wq 2 84 prefab_race_A_Fs02_Wq 2 85 prefab_race_A_Zs02_fwq 2 86 prefab_race_A_Fs02_fwq 2 87 prefab_race_Zq04 2 88 Prefab_Race_B_Cw06 2 89 prefab_race_A_Zs99_Wq 2 90 prefab_race_A_Fs99_Wq 2 91 Prefab_Race_B_Cw09 2 92 prefab_race_Zq05 2 93 prefab_race_A_Zs_Cb01 2 94 prefab_race_A_Fs_Cb01 2 95 prefab_race_B_Cw02 2 96 prefab_race_Zq01 2 97 prefab_race_Zq00 2 98 prefab_race_B_Cw16 2 99 prefab_race_ranshaoquan 2 100 prefab_race_a_zs00_sb 2 101 prefab_race_a_zs01_sb 2 102 prefab_race_a_zs02_sb 2 103 prefab_race_a_zs03_sb 2 104 prefab_race_a_zs04_sb 2 105 prefab_race_a_zs05_sb 2 106 prefab_race_a_zs06_sb 2 107 prefab_race_a_zs07_sb 2 108 prefab_race_a_zs08_sb 2 109 prefab_race_a_zs09_sb 2 110 prefab_race_a_zs10_sb 2 111 prefab_race_a_zs99_sb 2 112 boss1 3 113 music1 3 114 role1 3 115 show1 3 116 speak1 3 117 ui1 3 118 bossskill1 4 119 cj 4 120 common1 4 121 debuff1 4 122 dsskill1 4 123 skill1 4 124 ui1 4 Assets/test7zip.cs
File was deleted Assets/test7zip.cs.meta
File was deleted
