ReDawn/M-AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/W1NDes/M-AzurLaneAutoScript.git synced 2026-05-14 07:08:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source
This commit is contained in:
W1NDes 2025-08-31 13:44:09 +08:00
commit 4e4d0749dc
6 changed files with 104 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1991,6 +1991,9 @@
],
"option_tw": [
"event_20250814_cn"
],
"option_bold": [
"event_20250814_cn"
]
},
"Mode": {
@ -2250,7 +2253,7 @@
"value": "12-4"
},
"Event": {
"type": "select",
"type": "state",
"value": "campaign_main",
"option": [
"event_20250814_cn"
@ -2266,6 +2269,9 @@
],
"option_tw": [
"event_20250814_cn"
],
"option_bold": [
"event_20250814_cn"
]
},
"Mode": {
@ -2666,7 +2672,7 @@
"value": "12-4"
},
"Event": {
"type": "select",
"type": "state",
"value": "campaign_main",
"option": [
"event_20250814_cn"
@ -2682,6 +2688,9 @@
],
"option_tw": [
"event_20250814_cn"
],
"option_bold": [
"event_20250814_cn"
]
},
"Mode": {
@ -3463,7 +3472,7 @@
"display": "hide"
},
"Event": {
"type": "select",
"type": "state",
"value": "campaign_main",
"option": [
"raid_20250116"
@ -3479,6 +3488,9 @@
],
"option_tw": [
"raid_20250116"
],
"option_bold": [
"raid_20250116"
]
},
"Mode": {
@ -3863,7 +3875,7 @@
"display": "hide"
},
"Event": {
"type": "select",
"type": "state",
"value": "campaign_main",
"option": [
"coalition_20240627",
@ -3880,6 +3892,10 @@
],
"option_tw": [
"coalition_20240627"
],
"option_bold": [
"coalition_20240627",
"coalition_20250626"
]
},
"Mode": {
@ -4786,7 +4802,7 @@
"display": "hide"
},
"Event": {
"type": "select",
"type": "state",
"value": "campaign_main",
"option": [
"event_20250814_cn"
@ -4802,6 +4818,9 @@
],
"option_tw": [
"event_20250814_cn"
],
"option_bold": [
"event_20250814_cn"
]
},
"Mode": {
@ -5197,7 +5216,7 @@
"display": "hide"
},
"Event": {
"type": "select",
"type": "state",
"value": "campaign_main",
"option": [
"event_20250814_cn"
@ -5213,6 +5232,9 @@
],
"option_tw": [
"event_20250814_cn"
],
"option_bold": [
"event_20250814_cn"
]
},
"Mode": {
@ -5608,7 +5630,7 @@
"display": "hide"
},
"Event": {
"type": "select",
"type": "state",
"value": "campaign_main",
"option": [
"event_20250814_cn"
@ -5624,6 +5646,9 @@
],
"option_tw": [
"event_20250814_cn"
],
"option_bold": [
"event_20250814_cn"
]
},
"Mode": {
@ -6019,7 +6044,7 @@
"display": "hide"
},
"Event": {
"type": "select",
"type": "state",
"value": "campaign_main",
"option": [
"event_20250814_cn"
@ -6035,6 +6060,9 @@
],
"option_tw": [
"event_20250814_cn"
],
"option_bold": [
"event_20250814_cn"
]
},
"Mode": {
@ -6430,7 +6458,7 @@
"display": "hide"
},
"Event": {
"type": "select",
"type": "state",
"value": "campaign_main",
"option": [
"event_20250814_cn"
@ -6446,6 +6474,9 @@
],
"option_tw": [
"event_20250814_cn"
],
"option_bold": [
"event_20250814_cn"
]
},
"Mode": {
@ -6834,7 +6865,7 @@
"display": "hide"
},
"Event": {
"type": "select",
"type": "state",
"value": "campaign_main",
"option": [
"raid_20250116"
@ -6850,6 +6881,9 @@
],
"option_tw": [
"raid_20250116"
],
"option_bold": [
"raid_20250116"
]
},
"Mode": {
@ -7103,7 +7137,7 @@
"display": "hide"
},
"Event": {
"type": "select",
"type": "state",
"value": "campaign_main",
"option": [
"coalition_20240627",
@ -7120,6 +7154,10 @@
],
"option_tw": [
"coalition_20240627"
],
"option_bold": [
"coalition_20240627",
"coalition_20250626"
]
},
"Mode": {

22
module/config/argument/override.yaml
View File

@ -56,6 +56,8 @@ GemsFarming:
Event:
Campaign:
Mode: normal
Event:
type: state
AmbushEvade: true
EventPt:
Event2MapName:
@ -78,6 +80,8 @@ Event:
Event2:
Campaign:
Mode: normal
Event:
type: state
AmbushEvade: true
Event3:
@ -93,6 +97,8 @@ EventA:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@ -110,6 +116,8 @@ EventB:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@ -127,6 +135,8 @@ EventC:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@ -144,6 +154,8 @@ EventD:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@ -161,6 +173,8 @@ EventSp:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@ -176,6 +190,8 @@ EventSp:
Raid:
Campaign:
Name: dynamic
Event:
type: state
Mode: normal
UseClearMode: true
UseFleetLock: true
@ -218,6 +234,8 @@ RaidDaily:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
Mode: normal
UseClearMode: true
UseFleetLock: true
@ -248,6 +266,8 @@ Coalition:
FailureInterval: 30
ServerUpdate: 00:00
Campaign:
Event:
type: state
Name: dynamic
Mode: normal
UseClearMode: true
@ -284,6 +304,8 @@ CoalitionSp:
ServerUpdate: 00:00
Campaign:
Name: sp
Event:
type: state
Mode: normal
UseClearMode: true
UseFleetLock: true

2
module/config/config_updater.py
View File

@ -492,6 +492,8 @@ class ConfigGenerator:
latest[server] = deep_get(self.args, keys=f'{task}.Campaign.Event.option_{server}', default=[])
options = set().union(*latest.values())
options = sorted([option for option in options if option != 'campaign_main'])
if task not in WAR_ARCHIVES:
deep_set(self.args, keys=f'{task}.Campaign.Event.option_bold', value=options)
deep_set(self.args, keys=f'{task}.Campaign.Event.option', value=options)
@staticmethod

4
module/os_combat/combat.py
View File

@ -157,7 +157,9 @@ class Combat(Combat_, MapEventHandler):
def combat_status(self, drop=None, expected_end=None):
self.__os_combat_drop = drop
super().combat_status(drop=drop, expected_end=self._os_combat_expected_end)
if expected_end is None:
expected_end = self._os_combat_expected_end
super().combat_status(drop=drop, expected_end=expected_end)
def combat(self, *args, save_get_items=False, **kwargs):
"""

8
module/shop/shop_status.py
View File

@ -9,7 +9,13 @@ if server.server != 'jp':
else:
OCR_SHOP_GEMS = Digit(SHOP_GEMS, letter=(190, 180, 82), name='OCR_SHOP_GEMS')
# UI update in 20250814, but server TW is still old UI.
if server.server != 'tw':
if server.server == 'jp':
OCR_SHOP_GOLD_COINS = Digit(SHOP_OCR_BALANCE, letter=(110, 120, 130), name='OCR_SHOP_GOLD_COINS')
OCR_SHOP_MEDAL = Digit(SHOP_OCR_BALANCE, letter=(110, 120, 130), name='OCR_SHOP_MEDAL')
OCR_SHOP_MERIT = Digit(SHOP_OCR_BALANCE, letter=(110, 120, 130), name='OCR_SHOP_MERIT')
OCR_SHOP_GUILD_COINS = Digit(SHOP_OCR_BALANCE, letter=(110, 120, 130), name='OCR_SHOP_GUILD_COINS')
OCR_SHOP_CORE = Digit(SHOP_OCR_BALANCE, letter=(110, 120, 130), name='OCR_SHOP_CORE')
elif server.server != 'tw':
OCR_SHOP_GOLD_COINS = Digit(SHOP_OCR_BALANCE, letter=(100, 100, 100), name='OCR_SHOP_GOLD_COINS')
OCR_SHOP_MEDAL = Digit(SHOP_OCR_BALANCE, letter=(100, 100, 100), name='OCR_SHOP_MEDAL')
OCR_SHOP_MERIT = Digit(SHOP_OCR_BALANCE, letter=(100, 100, 100), name='OCR_SHOP_MERIT')

21
module/shop/ui.py
View File

@ -125,6 +125,27 @@ class ShopUI(UI):
inactive_color=(252, 252, 253), inactive_threshold=221, inactive_count=100,
)
@Config.when(SERVER='jp')
def shop_tab_250814(self):
"""
Set with `self.shop_tab.set(main=self, upper={index})`
- index
1: General supply shops
2: Monthly shops
3: Event shops
"""
grids = ButtonGrid(
origin=(29, 436), delta=(0, 50),
button_shape=(74, 21), grid_shape=(1, 3),
name='SHOP_TAB')
return Navbar(
grids=grids,
# blue text active
active_color=(88, 186, 255), active_threshold=221, active_count=100,
# white text inactive
inactive_color=(38, 92, 121), inactive_threshold=221, inactive_count=100,
)
@cached_property
@Config.when(SERVER=None)
def shop_tab_250814(self):