diff --git a/module/config/argument/args.json b/module/config/argument/args.json index bc097af84..24352c58b 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -282,6 +282,7 @@ "cn_android-26", "cn_android-27", "cn_android-28", + "cn_android-29", "cn_ios-0", "cn_ios-1", "cn_ios-2", diff --git a/module/config/config_generated.py b/module/config/config_generated.py index b534a1774..aa6541781 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -20,7 +20,7 @@ class GeneratedConfig: # Group `Emulator` Emulator_Serial = 'auto' Emulator_PackageName = 'auto' # auto, com.bilibili.azurlane, com.YoStarEN.AzurLane, com.YoStarJP.AzurLane, com.hkmanjuu.azurlane.gp, com.bilibili.blhx.huawei, com.bilibili.blhx.honor, com.bilibili.blhx.mi, com.tencent.tmgp.bilibili.blhx, com.bilibili.blhx.baidu, com.bilibili.blhx.qihoo, com.bilibili.blhx.nearme.gamecenter, com.bilibili.blhx.vivo, com.bilibili.blhx.mz, com.bilibili.blhx.dl, com.bilibili.blhx.lenovo, com.bilibili.blhx.uc, com.bilibili.blhx.mzw, com.yiwu.blhx.yx15, com.bilibili.blhx.m4399, com.bilibili.blhx.bilibiliMove, com.hkmanjuu.azurlane.gp.mc - Emulator_ServerName = 'disabled' # disabled, cn_android-0, cn_android-1, cn_android-2, cn_android-3, cn_android-4, cn_android-5, cn_android-6, cn_android-7, cn_android-8, cn_android-9, cn_android-10, cn_android-11, cn_android-12, cn_android-13, cn_android-14, cn_android-15, cn_android-16, cn_android-17, cn_android-18, cn_android-19, cn_android-20, cn_android-21, cn_android-22, cn_android-23, cn_android-24, cn_android-25, cn_android-26, cn_android-27, cn_android-28, cn_ios-0, cn_ios-1, cn_ios-2, cn_ios-3, cn_ios-4, cn_ios-5, cn_ios-6, cn_ios-7, cn_ios-8, cn_ios-9, cn_ios-10, cn_channel-0, cn_channel-1, cn_channel-2, cn_channel-3, cn_channel-4, cn_channel-5, en-0, en-1, en-2, en-3, en-4, en-5, jp-0, jp-1, jp-2, jp-3, jp-4, jp-5, jp-6, jp-7, jp-8, jp-9, jp-10, jp-11, jp-12, jp-13, jp-14, jp-15, jp-16, jp-17 + Emulator_ServerName = 'disabled' # disabled, cn_android-0, cn_android-1, cn_android-2, cn_android-3, cn_android-4, cn_android-5, cn_android-6, cn_android-7, cn_android-8, cn_android-9, cn_android-10, cn_android-11, cn_android-12, cn_android-13, cn_android-14, cn_android-15, cn_android-16, cn_android-17, cn_android-18, cn_android-19, cn_android-20, cn_android-21, cn_android-22, cn_android-23, cn_android-24, cn_android-25, cn_android-26, cn_android-27, cn_android-28, cn_android-29, cn_ios-0, cn_ios-1, cn_ios-2, cn_ios-3, cn_ios-4, cn_ios-5, cn_ios-6, cn_ios-7, cn_ios-8, cn_ios-9, cn_ios-10, cn_channel-0, cn_channel-1, cn_channel-2, cn_channel-3, cn_channel-4, cn_channel-5, en-0, en-1, en-2, en-3, en-4, en-5, jp-0, jp-1, jp-2, jp-3, jp-4, jp-5, jp-6, jp-7, jp-8, jp-9, jp-10, jp-11, jp-12, jp-13, jp-14, jp-15, jp-16, jp-17 Emulator_ScreenshotMethod = 'auto' # auto, ADB, ADB_nc, uiautomator2, aScreenCap, aScreenCap_nc, DroidCast, DroidCast_raw, nemu_ipc, ldopengl Emulator_ControlMethod = 'MaaTouch' # ADB, uiautomator2, minitouch, Hermit, MaaTouch Emulator_ScreenshotDedithering = False diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 9e46a6595..c4303c94c 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -391,6 +391,7 @@ "cn_android-26": "[国服] 冬月计划", "cn_android-27": "[国服] 长弓计划", "cn_android-28": "[国服] 裁决协议", + "cn_android-29": "[国服] 帷幕计划", "cn_ios-0": "[国服] 夏威夷", "cn_ios-1": "[国服] 珊瑚海", "cn_ios-2": "[国服] 中途岛", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 88db48d9b..e4c0df86f 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -391,6 +391,7 @@ "cn_android-26": "[国服] 冬月计划", "cn_android-27": "[国服] 长弓计划", "cn_android-28": "[国服] 裁决协议", + "cn_android-29": "[国服] 帷幕计划", "cn_ios-0": "[国服] 夏威夷", "cn_ios-1": "[国服] 珊瑚海", "cn_ios-2": "[国服] 中途岛", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 923c65eb3..f64af61b2 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -391,6 +391,7 @@ "cn_android-26": "[国服] 冬月计划", "cn_android-27": "[国服] 长弓计划", "cn_android-28": "[国服] 裁决协议", + "cn_android-29": "[国服] 帷幕计划", "cn_ios-0": "[国服] 夏威夷", "cn_ios-1": "[国服] 珊瑚海", "cn_ios-2": "[国服] 中途岛", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index da6e7fdea..24fccffbb 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -391,6 +391,7 @@ "cn_android-26": "[国服] 冬月计划", "cn_android-27": "[国服] 长弓计划", "cn_android-28": "[国服] 裁决协议", + "cn_android-29": "[国服] 帷幕计划", "cn_ios-0": "[国服] 夏威夷", "cn_ios-1": "[国服] 珊瑚海", "cn_ios-2": "[国服] 中途岛", diff --git a/module/config/server.py b/module/config/server.py index 5feef9318..278885a49 100644 --- a/module/config/server.py +++ b/module/config/server.py @@ -74,7 +74,7 @@ VALID_SERVER_LIST = { '小王冠行动', '波茨坦公告', '白色方案', '瓦尔基里行动', '曼哈顿计划', '八月风暴', '秋季旅行', '水星行动', '莱茵河卫兵', '北极光计划', '长戟计划', '暴雨行动', '水仙行动', '冬月计划', - '长弓计划', '裁决协议', + '长弓计划', '裁决协议', '帷幕计划', ], 'cn_ios': [ '夏威夷', '珊瑚海', '中途岛', '铁底湾', '所罗门', '马里亚纳', diff --git a/module/private_quarters/interact.py b/module/private_quarters/interact.py index 3415d343b..ceda5851e 100644 --- a/module/private_quarters/interact.py +++ b/module/private_quarters/interact.py @@ -220,7 +220,7 @@ class PQInteract(UI): # Rare case in the middle of dialogue, so address # before initiating room exit if (not self.appear(PRIVATE_QUARTERS_ROOM_CHECK, offset=(20, 20)) and - not self.appear(PRIVATE_QUARTERS_INTERACT, offset=(0, 60))): + not self.appear(PRIVATE_QUARTERS_INTERACT, offset=(-10, 0, 0, 65))): self._pq_handle_dialogue() self.interval_clear(PRIVATE_QUARTERS_ROOM_BACK) @@ -236,11 +236,14 @@ class PQInteract(UI): def pq_interact(self): """ Execute target interact routine - offset=(0, 60) to account for y-position of asset + offset=(-10, 0, 0, 65) to account for position of asset + top_x=-10, bottom_y=65 Depending on intimacy level, the asset may shift + Parameters identified as stable and server transparent """ # Click target ship girl for 1st stage sequence logger.hr(f'Interact Start', level=2) + interact_offset = (-10, 0, 0, 65) click_timer = Timer(1.5, count=3).start() skip_first_screenshot = True while 1: @@ -250,7 +253,7 @@ class PQInteract(UI): self.device.screenshot() # End - if self.appear(PRIVATE_QUARTERS_INTERACT, offset=(0, 60)): + if self.appear(PRIVATE_QUARTERS_INTERACT, offset=interact_offset): break if click_timer.reached(): @@ -273,7 +276,7 @@ class PQInteract(UI): if self.appear(PRIVATE_QUARTERS_INTERACT_CHECK, offset=(20, 20)): break - if self.appear_then_click(PRIVATE_QUARTERS_INTERACT, offset=(0, 60), interval=1): + if self.appear_then_click(PRIVATE_QUARTERS_INTERACT, offset=interact_offset, interval=1): continue skip_first_screenshot = True @@ -284,7 +287,7 @@ class PQInteract(UI): self.device.screenshot() # End - if self.appear(PRIVATE_QUARTERS_INTERACT, offset=(0, 60)): + if self.appear(PRIVATE_QUARTERS_INTERACT, offset=interact_offset): break if self.appear(PRIVATE_QUARTERS_INTERACT_CHECK, offset=(20, 20), interval=1):