sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
sui-feng-cb 2026-01-16 21:02:56 +08:00
commit 38228e2ad2
14 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/cn/private_quarters/PRIVATE_QUARTERS_SHIP_AEGIR.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
assets/en/private_quarters/PRIVATE_QUARTERS_SHIP_AEGIR.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
assets/jp/private_quarters/PRIVATE_QUARTERS_SHIP_AEGIR.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
assets/tw/private_quarters/PRIVATE_QUARTERS_SHIP_AEGIR.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

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

@ -10203,7 +10203,8 @@
"noshiro",
"sirius",
"new_jersey",
"taihou"
"taihou",
"aegir"
]
}
},

2
module/config/argument/argument.yaml
View File

@ -783,7 +783,7 @@ PrivateQuarters:
TargetInteract: true
TargetShip:
value: anchorage
option: [ anchorage, noshiro, sirius, new_jersey, taihou ]
option: [ anchorage, noshiro, sirius, new_jersey, taihou, aegir ]
# ==================== Daily ====================
Daily:

2
module/config/config_generated.py
View File

@ -482,7 +482,7 @@ class GeneratedConfig:
PrivateQuarters_BuyRoses = True
PrivateQuarters_BuyCake = False
PrivateQuarters_TargetInteract = True
PrivateQuarters_TargetShip = 'anchorage' # anchorage, noshiro, sirius, new_jersey, taihou
PrivateQuarters_TargetShip = 'anchorage' # anchorage, noshiro, sirius, new_jersey, taihou, aegir
# Group `Daily`
Daily_UseDailySkip = True

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

