From 8e02bfead03ec7f2626035a046bd0b271017e46b Mon Sep 17 00:00:00 2001
From: liutao <821580467@qq.com>
Date: Fri, 10 Apr 2026 13:27:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=89=93=E5=8C=85=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=89=93=E5=8C=85=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/Editor/Common/BuildLauncher.cs     | 52 +++++++++++++------
 ProjectNLD/Assets/PhxhSDK                     |  2 +-
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs b/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs
index c5d1164e855..a2683a16f82 100644
--- a/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs
+++ b/ProjectNLD/Assets/Editor/Common/BuildLauncher.cs
@@ -128,7 +128,6 @@ internal class BatchBuild
                 thinkingDataAppId = YooAssetBuildBase.thinkingDataAppId,
                 thinkingDataServerUrl = YooAssetBuildBase.thinkingDataServerUrl,
             };
-            PackDataInst.CreateResourceJson(info);
 
             BuildTargetGroup currentTargetGroup =
                 BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget);
@@ -139,12 +138,24 @@ internal class BatchBuild
 #if DEVELOPMENT_BUILD || DEBUG
             isDebugBuild = true;
 #endif
-            ExtBuildInfoHelper.CreateFirstExtBuildInfo(info.buildTicks, info.workSpace, info.version, info.buildCode,
-                isDebugBuild, defines);
+            var extBuildInfo = ExtBuildInfoHelper.PrepareFullBuildInfo(
+                info.buildTicks,
+                info.workSpace,
+                info.version,
+                info.buildCode,
+                isDebugBuild,
+                defines,
+                YooAssetBuildBase.ShouldPackDefaultRes(),
+                YooAssetBuildBase.ShouldPackDllRes(),
+                YooAssetBuildBase.ShouldPackConfigRes());
+            info.localFullVersion = extBuildInfo.ComposeResVersion();
+            PackDataInst.CreateResourceJson(info);
 
             BuildLauncher.SetEnableHotUpdate(enableHotUpdate);
-            if (enableHotUpdate)
+            if (YooAssetBuildBase.ShouldBuildHotUpdateDll())
                 BuildLauncher.BuildHotUpdateDlls();
+            else if (enableHotUpdate)
+                Debug.Log("检测到 packDllRes=false，已跳过热更新 DLL 重编步骤，将沿用上次已生成的 DLL 资源。");
 
             YooAssetBuildBase.BuildContentAndPlayer();
 
@@ -228,9 +239,25 @@ internal class BatchBuild
             ExtBuildInfoHelper.VertifyExitBuildInfo(YooAssetBuildBase.workSpace, YooAssetBuildBase.appVersion);
             DebugUtil.Log($"验证ExBuildInfo完成：{DateTime.Now}");
 
+            BuildTargetGroup currentTargetGroup = BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget);
+            string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(currentTargetGroup);
+
+            ExtBuildInfoHelper.PrepareHotUpdateBuildInfo(
+                YooAssetBuildBase.workSpace,
+                YooAssetBuildBase.appVersion,
+#if DEVELOPMENT_BUILD || DEBUG
+                true,
+#else
+                false,
+#endif
+                defines,
+                YooAssetBuildBase.ShouldPackDefaultRes(),
+                YooAssetBuildBase.ShouldPackDllRes(),
+                YooAssetBuildBase.ShouldPackConfigRes());
+
             var skipCheck = true;
 
-            if (enableHotUpdate)
+            if (YooAssetBuildBase.ShouldBuildHotUpdateDll())
             {
                 if (skipCheck)
                 {
@@ -255,22 +282,15 @@ internal class BatchBuild
                 }
                 
             }
+            else if (enableHotUpdate)
+            {
+                Debug.Log("检测到 packDllRes=false，已跳过热更新 DLL 重编步骤，将沿用上次已生成的 DLL 资源。");
+            }
             else
             {
                 Debug.Log("未开启热更");
             }
 
-            BuildTargetGroup currentTargetGroup = BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget);
-            string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(currentTargetGroup);
-            
-            // 写入打包信息到Yoo_Build_Cache
-#if DEVELOPMENT_BUILD || DEBUG
-            ExtBuildInfoHelper.UpdateExtBuildInfo(YooAssetBuildBase.workSpace, YooAssetBuildBase.appVersion, true,
-                defines);
-#else
-            ExtBuildInfoHelper.UpdateExtBuildInfo(YooAssetBuildBase.workSpace, YooAssetBuildBase.appVersion, false, defines);
-#endif
-
             DebugUtil.Log($"开始打包热更资源：{DateTime.Now}");
             bool result = YooAssetBuildBase.BuildOnlyResUpdate();
             DebugUtil.Log($"打包热更资源完成：{DateTime.Now}");
diff --git a/ProjectNLD/Assets/PhxhSDK b/ProjectNLD/Assets/PhxhSDK
index bdf307da1f8..8ef16e625b6 160000
--- a/ProjectNLD/Assets/PhxhSDK
+++ b/ProjectNLD/Assets/PhxhSDK
@@ -1 +1 @@
-Subproject commit bdf307da1f8cb9f8bd4740d9158b22b8052274e4
+Subproject commit 8ef16e625b609ff66d6ccb8bbfaa060bb022eeca