From ed72dc90f5bae868e055e8644145ef6f14c7fd77 Mon Sep 17 00:00:00 2001 From: YoursFunny Date: Mon, 5 Oct 2026 22:36:17 +0800 Subject: [PATCH] fix: update configs and asset files --- config/template.json | 8 ++++ module/config/argument/args.json | 46 +++++++++++++++++++++ module/config/argument/task.yaml | 2 + module/config/config_generated.py | 8 ++++ module/config/i18n/en-US.json | 50 +++++++++++++++++++++++ module/config/i18n/zh-CN.json | 50 +++++++++++++++++++++++ tasks/bounty/assets/assets_bounty.py | 60 ++++++++++++++++++++++++---- 7 files changed, 216 insertions(+), 8 deletions(-) diff --git a/config/template.json b/config/template.json index a41942a..6ccfaaa 100644 --- a/config/template.json +++ b/config/template.json @@ -91,6 +91,14 @@ "Schoolhouse": { "Stage": 0, "Count": 2 + }, + "Road": { + "Stage": 0, + "Count": 0 + }, + "Mansion": { + "Stage": 0, + "Count": 0 } }, "Scrimmage": { diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 1b726be..efc5049 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -397,6 +397,52 @@ "type": "input", "value": 2 } + }, + "Road": { + "Stage": { + "type": "select", + "value": 0, + "option": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + }, + "Count": { + "type": "input", + "value": 0 + } + }, + "Mansion": { + "Stage": { + "type": "select", + "value": 0, + "option": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + }, + "Count": { + "type": "input", + "value": 0 + } } }, "Scrimmage": { diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index b7f5839..1cdb955 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -36,6 +36,8 @@ Daily: - Highway - DesertRailroad - Schoolhouse + - Road + - Mansion Scrimmage: - Scheduler - Scrimmage diff --git a/module/config/config_generated.py b/module/config/config_generated.py index cb528ec..5e720de 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -67,6 +67,14 @@ class GeneratedConfig: Schoolhouse_Stage = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 Schoolhouse_Count = 2 + # Group `Road` + Road_Stage = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 + Road_Count = 0 + + # Group `Mansion` + Mansion_Stage = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 + Mansion_Count = 0 + # Group `Scrimmage` Scrimmage_OnError = 'skip' # stop, skip diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 0e462ae..0fdc026 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -340,6 +340,56 @@ "help": "Sweep the selected stage for X times" } }, + "Road": { + "_info": { + "name": "Road", + "help": "" + }, + "Stage": { + "name": "Select Stage", + "help": "", + "0": "Auto select", + "1": "01 - Burning Road A", + "2": "02 - Burning Road B", + "3": "03 - Burning Road C", + "4": "04 - Burning Road D", + "5": "05 - Burning Road E", + "6": "06 - Burning Road F", + "7": "07 - Burning Road G", + "8": "08 - Burning Road H", + "9": "09 - Burning Road I", + "10": "10 - Burning Road J" + }, + "Count": { + "name": "Sweep X times", + "help": "Sweep the selected stage for X times" + } + }, + "Mansion": { + "_info": { + "name": "Mansion", + "help": "" + }, + "Stage": { + "name": "Select Stage", + "help": "", + "0": "Auto select", + "1": "01 - Historic Mansion A", + "2": "02 - Historic Mansion B", + "3": "03 - Historic Mansion C", + "4": "04 - Historic Mansion D", + "5": "05 - Historic Mansion E", + "6": "06 - Historic Mansion F", + "7": "07 - Historic Mansion G", + "8": "08 - Historic Mansion H", + "9": "09 - Historic Mansion I", + "10": "10 - Historic Mansion J" + }, + "Count": { + "name": "Sweep X times", + "help": "Sweep the selected stage for X times" + } + }, "Scrimmage": { "_info": { "name": "Scrimmage Settings", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 066a1e5..ea708b8 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -340,6 +340,56 @@ "help": "扫荡所选择关卡 X 次" } }, + "Road": { + "_info": { + "name": "道路", + "help": "" + }, + "Stage": { + "name": "选择关卡", + "help": "", + "0": "自动选择", + "1": "01 - 燃烧道路 A", + "2": "02 - 燃烧道路 B", + "3": "03 - 燃烧道路 C", + "4": "04 - 燃烧道路 D", + "5": "05 - 燃烧道路 E", + "6": "06 - 燃烧道路 F", + "7": "07 - 燃烧道路 G", + "8": "08 - 燃烧道路 H", + "9": "09 - 燃烧道路 I", + "10": "10 - 燃烧道路 J" + }, + "Count": { + "name": "扫荡次数", + "help": "扫荡所选择关卡 X 次" + } + }, + "Mansion": { + "_info": { + "name": "宅邸", + "help": "" + }, + "Stage": { + "name": "选择关卡", + "help": "", + "0": "自动选择", + "1": "01 - 古老宅邸 A", + "2": "02 - 古老宅邸 B", + "3": "03 - 古老宅邸 C", + "4": "04 - 古老宅邸 D", + "5": "05 - 古老宅邸 E", + "6": "06 - 古老宅邸 F", + "7": "07 - 古老宅邸 G", + "8": "08 - 古老宅邸 H", + "9": "09 - 古老宅邸 I", + "10": "10 - 古老宅邸 J" + }, + "Count": { + "name": "扫荡次数", + "help": "扫荡所选择关卡 X 次" + } + }, "Scrimmage": { "_info": { "name": "学院交流会设置", diff --git a/tasks/bounty/assets/assets_bounty.py b/tasks/bounty/assets/assets_bounty.py index a10d2a7..710200a 100644 --- a/tasks/bounty/assets/assets_bounty.py +++ b/tasks/bounty/assets/assets_bounty.py @@ -54,6 +54,28 @@ CHECK_HIGHWAY = ButtonWrapper( button=(104, 143, 391, 188), ), ) +CHECK_MANSION = ButtonWrapper( + name='CHECK_MANSION', + jp=Button( + file='./assets/jp/bounty/CHECK_MANSION.png', + area=(108, 148, 313, 178), + search=(88, 128, 333, 198), + color=(167, 173, 178), + button=(108, 148, 313, 178), + ), + en=None, +) +CHECK_ROAD = ButtonWrapper( + name='CHECK_ROAD', + jp=Button( + file='./assets/jp/bounty/CHECK_ROAD.png', + area=(108, 148, 313, 178), + search=(88, 128, 333, 198), + color=(168, 175, 179), + button=(108, 148, 313, 178), + ), + en=None, +) CHECK_SCHOOLHOUSE = ButtonWrapper( name='CHECK_SCHOOLHOUSE', jp=Button( @@ -92,10 +114,10 @@ SELECT_DESERT_RAILROAD = ButtonWrapper( name='SELECT_DESERT_RAILROAD', jp=Button( file='./assets/jp/bounty/SELECT_DESERT_RAILROAD.png', - area=(1066, 271, 1224, 311), - search=(1046, 251, 1244, 331), - color=(178, 188, 199), - button=(1066, 271, 1224, 311), + area=(1071, 290, 1219, 321), + search=(1051, 270, 1239, 341), + color=(155, 166, 181), + button=(1071, 290, 1219, 321), ), en=Button( file='./assets/en/bounty/SELECT_DESERT_RAILROAD.png', @@ -122,14 +144,36 @@ SELECT_HIGHWAY = ButtonWrapper( button=(1073, 167, 1223, 202), ), ) +SELECT_MANSION = ButtonWrapper( + name='SELECT_MANSION', + jp=Button( + file='./assets/jp/bounty/SELECT_MANSION.png', + area=(1156, 657, 1221, 688), + search=(1136, 637, 1241, 708), + color=(145, 158, 175), + button=(1156, 657, 1221, 688), + ), + en=None, +) +SELECT_ROAD = ButtonWrapper( + name='SELECT_ROAD', + jp=Button( + file='./assets/jp/bounty/SELECT_ROAD.png', + area=(1156, 535, 1219, 565), + search=(1136, 515, 1239, 585), + color=(146, 159, 175), + button=(1156, 535, 1219, 565), + ), + en=None, +) SELECT_SCHOOLHOUSE = ButtonWrapper( name='SELECT_SCHOOLHOUSE', jp=Button( file='./assets/jp/bounty/SELECT_SCHOOLHOUSE.png', - area=(1154, 381, 1223, 417), - search=(1134, 361, 1243, 437), - color=(173, 185, 198), - button=(1154, 381, 1223, 417), + area=(1157, 412, 1220, 443), + search=(1137, 392, 1240, 463), + color=(157, 170, 185), + button=(1157, 412, 1220, 443), ), en=Button( file='./assets/en/bounty/SELECT_SCHOOLHOUSE.png',