From c878f307afbb8e8f08b08b33ffa265ee4ccf8415 Mon Sep 17 00:00:00 2001
From: Manicsteiner <63437036+Manicsteiner@users.noreply.github.com>
Date: Fri, 19 Dec 2025 22:16:55 +0800
Subject: [PATCH] feat: YostarJP Roguelike JieGarden (#15116)
* feat: YostarJP Roguelike JieGarden
* chore: templates and docs
* chore: OCR edits
* chore: templates and ocr
* chore: add templates
* chore: ocr edit
* chore: ocr edit
* chore: ocr edit
* chore: ocr edit
* chore: remove CoppersAnalyzer roi
* chore: Update docs/ja-jp/manual/introduction/integrated-strategy.md
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
* chore: ocr edit
---------
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
---
.../introduction/integrated-strategy.md | 4 +-
.../global/YoStarJP/resource/ocr_config.json | 2 +-
.../resource/tasks/Roguelike/JieGarden.json | 255 ++++++++++++++++++
.../resource/tasks/Roguelike/base.json | 83 ++----
.../global/YoStarJP/resource/tasks/tasks.json | 61 +----
.../JieGarden@Roguelike@ChooseDifficulty.png | Bin 0 -> 8000 bytes
.../JieGarden@Roguelike@ChooseOperConfirm.png | Bin 0 -> 3308 bytes
...en@Roguelike@ClickRemainingCandleFlame.png | Bin 0 -> 6496 bytes
...n@Roguelike@ConfirmToLeaveBoskyPassage.png | Bin 0 -> 11071 bytes
.../JieGarden@Roguelike@Continue.png | Bin 0 -> 30115 bytes
...arden@Roguelike@CoppersAbandonExchange.png | Bin 0 -> 2206 bytes
...den@Roguelike@CoppersListDialogConfirm.png | Bin 0 -> 10259 bytes
.../JieGarden@Roguelike@CoppersTakeFlag.png | Bin 0 -> 3778 bytes
.../JieGarden@Roguelike@EnterAfterRecruit.png | Bin 0 -> 23858 bytes
.../JieGarden@Roguelike@GamePass.png | Bin 0 -> 45578 bytes
.../JieGarden@Roguelike@GamePassSkip1.png | Bin 0 -> 3837 bytes
.../JieGarden@Roguelike@GamePassSkip2.png | Bin 0 -> 3693 bytes
.../JieGarden@Roguelike@GetDrop1.png | Bin 0 -> 9122 bytes
.../JieGarden@Roguelike@GetDrop2.png | Bin 0 -> 9994 bytes
.../JieGarden@Roguelike@GetDropLeave.png | Bin 0 -> 26427 bytes
.../JieGarden@Roguelike@GetDropRecruit.png | Bin 0 -> 9023 bytes
.../JieGarden@Roguelike@GetDropSelect.png | Bin 0 -> 6790 bytes
...eGarden@Roguelike@GetDropSelectRecruit.png | Bin 0 -> 10444 bytes
...ieGarden@Roguelike@GetDropSelectReward.png | Bin 0 -> 8869 bytes
.../JieGarden@Roguelike@GetDropSwitch.png | Bin 0 -> 9287 bytes
.../JieGarden@Roguelike@LastRewardConfirm.png | Bin 0 -> 20460 bytes
.../JieGarden@Roguelike@MapObject.png | Bin 0 -> 2157 bytes
.../JieGarden@Roguelike@MissionFailedFlag.png | Bin 0 -> 34733 bytes
...JieGarden@Roguelike@MissionFailedFlag2.png | Bin 0 -> 38657 bytes
.../JieGarden/JieGarden@Roguelike@Recruit.png | Bin 0 -> 8465 bytes
.../JieGarden@Roguelike@RolesDefault.png | Bin 0 -> 64061 bytes
.../JieGarden@Roguelike@SquadDefault.png | Bin 0 -> 54484 bytes
...arden@Roguelike@StageBoskyPassageEnter.png | Bin 0 -> 21735 bytes
...ieGarden@Roguelike@StageCombatDpsEnter.png | Bin 0 -> 22956 bytes
...rden@Roguelike@StageDreadfulFoe-5Enter.png | Bin 0 -> 42303 bytes
...Garden@Roguelike@StageDreadfulFoeEnter.png | Bin 0 -> 37320 bytes
...arden@Roguelike@StageEmergencyDpsEnter.png | Bin 0 -> 22295 bytes
...ieGarden@Roguelike@StageEncounterEnter.png | Bin 0 -> 20852 bytes
...n@Roguelike@StageEncounterLeaveConfirm.png | Bin 0 -> 10197 bytes
...ieGarden@Roguelike@StageSafeHouseEnter.png | Bin 0 -> 20894 bytes
.../JieGarden@Roguelike@StageTraderEnter.png | Bin 0 -> 22672 bytes
...JieGarden@Roguelike@StageYiTraderEnter.png | Bin 0 -> 20934 bytes
.../JieGarden@Roguelike@StartExplore.png | Bin 0 -> 33265 bytes
.../JieGarden@Roguelike@TodoEnter.png | Bin 0 -> 40385 bytes
.../JieGarden/encounter/default.json | 7 +
src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 56 ++--
46 files changed, 322 insertions(+), 146 deletions(-)
create mode 100644 resource/global/YoStarJP/resource/tasks/Roguelike/JieGarden.json
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@ChooseDifficulty.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@ChooseOperConfirm.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@ClickRemainingCandleFlame.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@ConfirmToLeaveBoskyPassage.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@Continue.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@CoppersAbandonExchange.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@CoppersListDialogConfirm.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@CoppersTakeFlag.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@EnterAfterRecruit.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@GamePass.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@GamePassSkip1.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@GamePassSkip2.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@GetDrop1.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@GetDrop2.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@GetDropLeave.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@GetDropRecruit.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@GetDropSelect.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@GetDropSelectRecruit.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@GetDropSelectReward.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@GetDropSwitch.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@LastRewardConfirm.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MapObject.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MissionFailedFlag.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@MissionFailedFlag2.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@Recruit.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@RolesDefault.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@SquadDefault.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageBoskyPassageEnter.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageCombatDpsEnter.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageDreadfulFoe-5Enter.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageDreadfulFoeEnter.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEmergencyDpsEnter.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEncounterEnter.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageEncounterLeaveConfirm.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageSafeHouseEnter.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageTraderEnter.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StageYiTraderEnter.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@StartExplore.png
create mode 100644 resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@TodoEnter.png
diff --git a/docs/ja-jp/manual/introduction/integrated-strategy.md b/docs/ja-jp/manual/introduction/integrated-strategy.md
index 8c7b738577..83618eae8b 100644
--- a/docs/ja-jp/manual/introduction/integrated-strategy.md
+++ b/docs/ja-jp/manual/introduction/integrated-strategy.md
@@ -33,7 +33,7 @@ MAAはデフォルトで最新のテーマを選択しますが、`自動ロゲ
| ミヅキ | 波瀾万丈·3~7 | 人文主義分隊 / 精神論分隊 | 攻守一体 | ウィシャデル |
| サーミ | 自然の猛威·4~10 | 特訓分隊 / 援護戦術分隊 | 攻守一体 | ウィシャデル |
| サルカズ | 魂に直面·4~10 | 位置測定分隊 / 援護戦術分隊 | 攻守一体 | ウィシャデル |
-| 界園 | 請君入園·3~10 | 指揮分隊 / 援護戦術分隊 | 攻守一体 | ウィシャデル |
+| 界園 | 迎客入園·3~10 | 指揮分隊 / 援護戦術分隊 | 攻守一体 | ウィシャデル |
難易度の推奨は、`敵の難易度`、`希望消費`、`スコア倍率`などの要素を総合的に考慮しています。高い練度でテストした場合、比較的安定しており、実際の状況やニーズに応じて自由に調整できます。
@@ -43,7 +43,7 @@ MAAはデフォルトで最新のテーマを選択しますが、`自動ロゲ
| ミヅキ | `波瀾万丈·4` およびそれ以上の難易度では、六星オペレーターの召集に必要な希望消費が+1されます。 `精神論分隊` を使用して開始した場合、六星オペレーターを召集できないことがあります。
`精神論分隊` はアカウントの練度が高い場合に適しており、運に頼る必要があります。 |
| サーミ | `自然の猛威·6` およびそれ以上の難易度では、六星オペレーターの召集に必要な希望消費が+1されます。 `特訓分隊` を使用して開始した場合、六星オペレーターを召集できないことがあります。 |
| サルカズ | `魂に直面·15` およびそれ以上の難易度では、六星オペレーターの召集に必要な希望消費が+1されます。 `歴史再編`内でまだ `位置測定分隊強化Ⅱ`を有効にしていない場合、 `位置測定分隊` を使用して開始した場合、六星オペレーターを召集できないことがあります。
`位置測定分隊`を選択した場合、回避戦略が採用され、 `魂のしおり`を素早く取得できますが、基本的にエンディングをクリアすることはできません。
源石錐を収集戦略を使用した場合、開始時の分隊は `破棘成金分隊` とならば、商店更新戦略を使用してプロセスを加速します。 |
-| 界園 | `請君入園·15` およびそれ以上の難易度では、六星オペレーターの召集に必要な希望消費が+1されます。 `指揮分隊` を使用して開始した場合、六星オペレーターを召集できないことがあります。
難易度が `請君入園·3`に設定され、源石錐を収集戦略を使用して開始時の分隊が `指揮分隊` とならば、 `時の果て` でスキップ戦略を使用してプロセスを加速します。 |
+| 界園 | `迎客入園·15` およびそれ以上の難易度では、六星オペレーターの召集に必要な希望消費が+1されます。 `指揮分隊` を使用して開始した場合、六星オペレーターを召集できないことがあります。
難易度が `迎客入園·3` に設定され、源石錐収集戦略を使用して開始時の分隊が `指揮分隊` ならば、`時の果て` でスキップ戦略を使用してプロセスを加速します。 |
:::
diff --git a/resource/global/YoStarJP/resource/ocr_config.json b/resource/global/YoStarJP/resource/ocr_config.json
index fdf0bba046..2a6979886e 100644
--- a/resource/global/YoStarJP/resource/ocr_config.json
+++ b/resource/global/YoStarJP/resource/ocr_config.json
@@ -2,7 +2,7 @@
"equivalence_classes": [
["夕", "タ"],
["ニ", "二"],
- ["-", "ー", "一"],
+ ["-", "ー", "一", "−"],
["ト", "卜"],
["ロ", "口"],
["カ", "力"],
diff --git a/resource/global/YoStarJP/resource/tasks/Roguelike/JieGarden.json b/resource/global/YoStarJP/resource/tasks/Roguelike/JieGarden.json
new file mode 100644
index 0000000000..a05a1768f7
--- /dev/null
+++ b/resource/global/YoStarJP/resource/tasks/Roguelike/JieGarden.json
@@ -0,0 +1,255 @@
+{
+ "JieGarden@Roguelike@CheckLevel": {
+ "text": ["来園記念", "来園", "記念"]
+ },
+ "JieGarden@Roguelike@ConfirmToGiveUp": {
+ "text": ["撤退する"]
+ },
+ "JieGarden@Roguelike@CoppersAnalyzer-CastOCR": {
+ "Doc": "通宝已投出状态识别 - 通宝已投出识别用 roi 为 通宝类型 的 Rect.move(me.roi)",
+ "text": ["振出済"]
+ },
+ "JieGarden@Roguelike@CoppersExchangeFinish": {
+ "Doc": "通宝交换完成后的交换按钮 (用于确认交换操作完成)",
+ "text": ["交換"],
+ "roi": [575, 558, 240, 50]
+ },
+ "JieGarden@Roguelike@CoppersNameOcrReplace": {
+ "Doc": "通宝名称 OCR 识别替换规则 (用于修正 OCR 误识别)",
+ "fullMatch": true,
+ "ocrReplace": [
+ ["_+$", ""],
+ ["\\.+$", ""],
+ ["^(属|雇)", "厲"],
+ ["厲-西の廉貞", "厉-西廉贞"],
+ ["厲-北の刺面", "厉-北刺面"],
+ ["厲-南に山を見る", "厉-南见山"],
+ ["厲-東の欠角", "厉-东缺角"],
+ ["衡-奇土金を生ず", "衡-奇土生金"],
+ ["衡-水生じ木護る", "衡-水生木护"],
+ ["衡-金寒く水.*く", "衡-金寒水衍"],
+ ["花-火灼き土沃す", "花-火灼土沃"],
+ ["衡-匪風", "衡-匪风"],
+ ["衡-霹靂", "衡-霹雳"],
+ ["衡-旱熱", "衡-旱热"],
+ ["衡-霧氷", "衡-雾凇"],
+ ["花-馳道長し", "花-驰道长"],
+ ["花-武人の争い", "花-武人之争"],
+ ["花-百業俱に興る", "花-百业俱兴"],
+ ["厲-寒窓の志", "厉-寒窗志"],
+ ["衡-志遂げんと欲す", "衡-志欲遂"],
+ ["衡-慧にして災い避く", "衡-慧避灾"],
+ ["厲-戦にて血流る", "厉-战血流"],
+ ["厲-良弈に遇う", "厉-遇良弈"],
+ ["厲-隠市の憂", "厉-隐市忧"],
+ ["厲-法と律と", "厉-法与律"],
+ ["厲-両江の春", "厉-两江春"],
+ ["厲-凡物の変", "厉-凡物变"],
+ ["厲-人間長く存す", "厉-人间长存"],
+ ["厲-神農守る", "厉-神农守"],
+ ["厲-奇物を夢みる", "厉-梦奇物"],
+ ["厲-一字落つ", "厉-一字落"],
+ ["厲-機縁を待つ", "厉-待机缘"],
+ ["厲-人間を画く", "厉-画人间"],
+ ["厲-狂情を恣にす", "厉-恣狂情"],
+ ["NEW_DLC1", "衡-挪移"],
+ ["NEW_DLC1", "衡-迅步"],
+ ["NEW_DLC1", "厉-生材百相"],
+ ["NEW_DLC1", "衡-重铠"],
+ ["NEW_DLC1", "厉-火机"],
+ ["厲-歳醒める天時", "厉-岁醒天时"],
+ ["厲-無皎の昧", "厉-无皎之昧"],
+ ["衡-豊収を慶ぶ", "衡-庆丰收"],
+ ["衡-塞上の月", "衡-塞上月"],
+ ["花-力聚めば則ち強し", "花-聚力则强"],
+ ["衡-軍[屯中][墾型]す", "衡-军屯垦"],
+ ["厲-碩.*を安める", "厉-安硕鼷"],
+ ["衡-怪しき金券", "衡-诡意代币"],
+ ["厲-礼に合す", "厉-合乎礼"],
+ ["花-繭絹を成す", "花-茧成绢"],
+ ["厲-黒石伏す", "厉-黑子伏"],
+ ["花-平沙の盾", "花-平沙之盾"],
+ ["花-火上の竈", "花-火上之灶"],
+ ["NEW_DLC1", "花-界园行"],
+ ["NEW_DLC1", "衡-债难偿"],
+ ["NEW_DLC1", "衡-触锁代币"],
+ ["NEW_DLC1", "花-延识镇木"],
+ ["厲-山を移すこと難し", "厉-移山难"],
+ ["衡-山を移すこと繁わし", "衡-移山繁"],
+ ["厲-朝に道を聞く", "厉-朝闻道"],
+ ["衡-天下の先", "衡-天下先"],
+ ["衡-初めに文有り", "衡-初有文"],
+ ["花-道載せること遠し", "花-载道远"],
+ ["衡-体運らすに勤しむ", "衡-勤运体"],
+ ["花-性情を修む", "花-修性情"],
+ ["花-心患うこと無し", "花-心无患"],
+ ["花-[鴨陽]爵の金幣", "花-鸭爵金币"],
+ ["衡-鴻蒙荒を開く", "衡-鸿蒙开荒"],
+ ["花-己が任重し", "花-己任重"],
+ ["花-聖詔神を封ず", "花-圣诏封神"],
+ ["花-神秘なる商賈", "花-神秘商贾"],
+ ["厲-誅邪雷法", "厉-诛邪雷法"],
+ ["厲-商路行き難し", "厉-商路难行"],
+ ["NEW_DLC1", "花-孜孜不倦"],
+ ["衡-虹[霓霞]", "衡-虹霓"],
+ ["衡-[霖森]雨", "衡-霖雨"]
+ ]
+ },
+ "JieGarden@Roguelike@GiveUpOperation": {
+ "text": ["撤退する"]
+ },
+ "JieGarden@Roguelike@NextLevel": {
+ "ocrReplace": [
+ ["雲瓦[亭亨夢幕]", "雲瓦亭"],
+ ["汝吾(門)?", "汝吾門"],
+ ["見字[祠乱嗣]", "見字祠"]
+ ],
+ "text": ["洪陸楼", "山水閣", "雲瓦亭", "汝吾門", "見字祠", "始末陵", "是非境"]
+ },
+ "JieGarden@Roguelike@ReserveRecruitmentVoucherConfirm": {
+ "text": ["保留する"]
+ },
+ "JieGarden@Roguelike@SelectTheme": {
+ "text": ["来園記念", "来園", "記念"]
+ },
+ "JieGarden@Roguelike@StageSafeHouseReuse": {
+ "text": ["セーフハウスを利用する"]
+ },
+ "JieGarden@Roguelike@StrategyChange_mode0": {
+ "text": ["_default", "_boskyPassageDefault"],
+ "ocrReplace": [
+ ["洪陸楼", "_default"],
+ ["山水閣", "_default"],
+ ["雲瓦[亭亨夢幕]", "_default"],
+ ["汝吾(門)?", "_default"],
+ ["見字[祠乱嗣]", "_default"],
+ ["始末陵", "_default"],
+ ["是非境", "_boskyPassageDefault"]
+ ]
+ },
+ "JieGarden@Roguelike@StrategyChange_mode0_NOT_IN_USE": {
+ "text": ["_aggressive", "_pragmatic", "_default", "_boskyPassageDefault"],
+ "ocrReplace": [
+ ["洪陸楼", "_aggressive"],
+ ["山水閣", "_aggressive"],
+ ["雲瓦[亭亨夢幕]", "_pragmatic"],
+ ["汝吾(門)?", "_pragmatic"],
+ ["見字[祠乱嗣]", "_default"],
+ ["始末陵", "_default"],
+ ["是非境", "_boskyPassageDefault"]
+ ]
+ },
+ "JieGarden@Roguelike@StrategyChange_mode1": {
+ "text": ["_default", "_restart", "_leaveBoskyPassage"],
+ "ocrReplace": [
+ ["洪陸楼", "_default"],
+ ["山水閣", "_restart"],
+ ["雲瓦[亭亨夢幕]", "_restart"],
+ ["汝吾(門)?", "_restart"],
+ ["見字[祠乱嗣]", "_restart"],
+ ["始末陵", "_restart"],
+ ["是非境", "_leaveBoskyPassage"]
+ ]
+ },
+ "JieGarden@Roguelike@StrategyChange_mode1-FastPass": {
+ "baseTask": "JieGarden@Roguelike@StrategyChange_mode1",
+ "text": ["_fastPass", "_restart", "_leaveBoskyPassage"],
+ "ocrReplace": [
+ ["洪陸楼", "_fastPass"],
+ ["山水閣", "_restart"],
+ ["雲瓦[亭亨夢幕]", "_restart"],
+ ["汝吾(門)?", "_restart"],
+ ["見字[祠乱嗣]", "_restart"],
+ ["始末陵", "_restart"],
+ ["是非境", "_leaveBoskyPassage"]
+ ]
+ },
+ "JieGarden@Roguelike@StrategyChange_mode10001": {
+ "baseTask": "JieGarden@Roguelike@StrategyChange_mode1",
+ "text": ["_fastPass", "_restart", "_leaveBoskyPassage"],
+ "ocrReplace": [
+ ["洪陸楼", "_fastPass"],
+ ["山水閣", "_restart"],
+ ["雲瓦[亭亨夢幕]", "_restart"],
+ ["汝吾(門)?", "_restart"],
+ ["見字[祠乱嗣]", "_restart"],
+ ["始末陵", "_restart"],
+ ["是非境", "_leaveBoskyPassage"]
+ ]
+ },
+ "JieGarden@Roguelike@StrategyChange_mode20001": {
+ "text": ["_default", "_restart", "_boskyPassageDefault"],
+ "ocrReplace": [
+ ["洪陸楼", "_default"],
+ ["山水閣", "_restart"],
+ ["雲瓦[亭亨夢幕]", "_restart"],
+ ["汝吾(門)?", "_restart"],
+ ["見字[祠乱嗣]", "_restart"],
+ ["始末陵", "_restart"],
+ ["是非境", "_boskyPassageDefault"]
+ ]
+ },
+ "JieGarden@Roguelike@StrategyChange_mode4": {
+ "text": ["_default", "_exit", "_leaveBoskyPassage"],
+ "ocrReplace": [
+ ["洪陸楼", "_default"],
+ ["山水閣", "_exit"],
+ ["雲瓦[亭亨夢幕]", "_exit"],
+ ["汝吾(門)?", "_exit"],
+ ["見字[祠乱嗣]", "_exit"],
+ ["始末陵", "_exit"],
+ ["是非境", "_leaveBoskyPassage"]
+ ]
+ },
+ "JieGarden@Roguelike@StrategyChange_mode4-FastPass": {
+ "baseTask": "JieGarden@Roguelike@StrategyChange_mode1",
+ "text": ["_fastPass", "_exit", "_leaveBoskyPassage"],
+ "ocrReplace": [
+ ["洪陸楼", "_fastPass"],
+ ["山水閣", "_exit"],
+ ["雲瓦[亭亨夢幕]", "_exit"],
+ ["汝吾(門)?", "_exit"],
+ ["見字[祠乱嗣]", "_exit"],
+ ["始末陵", "_exit"],
+ ["是非境", "_leaveBoskyPassage"]
+ ]
+ },
+ "JieGarden@Roguelike@StrategyChange_mode6": {
+ "text": ["_default", "_boskyPassageDefault"],
+ "ocrReplace": [
+ ["洪陸楼", "_default"],
+ ["山水閣", "_default"],
+ ["雲瓦[亭亨夢幕]", "_default"],
+ ["汝吾(門)?", "_default"],
+ ["見字[祠乱嗣]", "_default"],
+ ["始末陵", "_default"],
+ ["是非境", "_boskyPassageDefault"]
+ ]
+ },
+ "JieGarden@Roguelike@StrategyChange_mode7": {
+ "text": ["_default", "_boskyPassageDefault"],
+ "ocrReplace": [
+ ["洪陸楼", "_default"],
+ ["山水閣", "_default"],
+ ["雲瓦[亭亨夢幕]", "_default"],
+ ["汝吾(門)?", "_default"],
+ ["見字[祠乱嗣]", "_default"],
+ ["始末陵", "_default"],
+ ["是非境", "_boskyPassageDefault"]
+ ]
+ },
+ "JieGarden@RoguelikeEncounterOptionAnalyzer-OptionHeaderBar-Text": {
+ "doc": "识别事件选项文字时,应用于 RegionOCRer 的配置任务,TODO",
+ "roi": [0, 0, 300, 43],
+ "ocrReplace": [
+ ["[_—,,\\.]+$", ""],
+ ["^[_—,,\\.]+", ""],
+ ["^[儡蟹]+", ""],
+ ["想要时的", "想要亥时的"],
+ ["找委溯果", "找黍溯果"],
+ ["睁开双眼.*", "睁开双眼——"],
+ ["^饮一口缸中水[,,].*", "饮一口缸中水,祈求好运"],
+ ["奉碑行仪.*", "奉碑行仪"]
+ ]
+ }
+}
diff --git a/resource/global/YoStarJP/resource/tasks/Roguelike/base.json b/resource/global/YoStarJP/resource/tasks/Roguelike/base.json
index bb9bc21ef1..61a501a268 100644
--- a/resource/global/YoStarJP/resource/tasks/Roguelike/base.json
+++ b/resource/global/YoStarJP/resource/tasks/Roguelike/base.json
@@ -19,7 +19,9 @@
["自由自在", "随心所欲"],
["先手必勝", "先手必胜"],
["攻守一体", "稳扎稳打"],
- ["前線支援", "取长补短"]
+ ["前線支援", "取长补短"],
+ ["柔軟配置", "灵活部署"],
+ ["難攻不落", "坚不可摧"]
]
},
"RoguelikeCustom-HijackSquad": {
@@ -48,7 +50,13 @@
["破棘成金分隊", "点刺成锭分队"],
["擬態学者分隊", "拟态学者分队"],
["奇想天外分隊", "异想天开分队"],
- ["専門家分隊", "专业人士分队"]
+ ["専門家分隊", "专业人士分队"],
+ ["特別行動分隊", "特勤分队"],
+ ["高台突破分隊", "高台突破分队"],
+ ["地面突破分隊", "地面突破分队"],
+ ["観光客分隊", "游客分队"],
+ ["司歳台分隊", "司岁台分队"],
+ ["天師府分隊", "天师府分队"]
]
},
"RoguelikeRecruitLevel": {
@@ -1107,7 +1115,6 @@
["叢立.*暗雲", "阴云如聚"],
["独り歩む老人", "孤行的老者"],
["生存のため", "为了生存"],
- ["苦難の道", "苦路"],
["苦.*の道", "苦路"],
["思いやり", "设身处地"],
["信念", "信念"],
@@ -1122,7 +1129,7 @@
["(涙|戻)目の.*ッロ(ー)?", "狗眼婆娑"],
["ダックパワーテスト", "鸭力测试"],
[".*クパワーテス.*", "鸭力测试"],
- ["暇潰し", "打发时间"],
+ ["[暇眼]潰し", "打发时间"],
["仕事への情熱は", "工作热情"],
["仕事への情熱は?", "工作热情?"],
["ビジネス帝国?", "商业帝国?"],
@@ -1252,92 +1259,52 @@
["一か八か", "孤注一掷"],
["リュー", "柳儿"],
["見ゆる所", "所见"],
- ["見ゆる所", "所见"],
- ["見ゆる所", "所见"],
- ["暫亭に入る", "入暂亭"],
+ ["[暫曹]亭に入る", "入暂亭"],
["ひとり釣り", "孤钓"],
["火の祭祀", "火祀"],
- ["饕餮の回廊", "饕餮廊"],
+ ["[饕餮矍餐饗費]{1,2}の回廊", "饕餮廊"],
["片隅に落ち着く", "偏安"],
- ["地を鎮めるもの", "地镇"],
+ ["[地也]を鎮めるもの", "地镇"],
["分かれ道", "岔路"],
["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
- ["地を鎮めるもの", "地镇"],
- ["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
- ["見ゆる所", "所见"],
- ["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
["天円地方", "天圆地方"],
["助言", "点拨"],
- ["地を鎮めるもの", "地镇"],
["地に擲ちて声有り", "掷地有声"],
- ["一人足らぬ", "三缺一"],
- ["祠の入り口", "祠堂口"],
- ["煙火、天に満つ", "烟火漫天"],
- ["印影集め", "集印"],
+ ["人足[ら5]ぬ", "三缺一"],
+ ["[祠耐]の入(り)?口", "祠堂口"],
+ ["煙火、天に満.*", "烟火漫天"],
+ ["[印日]影集[め秒]", "集印"],
["伝令", "传讯"],
- ["伝令", "传讯"],
- ["石の山", "石山"],
["石の山", "石山"],
["出会い", "相会"],
["燭堂", "烛堂"],
["棋を執る", "执棋"],
["海からの来客", "海中来客"],
- ["実りの園", "硕果园"],
+ ["実[りゆ]の園", "硕果园"],
["取り立て夜叉", "催债鬼夜叉"],
["夕江にて対擂す", "夕江对擂"],
["観者自在", "观者自在"],
["まんまるな財神", "滚圆财神"],
["ペッロー小僧", "鼓上佩洛"],
["自然の要塞", "天险"],
- ["地を鎮めるもの", "地镇"],
- ["形は存すれど意味を失う", "存形失意"],
- ["印影集め", "集印"],
- ["暫亭に入る", "入暂亭"],
- ["暫亭に入る", "入暂亭"],
["永遠のダック帝", "千古鸭帝"],
- ["見ゆる所", "所见"],
["来るもの拒まず", "来者不拒"],
- ["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
["燭堂", "烛堂"],
- ["形は存すれど意味を失う", "存形失意"],
["「ボブ福来商店」", "“鲍老板连锁”"],
["盗人の老羽獣", "老贼羽"],
- ["「蘊」に応じて生ず", "应“蕴”而生"],
- ["掌灯人と引燭人", "掌灯与引烛"],
- ["熊面金剛", "护鸭金刚"],
+ [".*に応じて生ず", "应“蕴”而生"],
+ ["掌灯人と[引弓]燭人", "掌灯与引烛"],
+ ["熊面金[剛岡]", "护鸭金刚"],
["球中天", "同心"],
- ["地を鎮めるもの", "地镇"],
- ["見ゆる所", "所见"],
["楡の蝶", "榆蝶"],
- ["形は存すれど意味を失う", "存形失意"],
["招かれざる客", "不速之客"],
- ["形は存すれど意味を失う", "存形失意"],
- ["形は存すれど意味を失う", "存形失意"],
["因を種えて果を得る", "种因得果"],
["生命の兆し", "生机"],
- ["形は存すれど意味を失う", "存形失意"],
- ["百氏の乱", "百氏之乱"],
+ ["百氏の乱[^の]", "百氏之乱"],
["筆を置く", "收笔"],
- ["形は存すれど意味を失う", "存形失意"],
["友との邂逅", "会友"],
- ["煙火、天に満つ", "烟火漫天"],
- ["暫亭に入る", "入暂亭"],
- ["球中天", "同心"],
- ["地を鎮めるもの", "地镇"],
- ["形は存すれど意味を失う", "存形失意"]
+ ["(百年煙を焚き|百年涙を化し|百年痕を累ね)", "珀"],
+ ["[禳確]解", "禳解"]
],
"roi": [0, 320, 725, 310]
},
diff --git a/resource/global/YoStarJP/resource/tasks/tasks.json b/resource/global/YoStarJP/resource/tasks/tasks.json
index 05db99951e..24d7dfcd24 100644
--- a/resource/global/YoStarJP/resource/tasks/tasks.json
+++ b/resource/global/YoStarJP/resource/tasks/tasks.json
@@ -899,7 +899,7 @@
["聖徒像ごっこ", "圣徒像扮演者"],
["夜行笠モジュール", "夜行斗篷模块"],
["夜行鉤爪モジュール", "夜行钩爪模块"],
- ["新約エクシア", "新约能天使"],
+ ["(新)?約エクシア", "新约能天使"],
["ミス.*クリスティ", "Miss.Christine"],
["サンクタ.*ミ[キサ]", "信仰搅拌机"],
["天工夜行セット", "天工夜行套装"],
@@ -1335,13 +1335,9 @@
["きらきら輝いて", "闪闪发光"],
["底なし", "源源不断"],
["憤怒", "愠怒"],
- ["憤怒", "愠怒"],
- ["局面打破", "破局"],
["局面打破", "破局"],
["貪欲にして妄執", "贪妄"],
["我を忘れる", "忘形"],
- ["我を忘れる", "忘形"],
- ["器頼み", "凭器"],
["器頼み", "凭器"],
["迷い", "迷惘"],
["人により鎮める", "人镇"],
@@ -1358,7 +1354,6 @@
["文字を知る", "识文"],
["ひたすらな前進", "长驱不复"],
["邪気払い", "去晦"],
- ["教訓とせず", "不鉴"],
["後方に山、前方に水", "背山面水"],
["守りしものは義なり", "所守者,义"],
["甘い誘い", "啖之以利"],
@@ -1367,80 +1362,32 @@
["老練の役者", "老戏骨"],
["まともな商売", "正经生意"],
["露店市場へ", "赶集"],
- ["器頼み", "凭器"],
- ["赴隕", "赴陨"],
["赴隕", "赴陨"],
["謗天", "谤天"],
["崖の下の器鬼", "为崖作伥"],
["高みの見物", "作壁上观"],
["心ここにあらず", "神游天外"],
- ["鼷獣の巣穴", "狡鼷三窟"],
- ["ケイ素器鬼の宴", "硅基伥的宴席"],
- ["逸を以て労を待つ", "以逸待劳"],
- ["鈴なりの果実", "硕果累累"],
- ["劫罰", "劫罚"],
- ["商売禁止", "循循善诱"],
- ["崖の下の器鬼", "为崖作伥"],
+ [".*獣の巣穴", "狡鼷三窟"],
["過去の沈黙", "往事喑哑"],
- ["舞台への出演", "赶场戏班"],
- ["山海の争い", "山海必争"],
- ["ひたすらな前進", "长驱不复"],
- ["教え有りて類無し", "有教无类"],
- ["露店市場へ", "赶集"],
- ["鼷獣の巣穴", "狡鼷三窟"],
- ["人により鎮める", "人镇"],
["青嶺は語らず", "青山不语"],
["歳を謀る者", "谋岁者"],
- ["歳破りし陣を祀る", "破岁阵祀"],
- ["闇討ちは防ぎ難し", "暗箭难防"],
+ ["歳破りし陣を.*る", "破岁阵祀"],
["教え導く", "点化"],
["仁・義・武", "仁·义·武"],
["夕娥の記憶", "夕娥忆"],
- ["まともな商売", "正经生意"],
["月華の寒気", "月华寒"],
["奇譚", "奇谭"],
- ["良いカモ", "易易鸭鸭"],
- ["輝かしい戦功", "峥嵘战功"],
["食い意地", "贪饵"],
["地に四難有り", "地有四难"],
- ["食い意地", "贪饵"],
- ["灼熱の炎", "炎灼"],
- ["守りしものは義なり", "所守者,义"],
["煙火に成らず", "不成烟火"],
["生ける百面相", "生百相"],
- ["完全制御不能", "彻底失控"],
["喜びは駄獣より来たる", "喜从驮来"],
- ["邪気払い", "去晦"],
- ["甘い誘い", "啖之以利"],
["古き文字は煙の如し", "昔字如烟"],
["夕江にて対擂す", "夕江对擂"],
- ["ささやかな謝礼", "薄礼一份"],
- ["謗天", "谤天"],
["強盗と泥棒", "明抢暗偷"],
- ["退場検査", "离域检查"],
["剣・刀・矛", "剑·刀·矛"],
- ["生ける百面相", "生百相"],
- ["煙火に成らず", "不成烟火"],
- ["後方に山、前方に水", "背山面水"],
- ["邙山町郷土誌", "邙山镇地方志"],
- ["底なし", "源源不断"],
["明瞭", "分明"],
- ["奇譚", "奇谭"],
- ["過去の沈黙", "往事喑哑"],
- ["憤怒", "愠怒"],
- ["青嶺は語らず", "青山不语"],
- ["強盗と泥棒", "明抢暗偷"],
- ["夕江にて対擂す", "夕江对擂"],
- ["退廃の音", "靡靡之音"],
- ["退廃の音", "靡靡之音"],
- ["老練の役者", "老戏骨"],
- ["迷い", "迷惘"],
- ["きらきら輝いて", "闪闪发光"],
- ["地に四難有り", "地有四难"],
- ["文字を知る", "识文"],
- ["喜びは駄獣より来たる", "喜从驮来"],
- ["飛来する災い", "飞来横祸"],
- ["落葉の帰る場所", "落叶归根"]
+ ["退廃の音", "靡靡之音"]
]
},
"BattleQuickFormationFilter-Cost": {
diff --git a/resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@ChooseDifficulty.png b/resource/global/YoStarJP/resource/template/Roguelike/JieGarden/JieGarden@Roguelike@ChooseDifficulty.png
new file mode 100644
index 0000000000000000000000000000000000000000..88f6cff62c9a47cc4da6aa03d10c24ded212cf45
GIT binary patch
literal 8000
zcmV-GAHU#
Px#32;bRa{vGqB>(^xB>_oNB=7(L9_2|yK~#9!rF&_tWyf(|Rdt_pxA*Sb<}I^x
zW;h%UNr{$7O0*owixkRIoJCnJz<=^92!bGg^EdFHC@=yfK@bE10wf3$*oiG85o}5j
zAwiKWlHw{3$>DG|&idZWy#21{bXVneb>DmLWJsAd3q3u3`}F#Cbyam&KYZ(7dbv?{ME-g_5aH?U6R`{Ms)^4YUE?zxug&s*F!MT!GjuHgc5J0dp(JH=HDA6lqfTf
z4P%{O76ALH*sz}@5A6$%kacwsVrq8O_Gua+k2ru-6&j}nV<0QcIVm%E3bK->K@Nz;
zQ7j7#mo%@#**>~1ge50(w
zz}o54rp2Dg6Z=k#I8W-e6@Om#!hbFu+PjZHY5;Re_H+fQ=FJ2Ho&VL#A*zE8pLyl2
zH&=&;AgzJjyN^A7c6aZjuAZKJ93MC9$kmTO8AYVbrGH)V=7%3z5Q_U8Yo?@zK+1cc
ze4
Ti7&elgtH16m||{+zsu1y<4=Xgb@n{qv*0
zdq>d)Ct)$0jh*Y#Jf1{&A|)|eb%xDQ3aK8^oyxc**|9`VZ380K-XV!Shnm{~ataYq
zIhnyy@;Op72`736`cL8>P$_ZJW)^d>XU^Q(l;ms+%;Hs#|4sIyGN^+w9^d@_SZ8+%
zou?9_Oxn(DD@L9w`5gkR;b5FV6z(lb0?+~;Us0|W@?S}T*Z~6329nN%fa@-IQLb-Q
z`BWCm=kb*m`m!=2gTq405o;wkFlD7t$j+M)3>6iCK?Tz=`9#YKw|6m{m2Oy_yL3L(
z01vzR?;j4%%2)YFm;Ci@qGi|Nlb!qO#7nkp-=lo`#iF}!x@+^#E^mOARr|`@=)cIo
zriK4aHV~N3w&9Jl7tG0+SB!xKx9*5xIt$Tjlu+)Z8Av@T1
1tQF~JJ6SpnFJG9I%
zp9k3zIXr3w4{F}J8w>|6$JFyC7G*z7x>PpMQxMw7EGrI`6mEFoM?G~7;L(6r0?Gh<
zY|s<=)&C&588a3?2_EUe6W9ZFV#_||fpm4}x1YzHEf|Sm(J4@-;H9Aa0*cX?qFKzJ
zpPhIAO`)p!|H~4Fqp?G$V|!1UL!-pIG22~`9sJrl6o|_&X5aA82cHktp2DrAxh$30
zmSNcp`vuL4hY;X~*~sEB_^buI*Z%l1Pe%HoU;lBWr5&Y1RTv+C>H4cNC^}1H?;W5J
zKME=dtJHSF&2}+{&!$u*oL&A{x5hA`pIZ
U%7oA%89E?=K+Wk%J)kc0QA3c}2JA)+E;
zEKWGbwA|$Car4AxQI-IJ2+q0j!T7Jf`JI=p-h0Sn(^O6D+7wCk$dR?jpMDYmQf3o*
z>*bgCws-rnI}Z3@5e`gmW$go$-q&@nh9y3{e&-jjymjl{Yo^keZ`7M`;ruZZ;^;$A
z5#<&dgGmAd1V^P&&pE&3S6d5i2(2lKAJ&>0-JkYOuOcuw2&K!bCHh2NC K}FQyKera*6n|+j!LCXq$!CbVIt&2oiPukjkZoKG|MJ4<+5YD5ss+YSoC;b
zxq9RD>2o({?~iR7NjoV7p@6*1vQoPfM@cMIA~`^50?dFgcpw>}#K^Wy-}#I06<80C
zORLpB^u^I1{`fE7`cLm4?ya5smp@b6ILA8BN+Ey@o-Cb{p%RmVC9l`wy9>}VS$~Pj
z5fqh9GZT_Ivd#s>4I-}UU8PkQ#hICz-~RTu|K)G~X7%dTOHOR9y>Q|D?mfHx%U550
z)j7Li!^X#US|g>m?%1(w&vTyGfA`DZ9{cQw)EemV4rS<)!eYHSeQRcP^QaJzWyW{o
zV<8Pt+hGPKQS9g0LxMoW`TYNP0E+W~2&DXAbZzJIq@|2Fmex07=hubdYjMvro%#-J
zv6