Skip to content

Commit eb73b3c

Browse files
Bug fix (LmeSzinc#5505)
* Merge pull request LmeSzinc#5500 from sui-feng-cb/event_update Fix: raid_20240328 ex * Upd: Battle UI Ancient * Upd: [EN] TEMPLATE_REVELATIONS_OF_DUST --------- Co-authored-by: ArecaSapling <115386623+sui-feng-cb@users.noreply.github.com>
2 parents cd1ef2c + 7118c30 commit eb73b3c

15 files changed

Lines changed: 13 additions & 9 deletions

File tree

3.44 KB
Loading

assets/cn/raid/RPG_RAID_EX.png

-2.87 KB
Loading

assets/en/raid/RPG_RAID_EX.png

-2.87 KB
Loading
3.1 KB
Loading

assets/jp/raid/RPG_RAID_EX.png

-2.87 KB
Loading

assets/tw/raid/RPG_RAID_EX.png

-2.87 KB
Loading

module/combat/combat.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ def is_combat_executing(self):
124124
return PAUSE_ShadowPuppetry
125125
if PAUSE_MaidCafe.match_template_color(self.device.image, offset=(10, 10)):
126126
return PAUSE_MaidCafe
127+
if PAUSE_Ancient.match_template_color(self.device.image, offset=(10, 10)):
128+
return PAUSE_Ancient
127129
return False
128130

129131
def handle_combat_quit(self, offset=(20, 20), interval=3):

module/combat_ui/assets.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# Don't modify it manually.
66

77
PAUSE = Button(area={'cn': (1158, 40, 1199, 58), 'en': (1155, 38, 1216, 51), 'jp': (1232, 36, 1240, 60), 'tw': (1217, 36, 1225, 59)}, color={'cn': (189, 190, 202), 'en': (164, 169, 181), 'jp': (244, 241, 246), 'tw': (247, 243, 247)}, button={'cn': (1157, 34, 1241, 61), 'en': (1136, 26, 1270, 63), 'jp': (1141, 38, 1220, 57), 'tw': (1157, 34, 1241, 61)}, file={'cn': './assets/cn/combat_ui/PAUSE.png', 'en': './assets/en/combat_ui/PAUSE.png', 'jp': './assets/jp/combat_ui/PAUSE.png', 'tw': './assets/tw/combat_ui/PAUSE.png'})
8+
PAUSE_Ancient = Button(area={'cn': (1228, 36, 1245, 55), 'en': (1228, 36, 1245, 55), 'jp': (1228, 36, 1245, 55), 'tw': (1228, 36, 1245, 55)}, color={'cn': (172, 161, 144), 'en': (172, 161, 144), 'jp': (172, 161, 144), 'tw': (172, 161, 144)}, button={'cn': (1228, 36, 1245, 55), 'en': (1228, 36, 1245, 55), 'jp': (1228, 36, 1245, 55), 'tw': (1228, 36, 1245, 55)}, file={'cn': './assets/cn/combat_ui/PAUSE_Ancient.png', 'en': './assets/cn/combat_ui/PAUSE_Ancient.png', 'jp': './assets/cn/combat_ui/PAUSE_Ancient.png', 'tw': './assets/cn/combat_ui/PAUSE_Ancient.png'})
89
PAUSE_Christmas = Button(area={'cn': (1234, 35, 1250, 56), 'en': (1234, 35, 1250, 56), 'jp': (1234, 35, 1250, 56), 'tw': (1234, 35, 1250, 56)}, color={'cn': (158, 181, 210), 'en': (158, 181, 210), 'jp': (158, 181, 210), 'tw': (158, 181, 210)}, button={'cn': (1234, 35, 1250, 56), 'en': (1234, 35, 1250, 56), 'jp': (1234, 35, 1250, 56), 'tw': (1234, 35, 1250, 56)}, file={'cn': './assets/cn/combat_ui/PAUSE_Christmas.png', 'en': './assets/cn/combat_ui/PAUSE_Christmas.png', 'jp': './assets/cn/combat_ui/PAUSE_Christmas.png', 'tw': './assets/cn/combat_ui/PAUSE_Christmas.png'})
910
PAUSE_Cyber = Button(area={'cn': (1231, 32, 1253, 59), 'en': (1231, 32, 1253, 59), 'jp': (1231, 32, 1253, 59), 'tw': (1231, 32, 1253, 59)}, color={'cn': (40, 140, 157), 'en': (40, 140, 157), 'jp': (40, 140, 157), 'tw': (40, 140, 157)}, button={'cn': (1231, 32, 1253, 59), 'en': (1231, 32, 1253, 59), 'jp': (1231, 32, 1253, 59), 'tw': (1231, 32, 1253, 59)}, file={'cn': './assets/cn/combat_ui/PAUSE_Cyber.png', 'en': './assets/cn/combat_ui/PAUSE_Cyber.png', 'jp': './assets/cn/combat_ui/PAUSE_Cyber.png', 'tw': './assets/cn/combat_ui/PAUSE_Cyber.png'})
1011
PAUSE_DOUBLE_CHECK = Button(area={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, color={'cn': (96, 104, 136), 'en': (83, 98, 118), 'jp': (97, 102, 120), 'tw': (96, 104, 136)}, button={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, file={'cn': './assets/cn/combat_ui/PAUSE_DOUBLE_CHECK.png', 'en': './assets/en/combat_ui/PAUSE_DOUBLE_CHECK.png', 'jp': './assets/jp/combat_ui/PAUSE_DOUBLE_CHECK.png', 'tw': './assets/tw/combat_ui/PAUSE_DOUBLE_CHECK.png'})

module/config/i18n/en-US.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,10 +1270,10 @@
12701270
"Mode": {
12711271
"name": "Raid Mode",
12721272
"help": "",
1273-
"easy": "easy",
1274-
"normal": "normal",
1275-
"hard": "hard",
1276-
"ex": "ex"
1273+
"easy": "Easy",
1274+
"normal": "Normal",
1275+
"hard": "Hard",
1276+
"ex": "EX"
12771277
},
12781278
"UseTicket": {
12791279
"name": "Use Ticket(s)",

module/config/i18n/zh-CN.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1273,7 +1273,7 @@
12731273
"easy": "简单",
12741274
"normal": "普通",
12751275
"hard": "困难",
1276-
"ex": "ex"
1276+
"ex": "EX"
12771277
},
12781278
"UseTicket": {
12791279
"name": "使用演习券",

0 commit comments

Comments
 (0)