diff --git a/resource/roguelike/Mizuki/encounter_.json b/resource/roguelike/Mizuki/encounter_for_deposit.json similarity index 99% rename from resource/roguelike/Mizuki/encounter_.json rename to resource/roguelike/Mizuki/encounter_for_deposit.json index 503eddf9c9..2f3263aa2c 100644 --- a/resource/roguelike/Mizuki/encounter_.json +++ b/resource/roguelike/Mizuki/encounter_for_deposit.json @@ -1,5 +1,5 @@ { - "theme": "Mizuki_", + "theme": "Mizuki_deposit", "stage": [ { "name": "悬高之葬", diff --git a/resource/roguelike/Phantom/encounter_.json b/resource/roguelike/Phantom/encounter_for_deposit.json similarity index 99% rename from resource/roguelike/Phantom/encounter_.json rename to resource/roguelike/Phantom/encounter_for_deposit.json index 082b8ef162..d7a62fab69 100644 --- a/resource/roguelike/Phantom/encounter_.json +++ b/resource/roguelike/Phantom/encounter_for_deposit.json @@ -1,5 +1,5 @@ { - "theme": "Phantom_", + "theme": "Phantom_deposit", "stage": [ { "name": "扎营", diff --git a/resource/roguelike/Sami/encounter_.json b/resource/roguelike/Sami/encounter_for_deposit.json similarity index 99% rename from resource/roguelike/Sami/encounter_.json rename to resource/roguelike/Sami/encounter_for_deposit.json index 072b3e49ac..2025f9e2d0 100644 --- a/resource/roguelike/Sami/encounter_.json +++ b/resource/roguelike/Sami/encounter_for_deposit.json @@ -1,5 +1,5 @@ { - "theme": "Sami_", + "theme": "Sami_deposit", "stage": [ { "name": "低地市集", diff --git a/src/MaaCore/Config/ResourceLoader.cpp b/src/MaaCore/Config/ResourceLoader.cpp index a33e440777..6f52ef235c 100644 --- a/src/MaaCore/Config/ResourceLoader.cpp +++ b/src/MaaCore/Config/ResourceLoader.cpp @@ -160,9 +160,9 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path) AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Phantom"_p / "encounter.json"_p); AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Mizuki"_p / "encounter.json"_p); AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Sami"_p / "encounter.json"_p); - AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Phantom"_p / "encounter_.json"_p); - AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Mizuki"_p / "encounter_.json"_p); - AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Sami"_p / "encounter_.json"_p); + AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Phantom"_p / "encounter_for_deposit.json"_p); + AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Mizuki"_p / "encounter_for_deposit.json"_p); + AsyncLoadConfig(RoguelikeStageEncounterConfig, "roguelike"_p / "Sami"_p / "encounter_for_deposit.json"_p); // 太占内存的资源,都是惰性加载 FutureAppendBegins diff --git a/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp index 895af30081..d3678ccdec 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp @@ -40,13 +40,10 @@ bool asst::RoguelikeStageEncounterTaskPlugin::_run() std::string rogue_theme = status()->get_properties(Status::RoguelikeTheme).value(); std::string rogue_mode = status()->get_properties(Status::RoguelikeMode).value(); - // 存钱模式 - std::vector events; + std::vector events = RoguelikeStageEncounter.get_events(rogue_theme); + // 刷源石锭模式 if (rogue_mode == "1") { - events = RoguelikeStageEncounter.get_events(rogue_theme + "_"); - } - else { - events = RoguelikeStageEncounter.get_events(rogue_theme); + events = RoguelikeStageEncounter.get_events(rogue_theme + "_deposit"); } std::vector event_names; std::unordered_map event_map;