diff --git a/.claude/rules/yooasset-extensions.md b/.claude/rules/yooasset-extensions.md new file mode 100644 index 000000000..aafdf744c --- /dev/null +++ b/.claude/rules/yooasset-extensions.md @@ -0,0 +1,24 @@ +# YooAsset Extension Sample Maintenance + +YooAsset ships Extension Samples under `Assets/Samples/YooAsset/`. These are vendor-provided examples that JEngine customizes. When YooAsset is updated and its Extension Samples change, our customizations may be overwritten. + +## Custom Modifications to Track + +### PreprocessBuildCatalog (Decryption Support) + +**File**: `Assets/Samples/YooAsset/*/Extension Sample/Editor/PreprocessBuild/PreprocessBuildCatalog.cs` + +**What we changed**: The upstream code calls `CatalogTools.CreateCatalogFile(null, ...)` with a `//TODO 自行处理解密` comment, which causes a NRE when manifests are encrypted. We replaced this with a try-all approach that attempts each `IManifestRestoreServices` from `EncryptionMapping.Mapping` until one succeeds. + +**Why**: See [YooAsset#730](https://github.com/tuyoogame/YooAsset/issues/730). The YooAsset author confirmed this is an intentional extension point for consumers to customize. + +**On YooAsset update**: Verify that `PreprocessBuildCatalog.cs` still contains our `TryCreateCatalogFile` / `TryCreate` helper methods and the `using JEngine.Core.Encrypt` import. If the sample was overwritten by the update, reapply the decryption try-all logic. + +## Update Checklist + +When updating YooAsset or its Extension Samples: + +- [ ] Diff the new Extension Sample files against our customized versions +- [ ] Reapply any overwritten JEngine customizations listed above +- [ ] Verify catalog generation works with both encrypted and unencrypted manifests +- [ ] Add any new upstream extension points to this file if customized diff --git a/CLAUDE.md b/CLAUDE.md index 4b8238af9..67e4e9a85 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -6,6 +6,7 @@ @.claude/rules/commit-conventions.md @.claude/rules/package-creation.md @.claude/rules/plugin-maintenance.md +@.claude/rules/yooasset-extensions.md ## Project Overview diff --git a/UnityProject/Assets/HotUpdate/Compiled/AOT/JEngine.Core.dll.bytes b/UnityProject/Assets/HotUpdate/Compiled/AOT/JEngine.Core.dll.bytes index 42c5fdd8b..20b4217f1 100644 Binary files a/UnityProject/Assets/HotUpdate/Compiled/AOT/JEngine.Core.dll.bytes and b/UnityProject/Assets/HotUpdate/Compiled/AOT/JEngine.Core.dll.bytes differ diff --git a/UnityProject/Assets/Samples/YooAsset/2.3.18/Extension Sample/Editor/PreprocessBuild/PreprocessBuildCatalog.cs b/UnityProject/Assets/Samples/YooAsset/2.3.18/Extension Sample/Editor/PreprocessBuild/PreprocessBuildCatalog.cs index 339fc58d7..1e67e0770 100644 --- a/UnityProject/Assets/Samples/YooAsset/2.3.18/Extension Sample/Editor/PreprocessBuild/PreprocessBuildCatalog.cs +++ b/UnityProject/Assets/Samples/YooAsset/2.3.18/Extension Sample/Editor/PreprocessBuild/PreprocessBuildCatalog.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.IO; +using JEngine.Core.Encrypt; using UnityEngine; namespace YooAsset @@ -30,19 +31,44 @@ public void OnPreprocessBuild(UnityEditor.Build.Reporting.BuildReport report) { string packageName = subDirectory.Name; string pacakgeDirectory = subDirectory.FullName; - try + if (!TryCreateCatalogFile(packageName, pacakgeDirectory)) { - bool result = CatalogTools.CreateCatalogFile(null, packageName, pacakgeDirectory); //TODO 自行处理解密 - if (result == false) - { - Debug.LogError($"Create package {packageName} catalog file failed ! See the detail error in console !"); - } + Debug.LogError($"Create package {packageName} catalog file failed ! See the detail error in console !"); } - catch (System.Exception ex) + } + } + + private static bool TryCreateCatalogFile(string packageName, string packageDirectory) + { + // Try without decryption first (unencrypted manifests) + if (TryCreate(null, packageName, packageDirectory)) + return true; + + // Try each registered encryption method + foreach (var kvp in EncryptionMapping.Mapping) + { + var restore = kvp.Value.ManifestEncryptionConfig.Decryption; + if (TryCreate(restore, packageName, packageDirectory)) { - Debug.LogError($"Create package {packageName} catalog file failed ! {ex.Message}"); + YooLogger.Log($"Package '{packageName}' catalog created using {kvp.Key} decryption."); + return true; } } + + return false; + } + + private static bool TryCreate(IManifestRestoreServices services, + string packageName, string packageDirectory) + { + try + { + return CatalogTools.CreateCatalogFile(services, packageName, packageDirectory); + } + catch + { + return false; + } } } } \ No newline at end of file diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/1832d193ad604c285e2456ba2a7855c7.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/1832d193ad604c285e2456ba2a7855c7.bundle new file mode 100644 index 000000000..726588b2e Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/1832d193ad604c285e2456ba2a7855c7.bundle differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/5154722f17ed26abd07f0275b2fb315c.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/1832d193ad604c285e2456ba2a7855c7.bundle.meta similarity index 74% rename from UnityProject/Assets/StreamingAssets/yoo/main/5154722f17ed26abd07f0275b2fb315c.bundle.meta rename to UnityProject/Assets/StreamingAssets/yoo/main/1832d193ad604c285e2456ba2a7855c7.bundle.meta index 96074e337..595ef167b 100644 --- a/UnityProject/Assets/StreamingAssets/yoo/main/5154722f17ed26abd07f0275b2fb315c.bundle.meta +++ b/UnityProject/Assets/StreamingAssets/yoo/main/1832d193ad604c285e2456ba2a7855c7.bundle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5243d056b9ae74f9fbaa56e844dc828a +guid: dc7a2510496394a2e9b776e56a9d254c DefaultImporter: externalObjects: {} userData: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/20c6686ce660502e16a881f74dde76d7.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/20c6686ce660502e16a881f74dde76d7.bundle new file mode 100644 index 000000000..728781068 Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/20c6686ce660502e16a881f74dde76d7.bundle differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/427571ab4f40f72802eba023fca7a5e8.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/20c6686ce660502e16a881f74dde76d7.bundle.meta similarity index 74% rename from UnityProject/Assets/StreamingAssets/yoo/main/427571ab4f40f72802eba023fca7a5e8.bundle.meta rename to UnityProject/Assets/StreamingAssets/yoo/main/20c6686ce660502e16a881f74dde76d7.bundle.meta index 30b76022e..18cef0e3d 100644 --- a/UnityProject/Assets/StreamingAssets/yoo/main/427571ab4f40f72802eba023fca7a5e8.bundle.meta +++ b/UnityProject/Assets/StreamingAssets/yoo/main/20c6686ce660502e16a881f74dde76d7.bundle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: de5e734b7a33942bd9654e699dacc44c +guid: 31581fb4b699643dd9e3e7e63b2d0ba9 DefaultImporter: externalObjects: {} userData: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/427571ab4f40f72802eba023fca7a5e8.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/427571ab4f40f72802eba023fca7a5e8.bundle deleted file mode 100644 index 61e6aa1fc..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/427571ab4f40f72802eba023fca7a5e8.bundle and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/4549b29fd00b2e57f75873c7c370340b.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/4549b29fd00b2e57f75873c7c370340b.bundle deleted file mode 100644 index 4c68bf650..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/4549b29fd00b2e57f75873c7c370340b.bundle and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/490ed19cf4dd5e128fb13cf883211456.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/490ed19cf4dd5e128fb13cf883211456.bundle new file mode 100644 index 000000000..1d0ef8d6f Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/490ed19cf4dd5e128fb13cf883211456.bundle differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/578aebd507ab15c1f73f9a41b5962e15.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/490ed19cf4dd5e128fb13cf883211456.bundle.meta similarity index 74% rename from UnityProject/Assets/StreamingAssets/yoo/main/578aebd507ab15c1f73f9a41b5962e15.bundle.meta rename to UnityProject/Assets/StreamingAssets/yoo/main/490ed19cf4dd5e128fb13cf883211456.bundle.meta index d9a18d087..66b075e9c 100644 --- a/UnityProject/Assets/StreamingAssets/yoo/main/578aebd507ab15c1f73f9a41b5962e15.bundle.meta +++ b/UnityProject/Assets/StreamingAssets/yoo/main/490ed19cf4dd5e128fb13cf883211456.bundle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9e41401d7b056451bbff4a803d6a9851 +guid: fe311c92cb54941d2a621f92626d7cf1 DefaultImporter: externalObjects: {} userData: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/4abd3c5f4f01b40f54c4a348b24ead49.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/4abd3c5f4f01b40f54c4a348b24ead49.bundle new file mode 100644 index 000000000..df66425e7 Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/4abd3c5f4f01b40f54c4a348b24ead49.bundle differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/4549b29fd00b2e57f75873c7c370340b.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/4abd3c5f4f01b40f54c4a348b24ead49.bundle.meta similarity index 74% rename from UnityProject/Assets/StreamingAssets/yoo/main/4549b29fd00b2e57f75873c7c370340b.bundle.meta rename to UnityProject/Assets/StreamingAssets/yoo/main/4abd3c5f4f01b40f54c4a348b24ead49.bundle.meta index dbcbd6f19..cd7e49741 100644 --- a/UnityProject/Assets/StreamingAssets/yoo/main/4549b29fd00b2e57f75873c7c370340b.bundle.meta +++ b/UnityProject/Assets/StreamingAssets/yoo/main/4abd3c5f4f01b40f54c4a348b24ead49.bundle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2174447b3e3b0476d812642fafebd053 +guid: 921643076c5e940629df9ff840da556d DefaultImporter: externalObjects: {} userData: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/5154722f17ed26abd07f0275b2fb315c.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/5154722f17ed26abd07f0275b2fb315c.bundle deleted file mode 100644 index 2ef062de8..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/5154722f17ed26abd07f0275b2fb315c.bundle and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/56d90d09aba519ecd1cba11dfc31f5d8.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/56d90d09aba519ecd1cba11dfc31f5d8.bundle new file mode 100644 index 000000000..25496770c Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/56d90d09aba519ecd1cba11dfc31f5d8.bundle differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/56d90d09aba519ecd1cba11dfc31f5d8.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/56d90d09aba519ecd1cba11dfc31f5d8.bundle.meta new file mode 100644 index 000000000..6456b7b5b --- /dev/null +++ b/UnityProject/Assets/StreamingAssets/yoo/main/56d90d09aba519ecd1cba11dfc31f5d8.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e3eb4a466d3e7449b9eb542b9afc29b3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/578aebd507ab15c1f73f9a41b5962e15.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/578aebd507ab15c1f73f9a41b5962e15.bundle deleted file mode 100644 index 786243cd1..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/578aebd507ab15c1f73f9a41b5962e15.bundle and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/64a56ed51df1cee5f53c5ac4760ce454.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/64a56ed51df1cee5f53c5ac4760ce454.bundle deleted file mode 100644 index 0953fe501..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/64a56ed51df1cee5f53c5ac4760ce454.bundle and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/64a56ed51df1cee5f53c5ac4760ce454.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/64a56ed51df1cee5f53c5ac4760ce454.bundle.meta deleted file mode 100644 index a60c6c5a9..000000000 --- a/UnityProject/Assets/StreamingAssets/yoo/main/64a56ed51df1cee5f53c5ac4760ce454.bundle.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 66733749d34dd4074a1a8f3086470ebf -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/723671f97fbc4c6dfad84ca9c9664b26.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/723671f97fbc4c6dfad84ca9c9664b26.bundle deleted file mode 100644 index 9c55c3206..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/723671f97fbc4c6dfad84ca9c9664b26.bundle and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/723671f97fbc4c6dfad84ca9c9664b26.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/723671f97fbc4c6dfad84ca9c9664b26.bundle.meta deleted file mode 100644 index 8ebcc9e1d..000000000 --- a/UnityProject/Assets/StreamingAssets/yoo/main/723671f97fbc4c6dfad84ca9c9664b26.bundle.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2ed375ade0e644184afb424f9005c348 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/743303a92561c811cf9e428d59f4eed5.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/743303a92561c811cf9e428d59f4eed5.bundle deleted file mode 100644 index 2262543fa..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/743303a92561c811cf9e428d59f4eed5.bundle and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/743303a92561c811cf9e428d59f4eed5.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/743303a92561c811cf9e428d59f4eed5.bundle.meta deleted file mode 100644 index 7d3e1566d..000000000 --- a/UnityProject/Assets/StreamingAssets/yoo/main/743303a92561c811cf9e428d59f4eed5.bundle.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 81bbcfd248fb343c28dac65c33d43001 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/76c5d9ebda370e318d1d711bf29db391.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/76c5d9ebda370e318d1d711bf29db391.bundle deleted file mode 100644 index e3b710e08..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/76c5d9ebda370e318d1d711bf29db391.bundle and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/76c5d9ebda370e318d1d711bf29db391.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/76c5d9ebda370e318d1d711bf29db391.bundle.meta deleted file mode 100644 index 1705d5547..000000000 --- a/UnityProject/Assets/StreamingAssets/yoo/main/76c5d9ebda370e318d1d711bf29db391.bundle.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 212dfe20022f74ecd8320d07a2ab2c47 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/85bf7a8000e78a0640dd575c462d71de.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/85bf7a8000e78a0640dd575c462d71de.bundle new file mode 100644 index 000000000..a81da76d3 Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/85bf7a8000e78a0640dd575c462d71de.bundle differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/85bf7a8000e78a0640dd575c462d71de.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/85bf7a8000e78a0640dd575c462d71de.bundle.meta new file mode 100644 index 000000000..5f50007f8 --- /dev/null +++ b/UnityProject/Assets/StreamingAssets/yoo/main/85bf7a8000e78a0640dd575c462d71de.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 632bea6b9a7e84b419f3295c5a786c06 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/BuildinCatalog.bytes b/UnityProject/Assets/StreamingAssets/yoo/main/BuildinCatalog.bytes index 95d8f8b88..a76e75272 100644 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/BuildinCatalog.bytes and b/UnityProject/Assets/StreamingAssets/yoo/main/BuildinCatalog.bytes differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/BuildinCatalog.json b/UnityProject/Assets/StreamingAssets/yoo/main/BuildinCatalog.json index 1552d82b9..bd82f2921 100644 --- a/UnityProject/Assets/StreamingAssets/yoo/main/BuildinCatalog.json +++ b/UnityProject/Assets/StreamingAssets/yoo/main/BuildinCatalog.json @@ -1,59 +1,59 @@ { "FileVersion": "1.0.0", "PackageName": "main", - "PackageVersion": "260208645", + "PackageVersion": "260208479", "Wrappers": [ { - "BundleGUID": "427571ab4f40f72802eba023fca7a5e8", - "FileName": "427571ab4f40f72802eba023fca7a5e8.bundle" + "BundleGUID": "1832d193ad604c285e2456ba2a7855c7", + "FileName": "1832d193ad604c285e2456ba2a7855c7.bundle" }, { - "BundleGUID": "4549b29fd00b2e57f75873c7c370340b", - "FileName": "4549b29fd00b2e57f75873c7c370340b.bundle" + "BundleGUID": "20c6686ce660502e16a881f74dde76d7", + "FileName": "20c6686ce660502e16a881f74dde76d7.bundle" }, { - "BundleGUID": "5154722f17ed26abd07f0275b2fb315c", - "FileName": "5154722f17ed26abd07f0275b2fb315c.bundle" + "BundleGUID": "490ed19cf4dd5e128fb13cf883211456", + "FileName": "490ed19cf4dd5e128fb13cf883211456.bundle" }, { - "BundleGUID": "578aebd507ab15c1f73f9a41b5962e15", - "FileName": "578aebd507ab15c1f73f9a41b5962e15.bundle" + "BundleGUID": "4abd3c5f4f01b40f54c4a348b24ead49", + "FileName": "4abd3c5f4f01b40f54c4a348b24ead49.bundle" }, { - "BundleGUID": "64a56ed51df1cee5f53c5ac4760ce454", - "FileName": "64a56ed51df1cee5f53c5ac4760ce454.bundle" + "BundleGUID": "56d90d09aba519ecd1cba11dfc31f5d8", + "FileName": "56d90d09aba519ecd1cba11dfc31f5d8.bundle" }, { - "BundleGUID": "723671f97fbc4c6dfad84ca9c9664b26", - "FileName": "723671f97fbc4c6dfad84ca9c9664b26.bundle" + "BundleGUID": "85bf7a8000e78a0640dd575c462d71de", + "FileName": "85bf7a8000e78a0640dd575c462d71de.bundle" }, { - "BundleGUID": "743303a92561c811cf9e428d59f4eed5", - "FileName": "743303a92561c811cf9e428d59f4eed5.bundle" + "BundleGUID": "a08587b61b8accf9b169ccdf828176f6", + "FileName": "a08587b61b8accf9b169ccdf828176f6.bundle" }, { - "BundleGUID": "76c5d9ebda370e318d1d711bf29db391", - "FileName": "76c5d9ebda370e318d1d711bf29db391.bundle" + "BundleGUID": "ae16386504461146b4ec88eabc7de89f", + "FileName": "ae16386504461146b4ec88eabc7de89f.bundle" }, { - "BundleGUID": "a99f206109faf44e637346323f255c84", - "FileName": "a99f206109faf44e637346323f255c84.bundle" + "BundleGUID": "c792026eb6f717273422cfb875e3121d", + "FileName": "c792026eb6f717273422cfb875e3121d.bundle" }, { - "BundleGUID": "bd7a40533fe708ab184ec75ceac853ee", - "FileName": "bd7a40533fe708ab184ec75ceac853ee.bundle" + "BundleGUID": "c9cd151a5606eec7bf47ac8d9401fb94", + "FileName": "c9cd151a5606eec7bf47ac8d9401fb94.bundle" }, { - "BundleGUID": "e578f9b5397d53f41a2b284805860df8", - "FileName": "e578f9b5397d53f41a2b284805860df8.bundle" + "BundleGUID": "cde787d0afee29507a54189b7372cf14", + "FileName": "cde787d0afee29507a54189b7372cf14.bundle" }, { - "BundleGUID": "e6ed0b286414267962e71c6bd3e19aae", - "FileName": "e6ed0b286414267962e71c6bd3e19aae.bundle" + "BundleGUID": "dcb1b5ed74667265ec98799a1576d5d3", + "FileName": "dcb1b5ed74667265ec98799a1576d5d3.bundle" }, { - "BundleGUID": "eb53152c634d44794e4aebca15ee8b0b", - "FileName": "eb53152c634d44794e4aebca15ee8b0b.bundle" + "BundleGUID": "ec451612fae802d07094821d3808809f", + "FileName": "ec451612fae802d07094821d3808809f.bundle" } ] } \ No newline at end of file diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/a08587b61b8accf9b169ccdf828176f6.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/a08587b61b8accf9b169ccdf828176f6.bundle new file mode 100644 index 000000000..053e4cbb8 Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/a08587b61b8accf9b169ccdf828176f6.bundle differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/a08587b61b8accf9b169ccdf828176f6.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/a08587b61b8accf9b169ccdf828176f6.bundle.meta new file mode 100644 index 000000000..8b27aa7d6 --- /dev/null +++ b/UnityProject/Assets/StreamingAssets/yoo/main/a08587b61b8accf9b169ccdf828176f6.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bb82bd11c6eb54d0cbe0c30fef98a7d4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/a99f206109faf44e637346323f255c84.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/a99f206109faf44e637346323f255c84.bundle deleted file mode 100644 index ed26b2c15..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/a99f206109faf44e637346323f255c84.bundle and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/a99f206109faf44e637346323f255c84.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/a99f206109faf44e637346323f255c84.bundle.meta deleted file mode 100644 index 851e0121a..000000000 --- a/UnityProject/Assets/StreamingAssets/yoo/main/a99f206109faf44e637346323f255c84.bundle.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2958988901cfc434b80f4be6803f2476 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/ae16386504461146b4ec88eabc7de89f.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/ae16386504461146b4ec88eabc7de89f.bundle new file mode 100644 index 000000000..b9fc0ab4b Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/ae16386504461146b4ec88eabc7de89f.bundle differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/ae16386504461146b4ec88eabc7de89f.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/ae16386504461146b4ec88eabc7de89f.bundle.meta new file mode 100644 index 000000000..20f497b3f --- /dev/null +++ b/UnityProject/Assets/StreamingAssets/yoo/main/ae16386504461146b4ec88eabc7de89f.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ee72209489a534945a77825685951022 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/bd7a40533fe708ab184ec75ceac853ee.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/bd7a40533fe708ab184ec75ceac853ee.bundle deleted file mode 100644 index 3df9048f8..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/bd7a40533fe708ab184ec75ceac853ee.bundle and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/bd7a40533fe708ab184ec75ceac853ee.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/bd7a40533fe708ab184ec75ceac853ee.bundle.meta deleted file mode 100644 index 98d786a16..000000000 --- a/UnityProject/Assets/StreamingAssets/yoo/main/bd7a40533fe708ab184ec75ceac853ee.bundle.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f4fdff4e1398e4a5885baa7fc28a455c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/c792026eb6f717273422cfb875e3121d.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/c792026eb6f717273422cfb875e3121d.bundle new file mode 100644 index 000000000..2f4ca6735 Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/c792026eb6f717273422cfb875e3121d.bundle differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/c792026eb6f717273422cfb875e3121d.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/c792026eb6f717273422cfb875e3121d.bundle.meta new file mode 100644 index 000000000..9a02a3545 --- /dev/null +++ b/UnityProject/Assets/StreamingAssets/yoo/main/c792026eb6f717273422cfb875e3121d.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 97326bc3b2b3443a3b498357057be8bf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/c9cd151a5606eec7bf47ac8d9401fb94.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/c9cd151a5606eec7bf47ac8d9401fb94.bundle new file mode 100644 index 000000000..68c3c340a Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/c9cd151a5606eec7bf47ac8d9401fb94.bundle differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/c9cd151a5606eec7bf47ac8d9401fb94.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/c9cd151a5606eec7bf47ac8d9401fb94.bundle.meta new file mode 100644 index 000000000..ca02ceac6 --- /dev/null +++ b/UnityProject/Assets/StreamingAssets/yoo/main/c9cd151a5606eec7bf47ac8d9401fb94.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ee899f247db36435bb5cf06b6a567699 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/cde787d0afee29507a54189b7372cf14.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/cde787d0afee29507a54189b7372cf14.bundle new file mode 100644 index 000000000..5df889a71 Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/cde787d0afee29507a54189b7372cf14.bundle differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/cde787d0afee29507a54189b7372cf14.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/cde787d0afee29507a54189b7372cf14.bundle.meta new file mode 100644 index 000000000..c7e35becf --- /dev/null +++ b/UnityProject/Assets/StreamingAssets/yoo/main/cde787d0afee29507a54189b7372cf14.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5eea8af94087e493f8ed9ddec3e12db3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/dcb1b5ed74667265ec98799a1576d5d3.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/dcb1b5ed74667265ec98799a1576d5d3.bundle new file mode 100644 index 000000000..1f488cbf9 Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/dcb1b5ed74667265ec98799a1576d5d3.bundle differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/dcb1b5ed74667265ec98799a1576d5d3.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/dcb1b5ed74667265ec98799a1576d5d3.bundle.meta new file mode 100644 index 000000000..2a4d87bde --- /dev/null +++ b/UnityProject/Assets/StreamingAssets/yoo/main/dcb1b5ed74667265ec98799a1576d5d3.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5a35de3829437495a958346abdea9fe5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/e578f9b5397d53f41a2b284805860df8.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/e578f9b5397d53f41a2b284805860df8.bundle deleted file mode 100644 index 58728e098..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/e578f9b5397d53f41a2b284805860df8.bundle and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/e578f9b5397d53f41a2b284805860df8.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/e578f9b5397d53f41a2b284805860df8.bundle.meta deleted file mode 100644 index ca8b57254..000000000 --- a/UnityProject/Assets/StreamingAssets/yoo/main/e578f9b5397d53f41a2b284805860df8.bundle.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5c1eb87919ebe47b1a06e08655a3bc2c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/e6ed0b286414267962e71c6bd3e19aae.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/e6ed0b286414267962e71c6bd3e19aae.bundle deleted file mode 100644 index fddb219c2..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/e6ed0b286414267962e71c6bd3e19aae.bundle and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/e6ed0b286414267962e71c6bd3e19aae.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/e6ed0b286414267962e71c6bd3e19aae.bundle.meta deleted file mode 100644 index 48f835839..000000000 --- a/UnityProject/Assets/StreamingAssets/yoo/main/e6ed0b286414267962e71c6bd3e19aae.bundle.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a84b9fbe1723d4e4fae407b37fe9fbed -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/eb53152c634d44794e4aebca15ee8b0b.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/eb53152c634d44794e4aebca15ee8b0b.bundle deleted file mode 100644 index 3a4706dd6..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/eb53152c634d44794e4aebca15ee8b0b.bundle and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/eb53152c634d44794e4aebca15ee8b0b.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/eb53152c634d44794e4aebca15ee8b0b.bundle.meta deleted file mode 100644 index acd97f688..000000000 --- a/UnityProject/Assets/StreamingAssets/yoo/main/eb53152c634d44794e4aebca15ee8b0b.bundle.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ef03bf55664ca498e91aedd1b9fd485c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/ec451612fae802d07094821d3808809f.bundle b/UnityProject/Assets/StreamingAssets/yoo/main/ec451612fae802d07094821d3808809f.bundle new file mode 100644 index 000000000..d1eece83b Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/ec451612fae802d07094821d3808809f.bundle differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/ec451612fae802d07094821d3808809f.bundle.meta b/UnityProject/Assets/StreamingAssets/yoo/main/ec451612fae802d07094821d3808809f.bundle.meta new file mode 100644 index 000000000..53fd0a836 --- /dev/null +++ b/UnityProject/Assets/StreamingAssets/yoo/main/ec451612fae802d07094821d3808809f.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d36862f8c80594046b66470b69bc88ae +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/main.version b/UnityProject/Assets/StreamingAssets/yoo/main/main.version index 9adebe867..f960c074f 100644 --- a/UnityProject/Assets/StreamingAssets/yoo/main/main.version +++ b/UnityProject/Assets/StreamingAssets/yoo/main/main.version @@ -1 +1 @@ -260208645 \ No newline at end of file +260208479 \ No newline at end of file diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/main_260208479.bytes b/UnityProject/Assets/StreamingAssets/yoo/main/main_260208479.bytes new file mode 100644 index 000000000..913ef75d7 Binary files /dev/null and b/UnityProject/Assets/StreamingAssets/yoo/main/main_260208479.bytes differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/main_260208479.bytes.meta b/UnityProject/Assets/StreamingAssets/yoo/main/main_260208479.bytes.meta new file mode 100644 index 000000000..c2fc90301 --- /dev/null +++ b/UnityProject/Assets/StreamingAssets/yoo/main/main_260208479.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2f4124e6754aa47e696d655d5e28dd78 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/main_260208479.hash b/UnityProject/Assets/StreamingAssets/yoo/main/main_260208479.hash new file mode 100644 index 000000000..1bc5d2d89 --- /dev/null +++ b/UnityProject/Assets/StreamingAssets/yoo/main/main_260208479.hash @@ -0,0 +1 @@ +120fa27e \ No newline at end of file diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/main_260208479.hash.meta b/UnityProject/Assets/StreamingAssets/yoo/main/main_260208479.hash.meta new file mode 100644 index 000000000..b68807bb1 --- /dev/null +++ b/UnityProject/Assets/StreamingAssets/yoo/main/main_260208479.hash.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 30cc906e1c1894181ad12bc06845c3d2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/main_260208645.bytes b/UnityProject/Assets/StreamingAssets/yoo/main/main_260208645.bytes deleted file mode 100644 index ff1b7f5cd..000000000 Binary files a/UnityProject/Assets/StreamingAssets/yoo/main/main_260208645.bytes and /dev/null differ diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/main_260208645.bytes.meta b/UnityProject/Assets/StreamingAssets/yoo/main/main_260208645.bytes.meta deleted file mode 100644 index 6896edd83..000000000 --- a/UnityProject/Assets/StreamingAssets/yoo/main/main_260208645.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2f3dfd9130e0f42069d8ea2f2ac59aa8 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/main_260208645.hash b/UnityProject/Assets/StreamingAssets/yoo/main/main_260208645.hash deleted file mode 100644 index 096bd8e49..000000000 --- a/UnityProject/Assets/StreamingAssets/yoo/main/main_260208645.hash +++ /dev/null @@ -1 +0,0 @@ -5faecfba \ No newline at end of file diff --git a/UnityProject/Assets/StreamingAssets/yoo/main/main_260208645.hash.meta b/UnityProject/Assets/StreamingAssets/yoo/main/main_260208645.hash.meta deleted file mode 100644 index c92f2611e..000000000 --- a/UnityProject/Assets/StreamingAssets/yoo/main/main_260208645.hash.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: edb8532e58ed74294bdb4cc3eefedd9c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: