diff --git a/assets/tw/ui/RAID_CHECK.png b/assets/tw/ui/RAID_CHECK.png index 89d92cd501..6cd2d069c5 100644 Binary files a/assets/tw/ui/RAID_CHECK.png and b/assets/tw/ui/RAID_CHECK.png differ diff --git a/campaign/Readme.md b/campaign/Readme.md index 029a812a40..9363d7077e 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -92,4 +92,5 @@ To add a new event, add a new row in here, and run `python -m dev_tools.event_ex | 20220324 | event 20210422 cn | Daedalian Hymn | - | - | - | 復興的讚美詩 | | 20220407 | event 20220407 tw | Crimson Echoes | - | - | - | 蒼紅的迴響(復刻) | | 20220414 | event 20220414 cn | Aurora Noctis | 复刻永夜幻光 | Aurora Noctis Rerun | 極夜照らす幻光（復刻） | - | -| 20220428 | event 20220428 cn | Rondo at Rainbow's End | 虹彩的终幕曲 | Rondo at Rainbow's End | 吟ずる瑠璃の楽章 | - | \ No newline at end of file +| 20220428 | event 20220428 cn | Rondo at Rainbow's End | 虹彩的终幕曲 | Rondo at Rainbow's End | 吟ずる瑠璃の楽章 | - | +| 20220505 | raid 20200624 | Air Raid Drills with Essex | - | - | - | 特別演習埃塞克斯級(復刻) | \ No newline at end of file diff --git a/module/commission/commission.py b/module/commission/commission.py index 63ba222d89..1d8a4855e4 100644 --- a/module/commission/commission.py +++ b/module/commission/commission.py @@ -379,6 +379,8 @@ def _commission_find_and_start(self, comm, is_urgent=False): if failed: logger.warning(f'Failed to select commission: {comm}') + self._commission_mode_reset() + self._commission_swipe_to_top() self.device.click_record_clear() continue else: diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 2f83aa90d0..8295c42964 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -3739,14 +3739,14 @@ "type": "select", "value": "campaign_main", "option": [ + "raid_20200624", "raid_20220127", - "raid_20210708", - "raid_20200624" + "raid_20210708" ], + "tw": "raid_20200624", "cn": "raid_20220127", "en": "raid_20220127", - "jp": "raid_20220127", - "tw": "raid_20210708" + "jp": "raid_20220127" }, "Mode": { "type": "hide", @@ -3928,14 +3928,14 @@ "type": "select", "value": "campaign_main", "option": [ + "raid_20200624", "raid_20220127", - "raid_20210708", - "raid_20200624" + "raid_20210708" ], + "tw": "raid_20200624", "cn": "raid_20220127", "en": "raid_20220127", - "jp": "raid_20220127", - "tw": "raid_20210708" + "jp": "raid_20220127" }, "Mode": { "type": "hide", diff --git a/module/ui/assets.py b/module/ui/assets.py index 2eeafb5325..b0450c94b0 100644 --- a/module/ui/assets.py +++ b/module/ui/assets.py @@ -58,7 +58,7 @@ MUNITIONS_CHECK = Button(area={'cn': (121, 14, 230, 39), 'en': (115, 16, 235, 36), 'jp': (133, 14, 189, 39), 'tw': (117, 12, 232, 41)}, color={'cn': (151, 165, 203), 'en': (112, 126, 165), 'jp': (160, 176, 211), 'tw': (133, 148, 188)}, button={'cn': (121, 14, 230, 39), 'en': (115, 16, 235, 36), 'jp': (133, 14, 189, 39), 'tw': (117, 12, 232, 41)}, file={'cn': './assets/cn/ui/MUNITIONS_CHECK.png', 'en': './assets/en/ui/MUNITIONS_CHECK.png', 'jp': './assets/jp/ui/MUNITIONS_CHECK.png', 'tw': './assets/tw/ui/MUNITIONS_CHECK.png'}) OS_CHECK = Button(area={'cn': (587, 20, 623, 42), 'en': (587, 20, 623, 42), 'jp': (587, 20, 623, 42), 'tw': (587, 20, 623, 42)}, color={'cn': (159, 168, 177), 'en': (159, 168, 177), 'jp': (159, 168, 177), 'tw': (159, 168, 177)}, button={'cn': (587, 20, 623, 42), 'en': (587, 20, 623, 42), 'jp': (587, 20, 623, 42), 'tw': (587, 20, 623, 42)}, file={'cn': './assets/cn/ui/OS_CHECK.png', 'en': './assets/en/ui/OS_CHECK.png', 'jp': './assets/jp/ui/OS_CHECK.png', 'tw': './assets/tw/ui/OS_CHECK.png'}) PLAYER_CHECK = Button(area={'cn': (28, 668, 139, 688), 'en': (11, 649, 157, 705), 'jp': (26, 665, 141, 692), 'tw': (28, 668, 139, 688)}, color={'cn': (237, 204, 127), 'en': (197, 156, 97), 'jp': (228, 187, 117), 'tw': (237, 204, 127)}, button={'cn': (28, 668, 139, 688), 'en': (11, 649, 157, 705), 'jp': (26, 665, 141, 692), 'tw': (28, 668, 139, 688)}, file={'cn': './assets/cn/ui/PLAYER_CHECK.png', 'en': './assets/en/ui/PLAYER_CHECK.png', 'jp': './assets/jp/ui/PLAYER_CHECK.png', 'tw': './assets/tw/ui/PLAYER_CHECK.png'}) -RAID_CHECK = Button(area={'cn': (118, 14, 227, 39), 'en': (114, 13, 230, 34), 'jp': (118, 14, 226, 39), 'tw': (119, 13, 226, 38)}, color={'cn': (143, 161, 202), 'en': (106, 121, 161), 'jp': (149, 167, 206), 'tw': (153, 167, 205)}, button={'cn': (118, 14, 227, 39), 'en': (114, 13, 230, 34), 'jp': (118, 14, 226, 39), 'tw': (119, 13, 226, 38)}, file={'cn': './assets/cn/ui/RAID_CHECK.png', 'en': './assets/en/ui/RAID_CHECK.png', 'jp': './assets/jp/ui/RAID_CHECK.png', 'tw': './assets/tw/ui/RAID_CHECK.png'}) +RAID_CHECK = Button(area={'cn': (118, 14, 227, 39), 'en': (114, 13, 230, 34), 'jp': (118, 14, 226, 39), 'tw': (117, 13, 228, 40)}, color={'cn': (143, 161, 202), 'en': (106, 121, 161), 'jp': (149, 167, 206), 'tw': (141, 160, 200)}, button={'cn': (118, 14, 227, 39), 'en': (114, 13, 230, 34), 'jp': (118, 14, 226, 39), 'tw': (117, 13, 228, 40)}, file={'cn': './assets/cn/ui/RAID_CHECK.png', 'en': './assets/en/ui/RAID_CHECK.png', 'jp': './assets/jp/ui/RAID_CHECK.png', 'tw': './assets/tw/ui/RAID_CHECK.png'}) RESEARCH_CHECK = Button(area={'cn': (118, 15, 170, 39), 'en': (119, 14, 259, 36), 'jp': (117, 14, 171, 40), 'tw': (117, 13, 172, 40)}, color={'cn': (165, 179, 215), 'en': (118, 133, 174), 'jp': (135, 154, 195), 'tw': (148, 165, 205)}, button={'cn': (118, 15, 170, 39), 'en': (119, 14, 259, 36), 'jp': (117, 14, 171, 40), 'tw': (117, 13, 172, 40)}, file={'cn': './assets/cn/ui/RESEARCH_CHECK.png', 'en': './assets/en/ui/RESEARCH_CHECK.png', 'jp': './assets/jp/ui/RESEARCH_CHECK.png', 'tw': './assets/tw/ui/RESEARCH_CHECK.png'}) RESHMENU_CHECK = Button(area={'cn': (121, 15, 174, 39), 'en': (118, 14, 279, 35), 'jp': (116, 13, 174, 42), 'tw': (121, 14, 175, 40)}, color={'cn': (156, 171, 209), 'en': (100, 113, 152), 'jp': (136, 149, 186), 'tw': (147, 162, 201)}, button={'cn': (121, 15, 174, 39), 'en': (118, 14, 279, 35), 'jp': (116, 13, 174, 42), 'tw': (121, 14, 175, 40)}, file={'cn': './assets/cn/ui/RESHMENU_CHECK.png', 'en': './assets/en/ui/RESHMENU_CHECK.png', 'jp': './assets/jp/ui/RESHMENU_CHECK.png', 'tw': './assets/tw/ui/RESHMENU_CHECK.png'}) RESHMENU_GOTO_META = Button(area={'cn': (1076, 254, 1155, 334), 'en': (1102, 251, 1193, 332), 'jp': (1076, 254, 1155, 334), 'tw': (1076, 254, 1155, 334)}, color={'cn': (144, 156, 183), 'en': (141, 152, 181), 'jp': (144, 156, 183), 'tw': (144, 156, 183)}, button={'cn': (1076, 254, 1155, 334), 'en': (1102, 251, 1193, 332), 'jp': (1076, 254, 1155, 334), 'tw': (1076, 254, 1155, 334)}, file={'cn': './assets/cn/ui/RESHMENU_GOTO_META.png', 'en': './assets/en/ui/RESHMENU_GOTO_META.png', 'jp': './assets/jp/ui/RESHMENU_GOTO_META.png', 'tw': './assets/cn/ui/RESHMENU_GOTO_META.png'})