mirror of
https://github.com/0O0o0oOoO00/Alas.git
synced 2026-05-14 14:49:25 +08:00
Merge remote-tracking branch 'LmeSzinc/master' into refactor
# Conflicts: # module/config/argument/args.json
This commit is contained in:
0O0o0oOoO00
@@ -68,6 +68,7 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
|
||||
bool:
|
||||
"""
|
||||
image = self.image_crop((0, 620, 1280, 690), copy=False)
|
||||
# note that CN/EN/TW are the same, but JP character is smaller
|
||||
similarity, button = TEMPLATE_COMBAT_LOADING.match_luma_result(image)
|
||||
if similarity > 0.85:
|
||||
loading = (button.area[0] + 38 - LOADING_BAR.area[0]) / (LOADING_BAR.area[2] - LOADING_BAR.area[0])
|
||||
@@ -121,6 +122,8 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
|
||||
return PAUSE_Ninja
|
||||
if PAUSE_ShadowPuppetry.match_luma(self.device.image, offset=(10, 10)):
|
||||
return PAUSE_ShadowPuppetry
|
||||
if PAUSE_MaidCafe.match_template_color(self.device.image, offset=(10, 10)):
|
||||
return PAUSE_MaidCafe
|
||||
return False
|
||||
|
||||
def handle_combat_quit(self, offset=(20, 20), interval=3):
|
||||
@@ -168,6 +171,10 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
|
||||
self.device.click(QUIT_Ninja)
|
||||
timer.reset()
|
||||
return True
|
||||
if QUIT_MaidCafe.match_luma(self.device.image, offset=offset):
|
||||
self.device.click(QUIT_MaidCafe)
|
||||
timer.reset()
|
||||
return True
|
||||
return False
|
||||
|
||||
def ensure_combat_oil_loaded(self):
|
||||
@@ -630,9 +637,3 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
|
||||
# self.handle_map_after_combat_story()
|
||||
|
||||
logger.info('Combat end.')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
self = Combat('alas5')
|
||||
self.image_file = r'C:\Users\LmeSzinc\Documents\MuMu共享文件夹\Screenshots\MuMu12-20251219-021500.png'
|
||||
self.is_combat_loading()
|
||||
@@ -11,6 +11,7 @@ PAUSE_DOUBLE_CHECK = Button(area={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1
|
||||
PAUSE_Devil = Button(area={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, color={'cn': (193, 98, 108), 'en': (193, 98, 108), 'jp': (193, 98, 108), 'tw': (193, 98, 108)}, button={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Devil.png', 'en': './assets/cn/combat_ui/PAUSE_Devil.png', 'jp': './assets/cn/combat_ui/PAUSE_Devil.png', 'tw': './assets/cn/combat_ui/PAUSE_Devil.png'})
|
||||
PAUSE_HolyLight = Button(area={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, color={'cn': (54, 40, 27), 'en': (54, 40, 27), 'jp': (54, 40, 27), 'tw': (54, 40, 27)}, button={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'en': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'jp': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'tw': './assets/cn/combat_ui/PAUSE_HolyLight.png'})
|
||||
PAUSE_Iridescent_Fantasy = Button(area={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, color={'cn': (124, 139, 190), 'en': (124, 139, 190), 'jp': (124, 139, 190), 'tw': (124, 139, 190)}, button={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Iridescent_Fantasy.png', 'en': './assets/en/combat_ui/PAUSE_Iridescent_Fantasy.png', 'jp': './assets/jp/combat_ui/PAUSE_Iridescent_Fantasy.png', 'tw': './assets/tw/combat_ui/PAUSE_Iridescent_Fantasy.png'})
|
||||
PAUSE_MaidCafe = Button(area={'cn': (1230, 35, 1248, 54), 'en': (1230, 35, 1248, 54), 'jp': (1230, 35, 1248, 54), 'tw': (1230, 35, 1248, 54)}, color={'cn': (159, 145, 139), 'en': (159, 145, 139), 'jp': (159, 145, 139), 'tw': (159, 145, 139)}, button={'cn': (1230, 35, 1248, 54), 'en': (1230, 35, 1248, 54), 'jp': (1230, 35, 1248, 54), 'tw': (1230, 35, 1248, 54)}, file={'cn': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'en': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'jp': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'tw': './assets/cn/combat_ui/PAUSE_MaidCafe.png'})
|
||||
PAUSE_Neon = Button(area={'cn': (1228, 32, 1250, 59), 'en': (1228, 32, 1250, 59), 'jp': (1228, 32, 1250, 59), 'tw': (1228, 32, 1250, 59)}, color={'cn': (106, 137, 80), 'en': (106, 137, 80), 'jp': (106, 137, 80), 'tw': (106, 137, 80)}, button={'cn': (1228, 32, 1250, 59), 'en': (1228, 32, 1250, 59), 'jp': (1228, 32, 1250, 59), 'tw': (1228, 32, 1250, 59)}, file={'cn': './assets/cn/combat_ui/PAUSE_Neon.png', 'en': './assets/cn/combat_ui/PAUSE_Neon.png', 'jp': './assets/cn/combat_ui/PAUSE_Neon.png', 'tw': './assets/cn/combat_ui/PAUSE_Neon.png'})
|
||||
PAUSE_New = Button(area={'cn': (1231, 29, 1253, 56), 'en': (1231, 29, 1253, 56), 'jp': (1231, 29, 1253, 56), 'tw': (1231, 29, 1253, 56)}, color={'cn': (156, 158, 166), 'en': (156, 158, 166), 'jp': (156, 158, 166), 'tw': (156, 158, 166)}, button={'cn': (1231, 29, 1253, 56), 'en': (1231, 29, 1253, 56), 'jp': (1231, 29, 1253, 56), 'tw': (1231, 29, 1253, 56)}, file={'cn': './assets/cn/combat_ui/PAUSE_New.png', 'en': './assets/en/combat_ui/PAUSE_New.png', 'jp': './assets/jp/combat_ui/PAUSE_New.png', 'tw': './assets/tw/combat_ui/PAUSE_New.png'})
|
||||
PAUSE_Ninja = Button(area={'cn': (1230, 37, 1246, 53), 'en': (1230, 37, 1246, 53), 'jp': (1230, 37, 1246, 53), 'tw': (1230, 37, 1246, 53)}, color={'cn': (135, 109, 92), 'en': (135, 109, 92), 'jp': (135, 109, 92), 'tw': (135, 109, 92)}, button={'cn': (1230, 37, 1246, 53), 'en': (1230, 37, 1246, 53), 'jp': (1230, 37, 1246, 53), 'tw': (1230, 37, 1246, 53)}, file={'cn': './assets/cn/combat_ui/PAUSE_Ninja.png', 'en': './assets/cn/combat_ui/PAUSE_Ninja.png', 'jp': './assets/cn/combat_ui/PAUSE_Ninja.png', 'tw': './assets/cn/combat_ui/PAUSE_Ninja.png'})
|
||||
@@ -23,6 +24,7 @@ QUIT = Button(area={'cn': (420, 490, 593, 548), 'en': (473, 508, 567, 532), 'jp'
|
||||
QUIT_Christmas = Button(area={'cn': (400, 506, 477, 525), 'en': (410, 507, 469, 524), 'jp': (400, 506, 477, 525), 'tw': (400, 506, 477, 525)}, color={'cn': (195, 139, 166), 'en': (207, 166, 185), 'jp': (195, 139, 166), 'tw': (195, 139, 166)}, button={'cn': (400, 506, 477, 525), 'en': (410, 507, 469, 524), 'jp': (400, 506, 477, 525), 'tw': (400, 506, 477, 525)}, file={'cn': './assets/cn/combat_ui/QUIT_Christmas.png', 'en': './assets/en/combat_ui/QUIT_Christmas.png', 'jp': './assets/cn/combat_ui/QUIT_Christmas.png', 'tw': './assets/cn/combat_ui/QUIT_Christmas.png'})
|
||||
QUIT_Cyber = Button(area={'cn': (393, 506, 470, 524), 'en': (393, 506, 470, 524), 'jp': (393, 506, 470, 524), 'tw': (393, 506, 470, 524)}, color={'cn': (255, 198, 190), 'en': (255, 198, 190), 'jp': (255, 198, 190), 'tw': (255, 198, 190)}, button={'cn': (393, 506, 470, 524), 'en': (393, 506, 470, 524), 'jp': (393, 506, 470, 524), 'tw': (393, 506, 470, 524)}, file={'cn': './assets/cn/combat_ui/QUIT_Cyber.png', 'en': './assets/cn/combat_ui/QUIT_Cyber.png', 'jp': './assets/cn/combat_ui/QUIT_Cyber.png', 'tw': './assets/tw/combat_ui/QUIT_Cyber.png'})
|
||||
QUIT_Iridescent_Fantasy = Button(area={'cn': (391, 522, 464, 540), 'en': (402, 507, 460, 523), 'jp': (391, 522, 464, 540), 'tw': (391, 522, 464, 540)}, color={'cn': (121, 73, 79), 'en': (255, 174, 164), 'jp': (108, 60, 70), 'tw': (121, 73, 79)}, button={'cn': (391, 522, 464, 540), 'en': (402, 507, 460, 523), 'jp': (391, 522, 464, 540), 'tw': (391, 522, 464, 540)}, file={'cn': './assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png', 'en': './assets/en/combat_ui/QUIT_Iridescent_Fantasy.png', 'jp': './assets/jp/combat_ui/QUIT_Iridescent_Fantasy.png', 'tw': './assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png'})
|
||||
QUIT_MaidCafe = Button(area={'cn': (423, 549, 501, 568), 'en': (423, 549, 501, 568), 'jp': (423, 549, 501, 568), 'tw': (423, 549, 501, 568)}, color={'cn': (168, 142, 133), 'en': (168, 142, 133), 'jp': (168, 142, 133), 'tw': (168, 142, 133)}, button={'cn': (423, 549, 501, 568), 'en': (423, 549, 501, 568), 'jp': (423, 549, 501, 568), 'tw': (423, 549, 501, 568)}, file={'cn': './assets/cn/combat_ui/QUIT_MaidCafe.png', 'en': './assets/cn/combat_ui/QUIT_MaidCafe.png', 'jp': './assets/cn/combat_ui/QUIT_MaidCafe.png', 'tw': './assets/cn/combat_ui/QUIT_MaidCafe.png'})
|
||||
QUIT_New = Button(area={'cn': (394, 506, 467, 524), 'en': (404, 506, 463, 523), 'jp': (394, 506, 467, 524), 'tw': (393, 505, 471, 524)}, color={'cn': (255, 180, 171), 'en': (255, 195, 187), 'jp': (255, 180, 171), 'tw': (255, 200, 193)}, button={'cn': (394, 506, 467, 524), 'en': (404, 506, 463, 523), 'jp': (394, 506, 467, 524), 'tw': (393, 505, 471, 524)}, file={'cn': './assets/cn/combat_ui/QUIT_New.png', 'en': './assets/en/combat_ui/QUIT_New.png', 'jp': './assets/cn/combat_ui/QUIT_New.png', 'tw': './assets/tw/combat_ui/QUIT_New.png'})
|
||||
QUIT_Ninja = Button(area={'cn': (398, 509, 477, 528), 'en': (398, 509, 477, 528), 'jp': (398, 509, 477, 528), 'tw': (398, 509, 477, 528)}, color={'cn': (148, 138, 134), 'en': (148, 138, 134), 'jp': (148, 138, 134), 'tw': (148, 138, 134)}, button={'cn': (398, 509, 477, 528), 'en': (398, 509, 477, 528), 'jp': (398, 509, 477, 528), 'tw': (398, 509, 477, 528)}, file={'cn': './assets/cn/combat_ui/QUIT_Ninja.png', 'en': './assets/cn/combat_ui/QUIT_Ninja.png', 'jp': './assets/cn/combat_ui/QUIT_Ninja.png', 'tw': './assets/cn/combat_ui/QUIT_Ninja.png'})
|
||||
QUIT_Nurse = Button(area={'cn': (400, 507, 477, 525), 'en': (400, 507, 477, 525), 'jp': (400, 507, 477, 525), 'tw': (400, 507, 477, 525)}, color={'cn': (254, 193, 170), 'en': (254, 193, 170), 'jp': (254, 193, 170), 'tw': (254, 193, 170)}, button={'cn': (400, 507, 477, 525), 'en': (400, 507, 477, 525), 'jp': (400, 507, 477, 525), 'tw': (400, 507, 477, 525)}, file={'cn': './assets/cn/combat_ui/QUIT_Nurse.png', 'en': './assets/cn/combat_ui/QUIT_Nurse.png', 'jp': './assets/cn/combat_ui/QUIT_Nurse.png', 'tw': './assets/cn/combat_ui/QUIT_Nurse.png'})
|
||||
|
||||
@@ -3692,6 +3692,7 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20251218_cn",
|
||||
"event_20251023_cn",
|
||||
"event_20220428_cn",
|
||||
"event_20250227_cn",
|
||||
@@ -4479,6 +4480,7 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20251218_cn",
|
||||
"event_20251023_cn",
|
||||
"event_20220428_cn",
|
||||
"event_20250227_cn",
|
||||
@@ -5215,6 +5217,7 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20251218_cn",
|
||||
"event_20251023_cn",
|
||||
"event_20220428_cn",
|
||||
"event_20250227_cn",
|
||||
@@ -5951,6 +5954,7 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20251218_cn",
|
||||
"event_20251023_cn",
|
||||
"event_20220428_cn",
|
||||
"event_20250227_cn",
|
||||
@@ -6687,6 +6691,7 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20251218_cn",
|
||||
"event_20251023_cn",
|
||||
"event_20220428_cn",
|
||||
"event_20250227_cn",
|
||||
@@ -7423,6 +7428,7 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20251218_cn",
|
||||
"event_20251023_cn",
|
||||
"event_20220428_cn",
|
||||
"event_20250227_cn",
|
||||
@@ -8159,6 +8165,7 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20251218_cn",
|
||||
"event_20251023_cn",
|
||||
"event_20220428_cn",
|
||||
"event_20250227_cn",
|
||||
@@ -9492,9 +9499,11 @@
|
||||
"war_archives_20220526_cn",
|
||||
"war_archives_20220728_cn",
|
||||
"war_archives_20220915_cn",
|
||||
"war_archives_20221222_cn",
|
||||
"war_archives_20231026_cn"
|
||||
],
|
||||
"option_cn": [
|
||||
"war_archives_20221222_cn",
|
||||
"war_archives_20220915_cn",
|
||||
"war_archives_20231026_cn",
|
||||
"war_archives_20220428_cn",
|
||||
@@ -9539,6 +9548,7 @@
|
||||
"war_archives_20181020_en"
|
||||
],
|
||||
"option_en": [
|
||||
"war_archives_20221222_cn",
|
||||
"war_archives_20220915_cn",
|
||||
"war_archives_20231026_cn",
|
||||
"war_archives_20220428_cn",
|
||||
@@ -9583,6 +9593,7 @@
|
||||
"war_archives_20181020_en"
|
||||
],
|
||||
"option_jp": [
|
||||
"war_archives_20221222_cn",
|
||||
"war_archives_20220915_cn",
|
||||
"war_archives_20231026_cn",
|
||||
"war_archives_20220428_cn",
|
||||
@@ -9627,6 +9638,7 @@
|
||||
"war_archives_20181020_en"
|
||||
],
|
||||
"option_tw": [
|
||||
"war_archives_20221222_cn",
|
||||
"war_archives_20220915_cn",
|
||||
"war_archives_20231026_cn",
|
||||
"war_archives_20220428_cn",
|
||||
@@ -10347,6 +10359,7 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20251218_cn",
|
||||
"event_20251023_cn",
|
||||
"event_20220428_cn",
|
||||
"event_20250227_cn",
|
||||
@@ -11100,6 +11113,7 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20251218_cn",
|
||||
"event_20251023_cn",
|
||||
"event_20220428_cn",
|
||||
"event_20250227_cn",
|
||||
@@ -11853,6 +11867,7 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20251218_cn",
|
||||
"event_20251023_cn",
|
||||
"event_20220428_cn",
|
||||
"event_20250227_cn",
|
||||
@@ -12606,6 +12621,7 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20251218_cn",
|
||||
"event_20251023_cn",
|
||||
"event_20220428_cn",
|
||||
"event_20250227_cn",
|
||||
@@ -13349,6 +13365,7 @@
|
||||
"event_20200227_cn"
|
||||
],
|
||||
"option_tw": [
|
||||
"event_20251218_cn",
|
||||
"event_20251023_cn",
|
||||
"event_20220428_cn",
|
||||
"event_20250227_cn",
|
||||
|
||||
@@ -867,6 +867,7 @@
|
||||
"war_archives_20220526_cn": "archives Pledge of the Radiant Court",
|
||||
"war_archives_20220728_cn": "archives Aquilifers Ballade",
|
||||
"war_archives_20220915_cn": "archives Violet Tempest Blooming Lycoris",
|
||||
"war_archives_20221222_cn": "archives Parallel Superimposition",
|
||||
"war_archives_20231026_cn": "archives Tempesta and the Fountain of Youth"
|
||||
},
|
||||
"Mode": {
|
||||
|
||||
@@ -867,6 +867,7 @@
|
||||
"war_archives_20220526_cn": "檔案 诚閃の剣 搖光の城",
|
||||
"war_archives_20220728_cn": "檔案 鋼鷲の冒険譚",
|
||||
"war_archives_20220915_cn": "檔案 赫の涙月 菫の暁風",
|
||||
"war_archives_20221222_cn": "檔案 積重なる事象の幻界",
|
||||
"war_archives_20231026_cn": "檔案 テンペスタと若返りの泉"
|
||||
},
|
||||
"Mode": {
|
||||
|
||||
@@ -867,6 +867,7 @@
|
||||
"war_archives_20220526_cn": "档案 泠誓光庭",
|
||||
"war_archives_20220728_cn": "档案 雄鹰的叙事歌",
|
||||
"war_archives_20220915_cn": "档案 紫绛槿岚",
|
||||
"war_archives_20221222_cn": "档案 定向折叠",
|
||||
"war_archives_20231026_cn": "档案 飓风与青春之泉"
|
||||
},
|
||||
"Mode": {
|
||||
|
||||
@@ -815,7 +815,7 @@
|
||||
"event_20250814_cn": "奇淵下的秘密",
|
||||
"event_20250912_cn": "起舞於天原之上",
|
||||
"event_20251023_cn": "颶風與自由群島",
|
||||
"event_20251218_cn": "A Note Through the Firmament",
|
||||
"event_20251218_cn": "響徹於天穹之音",
|
||||
"raid_20200624": "特別演習埃塞克斯級(復刻)",
|
||||
"raid_20210708": "復刻穿越彼方的水線",
|
||||
"raid_20220127": "演習神秘事件調查",
|
||||
@@ -867,6 +867,7 @@
|
||||
"war_archives_20220526_cn": "檔案 泠誓光庭",
|
||||
"war_archives_20220728_cn": "檔案 雄鷹的敘事歌",
|
||||
"war_archives_20220915_cn": "檔案 紫絳槿嵐",
|
||||
"war_archives_20221222_cn": "檔案 定向折疊",
|
||||
"war_archives_20231026_cn": "檔案 飓風與青春之泉"
|
||||
},
|
||||
"Mode": {
|
||||
|
||||
@@ -74,7 +74,8 @@ class HpDaemon(ModuleBase):
|
||||
PAUSE_Seaside,
|
||||
PAUSE_Star,
|
||||
PAUSE_Ninja,
|
||||
PAUSE_ShadowPuppetry
|
||||
PAUSE_ShadowPuppetry,
|
||||
PAUSE_MaidCafe,
|
||||
]:
|
||||
self.attacker_hp = self._calculate_hp(image, area=ATTACKER_HP_AREA_New.area, reverse=True)
|
||||
self.defender_hp = self._calculate_hp(image, area=DEFENDER_HP_AREA_New.area, reverse=True)
|
||||
|
||||
@@ -100,5 +100,5 @@ SUBMARINE_VIEW_ON = Button(area={'cn': (1140, 435, 1170, 468), 'en': (1140, 435,
|
||||
TEMPLATE_MANJUU = Template(file={'cn': './assets/cn/handler/TEMPLATE_MANJUU.png', 'en': './assets/cn/handler/TEMPLATE_MANJUU.png', 'jp': './assets/cn/handler/TEMPLATE_MANJUU.png', 'tw': './assets/cn/handler/TEMPLATE_MANJUU.png'})
|
||||
USER_AGREEMENT_CONFIRM = Button(area={'cn': (709, 526, 742, 542), 'en': (709, 526, 742, 542), 'jp': (709, 526, 742, 542), 'tw': (709, 526, 742, 542)}, color={'cn': (151, 216, 243), 'en': (151, 216, 243), 'jp': (151, 216, 243), 'tw': (151, 216, 243)}, button={'cn': (709, 526, 742, 542), 'en': (709, 526, 742, 542), 'jp': (709, 526, 742, 542), 'tw': (709, 526, 742, 542)}, file={'cn': './assets/cn/handler/USER_AGREEMENT_CONFIRM.png', 'en': './assets/en/handler/USER_AGREEMENT_CONFIRM.png', 'jp': './assets/jp/handler/USER_AGREEMENT_CONFIRM.png', 'tw': './assets/tw/handler/USER_AGREEMENT_CONFIRM.png'})
|
||||
USE_DATA_KEY = Button(area={'cn': (688, 316, 781, 338), 'en': (759, 323, 889, 342), 'jp': (627, 300, 743, 321), 'tw': (688, 316, 782, 338)}, color={'cn': (165, 154, 99), 'en': (170, 160, 94), 'jp': (127, 128, 116), 'tw': (159, 150, 97)}, button={'cn': (688, 316, 781, 338), 'en': (759, 323, 889, 342), 'jp': (627, 300, 743, 321), 'tw': (688, 316, 782, 338)}, file={'cn': './assets/cn/handler/USE_DATA_KEY.png', 'en': './assets/en/handler/USE_DATA_KEY.png', 'jp': './assets/jp/handler/USE_DATA_KEY.png', 'tw': './assets/tw/handler/USE_DATA_KEY.png'})
|
||||
USE_DATA_KEY_NOTIFIED = Button(area={'cn': (690, 185, 713, 207), 'en': (820, 440, 837, 456), 'jp': (604, 183, 631, 209), 'tw': (782, 440, 799, 456)}, color={'cn': (34, 49, 75), 'en': (33, 40, 41), 'jp': (28, 43, 65), 'tw': (34, 40, 48)}, button={'cn': (690, 185, 713, 207), 'en': (820, 440, 837, 456), 'jp': (604, 183, 631, 209), 'tw': (782, 440, 799, 456)}, file={'cn': './assets/cn/handler/USE_DATA_KEY_NOTIFIED.png', 'en': './assets/en/handler/USE_DATA_KEY_NOTIFIED.png', 'jp': './assets/jp/handler/USE_DATA_KEY_NOTIFIED.png', 'tw': './assets/tw/handler/USE_DATA_KEY_NOTIFIED.png'})
|
||||
USE_DATA_KEY_NOTIFIED = Button(area={'cn': (690, 185, 713, 207), 'en': (740, 191, 757, 207), 'jp': (604, 183, 631, 209), 'tw': (782, 440, 799, 456)}, color={'cn': (34, 49, 75), 'en': (33, 48, 74), 'jp': (28, 43, 65), 'tw': (34, 40, 48)}, button={'cn': (690, 185, 713, 207), 'en': (740, 191, 757, 207), 'jp': (604, 183, 631, 209), 'tw': (782, 440, 799, 456)}, file={'cn': './assets/cn/handler/USE_DATA_KEY_NOTIFIED.png', 'en': './assets/en/handler/USE_DATA_KEY_NOTIFIED.png', 'jp': './assets/jp/handler/USE_DATA_KEY_NOTIFIED.png', 'tw': './assets/tw/handler/USE_DATA_KEY_NOTIFIED.png'})
|
||||
VOTE_CANCEL = Button(area={'cn': (404, 483, 576, 539), 'en': (413, 489, 566, 532), 'jp': (407, 483, 577, 538), 'tw': (404, 483, 576, 539)}, color={'cn': (167, 169, 171), 'en': (169, 170, 172), 'jp': (163, 164, 166), 'tw': (167, 169, 171)}, button={'cn': (404, 483, 576, 539), 'en': (413, 489, 566, 532), 'jp': (407, 483, 577, 538), 'tw': (404, 483, 576, 539)}, file={'cn': './assets/cn/handler/VOTE_CANCEL.png', 'en': './assets/en/handler/VOTE_CANCEL.png', 'jp': './assets/jp/handler/VOTE_CANCEL.png', 'tw': './assets/cn/handler/VOTE_CANCEL.png'})
|
||||
|
||||
@@ -47,6 +47,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
|
||||
name = ocr.ocr(self.device.image)
|
||||
name = "".join(name.split())
|
||||
name = name.lower()
|
||||
name = name.strip('\\/-')
|
||||
if '-' in name:
|
||||
name = name.split('-')[0]
|
||||
if 'é' in name: # Méditerranée name maps
|
||||
@@ -79,6 +80,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
|
||||
# For JP only
|
||||
ocr = Ocr(MAP_NAME, lang='jp', letter=(157, 173, 192), threshold=127, name='OCR_OS_MAP_NAME')
|
||||
name = ocr.ocr(self.device.image)
|
||||
name = name.strip('\\/-')
|
||||
self.is_zone_name_hidden = '安全' in name
|
||||
# Remove punctuations
|
||||
for char in '・':
|
||||
@@ -107,6 +109,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
|
||||
# For TW only
|
||||
ocr = Ocr(MAP_NAME, lang='tw', letter=(198, 215, 239), threshold=127, name='OCR_OS_MAP_NAME')
|
||||
name = ocr.ocr(self.device.image)
|
||||
name = name.strip('\\/-')
|
||||
self.is_zone_name_hidden = '安全' in name
|
||||
# Remove '塞壬要塞海域'
|
||||
if '塞' in name:
|
||||
@@ -120,6 +123,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
|
||||
# For CN only
|
||||
ocr = Ocr(MAP_NAME, lang='cnocr', letter=(214, 231, 255), threshold=127, name='OCR_OS_MAP_NAME')
|
||||
name = ocr.ocr(self.device.image)
|
||||
name = name.strip('\\/-')
|
||||
self.is_zone_name_hidden = '安全' in name
|
||||
if '-' in name:
|
||||
name = name.split('-')[0]
|
||||
|
||||
@@ -27,6 +27,7 @@ TEMPLATE_MICROLAYER_MEDLEY = Template(file={'cn': './assets/cn/war_archives/TEMP
|
||||
TEMPLATE_MIRROR_INVOLUTION = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_MIRROR_INVOLUTION.png', 'en': './assets/cn/war_archives/TEMPLATE_MIRROR_INVOLUTION.png', 'jp': './assets/cn/war_archives/TEMPLATE_MIRROR_INVOLUTION.png', 'tw': './assets/cn/war_archives/TEMPLATE_MIRROR_INVOLUTION.png'})
|
||||
TEMPLATE_MOONLIT_OVERTURE = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_MOONLIT_OVERTURE.png', 'en': './assets/cn/war_archives/TEMPLATE_MOONLIT_OVERTURE.png', 'jp': './assets/cn/war_archives/TEMPLATE_MOONLIT_OVERTURE.png', 'tw': './assets/cn/war_archives/TEMPLATE_MOONLIT_OVERTURE.png'})
|
||||
TEMPLATE_NORTHERN_OVERTURE = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_NORTHERN_OVERTURE.png', 'en': './assets/en/war_archives/TEMPLATE_NORTHERN_OVERTURE.png', 'jp': './assets/cn/war_archives/TEMPLATE_NORTHERN_OVERTURE.png', 'tw': './assets/cn/war_archives/TEMPLATE_NORTHERN_OVERTURE.png'})
|
||||
TEMPLATE_PARALLEL_SUPERIMPOSITION = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_PARALLEL_SUPERIMPOSITION.png', 'en': './assets/cn/war_archives/TEMPLATE_PARALLEL_SUPERIMPOSITION.png', 'jp': './assets/cn/war_archives/TEMPLATE_PARALLEL_SUPERIMPOSITION.png', 'tw': './assets/cn/war_archives/TEMPLATE_PARALLEL_SUPERIMPOSITION.png'})
|
||||
TEMPLATE_PLEDGE_OF_THE_RADIANT_COURT = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_PLEDGE_OF_THE_RADIANT_COURT.png', 'en': './assets/cn/war_archives/TEMPLATE_PLEDGE_OF_THE_RADIANT_COURT.png', 'jp': './assets/cn/war_archives/TEMPLATE_PLEDGE_OF_THE_RADIANT_COURT.png', 'tw': './assets/cn/war_archives/TEMPLATE_PLEDGE_OF_THE_RADIANT_COURT.png'})
|
||||
TEMPLATE_PRELUDE_UNDER_THE_MOON = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png', 'en': './assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png', 'jp': './assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png', 'tw': './assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png'})
|
||||
TEMPLATE_RONDO_AT_RAINBOWS_END = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_RONDO_AT_RAINBOWS_END.png', 'en': './assets/en/war_archives/TEMPLATE_RONDO_AT_RAINBOWS_END.png', 'jp': './assets/cn/war_archives/TEMPLATE_RONDO_AT_RAINBOWS_END.png', 'tw': './assets/cn/war_archives/TEMPLATE_RONDO_AT_RAINBOWS_END.png'})
|
||||
|
||||
@@ -43,4 +43,5 @@ dic_archives_template = {
|
||||
'war_archives_20220428_cn': TEMPLATE_RONDO_AT_RAINBOWS_END,
|
||||
'war_archives_20231026_cn': TEMPLATE_TEMPESTA_AND_THE_FOUNTAIN_OF_YOUTH,
|
||||
'war_archives_20220915_cn': TEMPLATE_VIOLET_TEMPEST_BLOOMING_LYCORIS,
|
||||
'war_archives_20221222_cn': TEMPLATE_PARALLEL_SUPERIMPOSITION,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user