From 0930e7c1730f9bb34b4b1dd071e742d9e4b5f003 Mon Sep 17 00:00:00 2001 From: "JSD\\13999" <1399945104@qq.com> Date: Fri, 5 Jun 2026 11:06:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=20Addressables=20=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E8=B5=84=E6=BA=90=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlayMode/{Resources_moved => Resources}/Fixtures.meta | 0 .../Fixtures/Addressables.meta | 0 .../Fixtures/Addressables/FlowScopeAddressablesText.txt | 0 .../Addressables/FlowScopeAddressablesText.txt.meta | 0 .../Assets/FlowScope/Tests/PlayMode/Resources_moved.meta | 8 -------- docs/reviews/addressables-integration-acceptance.md | 4 ++-- docs/reviews/p2-phase1-completion-report.md | 6 +++--- docs/reviews/p2-phase2-package-preview-report.md | 2 +- 8 files changed, 6 insertions(+), 14 deletions(-) rename My project/Assets/FlowScope/Tests/PlayMode/{Resources_moved => Resources}/Fixtures.meta (100%) rename My project/Assets/FlowScope/Tests/PlayMode/{Resources_moved => Resources}/Fixtures/Addressables.meta (100%) rename My project/Assets/FlowScope/Tests/PlayMode/{Resources_moved => Resources}/Fixtures/Addressables/FlowScopeAddressablesText.txt (100%) rename My project/Assets/FlowScope/Tests/PlayMode/{Resources_moved => Resources}/Fixtures/Addressables/FlowScopeAddressablesText.txt.meta (100%) delete mode 100644 My project/Assets/FlowScope/Tests/PlayMode/Resources_moved.meta diff --git a/My project/Assets/FlowScope/Tests/PlayMode/Resources_moved/Fixtures.meta b/My project/Assets/FlowScope/Tests/PlayMode/Resources/Fixtures.meta similarity index 100% rename from My project/Assets/FlowScope/Tests/PlayMode/Resources_moved/Fixtures.meta rename to My project/Assets/FlowScope/Tests/PlayMode/Resources/Fixtures.meta diff --git a/My project/Assets/FlowScope/Tests/PlayMode/Resources_moved/Fixtures/Addressables.meta b/My project/Assets/FlowScope/Tests/PlayMode/Resources/Fixtures/Addressables.meta similarity index 100% rename from My project/Assets/FlowScope/Tests/PlayMode/Resources_moved/Fixtures/Addressables.meta rename to My project/Assets/FlowScope/Tests/PlayMode/Resources/Fixtures/Addressables.meta diff --git a/My project/Assets/FlowScope/Tests/PlayMode/Resources_moved/Fixtures/Addressables/FlowScopeAddressablesText.txt b/My project/Assets/FlowScope/Tests/PlayMode/Resources/Fixtures/Addressables/FlowScopeAddressablesText.txt similarity index 100% rename from My project/Assets/FlowScope/Tests/PlayMode/Resources_moved/Fixtures/Addressables/FlowScopeAddressablesText.txt rename to My project/Assets/FlowScope/Tests/PlayMode/Resources/Fixtures/Addressables/FlowScopeAddressablesText.txt diff --git a/My project/Assets/FlowScope/Tests/PlayMode/Resources_moved/Fixtures/Addressables/FlowScopeAddressablesText.txt.meta b/My project/Assets/FlowScope/Tests/PlayMode/Resources/Fixtures/Addressables/FlowScopeAddressablesText.txt.meta similarity index 100% rename from My project/Assets/FlowScope/Tests/PlayMode/Resources_moved/Fixtures/Addressables/FlowScopeAddressablesText.txt.meta rename to My project/Assets/FlowScope/Tests/PlayMode/Resources/Fixtures/Addressables/FlowScopeAddressablesText.txt.meta diff --git a/My project/Assets/FlowScope/Tests/PlayMode/Resources_moved.meta b/My project/Assets/FlowScope/Tests/PlayMode/Resources_moved.meta deleted file mode 100644 index 51d2828..0000000 --- a/My project/Assets/FlowScope/Tests/PlayMode/Resources_moved.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 20098efc5dc925a4194600eea4969d68 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/docs/reviews/addressables-integration-acceptance.md b/docs/reviews/addressables-integration-acceptance.md index f27c1bb..b96a381 100644 --- a/docs/reviews/addressables-integration-acceptance.md +++ b/docs/reviews/addressables-integration-acceptance.md @@ -20,7 +20,7 @@ 真实 Addressables 测试资源： -- 路径：`Assets/FlowScope/Tests/PlayMode/Resources_moved/Fixtures/Addressables/FlowScopeAddressablesText.txt` +- 路径：`Assets/FlowScope/Tests/PlayMode/Resources/Fixtures/Addressables/FlowScopeAddressablesText.txt` - 内容：`FlowScope Addressables Acceptance` - GUID：`7e04733ce9dab74459592d3bd99fcafd` - Addressables group：`Default Local Group` @@ -68,7 +68,7 @@ m_Address: FlowScope.Tests.Addressables.Text ## 剩余注意事项 -- 当前 Addressables 测试资源位于 `Resources_moved` 路径下；这是本轮真实验收的有效路径，但后续 package 迁移时应统一测试资源目录命名。 +- 当前 Addressables 测试资源已整理到 `Resources/Fixtures/Addressables` 路径下，为后续 package `Tests~` 迁移去掉临时目录命名。 - `Assets/FlowScope/Tests/PlayMode/Resources/Fixtures` 当前只剩空目录 meta，属于提交前清理候选。 - 当前验收仍在主项目内完成；P2 后续 package 阶段还需要在干净 Unity 项目中验证本地 package path 或 Git URL 安装。 diff --git a/docs/reviews/p2-phase1-completion-report.md b/docs/reviews/p2-phase1-completion-report.md index 773169c..c280f03 100644 --- a/docs/reviews/p2-phase1-completion-report.md +++ b/docs/reviews/p2-phase1-completion-report.md @@ -62,7 +62,7 @@ 剩余缺口： -- 当前 Addressables 测试资源路径为 `Assets/FlowScope/Tests/PlayMode/Resources_moved/Fixtures/Addressables/FlowScopeAddressablesText.txt`，后续 package 迁移时应统一测试资源目录命名。 +- 当前 Addressables 测试资源路径为 `Assets/FlowScope/Tests/PlayMode/Resources/Fixtures/Addressables/FlowScopeAddressablesText.txt`，早期临时目录命名已在 P2 第二阶段整理。 - `Assets/FlowScope/Tests/PlayMode/Resources/Fixtures` 当前只剩空目录 meta，属于提交前清理候选。 ### 4. Editor 最小诊断入口 @@ -165,7 +165,7 @@ git diff --check 1. 尚未创建正式 package 根目录和 `package.json` 文件。 2. 尚未在干净 Unity 项目中验证本地 package path 或 Git URL 安装。 3. 尚未实际打开 `Tools/FlowScope/Diagnostics` 做人工 UI 检查。 -4. Addressables 测试资源目录命名仍需在 package 迁移前统一。 +4. Addressables 测试资源目录命名已统一到 `Resources/Fixtures/Addressables`，后续仍需决定是否随 Tests 迁移到 package `Tests~`。 ## 下一阶段建议 @@ -176,5 +176,5 @@ git diff --check 1. 创建 `Packages/com.flowscope.gamecore` 和最小 `package.json`。 2. 先复制或镜像 Runtime 到 package 目录，不删除 `Assets/FlowScope`。 3. 在当前项目和一个干净 Unity 项目中验证本地 package path。 -4. 整理 Addressables 测试资源目录，再迁移 package 内 Tests。 +4. 基于已整理的 Addressables fixture 路径，迁移或镜像 package 内 Tests。 5. 再考虑 `Samples~/MainMenuP0` 和 Tests 的分批迁移。 diff --git a/docs/reviews/p2-phase2-package-preview-report.md b/docs/reviews/p2-phase2-package-preview-report.md index 8211a99..82816be 100644 --- a/docs/reviews/p2-phase2-package-preview-report.md +++ b/docs/reviews/p2-phase2-package-preview-report.md @@ -55,5 +55,5 @@ 1. 当前 preview tag 已可被消费方解析，但 tag 内 package 文档仍是打 tag 当时的快照。后续如果要让 package 内文档也随 tag 发布，应在文档修正后创建下一个 preview tag。 2. 已在后续切片镜像 `Samples~/MainMenuP0`，但尚未在消费方导入 package sample 做人工验收。 3. 还没有迁移 package 内 `Tests`。 -4. Addressables 测试资源仍位于主项目测试目录，后续迁移 Tests 前需要统一 fixture 路径。 +4. Addressables 测试资源已统一到主项目测试目录的 `Resources/Fixtures/Addressables`，后续迁移 Tests 前需要决定是否镜像到 package `Tests~`。 5. 仍需在一个真正空白 Unity 项目中重复 Git package 接入；FishingFrenzy 是真实消费方，但不是空白项目。