sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-03 06:29:43 +08:00
Code Activity

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
GH Action - Upstream Sync
2026-03-31 19:13:46 +00:00
parent 27f9a23ad5 1e67ed613a
commit 4e1673fe99
8 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -939,7 +939,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -976,7 +976,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -1335,7 +1335,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -1372,7 +1372,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -1731,7 +1731,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -1768,7 +1768,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -2640,7 +2640,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -2677,7 +2677,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -3054,7 +3054,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -3091,7 +3091,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -3351,7 +3351,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -3795,7 +3795,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -4436,7 +4436,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -4473,7 +4473,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -4868,7 +4868,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -4905,7 +4905,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -5300,7 +5300,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -5337,7 +5337,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -5732,7 +5732,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -5769,7 +5769,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -6164,7 +6164,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -6201,7 +6201,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -6587,7 +6587,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -6624,7 +6624,7 @@
},
"Fleet2Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -6875,7 +6875,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -7137,7 +7137,7 @@
},
"Fleet1Control": {
"type": "select",
"value": "prevent_yellow_face",
"value": "prevent_green_face",
"option": [
"keep_exp_bonus",
"prevent_green_face",
@@ -7363,7 +7363,7 @@
},
"Favorite": {
"type": "checkbox",
"value": true
"value": false
},
"MinLevel": {
"type": "input",

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

@@ -228,7 +228,7 @@ Emotion:
value: 2020-01-01 00:00:00
display: disabled
Fleet1Control:
value: prevent_yellow_face
value: prevent_green_face
option: [ keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face ]
Fleet1Recover:
value: not_in_dormitory
@@ -240,7 +240,7 @@ Emotion:
value: 2020-01-01 00:00:00
display: disabled
Fleet2Control:
value: prevent_yellow_face
value: prevent_green_face
option: [ keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face ]
Fleet2Recover:
value: not_in_dormitory
@@ -401,7 +401,7 @@ ControlExpOverflow:
T1Allow: 200
AddNewStudent:
Enable: false
Favorite: true
Favorite: false
MinLevel: 50
Research:
UseCube:

6
module/config/config_generated.py
View File

@@ -119,13 +119,13 @@ class GeneratedConfig:
Emotion_Mode = 'calculate' # calculate, ignore, calculate_ignore
Emotion_Fleet1Value = 119
Emotion_Fleet1Record = datetime.datetime(2020, 1, 1, 0, 0)
Emotion_Fleet1Control = 'prevent_yellow_face' # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face
Emotion_Fleet1Control = 'prevent_green_face' # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face
Emotion_Fleet1Recover = 'not_in_dormitory' # not_in_dormitory, dormitory_floor_1, dormitory_floor_2
Emotion_Fleet1Oath = False
Emotion_Fleet1Onsen = False
Emotion_Fleet2Value = 119
Emotion_Fleet2Record = datetime.datetime(2020, 1, 1, 0, 0)
Emotion_Fleet2Control = 'prevent_yellow_face' # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face
Emotion_Fleet2Control = 'prevent_green_face' # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face
Emotion_Fleet2Recover = 'not_in_dormitory' # not_in_dormitory, dormitory_floor_1, dormitory_floor_2
Emotion_Fleet2Oath = False
Emotion_Fleet2Onsen = False
@@ -222,7 +222,7 @@ class GeneratedConfig:
# Group `AddNewStudent`
AddNewStudent_Enable = False
AddNewStudent_Favorite = True
AddNewStudent_Favorite = False
AddNewStudent_MinLevel = 50
# Group `Research`