From 7891ba2c8dafc49b5cd83f6da2d5f0099674d4e2 Mon Sep 17 00:00:00 2001 From: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com> Date: Mon, 8 Jul 2024 03:30:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E8=82=89?= =?UTF-8?q?=E9=B8=BD=E4=B8=8D=E6=9C=9F=E8=80=8C=E9=81=87=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E7=9A=84=E7=9B=AE=E5=BD=95=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/zh-cn/protocol/integrated-strategy-schema.md | 13 +++++++------ .../{encounter.json => encounter/default.json} | 0 .../deposit.json} | 0 .../{encounter.json => encounter/default.json} | 0 .../deposit.json} | 0 .../collapse.json} | 0 .../{encounter.json => encounter/default.json} | 0 .../deposit.json} | 0 src/MaaCore/Config/ResourceLoader.cpp | 14 +++++++------- 9 files changed, 14 insertions(+), 13 deletions(-) rename resource/roguelike/Mizuki/{encounter.json => encounter/default.json} (100%) rename resource/roguelike/Mizuki/{encounter_for_deposit.json => encounter/deposit.json} (100%) rename resource/roguelike/Phantom/{encounter.json => encounter/default.json} (100%) rename resource/roguelike/Phantom/{encounter_for_deposit.json => encounter/deposit.json} (100%) rename resource/roguelike/Sami/{encounter_for_collapse.json => encounter/collapse.json} (100%) rename resource/roguelike/Sami/{encounter.json => encounter/default.json} (100%) rename resource/roguelike/Sami/{encounter_for_deposit.json => encounter/deposit.json} (100%) diff --git a/docs/zh-cn/protocol/integrated-strategy-schema.md b/docs/zh-cn/protocol/integrated-strategy-schema.md index 2c788e7af3..b379d172a7 100644 --- a/docs/zh-cn/protocol/integrated-strategy-schema.md +++ b/docs/zh-cn/protocol/integrated-strategy-schema.md @@ -11,14 +11,15 @@ icon: ri:game-fill ## 肉鸽资源存放位置 -- `resource/roguelike/`下按照主题存放各个肉鸽的作业资源 - - 主题文件夹：`Phantom/` 为傀影肉鸽资源，`Mizuki/` 为水月肉鸽资源,`Sami/` 为萨米肉鸽资源 - - `autopilot/`内是各个关卡的作战 json +- `resource/roguelike/` 下按照主题存放各个肉鸽的作业资源 + - 主题文件夹：`Phantom/` 为傀影肉鸽资源，`Mizuki/` 为水月肉鸽资源, `Sami/` 为萨米肉鸽资源 + - `autopilot/` 内是各个关卡的作战 json - `关卡名.json` 关卡的作战逻辑 - `关卡名_collapse.json` 关卡的作战逻辑（刷坍缩范式模式） - - `encounter.json` 不期而遇类事件逻辑（刷等级模式） - - `encounter_for_deposit.json` 不期而遇类事件逻辑（刷源石锭模式） - - `encounter_for_collapse.json` 不期而遇类事件逻辑（刷坍缩范式模式） + - `encounter/` 内是不期而遇类事件逻辑 + - `default.json` 刷等级模式 + - `deposit.json` 刷源石锭模式 + - `collapse.json` 刷坍缩范式模式 - `recruitment.json` 干员招募逻辑 - `shopping.json` 商店购买藏品逻辑 diff --git a/resource/roguelike/Mizuki/encounter.json b/resource/roguelike/Mizuki/encounter/default.json similarity index 100% rename from resource/roguelike/Mizuki/encounter.json rename to resource/roguelike/Mizuki/encounter/default.json diff --git a/resource/roguelike/Mizuki/encounter_for_deposit.json b/resource/roguelike/Mizuki/encounter/deposit.json similarity index 100% rename from resource/roguelike/Mizuki/encounter_for_deposit.json rename to resource/roguelike/Mizuki/encounter/deposit.json diff --git a/resource/roguelike/Phantom/encounter.json b/resource/roguelike/Phantom/encounter/default.json similarity index 100% rename from resource/roguelike/Phantom/encounter.json rename to resource/roguelike/Phantom/encounter/default.json diff --git a/resource/roguelike/Phantom/encounter_for_deposit.json b/resource/roguelike/Phantom/encounter/deposit.json similarity index 100% rename from resource/roguelike/Phantom/encounter_for_deposit.json rename to resource/roguelike/Phantom/encounter/deposit.json diff --git a/resource/roguelike/Sami/encounter_for_collapse.json b/resource/roguelike/Sami/encounter/collapse.json similarity index 100% rename from resource/roguelike/Sami/encounter_for_collapse.json rename to resource/roguelike/Sami/encounter/collapse.json diff --git a/resource/roguelike/Sami/encounter.json b/resource/roguelike/Sami/encounter/default.json similarity index 100% rename from resource/roguelike/Sami/encounter.json rename to resource/roguelike/Sami/encounter/default.json diff --git a/resource/roguelike/Sami/encounter_for_deposit.json b/resource/roguelike/Sami/encounter/deposit.json similarity index 100% rename from resource/roguelike/Sami/encounter_for_deposit.json rename to resource/roguelike/Sami/encounter/deposit.json diff --git a/src/MaaCore/Config/ResourceLoader.cpp b/src/MaaCore/Config/ResourceLoader.cpp index 2627295bdc..844a133650 100644 --- a/src/MaaCore/Config/ResourceLoader.cpp +++ b/src/MaaCore/Config/ResourceLoader.cpp @@ -191,25 +191,25 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path) LoadResourceAndCheckRet( RoguelikeStageEncounterConfig, - "roguelike"_p / "Phantom"_p / "encounter.json"_p); + "roguelike"_p / "Phantom"_p / "encounter"_p / "default.json"_p); LoadResourceAndCheckRet( RoguelikeStageEncounterConfig, - "roguelike"_p / "Mizuki"_p / "encounter.json"_p); + "roguelike"_p / "Mizuki"_p / "encounter"_p / "default.json"_p); LoadResourceAndCheckRet( RoguelikeStageEncounterConfig, - "roguelike"_p / "Sami"_p / "encounter.json"_p); + "roguelike"_p / "Sami"_p / "encounter"_p / "default.json"_p); LoadResourceAndCheckRet( RoguelikeStageEncounterConfig, - "roguelike"_p / "Phantom"_p / "encounter_for_deposit.json"_p); + "roguelike"_p / "Phantom"_p / "encounter"_p / "deposit.json"_p); LoadResourceAndCheckRet( RoguelikeStageEncounterConfig, - "roguelike"_p / "Mizuki"_p / "encounter_for_deposit.json"_p); + "roguelike"_p / "Mizuki"_p / "encounter"_p / "deposit.json"_p); LoadResourceAndCheckRet( RoguelikeStageEncounterConfig, - "roguelike"_p / "Sami"_p / "encounter_for_deposit.json"_p); + "roguelike"_p / "Sami"_p / "encounter"_p / "deposit.json"_p); LoadResourceAndCheckRet( RoguelikeStageEncounterConfig, - "roguelike"_p / "Sami"_p / "encounter_for_collapse.json"_p); + "roguelike"_p / "Sami"_p / "encounter"_p / "collapse.json"_p); LoadResourceAndCheckRet( RoguelikeFoldartalConfig,