mirror of
https://github.com/sui-feng-cb/AzurLaneAutoScript1.git
synced 2026-08-19 20:55:05 +08:00
Fix: harmonize Tool group config ordering after merge
This commit is contained in:
@@ -2382,19 +2382,6 @@
|
||||
"Storage": {}
|
||||
}
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"BoxDisassemble": {
|
||||
"UsePurpleBox": false,
|
||||
"PurpleBoxLimit": 100,
|
||||
"UseBlueBox": false,
|
||||
"BlueBoxLimit": 1000,
|
||||
"UseWhiteBox": true,
|
||||
"WhiteBoxLimit": 2000
|
||||
},
|
||||
"Storage": {
|
||||
"Storage": {}
|
||||
}
|
||||
},
|
||||
"IslandProductionPlanner": {
|
||||
"IslandProductionPlanner": {
|
||||
"RescanIslandTechnology": false,
|
||||
@@ -2408,6 +2395,19 @@
|
||||
"Storage": {}
|
||||
}
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"BoxDisassemble": {
|
||||
"UsePurpleBox": false,
|
||||
"PurpleBoxLimit": 100,
|
||||
"UseBlueBox": false,
|
||||
"BlueBoxLimit": 1000,
|
||||
"UseWhiteBox": true,
|
||||
"WhiteBoxLimit": 2000
|
||||
},
|
||||
"Storage": {
|
||||
"Storage": {}
|
||||
}
|
||||
},
|
||||
"Benchmark": {
|
||||
"Benchmark": {
|
||||
"DeviceType": "emulator",
|
||||
|
||||
@@ -11491,42 +11491,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"BoxDisassemble": {
|
||||
"UsePurpleBox": {
|
||||
"type": "checkbox",
|
||||
"value": false
|
||||
},
|
||||
"PurpleBoxLimit": {
|
||||
"type": "input",
|
||||
"value": 100
|
||||
},
|
||||
"UseBlueBox": {
|
||||
"type": "checkbox",
|
||||
"value": false
|
||||
},
|
||||
"BlueBoxLimit": {
|
||||
"type": "input",
|
||||
"value": 1000
|
||||
},
|
||||
"UseWhiteBox": {
|
||||
"type": "checkbox",
|
||||
"value": true
|
||||
},
|
||||
"WhiteBoxLimit": {
|
||||
"type": "input",
|
||||
"value": 2000
|
||||
}
|
||||
},
|
||||
"Storage": {
|
||||
"Storage": {
|
||||
"type": "storage",
|
||||
"value": {},
|
||||
"valuetype": "ignore",
|
||||
"display": "disabled"
|
||||
}
|
||||
}
|
||||
},
|
||||
"IslandProductionPlanner": {
|
||||
"IslandProductionPlanner": {
|
||||
"RescanIslandTechnology": {
|
||||
@@ -11578,6 +11542,42 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"BoxDisassemble": {
|
||||
"UsePurpleBox": {
|
||||
"type": "checkbox",
|
||||
"value": false
|
||||
},
|
||||
"PurpleBoxLimit": {
|
||||
"type": "input",
|
||||
"value": 100
|
||||
},
|
||||
"UseBlueBox": {
|
||||
"type": "checkbox",
|
||||
"value": false
|
||||
},
|
||||
"BlueBoxLimit": {
|
||||
"type": "input",
|
||||
"value": 1000
|
||||
},
|
||||
"UseWhiteBox": {
|
||||
"type": "checkbox",
|
||||
"value": true
|
||||
},
|
||||
"WhiteBoxLimit": {
|
||||
"type": "input",
|
||||
"value": 2000
|
||||
}
|
||||
},
|
||||
"Storage": {
|
||||
"Storage": {
|
||||
"type": "storage",
|
||||
"value": {},
|
||||
"valuetype": "ignore",
|
||||
"display": "disabled"
|
||||
}
|
||||
}
|
||||
},
|
||||
"Benchmark": {
|
||||
"Benchmark": {
|
||||
"DeviceType": {
|
||||
|
||||
@@ -956,13 +956,6 @@ EventStory:
|
||||
type: checkbox
|
||||
value: false
|
||||
option: [ true, false ]
|
||||
BoxDisassemble:
|
||||
UsePurpleBox: false
|
||||
PurpleBoxLimit: 100
|
||||
UseBlueBox: false
|
||||
BlueBoxLimit: 1000
|
||||
UseWhiteBox: true
|
||||
WhiteBoxLimit: 2000
|
||||
IslandProductionPlanner:
|
||||
RescanIslandTechnology: false
|
||||
DailyProfitLowerLimit: 50000
|
||||
@@ -976,6 +969,13 @@ IslandProductionPlanner:
|
||||
NurseryEfficiency:
|
||||
value: 0
|
||||
option: [ 0, 0.04, 0.12 ]
|
||||
BoxDisassemble:
|
||||
UsePurpleBox: false
|
||||
PurpleBoxLimit: 100
|
||||
UseBlueBox: false
|
||||
BlueBoxLimit: 1000
|
||||
UseWhiteBox: true
|
||||
WhiteBoxLimit: 2000
|
||||
Benchmark:
|
||||
DeviceType:
|
||||
value: emulator
|
||||
|
||||
@@ -117,8 +117,8 @@
|
||||
"Daemon",
|
||||
"OpsiDaemon",
|
||||
"EventStory",
|
||||
"BoxDisassemble",
|
||||
"IslandProductionPlanner",
|
||||
"BoxDisassemble",
|
||||
"Benchmark",
|
||||
"DowntimeFetch",
|
||||
"AzurLaneUncensored",
|
||||
|
||||
@@ -380,10 +380,10 @@ Tool:
|
||||
- OpsiDaemon
|
||||
EventStory:
|
||||
- EventStory
|
||||
BoxDisassemble:
|
||||
- BoxDisassemble
|
||||
IslandProductionPlanner:
|
||||
- IslandProductionPlanner
|
||||
BoxDisassemble:
|
||||
- BoxDisassemble
|
||||
Benchmark:
|
||||
- Benchmark
|
||||
DowntimeFetch:
|
||||
|
||||
@@ -544,14 +544,6 @@ class GeneratedConfig:
|
||||
# Group `EventStory`
|
||||
EventStory_SkipBattle = False # True, False
|
||||
|
||||
# Group `BoxDisassemble`
|
||||
BoxDisassemble_UsePurpleBox = False
|
||||
BoxDisassemble_PurpleBoxLimit = 100
|
||||
BoxDisassemble_UseBlueBox = False
|
||||
BoxDisassemble_BlueBoxLimit = 1000
|
||||
BoxDisassemble_UseWhiteBox = True
|
||||
BoxDisassemble_WhiteBoxLimit = 2000
|
||||
|
||||
# Group `IslandProductionPlanner`
|
||||
IslandProductionPlanner_RescanIslandTechnology = False
|
||||
IslandProductionPlanner_DailyProfitLowerLimit = 50000
|
||||
@@ -560,6 +552,14 @@ class GeneratedConfig:
|
||||
IslandProductionPlanner_OrchardEfficiency = 0 # 0, 0.04, 0.12
|
||||
IslandProductionPlanner_NurseryEfficiency = 0 # 0, 0.04, 0.12
|
||||
|
||||
# Group `BoxDisassemble`
|
||||
BoxDisassemble_UsePurpleBox = False
|
||||
BoxDisassemble_PurpleBoxLimit = 100
|
||||
BoxDisassemble_UseBlueBox = False
|
||||
BoxDisassemble_BlueBoxLimit = 1000
|
||||
BoxDisassemble_UseWhiteBox = True
|
||||
BoxDisassemble_WhiteBoxLimit = 2000
|
||||
|
||||
# Group `Benchmark`
|
||||
Benchmark_DeviceType = 'emulator' # emulator, plone_cloud_with_adb, phone_cloud_without_adb, android_phone, android_phone_vmos
|
||||
Benchmark_TestScene = 'screenshot_click' # screenshot_click, screenshot, click
|
||||
|
||||
@@ -302,14 +302,14 @@
|
||||
"name": "Event Story",
|
||||
"help": ""
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"name": "Box Disassemble",
|
||||
"help": ""
|
||||
},
|
||||
"IslandProductionPlanner": {
|
||||
"name": "Island Production Planner",
|
||||
"help": "Planner for optimizing island production plan to earn pt subject to given daily profit.\nWill export bootstrap inventory stock quantities and accumulating item quantities to config after running, which can be used for production planning in the future without scanning technology again.\nNote: The production plan is optimized based on the technology status at the time of scanning, if there are changes in technology status, it is recommended to run the planner again to get an updated production plan."
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"name": "Box Disassemble",
|
||||
"help": ""
|
||||
},
|
||||
"Benchmark": {
|
||||
"name": "Performance Test",
|
||||
"help": ""
|
||||
@@ -3135,36 +3135,6 @@
|
||||
"False": "False"
|
||||
}
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"_info": {
|
||||
"name": "Box Disassemble",
|
||||
"help": "Disassemble equipment boxes in storage, configure before starting up, then wait"
|
||||
},
|
||||
"UsePurpleBox": {
|
||||
"name": "Disassemble Purple Box",
|
||||
"help": ""
|
||||
},
|
||||
"PurpleBoxLimit": {
|
||||
"name": "Keep each kind of Purple Box number above X",
|
||||
"help": ""
|
||||
},
|
||||
"UseBlueBox": {
|
||||
"name": "Disassemble Blue Box",
|
||||
"help": ""
|
||||
},
|
||||
"BlueBoxLimit": {
|
||||
"name": "Keep each kind of Blue Box number above X",
|
||||
"help": ""
|
||||
},
|
||||
"UseWhiteBox": {
|
||||
"name": "Disassemble White Box",
|
||||
"help": ""
|
||||
},
|
||||
"WhiteBoxLimit": {
|
||||
"name": "Keep each kind of White Box number above X",
|
||||
"help": ""
|
||||
}
|
||||
},
|
||||
"IslandProductionPlanner": {
|
||||
"_info": {
|
||||
"name": "Island Production Planner",
|
||||
@@ -3204,6 +3174,36 @@
|
||||
"0.12": "0.12"
|
||||
}
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"_info": {
|
||||
"name": "Box Disassemble",
|
||||
"help": "Disassemble equipment boxes in storage, configure before starting up, then wait"
|
||||
},
|
||||
"UsePurpleBox": {
|
||||
"name": "Disassemble Purple Box",
|
||||
"help": ""
|
||||
},
|
||||
"PurpleBoxLimit": {
|
||||
"name": "Keep each kind of Purple Box number above X",
|
||||
"help": ""
|
||||
},
|
||||
"UseBlueBox": {
|
||||
"name": "Disassemble Blue Box",
|
||||
"help": ""
|
||||
},
|
||||
"BlueBoxLimit": {
|
||||
"name": "Keep each kind of Blue Box number above X",
|
||||
"help": ""
|
||||
},
|
||||
"UseWhiteBox": {
|
||||
"name": "Disassemble White Box",
|
||||
"help": ""
|
||||
},
|
||||
"WhiteBoxLimit": {
|
||||
"name": "Keep each kind of White Box number above X",
|
||||
"help": ""
|
||||
}
|
||||
},
|
||||
"Benchmark": {
|
||||
"_info": {
|
||||
"name": "Performance Test",
|
||||
|
||||
@@ -302,14 +302,14 @@
|
||||
"name": "Event Story",
|
||||
"help": ""
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"name": "Task.BoxDisassemble.name",
|
||||
"help": "Task.BoxDisassemble.help"
|
||||
},
|
||||
"IslandProductionPlanner": {
|
||||
"name": "離島生産ソルバー",
|
||||
"help": "線形計画法を使用して、指定した日次利益を満たしつつ ポイントを獲得します。\n実行後、ブートストラップの在庫数量と累積アイテム数量をコンフィグに出力します。これは、再度技術をスキャンしなくても将来の生産計画に使用できます。\n注意: 生産計画はスキャン時点の技術状況に基づいて最適化されるため、技術状況に変更がある場合は、更新された生産計画を得るために再度プランナーを実行することを推奨します。"
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"name": "Task.BoxDisassemble.name",
|
||||
"help": "Task.BoxDisassemble.help"
|
||||
},
|
||||
"Benchmark": {
|
||||
"name": "機能テスト",
|
||||
"help": ""
|
||||
@@ -3135,36 +3135,6 @@
|
||||
"False": "False"
|
||||
}
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"_info": {
|
||||
"name": "BoxDisassemble._info.name",
|
||||
"help": "BoxDisassemble._info.help"
|
||||
},
|
||||
"UsePurpleBox": {
|
||||
"name": "BoxDisassemble.UsePurpleBox.name",
|
||||
"help": "BoxDisassemble.UsePurpleBox.help"
|
||||
},
|
||||
"PurpleBoxLimit": {
|
||||
"name": "BoxDisassemble.PurpleBoxLimit.name",
|
||||
"help": "BoxDisassemble.PurpleBoxLimit.help"
|
||||
},
|
||||
"UseBlueBox": {
|
||||
"name": "BoxDisassemble.UseBlueBox.name",
|
||||
"help": "BoxDisassemble.UseBlueBox.help"
|
||||
},
|
||||
"BlueBoxLimit": {
|
||||
"name": "BoxDisassemble.BlueBoxLimit.name",
|
||||
"help": "BoxDisassemble.BlueBoxLimit.help"
|
||||
},
|
||||
"UseWhiteBox": {
|
||||
"name": "BoxDisassemble.UseWhiteBox.name",
|
||||
"help": "BoxDisassemble.UseWhiteBox.help"
|
||||
},
|
||||
"WhiteBoxLimit": {
|
||||
"name": "BoxDisassemble.WhiteBoxLimit.name",
|
||||
"help": "BoxDisassemble.WhiteBoxLimit.help"
|
||||
}
|
||||
},
|
||||
"IslandProductionPlanner": {
|
||||
"_info": {
|
||||
"name": "離島生産ソルバー",
|
||||
@@ -3204,6 +3174,36 @@
|
||||
"0.12": "0.12"
|
||||
}
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"_info": {
|
||||
"name": "BoxDisassemble._info.name",
|
||||
"help": "BoxDisassemble._info.help"
|
||||
},
|
||||
"UsePurpleBox": {
|
||||
"name": "BoxDisassemble.UsePurpleBox.name",
|
||||
"help": "BoxDisassemble.UsePurpleBox.help"
|
||||
},
|
||||
"PurpleBoxLimit": {
|
||||
"name": "BoxDisassemble.PurpleBoxLimit.name",
|
||||
"help": "BoxDisassemble.PurpleBoxLimit.help"
|
||||
},
|
||||
"UseBlueBox": {
|
||||
"name": "BoxDisassemble.UseBlueBox.name",
|
||||
"help": "BoxDisassemble.UseBlueBox.help"
|
||||
},
|
||||
"BlueBoxLimit": {
|
||||
"name": "BoxDisassemble.BlueBoxLimit.name",
|
||||
"help": "BoxDisassemble.BlueBoxLimit.help"
|
||||
},
|
||||
"UseWhiteBox": {
|
||||
"name": "BoxDisassemble.UseWhiteBox.name",
|
||||
"help": "BoxDisassemble.UseWhiteBox.help"
|
||||
},
|
||||
"WhiteBoxLimit": {
|
||||
"name": "BoxDisassemble.WhiteBoxLimit.name",
|
||||
"help": "BoxDisassemble.WhiteBoxLimit.help"
|
||||
}
|
||||
},
|
||||
"Benchmark": {
|
||||
"_info": {
|
||||
"name": "Benchmark._info.name",
|
||||
|
||||
@@ -302,14 +302,14 @@
|
||||
"name": "活动剧情",
|
||||
"help": ""
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"name": "拆装备箱",
|
||||
"help": ""
|
||||
},
|
||||
"IslandProductionPlanner": {
|
||||
"name": "岛屿生产规划器",
|
||||
"help": "将根据用户设置的参数使用线性规划优化岛屿的生产计划,并生成岛屿生产模块的配置"
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"name": "拆装备箱",
|
||||
"help": ""
|
||||
},
|
||||
"Benchmark": {
|
||||
"name": "性能测试",
|
||||
"help": ""
|
||||
@@ -3135,36 +3135,6 @@
|
||||
"False": "False"
|
||||
}
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"_info": {
|
||||
"name": "拆解装备箱",
|
||||
"help": "拆解仓库中的装备箱子,配置完成后启动并等待即可"
|
||||
},
|
||||
"UsePurpleBox": {
|
||||
"name": "拆解紫色装备箱",
|
||||
"help": ""
|
||||
},
|
||||
"PurpleBoxLimit": {
|
||||
"name": "保留每种紫色装备箱 X 个",
|
||||
"help": ""
|
||||
},
|
||||
"UseBlueBox": {
|
||||
"name": "拆解蓝色装备箱",
|
||||
"help": ""
|
||||
},
|
||||
"BlueBoxLimit": {
|
||||
"name": "保留每种蓝色装备箱 X 个",
|
||||
"help": ""
|
||||
},
|
||||
"UseWhiteBox": {
|
||||
"name": "拆解白色装备箱",
|
||||
"help": ""
|
||||
},
|
||||
"WhiteBoxLimit": {
|
||||
"name": "保留每种白色装备箱 X 个",
|
||||
"help": ""
|
||||
}
|
||||
},
|
||||
"IslandProductionPlanner": {
|
||||
"_info": {
|
||||
"name": "岛屿生产规划器",
|
||||
@@ -3204,6 +3174,36 @@
|
||||
"0.12": "0.12"
|
||||
}
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"_info": {
|
||||
"name": "拆解装备箱",
|
||||
"help": "拆解仓库中的装备箱子,配置完成后启动并等待即可"
|
||||
},
|
||||
"UsePurpleBox": {
|
||||
"name": "拆解紫色装备箱",
|
||||
"help": ""
|
||||
},
|
||||
"PurpleBoxLimit": {
|
||||
"name": "保留每种紫色装备箱 X 个",
|
||||
"help": ""
|
||||
},
|
||||
"UseBlueBox": {
|
||||
"name": "拆解蓝色装备箱",
|
||||
"help": ""
|
||||
},
|
||||
"BlueBoxLimit": {
|
||||
"name": "保留每种蓝色装备箱 X 个",
|
||||
"help": ""
|
||||
},
|
||||
"UseWhiteBox": {
|
||||
"name": "拆解白色装备箱",
|
||||
"help": ""
|
||||
},
|
||||
"WhiteBoxLimit": {
|
||||
"name": "保留每种白色装备箱 X 个",
|
||||
"help": ""
|
||||
}
|
||||
},
|
||||
"Benchmark": {
|
||||
"_info": {
|
||||
"name": "性能测试",
|
||||
|
||||
@@ -302,14 +302,14 @@
|
||||
"name": "活動劇情",
|
||||
"help": ""
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"name": "拆裝備箱",
|
||||
"help": ""
|
||||
},
|
||||
"IslandProductionPlanner": {
|
||||
"name": "離島生產規劃器",
|
||||
"help": "將根據用戶設定的參數使用線性規劃優化離島的生產計劃,並生成離島生產模組的配置"
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"name": "拆裝備箱",
|
||||
"help": ""
|
||||
},
|
||||
"Benchmark": {
|
||||
"name": "性能測試",
|
||||
"help": ""
|
||||
@@ -3135,36 +3135,6 @@
|
||||
"False": "False"
|
||||
}
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"_info": {
|
||||
"name": "折開裝備箱",
|
||||
"help": "折開倉庫中的裝備箱子,配寘完成後啟動並等待即可"
|
||||
},
|
||||
"UsePurpleBox": {
|
||||
"name": "折開紫色裝備箱",
|
||||
"help": ""
|
||||
},
|
||||
"PurpleBoxLimit": {
|
||||
"name": "保留每種紫色裝備箱 X 個",
|
||||
"help": ""
|
||||
},
|
||||
"UseBlueBox": {
|
||||
"name": "折開藍色裝備箱",
|
||||
"help": ""
|
||||
},
|
||||
"BlueBoxLimit": {
|
||||
"name": "保留每種藍色裝備箱 X 個",
|
||||
"help": ""
|
||||
},
|
||||
"UseWhiteBox": {
|
||||
"name": "折開白色裝備箱",
|
||||
"help": ""
|
||||
},
|
||||
"WhiteBoxLimit": {
|
||||
"name": "保留每種白色裝備箱 X 個",
|
||||
"help": ""
|
||||
}
|
||||
},
|
||||
"IslandProductionPlanner": {
|
||||
"_info": {
|
||||
"name": "離島生產規劃器",
|
||||
@@ -3204,6 +3174,36 @@
|
||||
"0.12": "0.12"
|
||||
}
|
||||
},
|
||||
"BoxDisassemble": {
|
||||
"_info": {
|
||||
"name": "折開裝備箱",
|
||||
"help": "折開倉庫中的裝備箱子,配寘完成後啟動並等待即可"
|
||||
},
|
||||
"UsePurpleBox": {
|
||||
"name": "折開紫色裝備箱",
|
||||
"help": ""
|
||||
},
|
||||
"PurpleBoxLimit": {
|
||||
"name": "保留每種紫色裝備箱 X 個",
|
||||
"help": ""
|
||||
},
|
||||
"UseBlueBox": {
|
||||
"name": "折開藍色裝備箱",
|
||||
"help": ""
|
||||
},
|
||||
"BlueBoxLimit": {
|
||||
"name": "保留每種藍色裝備箱 X 個",
|
||||
"help": ""
|
||||
},
|
||||
"UseWhiteBox": {
|
||||
"name": "折開白色裝備箱",
|
||||
"help": ""
|
||||
},
|
||||
"WhiteBoxLimit": {
|
||||
"name": "保留每種白色裝備箱 X 個",
|
||||
"help": ""
|
||||
}
|
||||
},
|
||||
"Benchmark": {
|
||||
"_info": {
|
||||
"name": "性能測試",
|
||||
|
||||
Reference in New Issue
Block a user