mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 06:18:21 +08:00
Opt: Refactor config display
Opt: Lock event selector
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -10,13 +10,13 @@ Scheduler:
|
||||
Command: Alas
|
||||
SuccessInterval:
|
||||
value: 0
|
||||
type: hide
|
||||
display: hide
|
||||
FailureInterval:
|
||||
value: 120
|
||||
type: hide
|
||||
display: hide
|
||||
ServerUpdate:
|
||||
value: 00:00
|
||||
type: hide
|
||||
display: hide
|
||||
Emulator:
|
||||
Serial:
|
||||
value: auto
|
||||
@@ -167,7 +167,7 @@ Emotion:
|
||||
Fleet1Value: 119
|
||||
Fleet1Record:
|
||||
value: 2020-01-01 00:00:00
|
||||
type: disable
|
||||
display: disabled
|
||||
Fleet1Control:
|
||||
value: prevent_yellow_face
|
||||
option: [keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face]
|
||||
@@ -178,7 +178,7 @@ Emotion:
|
||||
Fleet2Value: 119
|
||||
Fleet2Record:
|
||||
value: 2020-01-01 00:00:00
|
||||
type: disable
|
||||
display: disabled
|
||||
Fleet2Control:
|
||||
value: prevent_yellow_face
|
||||
option: [keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face]
|
||||
|
||||
@@ -8,7 +8,7 @@ Restart:
|
||||
Scheduler:
|
||||
Enable:
|
||||
value: true
|
||||
type: disable
|
||||
display: disabled
|
||||
SuccessInterval: 0
|
||||
FailureInterval: 0
|
||||
ServerUpdate: 00:00
|
||||
@@ -38,10 +38,14 @@ GemsFarming:
|
||||
Event:
|
||||
Campaign:
|
||||
Mode: normal
|
||||
Event:
|
||||
display: disabled
|
||||
AmbushEvade: true
|
||||
Event2:
|
||||
Campaign:
|
||||
Mode: normal
|
||||
Event:
|
||||
display: disabled
|
||||
AmbushEvade: true
|
||||
EventA:
|
||||
Scheduler:
|
||||
@@ -50,6 +54,8 @@ EventA:
|
||||
ServerUpdate: 00:00
|
||||
Campaign:
|
||||
Name: dynamic
|
||||
Event:
|
||||
display: disabled
|
||||
Mode: normal
|
||||
Use2xBook: false
|
||||
AmbushEvade: true
|
||||
@@ -66,6 +72,8 @@ EventB:
|
||||
ServerUpdate: 00:00
|
||||
Campaign:
|
||||
Name: dynamic
|
||||
Event:
|
||||
display: disabled
|
||||
Mode: normal
|
||||
Use2xBook: false
|
||||
AmbushEvade: true
|
||||
@@ -82,6 +90,8 @@ EventC:
|
||||
ServerUpdate: 00:00
|
||||
Campaign:
|
||||
Name: dynamic
|
||||
Event:
|
||||
display: disabled
|
||||
Mode: normal
|
||||
Use2xBook: false
|
||||
AmbushEvade: true
|
||||
@@ -98,6 +108,8 @@ EventD:
|
||||
ServerUpdate: 00:00
|
||||
Campaign:
|
||||
Name: dynamic
|
||||
Event:
|
||||
display: disabled
|
||||
Mode: normal
|
||||
Use2xBook: false
|
||||
AmbushEvade: true
|
||||
@@ -114,6 +126,8 @@ EventSp:
|
||||
ServerUpdate: 00:00
|
||||
Campaign:
|
||||
Name: sp
|
||||
Event:
|
||||
display: disabled
|
||||
Mode: normal
|
||||
Use2xBook: false
|
||||
AmbushEvade: true
|
||||
@@ -128,6 +142,8 @@ EventSp:
|
||||
Raid:
|
||||
Campaign:
|
||||
Name: dynamic
|
||||
Event:
|
||||
display: disabled
|
||||
Mode: normal
|
||||
UseClearMode: true
|
||||
UseFleetLock: true
|
||||
@@ -152,6 +168,8 @@ RaidDaily:
|
||||
ServerUpdate: 00:00
|
||||
Campaign:
|
||||
Name: dynamic
|
||||
Event:
|
||||
display: disabled
|
||||
Mode: normal
|
||||
UseClearMode: true
|
||||
UseFleetLock: true
|
||||
|
||||
@@ -81,6 +81,7 @@ class ConfigGenerator:
|
||||
value = {'value': value}
|
||||
arg['type'] = data_to_type(value, arg=path[1])
|
||||
if isinstance(value['value'], datetime):
|
||||
arg['type'] = 'datetime'
|
||||
arg['validate'] = 'datetime'
|
||||
# Manual definition has the highest priority
|
||||
arg.update(value)
|
||||
@@ -174,17 +175,20 @@ class ConfigGenerator:
|
||||
if not check_override(p, v):
|
||||
continue
|
||||
if isinstance(v, dict):
|
||||
deep_default(v, keys='type', value='hide')
|
||||
if deep_get(v, keys='type') in ['lock']:
|
||||
deep_default(v, keys='display', value="disabled")
|
||||
else:
|
||||
deep_default(v, keys='display', value='hide')
|
||||
for arg_k, arg_v in v.items():
|
||||
deep_set(data, keys=p + [arg_k], value=arg_v)
|
||||
else:
|
||||
deep_set(data, keys=p + ['value'], value=v)
|
||||
deep_set(data, keys=p + ['type'], value='hide')
|
||||
deep_set(data, keys=p + ['display'], value='hide')
|
||||
# Set command
|
||||
for task in self.task.keys():
|
||||
if deep_get(data, keys=f'{task}.Scheduler.Command'):
|
||||
deep_set(data, keys=f'{task}.Scheduler.Command.value', value=task)
|
||||
deep_set(data, keys=f'{task}.Scheduler.Command.type', value='hide')
|
||||
deep_set(data, keys=f'{task}.Scheduler.Command.display', value='hide')
|
||||
|
||||
return data
|
||||
|
||||
|
||||
Reference in New Issue
Block a user