diff --git a/resource/global/YoStarJP/resource/tasks.json b/resource/global/YoStarJP/resource/tasks.json index 317b99d4de..0ed9ca122f 100644 --- a/resource/global/YoStarJP/resource/tasks.json +++ b/resource/global/YoStarJP/resource/tasks.json @@ -9,6 +9,21 @@ "幻滅" ] }, + "DH-Open": { + "text": [ + "ドッソレス", + "ホリデー", + "復刻", + "イベント", + "催中" + ] + }, + "DHChapterToDH": { + "text": [ + "大会", + "エントリー" + ] + }, "CharsNameOcrReplace": { "Doc": "该任务的 ocrReplace 被所有涉及干员名的日文识别任务复用 このタスクの「ocrReplace」は、オペレーター名に関連するすべての認識タスクで再利用されます", "replaceFull": true, @@ -3553,19 +3568,19 @@ ] ] }, - "DH-Open": { + "RoguelikeRefreshSupportBtnOcr": { "text": [ - "ドッソレス", - "ホリデー", - "復刻", - "イベント", - "催中" + "サポート更新" ] }, - "DHChapterToDH": { + "RoguelikeChooseSupportBtnOcr": { "text": [ - "大会", - "エントリー" + "サポート" + ] + }, + "Roguelike@RecruitSupportConfirm": { + "text": [ + "サポート招集" ] } } \ No newline at end of file diff --git a/resource/global/YoStarJP/resource/template/Roguelike@RefreshSupportBtn.png b/resource/global/YoStarJP/resource/template/Roguelike@RefreshSupportBtn.png new file mode 100644 index 0000000000..c2690ee48e Binary files /dev/null and b/resource/global/YoStarJP/resource/template/Roguelike@RefreshSupportBtn.png differ diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeRecruitSupportAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitSupportAnalyzer.cpp index eaf2efc5da..4c4dcdce58 100644 --- a/src/MaaCore/Vision/Roguelike/RoguelikeRecruitSupportAnalyzer.cpp +++ b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitSupportAnalyzer.cpp @@ -32,6 +32,8 @@ bool asst::RoguelikeRecruitSupportAnalyzer::analyze() OcrImageAnalyzer analyzer(m_image); analyzer.set_roi(Task.get("RoguelikeRecruitSupportOcr")->roi); analyzer.set_required(m_required); + analyzer.set_replace(Task.get("CharsNameOcrReplace")->replace_map, + Task.get("CharsNameOcrReplace")->replace_full); if (!analyzer.analyze()) return false; const auto& char_name_rects = analyzer.get_result(); diff --git a/tools/OverseasClients/FindMissingTemplates.py b/tools/OverseasClients/FindMissingTemplates.py index 35042eb30a..904ae435fb 100644 --- a/tools/OverseasClients/FindMissingTemplates.py +++ b/tools/OverseasClients/FindMissingTemplates.py @@ -36,8 +36,7 @@ ignore_list_file_name = "ignore_list_of_templates.txt" regex_ignore_list = [ "Mizuki", "SSS", - "Reclamation", - "Rogue" + "Reclamation" ] server_list = [ diff --git a/tools/OverseasClients/ignore_list_of_templates.txt b/tools/OverseasClients/ignore_list_of_templates.txt index a0559ec1ee..f888df8161 100644 --- a/tools/OverseasClients/ignore_list_of_templates.txt +++ b/tools/OverseasClients/ignore_list_of_templates.txt @@ -72,6 +72,21 @@ OfflineConfirm.png OperLockedMfg.png OperLockedTrade.png OperSelected.png +Phantom@Roguelike@CloseCollection.png +Phantom@Roguelike@GamePassSkip1Confirm.png +Phantom@Roguelike@InitalDrop.png +Phantom@Roguelike@LastRewardRand.png +Phantom@Roguelike@MissionFailedFlag.png +Phantom@Roguelike@StageBoons.png +Phantom@Roguelike@StageCambatDps.png +Phantom@Roguelike@StageDreadfulFoe.png +Phantom@Roguelike@StageEmergencyDps.png +Phantom@Roguelike@StageEncounter.png +Phantom@Roguelike@StageEncounterOptionFree.png +Phantom@Roguelike@StageEncounterOptionLeave.png +Phantom@Roguelike@StageEncounterSpecialClose.png +Phantom@Roguelike@StageSafeHouse.png +Phantom@Roguelike@StageTrader.png PopupCancel.png PopupConfirm.png RecruitConfirm.png @@ -81,6 +96,28 @@ RecruitSkip.png RecruitTimerDecrement.png ReplenishToMaxConfirm.png Return.png +Roguelike@AbandonConfirm.png +Roguelike@DialogSkipConfirm.png +Roguelike@ExitThenAbandon.png +Roguelike@GamePassTheEndConfirm.png +Roguelike@GetDropLeaveConfirm.png +Roguelike@IntegratedStrategies.png +Roguelike@MissionCompletedFlag.png +Roguelike@StageEncounterGiveUpRecruitConfirm.png +Roguelike@StageTraderInvestSystemError.png +Roguelike@TraderRandomShopping.png +RoguelikeBattleExitBegin.png +RoguelikeFormationOper.png +RoguelikeQuickFormationClearAndReselect.png +RoguelikeRecruitElite0.png +RoguelikeRecruitElite1.png +RoguelikeRecruitElite2.png +RoguelikeRecruitOcrFlag.png +RoguelikeRecruitSupportElite0.png +RoguelikeRecruitSupportElite1.png +RoguelikeRecruitSupportElite2.png +RoguelikeSkillSelectionFlag.png +RoguelikeSkillSelectionTeamFull.png SendClueConfirm.png SendClues.png SkipThePreBattlePlotConfirm.png