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

Merge pull request #1823 from SaiCateDoan/maa

Browse Source 
Opt: Optimized logic of MaaMaterial
This commit is contained in:
LmeSzinc
2022-11-06 00:36:49 +08:00
committed by GitHub
parent 1923399ab8 d73336af5a
commit 57b36c4d1a
12 changed files with 253 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
submodule/AlasMaaBridge/module/config/argument/args.json
View File

@@ -136,9 +136,30 @@
},
"MaaFight": {
"Stage": {
"type": "select",
"value": "custom",
"option": [
"last",
"1-7",
"CE-6",
"AP-5",
"CA-5",
"LS-6",
"PR-A-1",
"PR-A-2",
"PR-B-1",
"PR-B-2",
"PR-C-1",
"PR-C-2",
"PR-D-1",
"PR-D-2",
"custom"
],
"display": "hide"
},
"CustomStage": {
"type": "input",
"value": "Annihilation",
"valuetype": "str",
"display": "hide"
},
"Medicine": {
@@ -191,7 +212,7 @@
},
"FailureInterval": {
"type": "input",
"value": 120,
"value": 480,
"display": "hide"
},
"ServerUpdate": {
@@ -202,21 +223,41 @@
},
"MaaFight": {
"Stage": {
"type": "select",
"value": "last",
"option": [
"last",
"1-7",
"CE-6",
"AP-5",
"CA-5",
"LS-6",
"PR-A-1",
"PR-A-2",
"PR-B-1",
"PR-B-2",
"PR-C-1",
"PR-C-2",
"PR-D-1",
"PR-D-2",
"custom"
]
},
"CustomStage": {
"type": "input",
"value": "1-7",
"valuetype": "str"
"value": null
},
"Medicine": {
"type": "input",
"value": 0
"value": null
},
"Stone": {
"type": "input",
"value": 0
"value": null
},
"Times": {
"type": "input",
"value": 0
"value": null
},
"Drops": {
"type": "textarea",
@@ -262,9 +303,29 @@
},
"MaaFight": {
"Stage": {
"type": "select",
"value": "last",
"option": [
"last",
"1-7",
"CE-6",
"AP-5",
"CA-5",
"LS-6",
"PR-A-1",
"PR-A-2",
"PR-B-1",
"PR-B-2",
"PR-C-1",
"PR-C-2",
"PR-D-1",
"PR-D-2",
"custom"
]
},
"CustomStage": {
"type": "input",
"value": "1-7",
"valuetype": "str"
"value": null
},
"Medicine": {
"type": "input",

11
submodule/AlasMaaBridge/module/config/argument/argument.yaml
View File

@@ -55,11 +55,12 @@ MaaRecord:
MaaFight:
Stage:
value: 1-7
valuetype: str
Medicine: 0
Stone: 0
Times: 0
value: last
option: [last, 1-7, CE-6, AP-5, CA-5, LS-6, PR-A-1, PR-A-2, PR-B-1, PR-B-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2, custom]
CustomStage: null
Medicine: null
Stone: null
Times: null
Drops:
value: null
type: textarea

7
submodule/AlasMaaBridge/module/config/argument/override.yaml
View File

@@ -13,11 +13,16 @@ MaaStartup:
FailureInterval: 0
ServerUpdate: 04:00
MaaMaterial:
Scheduler:
FailureInterval: 480
MaaAnnihilation:
Scheduler:
SuccessInterval: 480
MaaFight:
Stage: Annihilation
Stage: custom
CustomStage: Annihilation
Medicine: 0
Stone: 0
Times: 5

9
submodule/AlasMaaBridge/module/config/config_generated.py
View File

@@ -38,10 +38,11 @@ class GeneratedConfig:
MaaRecord_PenguinID = None
# Group `MaaFight`
MaaFight_Stage = '1-7'
MaaFight_Medicine = 0
MaaFight_Stone = 0
MaaFight_Times = 0
MaaFight_Stage = 'last' # last, 1-7, CE-6, AP-5, CA-5, LS-6, PR-A-1, PR-A-2, PR-B-1, PR-B-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2, custom
MaaFight_CustomStage = None
MaaFight_Medicine = None
MaaFight_Stone = None
MaaFight_Times = None
MaaFight_Drops = None
MaaFight_DrGrandet = False

21
submodule/AlasMaaBridge/module/config/i18n/en-US.json
View File

@@ -176,7 +176,26 @@
},
"Stage": {
"name": "MaaFight.Stage.name",
"help": "MaaFight.Stage.help"
"help": "MaaFight.Stage.help",
"last": "last",
"1-7": "1-7",
"CE-6": "CE-6",
"AP-5": "AP-5",
"CA-5": "CA-5",
"LS-6": "LS-6",
"PR-A-1": "PR-A-1",
"PR-A-2": "PR-A-2",
"PR-B-1": "PR-B-1",
"PR-B-2": "PR-B-2",
"PR-C-1": "PR-C-1",
"PR-C-2": "PR-C-2",
"PR-D-1": "PR-D-1",
"PR-D-2": "PR-D-2",
"custom": "custom"
},
"CustomStage": {
"name": "MaaFight.CustomStage.name",
"help": "MaaFight.CustomStage.help"
},
"Medicine": {
"name": "MaaFight.Medicine.name",

21
submodule/AlasMaaBridge/module/config/i18n/ja-JP.json
View File

@@ -176,7 +176,26 @@
},
"Stage": {
"name": "MaaFight.Stage.name",
"help": "MaaFight.Stage.help"
"help": "MaaFight.Stage.help",
"last": "last",
"1-7": "1-7",
"CE-6": "CE-6",
"AP-5": "AP-5",
"CA-5": "CA-5",
"LS-6": "LS-6",
"PR-A-1": "PR-A-1",
"PR-A-2": "PR-A-2",
"PR-B-1": "PR-B-1",
"PR-B-2": "PR-B-2",
"PR-C-1": "PR-C-1",
"PR-C-2": "PR-C-2",
"PR-D-1": "PR-D-1",
"PR-D-2": "PR-D-2",
"custom": "custom"
},
"CustomStage": {
"name": "MaaFight.CustomStage.name",
"help": "MaaFight.CustomStage.help"
},
"Medicine": {
"name": "MaaFight.Medicine.name",

25
submodule/AlasMaaBridge/module/config/i18n/zh-CN.json
View File

@@ -31,7 +31,7 @@
"help": ""
},
"MaaFight": {
"name": "刷理智",
"name": "清理智",
"help": ""
},
"MaaRecruit": {
@@ -172,10 +172,29 @@
"MaaFight": {
"_info": {
"name": "战斗设置",
"help": ""
"help": "任何一个战斗结束条件被满足后，都会导致任务被关闭且所有条件被删除，留空的条件不生效"
},
"Stage": {
"name": "关卡选择",
"help": "",
"last": "上次",
"1-7": "1-7",
"CE-6": "龙门币-6",
"AP-5": "红票-5",
"CA-5": "技能-5",
"LS-6": "经验-6",
"PR-A-1": "奶/盾芯片",
"PR-A-2": "奶/盾芯片组",
"PR-B-1": "术/狙芯片",
"PR-B-2": "术/狙芯片组",
"PR-C-1": "先/辅芯片",
"PR-C-2": "先/辅芯片组",
"PR-D-1": "近/特芯片",
"PR-D-2": "近/特芯片组",
"custom": "自定义"
},
"CustomStage": {
"name": "自定义关卡",
"help": ""
},
"Medicine": {
@@ -192,7 +211,7 @@
},
"Drops": {
"name": "指定掉落",
"help": "以\"掉落物:数量 > 掉落物:数量\"的形式，支持中文名称和物品ID"
"help": "以\"掉落物:数量 > 掉落物:数量\"的形式，支持中文名称和物品ID\n注意：填写多种掉落物时，任何一种掉落物刷满都会使任务结束"
},
"DrGrandet": {
"name": "节省理智碎石模式",

21
submodule/AlasMaaBridge/module/config/i18n/zh-TW.json
View File

@@ -176,7 +176,26 @@
},
"Stage": {
"name": "MaaFight.Stage.name",
"help": "MaaFight.Stage.help"
"help": "MaaFight.Stage.help",
"last": "last",
"1-7": "1-7",
"CE-6": "CE-6",
"AP-5": "AP-5",
"CA-5": "CA-5",
"LS-6": "LS-6",
"PR-A-1": "PR-A-1",
"PR-A-2": "PR-A-2",
"PR-B-1": "PR-B-1",
"PR-B-2": "PR-B-2",
"PR-C-1": "PR-C-1",
"PR-C-2": "PR-C-2",
"PR-D-1": "PR-D-1",
"PR-D-2": "PR-D-2",
"custom": "custom"
},
"CustomStage": {
"name": "MaaFight.CustomStage.name",
"help": "MaaFight.CustomStage.help"
},
"Medicine": {
"name": "MaaFight.Medicine.name",