sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 08:38:20 +08:00
Code Activity

Add: island transport gui

Browse Source
This commit is contained in:
sui-feng-cb
2025-10-16 00:46:28 +08:00
parent f860763418
commit 2edc54d225
12 changed files with 68 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7934,6 +7934,12 @@
"display": "hide"
}
},
"IslandTransport": {
"Enable": {
"type": "checkbox",
"value": false
}
},
"Island1": {
"Receive": {
"type": "checkbox",

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

@@ -485,6 +485,8 @@ Awaken:
option: [ level120, level125 ]
Favourite:
value: false
IslandTransport:
Enable: false
Island1:
Receive: false
Option1:

1
module/config/argument/task.yaml
View File

@@ -232,6 +232,7 @@ Reward:
- Awaken
Island:
- Scheduler
- IslandTransport
- Island1
- Island2
- Island3

3
module/config/config_generated.py
View File

@@ -271,6 +271,9 @@ class GeneratedConfig:
Awaken_LevelCap = 'level120' # level120, level125
Awaken_Favourite = False
# Group `IslandTransport`
IslandTransport_Enable = False
# Group `Island1`
Island1_Receive = False
Island1_Option1 = 0 # 0, 1, 2, 3, 4, 5, 6, 7, 8

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

@@ -1727,6 +1727,16 @@
"help": ""
}
},
"IslandTransport": {
"_info": {
"name": "IslandTransport._info.name",
"help": "IslandTransport._info.help"
},
"Enable": {
"name": "IslandTransport.Enable.name",
"help": "IslandTransport.Enable.help"
}
},
"Island1": {
"_info": {
"name": "Island1._info.name",

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

@@ -1727,6 +1727,16 @@
"help": "Awaken.Favourite.help"
}
},
"IslandTransport": {
"_info": {
"name": "IslandTransport._info.name",
"help": "IslandTransport._info.help"
},
"Enable": {
"name": "IslandTransport.Enable.name",
"help": "IslandTransport.Enable.help"
}
},
"Island1": {
"_info": {
"name": "Island1._info.name",

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

@@ -1727,6 +1727,16 @@
"help": ""
}
},
"IslandTransport": {
"_info": {
"name": "货运委托",
"help": ""
},
"Enable": {
"name": "做货运委托",
"help": "会装载全部满足条件的货运委托，并计算下一次收货时间\n目前不会交带有鸡肉的货运委托"
}
},
"Island1": {
"_info": {
"name": "丰壤农田",
@@ -2080,8 +2090,8 @@
"4": "香蕉芒果汁",
"5": "蜂蜜柠檬水",
"6": "草莓蜜沁",
"7": "草莓蜂蜜冰沙",
"8": "薰衣草茶",
"7": "薰衣草茶",
"8": "草莓蜂蜜冰沙",
"9": "阳光蜜水",
"10": "缤纷果乐园",
"11": "花香果韵"
@@ -2096,8 +2106,8 @@
"4": "香蕉芒果汁",
"5": "蜂蜜柠檬水",
"6": "草莓蜜沁",
"7": "草莓蜂蜜冰沙",
"8": "薰衣草茶",
"7": "薰衣草茶",
"8": "草莓蜂蜜冰沙",
"9": "阳光蜜水",
"10": "缤纷果乐园",
"11": "花香果韵"

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

@@ -1727,6 +1727,16 @@
"help": ""
}
},
"IslandTransport": {
"_info": {
"name": "IslandTransport._info.name",
"help": "IslandTransport._info.help"
},
"Enable": {
"name": "IslandTransport.Enable.name",
"help": "IslandTransport.Enable.help"
}
},
"Island1": {
"_info": {
"name": "Island1._info.name",

12
module/island/island.py
View File

@@ -23,7 +23,7 @@ class Island(IslandProjectRun, IslandTransportRun):
else:
return []
def island_run(self, transport=False, project=True, names=None):
def island_run(self, transport=True, project=True, names=None):
"""
Execute island routine.
@@ -57,14 +57,16 @@ class Island(IslandProjectRun, IslandTransportRun):
def run(self):
if server.server in ['cn']:
names = self.island_config_to_names(
[self.config.__getattribute__(f'Island{i}_Receive') for i in range(1, 16)])
if len(names):
transport = self.config.IslandTransport_Enable
project_config = [self.config.__getattribute__(f'Island{i}_Receive') for i in range(1, 16)]
project = any(project_config)
names = self.island_config_to_names(project_config)
if transport or project:
self.ui_ensure(page_dormmenu)
self.ui_goto(page_island, get_ship=False)
self.device.sleep(0.5)
self.ui_ensure(page_island_phone)
self.island_run(names=names)
self.island_run(transport=transport, project=project, names=names)
self.ui_goto(page_main, get_ship=False)
else:
logger.info('Nothing to receive, skip island running')

2
module/island/project_data.py
View File

@@ -32,7 +32,7 @@ items_data_cn = {
},
8: {
1: '胡萝卜秋梨汁', 2: '菊花茶', 3: '苹果汁', 4: '香蕉芒果汁',
5: '蜂蜜柠檬水', 6: '草莓蜜沁', 7: '草莓蜂蜜冰沙', 8: '薰衣草茶',
5: '蜂蜜柠檬水', 6: '草莓蜜沁', 7: '薰衣草茶', 8: '草莓蜂蜜冰沙',
9: '阳光蜜水', 10: '缤纷果乐园', 11: '花香果韵',
},
9: {

2
module/island/transport.py
View File

@@ -296,7 +296,7 @@ class IslandTransportRun(IslandUI):
if self.handle_get_items():
success = True
self.interval_clear(TRANSPORT_START)
self.interval_reset(TRANSPORT_START)
confirm_timer.reset()
continue