fix: YooAsset native builder support, bundle granularity, and dropdown stale values (#631, #632)

UnityProject/Assets/Init.unity

@@ -858,6 +858,40 @@ MonoBehaviour:
   downloadProgressText: {fileID: 1384766990}
   downloadProgressBar: {fileID: 1847636611}
   startButton: {fileID: 1079429684}
+  text:
+    initializingPackage: Initializing resource package...
+    gettingVersion: Getting resource package version...
+    updatingManifest: Updating resource manifest...
+    checkingUpdate: Checking resources to download...
+    downloadingResources: Downloading resources...
+    packageCompleted: Resource package initialization completed
+    initializationFailed: Initialization failed
+    unknownPackageStatus: Unknown status
+    sceneLoading: Loading scene...
+    sceneCompleted: Scene loading completed
+    sceneFailed: Scene loading failed
+    unknownSceneStatus: Unknown status
+    initializing: Initializing...
+    downloading: Downloading...
+    downloadCompletedLoading: Download completed, loading...
+    loadingCode: Loading code...
+    decryptingResources: Decrypting resources...
+    loadingScene: Loading scene...
+    dialogTitleError: Error
+    dialogTitleWarning: Warning
+    dialogTitleNotice: Notice
+    buttonOk: OK
+    buttonCancel: Cancel
+    buttonDownload: Download
+    buttonRetry: Retry
+    buttonExit: Exit
+    dialogInitFailed: 'Initialization failed: {0}'
+    dialogDownloadPrompt: Need to download {0} files, total size {1}MB. Start download?
+    dialogDownloadProgress: Downloading file {0}/{1} ({2}MB/{3}MB)
+    dialogSceneLoadFailed: 'Scene loading failed: {0}'
+    dialogInitException: 'Exception occurred during initialization: {0}'
+    dialogCodeException: Code exception, please contact customer service
+    dialogFunctionCallFailed: 'Function call failed: {0}'
   useEditorDevMode: 0
 --- !u!1 &1033013693
 GameObject:

UnityProject/Assets/Obfuz/SymbolObfus/symbol-mapping.xml

@@ -302,18 +302,18 @@
       <field signature="int $Obfuz$RVA_Value14" newName="$Pd" />
       <field signature="int $Obfuz$RVA_Value15" newName="$Kb" />
       <field signature="int $Obfuz$RVA_Value16" newName="$lb" />
-      <field signature="int $Obfuz$RVA_Value17" newName="$KC" />
+      <field signature="string $Obfuz$RVA_Value17" newName="$HA" />
       <field signature="int $Obfuz$RVA_Value18" newName="$lC" />
-      <field signature="int $Obfuz$RVA_Value19" newName="$LC" />
-      <field signature="int $Obfuz$RVA_Value20" newName="$fD" />
-      <field signature="int $Obfuz$RVA_Value21" newName="$Kc" />
+      <field signature="string $Obfuz$RVA_Value19" newName="$iA" />
+      <field signature="string $Obfuz$RVA_Value20" newName="$IA" />
+      <field signature="string $Obfuz$RVA_Value21" newName="$jA" />
       <field signature="int $Obfuz$RVA_Value22" newName="$Qd" />
-      <field signature="float $Obfuz$RVA_Value23" newName="$DC" />
-      <field signature="string $Obfuz$RVA_Value24" newName="$HC" />
-      <field signature="string $Obfuz$RVA_Value25" newName="$Rd" />
+      <field signature="int $Obfuz$RVA_Value23" newName="$JA" />
+      <field signature="int $Obfuz$RVA_Value24" newName="$kA" />
+      <field signature="int $Obfuz$RVA_Value25" newName="$KA" />
       <field signature="int $Obfuz$RVA_Value26" newName="$iC" />
       <field signature="int $Obfuz$RVA_Value27" newName="$MC" />
-      <field signature="int $Obfuz$RVA_Value28" newName="$sd" />
+      <field signature="float $Obfuz$RVA_Value28" newName="$lA" />
       <field signature="int $Obfuz$RVA_Value29" newName="$nC" />
       <field signature="int $Obfuz$RVA_Value30" newName="$NC" />
       <field signature="int $Obfuz$RVA_Value31" newName="$Sb" />
@@ -418,6 +418,8 @@
       <field signature="int $Obfuz$RVA_Value130" newName="$oD" />
       <field signature="int $Obfuz$RVA_Value131" newName="$OD" />
       <field signature="int $Obfuz$RVA_Value132" newName="$pD" />
+      <field signature="int $Obfuz$RVA_Value133" newName="$Kc" />
+      <field signature="int $Obfuz$RVA_Value134" newName="$DC" />
     </type>
     <type fullName="$Obfuz$ProxyCall" newFullName="$Q" status="Renamed">
       <method signature="[UniTask]Cysharp.Threading.Tasks.CompilerServices.AsyncUniTaskMethodBuilder $Obfuz$ProxyCall::@$Obfuz$Dispatch_22824_10462300(int)" newName="$cb" oldStackTraceSignature="$Obfuz$ProxyCall:$Obfuz$Dispatch_22824_10462300(Int32)" newStackTraceSignature="$Q:$cb(Int32)" />
@@ -514,6 +516,7 @@
       <method signature="[UnityEngine.CoreModule]UnityEngine.SceneManagement.Scene $Obfuz$ProxyCall::@$Obfuz$Dispatch_22824_735318(int)" newName="$dc" oldStackTraceSignature="$Obfuz$ProxyCall:$Obfuz$Dispatch_22824_735318(Int32)" newStackTraceSignature="$Q:$dc(Int32)" />
       <method signature="[UnityEngine.CoreModule]UnityEngine.TextAsset $Obfuz$ProxyCall::@$Obfuz$Dispatch_11150_3944058(object, int)" newName="$JD" oldStackTraceSignature="$Obfuz$ProxyCall:$Obfuz$Dispatch_11150_3944058(Object, Int32)" newStackTraceSignature="$Q:$JD(Object, Int32)" />
       <method signature="[UnityEngine.UI]UnityEngine.UI.Button/ButtonClickedEvent $Obfuz$ProxyCall::@$Obfuz$Dispatch_11150_10350119(object, int)" newName="$fc" oldStackTraceSignature="$Obfuz$ProxyCall:$Obfuz$Dispatch_11150_10350119(Object, Int32)" newStackTraceSignature="$Q:$fc(Object, Int32)" />
+      <method signature="[YooAsset]YooAsset.AssetHandle $Obfuz$ProxyCall::@$Obfuz$Dispatch_11150_11965409(object, int)" newName="$fA" oldStackTraceSignature="$Obfuz$ProxyCall:$Obfuz$Dispatch_11150_11965409(Object, Int32)" newStackTraceSignature="$Q:$fA(Object, Int32)" />
       <method signature="[YooAsset]YooAsset.AssetHandle $Obfuz$ProxyCall::@$Obfuz$Dispatch_20882_11965409(object, uint, int)" newName="$Fc" oldStackTraceSignature="$Obfuz$ProxyCall:$Obfuz$Dispatch_20882_11965409(Object, UInt32, Int32)" newStackTraceSignature="$Q:$Fc(Object, UInt32, Int32)" />
       <method signature="[YooAsset]YooAsset.AssetHandle $Obfuz$ProxyCall::@$Obfuz$Dispatch_34824_11965409(object, object, uint, int)" newName="$gc" oldStackTraceSignature="$Obfuz$ProxyCall:$Obfuz$Dispatch_34824_11965409(Object, Object, UInt32, Int32)" newStackTraceSignature="$Q:$gc(Object, Object, UInt32, Int32)" />
       <method signature="[YooAsset]YooAsset.ClearCacheFilesOperation $Obfuz$ProxyCall::@$Obfuz$Dispatch_45707_10036602(object, int, object, int)" newName="$kD" oldStackTraceSignature="$Obfuz$ProxyCall:$Obfuz$Dispatch_45707_10036602(Object, Int32, Object, Int32)" newStackTraceSignature="$Q:$kD(Object, Int32, Object, Int32)" />
@@ -589,7 +592,7 @@
       <method signature="string JEngine.Core.Bootstrap::@GetPlatform()" newName="$a" oldStackTraceSignature="JEngine.Core.Bootstrap:GetPlatform()" newStackTraceSignature="JEngine.Core.Bootstrap:$a()" />
       <method signature="void JEngine.Core.Bootstrap::@SetInstance([JEngine.Core]JEngine.Core.Bootstrap)" newName="$h" oldStackTraceSignature="JEngine.Core.Bootstrap:SetInstance(Bootstrap)" newStackTraceSignature="JEngine.Core.Bootstrap:$h(Bootstrap)" />
       <method signature="[UniTask]Cysharp.Threading.Tasks.UniTask JEngine.Core.Bootstrap::SetUpDynamicSecret([JEngine.Core]JEngine.Core.Bootstrap)" newName="$A" oldStackTraceSignature="JEngine.Core.Bootstrap:SetUpDynamicSecret()" newStackTraceSignature="JEngine.Core.Bootstrap:$A()" />
-      <method signature="[UniTask]Cysharp.Threading.Tasks.UniTask JEngine.Core.Bootstrap::LoadMetadataForAOTAssemblies([JEngine.Core]JEngine.Core.Bootstrap)" newName="$b" oldStackTraceSignature="JEngine.Core.Bootstrap:LoadMetadataForAOTAssemblies()" newStackTraceSignature="JEngine.Core.Bootstrap:$b()" />
+      <method signature="void JEngine.Core.Bootstrap::LoadMetadataForAOTAssemblies([JEngine.Core]JEngine.Core.Bootstrap)" newName="$b" oldStackTraceSignature="JEngine.Core.Bootstrap:LoadMetadataForAOTAssemblies()" newStackTraceSignature="JEngine.Core.Bootstrap:$b()" />
       <method signature="void JEngine.Core.Bootstrap::Initialize([JEngine.Core]JEngine.Core.Bootstrap)" newName="$E" oldStackTraceSignature="JEngine.Core.Bootstrap:Initialize()" newStackTraceSignature="JEngine.Core.Bootstrap:$E()" />
       <method signature="[UniTask]Cysharp.Threading.Tasks.UniTask JEngine.Core.Bootstrap::InitializeGame([JEngine.Core]JEngine.Core.Bootstrap)" newName="$B" oldStackTraceSignature="JEngine.Core.Bootstrap:InitializeGame()" newStackTraceSignature="JEngine.Core.Bootstrap:$B()" />
       <method signature="[UniTask]Cysharp.Threading.Tasks.UniTask JEngine.Core.Bootstrap::LoadHotCode([JEngine.Core]JEngine.Core.Bootstrap, System.Reflection.Assembly)" newName="$d" oldStackTraceSignature="JEngine.Core.Bootstrap:LoadHotCode(Assembly)" newStackTraceSignature="JEngine.Core.Bootstrap:$d(Assembly)" />

UnityProject/Assets/StreamingAssets/yoo/main/BuildinCatalog.json

@@ -1,7 +1,7 @@
 {
     "FileVersion": "1.0.0",
     "PackageName": "main",
-    "PackageVersion": "260208479",
+    "PackageVersion": "260424255",
     "Wrappers": [
         {
             "BundleGUID": "1832d193ad604c285e2456ba2a7855c7",
@@ -11,13 +11,25 @@
             "BundleGUID": "20c6686ce660502e16a881f74dde76d7",
             "FileName": "20c6686ce660502e16a881f74dde76d7.bundle"
         },
+        {
+            "BundleGUID": "3050e56ae07e86927996878bb1a5e4ce",
+            "FileName": "3050e56ae07e86927996878bb1a5e4ce.bundle"
+        },
+        {
+            "BundleGUID": "3fbfdf48f0b37821c942c9be8002d286",
+            "FileName": "3fbfdf48f0b37821c942c9be8002d286.bundle"
+        },
+        {
+            "BundleGUID": "463a37fa048a6a552f76991c14fae884",
+            "FileName": "463a37fa048a6a552f76991c14fae884.bundle"
+        },
         {
             "BundleGUID": "490ed19cf4dd5e128fb13cf883211456",
             "FileName": "490ed19cf4dd5e128fb13cf883211456.bundle"
         },
         {
-            "BundleGUID": "4abd3c5f4f01b40f54c4a348b24ead49",
-            "FileName": "4abd3c5f4f01b40f54c4a348b24ead49.bundle"
+            "BundleGUID": "4cec6d96ce074cd2e4a452dd8f93a44f",
+            "FileName": "4cec6d96ce074cd2e4a452dd8f93a44f.bundle"
         },
         {
             "BundleGUID": "56d90d09aba519ecd1cba11dfc31f5d8",
@@ -28,8 +40,8 @@
             "FileName": "85bf7a8000e78a0640dd575c462d71de.bundle"
         },
         {
-            "BundleGUID": "a08587b61b8accf9b169ccdf828176f6",
-            "FileName": "a08587b61b8accf9b169ccdf828176f6.bundle"
+            "BundleGUID": "8c8afa4493431415b8e6e4b9aa9e7616",
+            "FileName": "8c8afa4493431415b8e6e4b9aa9e7616.bundle"
         },
         {
             "BundleGUID": "ae16386504461146b4ec88eabc7de89f",
@@ -43,6 +55,10 @@
             "BundleGUID": "c9cd151a5606eec7bf47ac8d9401fb94",
             "FileName": "c9cd151a5606eec7bf47ac8d9401fb94.bundle"
         },
+        {
+            "BundleGUID": "c9f5f10f27a7b78065e5943aa413b8e0",
+            "FileName": "c9f5f10f27a7b78065e5943aa413b8e0.bundle"
+        },
         {
             "BundleGUID": "cde787d0afee29507a54189b7372cf14",
             "FileName": "cde787d0afee29507a54189b7372cf14.bundle"
@@ -52,8 +68,8 @@
             "FileName": "dcb1b5ed74667265ec98799a1576d5d3.bundle"
         },
         {
-            "BundleGUID": "ec451612fae802d07094821d3808809f",
-            "FileName": "ec451612fae802d07094821d3808809f.bundle"
+            "BundleGUID": "f568ec9e573cad91faed8ed55942d5c1",
+            "FileName": "f568ec9e573cad91faed8ed55942d5c1.bundle"
         }
     ]
 }

UnityProject/Assets/StreamingAssets/yoo/main/main.version

@@ -1 +1 @@
-260208479
+260424255

UnityProject/Assets/StreamingAssets/yoo/main/main_260424255.hash

@@ -0,0 +1 @@
+c317c44d

UnityProject/Packages/com.jasonxudeveloper.jengine.core/Editor/CustomEditor/BuildManager.cs

@@ -406,6 +406,7 @@ private ScriptableBuildParameters CreateBuildParameters(int packageVersion)
                 BuildTarget = _settings.buildTarget,
                 PackageName = _settings.packageName,
                 PackageVersion = packageVersion.ToString(),
+                EnableSharePackRule = true,
                 VerifyBuildingResult = true,
                 FileNameStyle = EFileNameStyle.HashName,
                 BuildinFileCopyOption = copyOption,

UnityProject/Packages/com.jasonxudeveloper.jengine.core/Editor/CustomEditor/Panel.cs

@@ -73,6 +73,20 @@ private void CreateGUI()
             CreateDefaultGUI();
         }
 