@ -3441,7 +3441,8 @@
"noshiro": "Noshiro",
"sirius": "Sirius",
"new_jersey": "New Jersey",
"taihou": "Taihou"
"taihou": "Taihou",
"aegir": "Aegir"
}
},
"Daily": {

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

@ -3441,7 +3441,8 @@
"noshiro": "noshiro",
"sirius": "sirius",
"new_jersey": "new_jersey",
"taihou": "taihou"
"taihou": "taihou",
"aegir": "aegir"
}
},
"Daily": {

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

@ -3441,7 +3441,8 @@
"noshiro": "能代",
"sirius": "天狼星",
"new_jersey": "新泽西",
"taihou": "大凤"
"taihou": "大凤",
"aegir": "埃吉尔"
}
},
"Daily": {

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

@ -3441,7 +3441,8 @@
"noshiro": "能代",
"sirius": "天狼星",
"new_jersey": "紐澤西",
"taihou": "大鳳"
"taihou": "大鳳",
"aegir": "埃吉爾"
}
},
"Daily": {

2
module/map_detection/homography.py
View File

@ -408,7 +408,7 @@ class Homography:
hori = Points([640, grids[(0, 0)][1, 1]]).link(None, is_horizontal=True)
for y in range(shape[1] + 1):
hori = hori.add(Points([640, grids[(0, y)][3, 1]]).link(None, is_horizontal=True))
vert = Points(grids[(0, 0)][1]).link(grids[(0, shape[1])][3])
vert = Points(grids[(0, 0)][0]).link(grids[(0, shape[1])][2])
for x in range(shape[0] + 1):
vert = vert.add(Points(grids[(x, 0)][1]).link(grids[(x, shape[1])][3]))
return hori, vert

1
module/private_quarters/assets.py
View File

@ -19,6 +19,7 @@ PRIVATE_QUARTERS_ROOM_TARGET_CHECK_1 = Button(area={'cn': (721, 17, 781, 37), 'e
PRIVATE_QUARTERS_ROOM_TARGET_CHECK_2 = Button(area={'cn': (667, 71, 717, 86), 'en': (667, 71, 717, 86), 'jp': (667, 71, 717, 86), 'tw': (667, 71, 717, 86)}, color={'cn': (222, 213, 198), 'en': (222, 213, 198), 'jp': (222, 213, 198), 'tw': (222, 213, 198)}, button={'cn': (667, 71, 717, 86), 'en': (667, 71, 717, 86), 'jp': (667, 71, 717, 86), 'tw': (667, 71, 717, 86)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_CHECK_2.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_CHECK_2.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_CHECK_2.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_CHECK_2.png'})
PRIVATE_QUARTERS_ROOM_TARGET_CLICK_AREA = Button(area={'cn': (504, 45, 784, 625), 'en': (504, 45, 784, 625), 'jp': (504, 45, 784, 625), 'tw': (504, 45, 784, 625)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (504, 45, 784, 625), 'en': (504, 45, 784, 625), 'jp': (504, 45, 784, 625), 'tw': (504, 45, 784, 625)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_CLICK_AREA.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_CLICK_AREA.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_CLICK_AREA.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_CLICK_AREA.png'})
PRIVATE_QUARTERS_ROOM_TARGET_INTIMACY_MAX = Button(area={'cn': (1157, 40, 1197, 60), 'en': (1157, 40, 1197, 60), 'jp': (1157, 40, 1197, 60), 'tw': (1157, 40, 1197, 60)}, color={'cn': (173, 161, 155), 'en': (173, 161, 155), 'jp': (173, 161, 155), 'tw': (173, 161, 155)}, button={'cn': (1157, 40, 1197, 60), 'en': (1157, 40, 1197, 60), 'jp': (1157, 40, 1197, 60), 'tw': (1157, 40, 1197, 60)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_INTIMACY_MAX.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_INTIMACY_MAX.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_INTIMACY_MAX.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_ROOM_TARGET_INTIMACY_MAX.png'})
PRIVATE_QUARTERS_SHIP_AEGIR = Button(area={'cn': (512, 526, 569, 568), 'en': (512, 526, 569, 568), 'jp': (512, 526, 569, 568), 'tw': (512, 526, 569, 568)}, color={'cn': (209, 191, 188), 'en': (209, 191, 188), 'jp': (209, 191, 188), 'tw': (209, 191, 188)}, button={'cn': (512, 526, 569, 568), 'en': (512, 526, 569, 568), 'jp': (512, 526, 569, 568), 'tw': (512, 526, 569, 568)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_SHIP_AEGIR.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_SHIP_AEGIR.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_SHIP_AEGIR.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_SHIP_AEGIR.png'})
PRIVATE_QUARTERS_SHIP_ANCHORAGE = Button(area={'cn': (713, 246, 778, 311), 'en': (713, 246, 778, 311), 'jp': (713, 246, 778, 311), 'tw': (713, 246, 778, 311)}, color={'cn': (214, 184, 176), 'en': (214, 184, 176), 'jp': (214, 184, 176), 'tw': (214, 184, 176)}, button={'cn': (713, 246, 778, 311), 'en': (713, 246, 778, 311), 'jp': (713, 246, 778, 311), 'tw': (713, 246, 778, 311)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_SHIP_ANCHORAGE.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_SHIP_ANCHORAGE.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_SHIP_ANCHORAGE.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_SHIP_ANCHORAGE.png'})
PRIVATE_QUARTERS_SHIP_NEW_JERSEY = Button(area={'cn': (973, 307, 1023, 347), 'en': (973, 307, 1023, 347), 'jp': (973, 307, 1023, 347), 'tw': (973, 307, 1023, 347)}, color={'cn': (149, 141, 173), 'en': (149, 141, 173), 'jp': (149, 141, 173), 'tw': (149, 141, 173)}, button={'cn': (973, 307, 1023, 347), 'en': (973, 307, 1023, 347), 'jp': (973, 307, 1023, 347), 'tw': (973, 307, 1023, 347)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_SHIP_NEW_JERSEY.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_SHIP_NEW_JERSEY.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_SHIP_NEW_JERSEY.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_SHIP_NEW_JERSEY.png'})
PRIVATE_QUARTERS_SHIP_NOSHIRO = Button(area={'cn': (965, 289, 1027, 362), 'en': (962, 295, 1027, 360), 'jp': (962, 295, 1027, 360), 'tw': (962, 295, 1027, 360)}, color={'cn': (143, 120, 127), 'en': (102, 93, 102), 'jp': (102, 93, 102), 'tw': (102, 93, 102)}, button={'cn': (965, 289, 1027, 362), 'en': (962, 295, 1027, 360), 'jp': (962, 295, 1027, 360), 'tw': (962, 295, 1027, 360)}, file={'cn': './assets/cn/private_quarters/PRIVATE_QUARTERS_SHIP_NOSHIRO.png', 'en': './assets/en/private_quarters/PRIVATE_QUARTERS_SHIP_NOSHIRO.png', 'jp': './assets/jp/private_quarters/PRIVATE_QUARTERS_SHIP_NOSHIRO.png', 'tw': './assets/tw/private_quarters/PRIVATE_QUARTERS_SHIP_NOSHIRO.png'})

1
module/private_quarters/interact.py
View File

@ -17,6 +17,7 @@ class PQInteract(UI):
'sirius': (PRIVATE_QUARTERS_SHIP_SIRIUS, PRIVATE_QUARTERS_PAGE_LOCALE_BEACH),
'new_jersey': (PRIVATE_QUARTERS_SHIP_NEW_JERSEY, PRIVATE_QUARTERS_PAGE_LOCALE_LOFT),
'taihou': (PRIVATE_QUARTERS_SHIP_TAIHOU, PRIVATE_QUARTERS_PAGE_LOCALE_LOFT),
'aegir': (PRIVATE_QUARTERS_SHIP_AEGIR, PRIVATE_QUARTERS_PAGE_LOCALE_LOFT),
}
def _pq_handle_dialogue(self):