WindyMadman/AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/LmeSzinc/AzurLaneAutoScript.git synced 2025-01-08 13:27:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2220 from Azusachan/master

Browse Source 
Add support for Bluestacks 5 Pie64 instances
This commit is contained in:
LmeSzinc 2023-02-08 11:46:56 +08:00 committed by GitHub
commit b128375a22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
campaign/Readme.md
View File

@ -127,4 +127,5 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
| 20230105 | event 20210225 cn | Khorovod of Dawn's Rime | 复刻破晓冰华 | Khorovod of Dawn's Rime Rerun | 暁射す氷華の嵐（復刻） | - |
| 20230105 | event 20210610 tw | The Way Home in the Night | - | - | - | 復刻夜幕下的歸途 |
| 20230118 | raid 20230118 | Winter Pathfinder | 冬日的寻路人 | Winter Pathfinder | 冬の案内人 | - |
| 20220127 | raid 20220127 | - | - | - | - | 演習神秘事件調查 |
| 20230118 | raid 20220127 | - | - | - | - | 演習神秘事件調查 |
| 20230202 | event 20200806 cn | The Enigma and the Shark | - | - | - | 復刻最重要的寶物 |

32
module/config/argument/args.json
View File

@ -1576,6 +1576,7 @@
"value": "campaign_main",
"option": [
"campaign_main",
"event_20200806_cn",
"event_20210610_tw",
"event_20210225_cn",
"event_20211229_cn",
@ -1610,7 +1611,6 @@
"event_20211028_tw",
"event_20210722_cn",
"event_20210819_cn",
"event_20200806_cn",
"event_20200723_cn",
"event_20210624_cn",
"event_20210624_tw",
@ -1632,7 +1632,7 @@
"event_20200227_cn"
],
"display": "hide",
"tw": "event_20210610_tw",
"tw": "event_20200806_cn",
"cn": "event_20210225_cn",
"en": "event_20210225_cn",
"jp": "event_20210225_cn"
@ -2016,6 +2016,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20200806_cn",
"event_20210610_tw",
"event_20210225_cn",
"event_20211229_cn",
@ -2050,7 +2051,6 @@
"event_20211028_tw",
"event_20210722_cn",
"event_20210819_cn",
"event_20200806_cn",
"event_20200723_cn",
"event_20210624_cn",
"event_20210624_tw",
@ -2072,7 +2072,7 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20210610_tw",
"tw": "event_20200806_cn",
"cn": "event_20210225_cn",
"en": "event_20210225_cn",
"jp": "event_20210225_cn"
@ -2447,6 +2447,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20200806_cn",
"event_20210610_tw",
"event_20210225_cn",
"event_20211229_cn",
@ -2481,7 +2482,6 @@
"event_20211028_tw",
"event_20210722_cn",
"event_20210819_cn",
"event_20200806_cn",
"event_20200723_cn",
"event_20210624_cn",
"event_20210624_tw",
@ -2503,7 +2503,7 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20210610_tw",
"tw": "event_20200806_cn",
"cn": "event_20210225_cn",
"en": "event_20210225_cn",
"jp": "event_20210225_cn"
@ -2889,6 +2889,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20200806_cn",
"event_20210610_tw",
"event_20210225_cn",
"event_20211229_cn",
@ -2923,7 +2924,6 @@
"event_20211028_tw",
"event_20210722_cn",
"event_20210819_cn",
"event_20200806_cn",
"event_20200723_cn",
"event_20210624_cn",
"event_20210624_tw",
@ -2945,7 +2945,7 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20210610_tw",
"tw": "event_20200806_cn",
"cn": "event_20210225_cn",
"en": "event_20210225_cn",
"jp": "event_20210225_cn"
@ -3337,6 +3337,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20200806_cn",
"event_20210610_tw",
"event_20210225_cn",
"event_20211229_cn",
@ -3371,7 +3372,6 @@
"event_20211028_tw",
"event_20210722_cn",
"event_20210819_cn",
"event_20200806_cn",
"event_20200723_cn",
"event_20210624_cn",
"event_20210624_tw",
@ -3393,7 +3393,7 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20210610_tw",
"tw": "event_20200806_cn",
"cn": "event_20210225_cn",
"en": "event_20210225_cn",
"jp": "event_20210225_cn"
@ -3785,6 +3785,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20200806_cn",
"event_20210610_tw",
"event_20210225_cn",
"event_20211229_cn",
@ -3819,7 +3820,6 @@
"event_20211028_tw",
"event_20210722_cn",
"event_20210819_cn",
"event_20200806_cn",
"event_20200723_cn",
"event_20210624_cn",
"event_20210624_tw",
@ -3841,7 +3841,7 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20210610_tw",
"tw": "event_20200806_cn",
"cn": "event_20210225_cn",
"en": "event_20210225_cn",
"jp": "event_20210225_cn"
@ -4233,6 +4233,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20200806_cn",
"event_20210610_tw",
"event_20210225_cn",
"event_20211229_cn",
@ -4267,7 +4268,6 @@
"event_20211028_tw",
"event_20210722_cn",
"event_20210819_cn",
"event_20200806_cn",
"event_20200723_cn",
"event_20210624_cn",
"event_20210624_tw",
@ -4289,7 +4289,7 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20210610_tw",
"tw": "event_20200806_cn",
"cn": "event_20210225_cn",
"en": "event_20210225_cn",
"jp": "event_20210225_cn"
@ -4671,6 +4671,7 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20200806_cn",
"event_20210610_tw",
"event_20210225_cn",
"event_20211229_cn",
@ -4705,7 +4706,6 @@
"event_20211028_tw",
"event_20210722_cn",
"event_20210819_cn",
"event_20200806_cn",
"event_20200723_cn",
"event_20210624_cn",
"event_20210624_tw",
@ -4727,7 +4727,7 @@
"event_20200227_cn"
],
"display": "disabled",
"tw": "event_20210610_tw",
"tw": "event_20200806_cn",
"cn": "event_20210225_cn",
"en": "event_20210225_cn",
"jp": "event_20210225_cn"

