From cef04b2e28d517d390b4f1e48f8be0cc42ae77fa Mon Sep 17 00:00:00 2001 From: SarContDeli <48789988+SaiCateDoan@users.noreply.github.com> Date: Thu, 5 May 2022 18:39:35 +0800 Subject: [PATCH 1/3] Fix: An accidental exception causes the commission to fail --- module/commission/commission.py | 2 ++ 1 file changed, 2 insertions(+) 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: From 98de926afca6799279996e2d7f8d8643038b1bef Mon Sep 17 00:00:00 2001 From: Zorachristine Date: Thu, 5 May 2022 22:01:30 +0800 Subject: [PATCH 2/3] Fix:[TW] RAID_CHECK assets --- assets/tw/ui/RAID_CHECK.png | Bin 7677 -> 8010 bytes module/config/argument/args.json | 4 ++-- module/ui/assets.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/tw/ui/RAID_CHECK.png b/assets/tw/ui/RAID_CHECK.png index 89d92cd501eba3efe1f1b63eec0f2e048fa6063f..6cd2d069c53c9b2cd03b7fa2686a59408ad397c1 100644 GIT binary patch delta 5407 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 F{|~h&aHaqN delta 5063 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 diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 2f83aa90d0..5629f6e645 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -3746,7 +3746,7 @@ "cn": "raid_20220127", "en": "raid_20220127", "jp": "raid_20220127", - "tw": "raid_20210708" + "tw": "raid_20200624" }, "Mode": { "type": "hide", @@ -3935,7 +3935,7 @@ "cn": "raid_20220127", "en": "raid_20220127", "jp": "raid_20220127", - "tw": "raid_20210708" + "tw": "raid_20200624" }, "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'}) From b075056fa5338172173b7f3bb9da9f13f6069889 Mon Sep 17 00:00:00 2001 From: Zorachristine Date: Thu, 5 May 2022 22:28:38 +0800 Subject: [PATCH 3/3] Add:[TW] Air Raid Drills with Essex Rerun --- campaign/Readme.md | 3 ++- module/config/argument/args.json | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) 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/config/argument/args.json b/module/config/argument/args.json index 5629f6e645..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_20200624" + "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_20200624" + "jp": "raid_20220127" }, "Mode": { "type": "hide",