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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2022-01-11 21:11:31 +08:00
parent 2443a022f7 5dc207bb69
commit abd91e9b85
7 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@
}, },
"Optimization": { "Optimization": {
"CombatScreenshotInterval": { "CombatScreenshotInterval": {
"type": "input", "type": "disable",
"value": 1.0 "value": 1.0
}, },
"TaskHoardingDuration": { "TaskHoardingDuration": {

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

@@ -4,6 +4,9 @@
# ==================== Alas ==================== # ==================== Alas ====================
Alas:
Optimization:
CombatScreenshotInterval: 1.0
Restart: Restart:
Scheduler: Scheduler:
SuccessInterval: 0 SuccessInterval: 0

7
module/device/screenshot.py
View File

@@ -120,9 +120,6 @@ class Screenshot(AScreenCap):
def screenshot_interval_set(self, interval): def screenshot_interval_set(self, interval):
interval = max(interval, 0.1) interval = max(interval, 0.1)
if interval != self._screenshot_interval_timer.limit: if interval != self._screenshot_interval_timer.limit:
if self.config.Campaign_UseAutoSearch: interval = min(interval, 1.0)
interval = min(interval, 1.0) logger.info(f'Screenshot interval set to {interval}s')
logger.info(f'Screenshot interval set to {interval}s, limited to 1.0s in auto search')
else:
logger.info(f'Screenshot interval set to {interval}s')
self._screenshot_interval_timer.limit = interval self._screenshot_interval_timer.limit = interval

2
module/os/globe_operation.py
View File

@@ -246,7 +246,7 @@ class GlobeOperation(ActionPointHandler, MapEventHandler):
# Popup: Leaving current zone will terminate meowfficer searching. # Popup: Leaving current zone will terminate meowfficer searching.
# Searching reward will be shown after entering another zone. # Searching reward will be shown after entering another zone.
if self.handle_popup_confirm('GOTO_GLOBE'): if self.handle_popup_confirm('GOTO_GLOBE'):
return True continue
# End # End
if self.is_in_globe(): if self.is_in_globe():

8
module/research/preset.py
View File

@@ -7,10 +7,10 @@ DICT_FILTER_PRESET = {
> S4-G2.5 > S4-PRY5 > S4-PRY8 > 1.5 > 2 > S4-Q4 > 2.5 > 4 > 5 > S4-C6 > S4-G2.5 > S4-PRY5 > S4-PRY8 > 1.5 > 2 > S4-Q4 > 2.5 > 4 > 5 > S4-C6
> S4-C8 > 6 > 8 > S4-C12 > 12""", > S4-C8 > 6 > 8 > S4-C12 > 12""",
'series_4_blueprint_only': """ 'series_4_blueprint_only': """
S4-DR0.5 > S4-PRY0.5 > S4-H0.5 > S4-DR8 > S4-DR2.5 > S4-DR5 > S4-G1.5 > S4-PRY2.5 S4-DR0.5 > S4-PRY0.5 > S4-H0.5 > S4-DR8 > S4-DR2.5 > S4-DR5 > S4-G1.5
> S4-Q0.5 > !4-0.5 > S4-G2.5 > !4-1 > S4-Q1 > reset > S4-G4 > S4-PRY5 > S4-PRY2.5 > S4-Q0.5 > 0.5 > S4-G2.5 > S4-Q1 > 1 > reset > S4-G4
> !4-1.5 > S4-Q2 > !4-2 > !4-5 > S4-PRY8 > !4-2.5 > S4-Q4 > !4-4 > S4-PRY5 > 1.5 > S4-Q2 > 2 > S4-PRY8 > 2.5 > S4-Q4 > 4 > 5 > S4-C6
> !4-C6 > S4-C6 > S4-C8 > !4-C8 > S4-C12 > !4-C12""", > 6 > S4-C8 > 8 > S4-C12 > 12""",
'series_4_tenrai_only': """ 'series_4_tenrai_only': """
S4-Q0.5 > S4-PRY0.5 > S4-DR0.5 > S4-Q4 > S4-Q1 > S4-Q2 > S4-H0.5 > 0.5 S4-Q0.5 > S4-PRY0.5 > S4-DR0.5 > S4-Q4 > S4-Q1 > S4-Q2 > S4-H0.5 > 0.5
> S4-G4 > S4-G1.5 > 1 > S4-DR2.5 > S4-PRY2.5 > reset > S4-G2.5 > 1.5 > S4-G4 > S4-G1.5 > 1 > S4-DR2.5 > S4-PRY2.5 > reset > S4-G2.5 > 1.5

5
webapp/packages/main/src/index.ts
View File

@@ -102,8 +102,9 @@ const createWindow = async () => {
mainWindow?.isMaximized() ? mainWindow?.restore() : mainWindow?.maximize(); mainWindow?.isMaximized() ? mainWindow?.restore() : mainWindow?.maximize();
}); });
ipcMain.on('window-close', function () { ipcMain.on('window-close', function () {
alas.kill(); alas.kill(function () {
setTimeout(() => mainWindow?.close(), 500); // Wait taskkill to finish mainWindow?.close();
})
}); });
// Tray // Tray

4
webapp/packages/main/src/pyshell.ts
View File

@@ -21,8 +21,8 @@ export class PyShell extends PythonShell {
return this; return this;
} }
kill(): this { kill(callback: (...args: any[]) => void): this {
treeKill(this.childProcess.pid, 'SIGTERM'); treeKill(this.childProcess.pid, 'SIGTERM', callback);
return this; return this;
} }
} }