2
module/config/i18n/en-US.json
View File

@ -615,6 +615,7 @@
"name": "Event Name",
"help": "Automatically selects to the latest event",
"campaign_main": "campaign_main",
"event_20200806_cn": "The Enigma and the Shark Rerun",
"raid_20220127": "Mystery Investigation",
"raid_20230118": "Winter Pathfinder",
"event_20210610_tw": "復刻夜幕下的歸途",
@ -655,7 +656,6 @@
"event_20211028_tw": "復刻光與影的鳶尾之華",
"event_20210722_cn": "Azur Anthem",
"event_20210819_cn": "Microlayer Medley Rerun",
"event_20200806_cn": "The Enigma and the Shark Rerun",
"event_20200723_cn": "Aurora Noctis",
"event_20210624_cn": "Swirling Cherry Blossoms Rerun",
"event_20210624_tw": "穹頂下的聖詠曲",

2
module/config/i18n/ja-JP.json
View File

@ -615,6 +615,7 @@
"name": "Campaign.Event.name",
"help": "Campaign.Event.help",
"campaign_main": "campaign_main",
"event_20200806_cn": "鉄血鮫とエニグマ（復刻）",
"raid_20220127": "秘密事件調査",
"raid_20230118": "冬の案内人",
"event_20210610_tw": "復刻夜幕下的歸途",
@ -655,7 +656,6 @@
"event_20211028_tw": "復刻光與影的鳶尾之華",
"event_20210722_cn": "海に響くアイドルの歌",
"event_20210819_cn": "闇靄払う銀翼（復刻）",
"event_20200806_cn": "鉄血鮫とエニグマ（復刻）",
"event_20200723_cn": "極夜照らす幻光",
"event_20210624_cn": "翳りし満ちる影の華(復刻)",
"event_20210624_tw": "穹頂下的聖詠曲",

2
module/config/i18n/zh-CN.json
View File

@ -615,6 +615,7 @@
"name": "活动名称",
"help": "自动选择至最新的活动",
"campaign_main": "主线图",
"event_20200806_cn": "复刻最重要的宝物",
"raid_20220127": "演习神秘事件调查",
"raid_20230118": "冬日的寻路人",
"event_20210610_tw": "復刻夜幕下的歸途",
@ -655,7 +656,6 @@
"event_20211028_tw": "復刻光與影的鳶尾之華",
"event_20210722_cn": "响彻碧海的偶像歌",
"event_20210819_cn": "复刻微层混合",
"event_20200806_cn": "复刻最重要的宝物",
"event_20200723_cn": "永夜幻光",
"event_20210624_cn": "复刻浮樱影华",
"event_20210624_tw": "穹頂下的聖詠曲",

2
module/config/i18n/zh-TW.json
View File

@ -615,6 +615,7 @@
"name": "活動名稱",
"help": "自動選擇至最新的活動圖",
"campaign_main": "主線圖",
"event_20200806_cn": "復刻最重要的寶物",
"raid_20220127": "演習神秘事件調查",
"raid_20230118": "Winter Pathfinder",
"event_20210610_tw": "復刻夜幕下的歸途",
@ -655,7 +656,6 @@
"event_20211028_tw": "復刻光與影的鳶尾之華",
"event_20210722_cn": "響徹碧海的偶像歌",
"event_20210819_cn": "Microlayer Medley Rerun",
"event_20200806_cn": "最重要的寶物",
"event_20200723_cn": "永夜幻光",
"event_20210624_cn": "Swirling Cherry Blossoms Rerun",
"event_20210624_tw": "穹頂下的聖詠曲",

6
module/device/connection_attr.py
View File

@ -185,9 +185,9 @@ class ConnectionAttr:
logger.info("Reading Realtime adb port")
if serial == "bluestacks5-hyperv":
parameter_name = r"bst\.instance\.Nougat64\.status\.adb_port"
parameter_name = r"bst\.instance\.(Nougat64|Pie64)\.status\.adb_port"
else:
parameter_name = rf"bst\.instance\.Nougat64_{serial[19:]}\.status.adb_port"
parameter_name = rf"bst\.instance\.(Nougat64|Pie64)_{serial[19:]}\.status.adb_port"
try:
with OpenKey(HKEY_LOCAL_MACHINE, r"SOFTWARE\BlueStacks_nxt") as key:
@ -209,7 +209,7 @@ class ConnectionAttr:
if port is None:
logger.warning(f"Did not match the result: {serial}.")
raise RequestHumanTakeover
port = port.group(1)
port = port.group(2)
logger.info(f"Match to dynamic port: {port}")
return f"127.0.0.1:{port}"