+        /// <summary>
+        /// Rebuilds the panel when it regains focus so dropdown choices (e.g. YooAsset
+        /// packages, hot scenes) reflect changes made in other editor windows. Skipped mid-build
+        /// to avoid losing <see cref="BuildManager"/> state or the log view contents.
+        /// </summary>
+        private void OnFocus()
+        {
+            if (_root == null) return;
+            if (_buildManager != null && _buildManager.IsBuilding) return;
+
+            _root.Clear();
+            CreateGUI();
+        }
+
         private void CreateDefaultGUI()
         {
             // Load stylesheets - Panel first, then Common to override

UnityProject/Packages/com.jasonxudeveloper.jengine.core/Editor/CustomEditor/SettingsUIBuilder.cs

@@ -46,18 +46,19 @@ public static VisualElement CreatePackageSettingsGroup(Settings settings)
             // Package Name field (dropdown or text field based on useDropdown)
             var packageNameRow = EditorUIUtils.CreateFormRow("Package");
 
-            // Use PopupField for Panel (with available packages)
-            var packageChoices = EditorUtils.GetAvailableYooAssetPackages();
+            // Prepend a "None" sentinel so renamed/missing packages surface as "None" instead of
+            // silently desyncing with the serialized value.
+            var packageOptions = EditorUtils.WithNoneOption(EditorUtils.GetAvailableYooAssetPackages());
             var packageNameField = new PopupField<string>()
             {
-                choices = packageChoices.Count > 0 ? packageChoices : new List<string> { settings.packageName },
-                value = settings.packageName
+                choices = packageOptions,
+                value = EditorUtils.ResolveDropdownValue(settings.packageName, packageOptions)
             };
             packageNameField.AddToClassList("form-control");
             EditorUIUtils.MakeTextResponsive(packageNameField);
             packageNameField.RegisterValueChangedCallback(evt =>
             {
-                settings.packageName = evt.newValue;
+                settings.packageName = EditorUtils.NormalizeDropdownSelection(evt.newValue);
                 settings.Save();
             });
             packageNameRow.Add(packageNameField);

UnityProject/Packages/com.jasonxudeveloper.jengine.core/Editor/EditorUtils.cs

@@ -36,6 +36,45 @@ namespace JEngine.Core.Editor
 {
     public static class EditorUtils
     {
+        /// <summary>
+        /// Sentinel shown in dropdowns when the stored value is missing or no longer in the
+        /// available choices (e.g. a YooAsset package was renamed). Guarantees >=2 entries and
+        /// gives the user an explicit "clear" option.
+        /// </summary>
+        public const string NoneDropdownOption = "None";
+
+        /// <summary>
+        /// Returns a new list with <see cref="NoneDropdownOption"/> prepended to the given
+        /// choices. Safe to call with a null choices list.
+        /// </summary>
+        public static List<string> WithNoneOption(IList<string> choices)
+        {
+            var options = new List<string> { NoneDropdownOption };
+            if (choices != null) options.AddRange(choices);
+            return options;
+        }
+
+        /// <summary>
+        /// Returns the value that should be displayed in a dropdown. Falls back to
+        /// <see cref="NoneDropdownOption"/> when the stored value is empty or no longer present
+        /// in the current options.
+        /// </summary>
+        public static string ResolveDropdownValue(string storedValue, List<string> options)
+        {
+            return string.IsNullOrEmpty(storedValue) || options == null || !options.Contains(storedValue)
+                ? NoneDropdownOption
+                : storedValue;
+        }
+
+        /// <summary>
+        /// Converts a dropdown selection into the value to persist. The sentinel
+        /// <see cref="NoneDropdownOption"/> is mapped to an empty string.
+        /// </summary>
+        public static string NormalizeDropdownSelection(string value)
+        {
+            return value == NoneDropdownOption ? string.Empty : value;
+        }
+
         public static List<string> GetAvailableYooAssetPackages()
         {
             var packages = new List<string>();

UnityProject/Packages/com.jasonxudeveloper.jengine.core/Runtime/Encrypt/Bundle/AesBundle.cs

@@ -43,6 +43,9 @@ public class AesEncryptionServices : IEncryptionServices
     {
         private readonly AesConfig _config;
 
+        // Required by YooAsset's AssetBundleBuilder (Activator.CreateInstance with no args).
+        public AesEncryptionServices() : this(AesConfig.Instance) { }
+
         public AesEncryptionServices(AesConfig config)
         {
             _config = config;

UnityProject/Packages/com.jasonxudeveloper.jengine.core/Runtime/Encrypt/Bundle/ChaCha20Bundle.cs

@@ -43,6 +43,9 @@ public class ChaCha20EncryptionServices : IEncryptionServices
     {
         private readonly ChaCha20Config _config;
 
+        // Required by YooAsset's AssetBundleBuilder (Activator.CreateInstance with no args).
+        public ChaCha20EncryptionServices() : this(ChaCha20Config.Instance) { }
+
         public ChaCha20EncryptionServices(ChaCha20Config config)
         {
             _config = config;

UnityProject/Packages/com.jasonxudeveloper.jengine.core/Runtime/Encrypt/Bundle/XorBundle.cs

@@ -43,6 +43,9 @@ public class XorEncryptionServices : IEncryptionServices
     {
         private readonly XorConfig _config;
 
+        // Required by YooAsset's AssetBundleBuilder (Activator.CreateInstance with no args).
+        public XorEncryptionServices() : this(XorConfig.Instance) { }
+
         public XorEncryptionServices(XorConfig config)
         {
             _config = config;