Skip to content

Commit c75dd93

Browse files
committed
Add: auto change state of options (default select and single means state)
1 parent 6562ce0 commit c75dd93

3 files changed

Lines changed: 22 additions & 34 deletions

File tree

module/config/argument/args.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1922,7 +1922,7 @@
19221922
"value": "12-4"
19231923
},
19241924
"Event": {
1925-
"type": "state",
1925+
"type": "select",
19261926
"value": "campaign_main",
19271927
"option": [
19281928
"event_20220915_cn",
@@ -2319,7 +2319,7 @@
23192319
"value": "12-4"
23202320
},
23212321
"Event": {
2322-
"type": "state",
2322+
"type": "select",
23232323
"value": "campaign_main",
23242324
"option": [
23252325
"event_20220915_cn",
@@ -2733,7 +2733,7 @@
27332733
"display": "hide"
27342734
},
27352735
"Event": {
2736-
"type": "state",
2736+
"type": "select",
27372737
"value": "campaign_main",
27382738
"option": [
27392739
"raid_20260212"
@@ -3132,7 +3132,7 @@
31323132
"display": "hide"
31333133
},
31343134
"Event": {
3135-
"type": "state",
3135+
"type": "select",
31363136
"value": "campaign_main",
31373137
"option": [
31383138
"coalition_20260122"
@@ -4046,7 +4046,7 @@
40464046
"display": "hide"
40474047
},
40484048
"Event": {
4049-
"type": "state",
4049+
"type": "select",
40504050
"value": "campaign_main",
40514051
"option": [
40524052
"event_20220915_cn",
@@ -4460,7 +4460,7 @@
44604460
"display": "hide"
44614461
},
44624462
"Event": {
4463-
"type": "state",
4463+
"type": "select",
44644464
"value": "campaign_main",
44654465
"option": [
44664466
"event_20220915_cn",
@@ -4874,7 +4874,7 @@
48744874
"display": "hide"
48754875
},
48764876
"Event": {
4877-
"type": "state",
4877+
"type": "select",
48784878
"value": "campaign_main",
48794879
"option": [
48804880
"event_20220915_cn",
@@ -5288,7 +5288,7 @@
52885288
"display": "hide"
52895289
},
52905290
"Event": {
5291-
"type": "state",
5291+
"type": "select",
52925292
"value": "campaign_main",
52935293
"option": [
52945294
"event_20220915_cn",
@@ -5692,7 +5692,7 @@
56925692
"display": "hide"
56935693
},
56945694
"Event": {
5695-
"type": "state",
5695+
"type": "select",
56965696
"value": "campaign_main",
56975697
"option": [
56985698
"event_20220915_cn",
@@ -6103,7 +6103,7 @@
61036103
"display": "hide"
61046104
},
61056105
"Event": {
6106-
"type": "state",
6106+
"type": "select",
61076107
"value": "campaign_main",
61086108
"option": [
61096109
"raid_20260212"
@@ -6330,7 +6330,7 @@
63306330
"display": "hide"
63316331
},
63326332
"Event": {
6333-
"type": "state",
6333+
"type": "select",
63346334
"value": "campaign_main",
63356335
"option": [
63366336
"coalition_20260122"

module/config/argument/override.yaml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,10 @@ GemsFarming:
5252
Event:
5353
Campaign:
5454
Mode: normal
55-
Event:
56-
type: state
5755
AmbushEvade: true
5856
Event2:
5957
Campaign:
6058
Mode: normal
61-
Event:
62-
type: state
6359
AmbushEvade: true
6460
EventA:
6561
Scheduler:
@@ -68,8 +64,6 @@ EventA:
6864
ServerUpdate: 00:00
6965
Campaign:
7066
Name: dynamic
71-
Event:
72-
type: state
7367
Mode: normal
7468
Use2xBook: false
7569
AmbushEvade: true
@@ -86,8 +80,6 @@ EventB:
8680
ServerUpdate: 00:00
8781
Campaign:
8882
Name: dynamic
89-
Event:
90-
type: state
9183
Mode: normal
9284
Use2xBook: false
9385
AmbushEvade: true
@@ -104,8 +96,6 @@ EventC:
10496
ServerUpdate: 00:00
10597
Campaign:
10698
Name: dynamic
107-
Event:
108-
type: state
10999
Mode: normal
110100
Use2xBook: false
111101
AmbushEvade: true
@@ -122,8 +112,6 @@ EventD:
122112
ServerUpdate: 00:00
123113
Campaign:
124114
Name: dynamic
125-
Event:
126-
type: state
127115
Mode: normal
128116
Use2xBook: false
129117
AmbushEvade: true
@@ -140,8 +128,6 @@ EventSp:
140128
ServerUpdate: 00:00
141129
Campaign:
142130
Name: sp
143-
Event:
144-
type: state
145131
Mode: normal
146132
Use2xBook: false
147133
AmbushEvade: true
@@ -156,8 +142,6 @@ EventSp:
156142
Raid:
157143
Campaign:
158144
Name: dynamic
159-
Event:
160-
type: state
161145
Mode: normal
162146
UseClearMode: true
163147
UseFleetLock: true
@@ -198,8 +182,6 @@ RaidDaily:
198182
ServerUpdate: 00:00
199183
Campaign:
200184
Name: dynamic
201-
Event:
202-
type: state
203185
Mode: normal
204186
UseClearMode: true
205187
UseFleetLock: true
@@ -229,8 +211,6 @@ Coalition:
229211
FailureInterval: 30
230212
ServerUpdate: 00:00
231213
Campaign:
232-
Event:
233-
type: state
234214
Name: dynamic
235215
Mode: normal
236216
UseClearMode: true
@@ -259,8 +239,6 @@ CoalitionSp:
259239
ServerUpdate: 00:00
260240
Campaign:
261241
Name: sp
262-
Event:
263-
type: state
264242
Mode: normal
265243
UseClearMode: true
266244
UseFleetLock: true

module/webui/app.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
from module.config.config import AzurLaneConfig, Function
4444
from module.config.deep import deep_get, deep_iter, deep_set
4545
from module.config.env import IS_ON_PHONE_CLOUD
46+
from module.config.server import to_server
4647
from module.config.utils import (
4748
alas_instance,
4849
alas_template,
@@ -312,6 +313,7 @@ def alas_set_group(self, task: str) -> None:
312313
@use_scope("groups")
313314
def set_group(self, group, arg_dict, config, task):
314315
group_name = group[0]
316+
server = to_server(deep_get(config, "Alas.Emulator.PackageName", "cn"))
315317

316318
output_list: List[Output] = []
317319
for arg, arg_dict in deep_iter(arg_dict, depth=1):
@@ -342,7 +344,15 @@ def set_group(self, group, arg_dict, config, task):
342344
# Default value
343345
output_kwargs["value"] = value
344346
# Options
345-
output_kwargs["options"] = options = output_kwargs.pop("option", [])
347+
options = output_kwargs.pop("option", [])
348+
server_options = output_kwargs.get(f"option_{server}")
349+
if output_kwargs["widget_type"] == "select" and isinstance(server_options, list) and server_options:
350+
options = server_options
351+
output_kwargs["options"] = options
352+
if output_kwargs["widget_type"] == "select" and len(options) == 1:
353+
only_option = options[0]
354+
if only_option in output_kwargs.get("option_bold", []):
355+
output_kwargs["widget_type"] = "state"
346356
# Options label
347357
options_label = []
348358
for opt in options:

0 commit comments

Comments
 (0)