sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-22 15:13:45 +08:00
Code Activity

Fix: dashboard in config_updater

Browse Source
This commit is contained in:
sui-feng-cb
2025-03-18 17:56:01 +08:00
parent 6190cc6128
commit 104ebd2e9d
3 changed files with 283 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
config/template.json
View File

@@ -1,4 +1,72 @@
{ {
"Dashboard": {
"Oil": {
"Value": 0,
"Limit": 0,
"Color": "^000000",
"Record": "2020-01-01 00:00:00"
},
"Coin": {
"Value": 0,
"Limit": 0,
"Color": "^FFAA33",
"Record": "2020-01-01 00:00:00"
},
"Gem": {
"Value": 0,
"Color": "^FF3333",
"Record": "2020-01-01 00:00:00"
},
"Pt": {
"Value": 0,
"Color": "^00BFFF",
"Record": "2020-01-01 00:00:00"
},
"Cube": {
"Value": 0,
"Color": "^33FFFF",
"Record": "2020-01-01 00:00:00"
},
"ActionPoint": {
"Value": 0,
"Total": 0,
"Color": "^0000FF",
"Record": "2020-01-01 00:00:00"
},
"YellowCoin": {
"Value": 0,
"Color": "^FF8800",
"Record": "2020-01-01 00:00:00"
},
"PurpleCoin": {
"Value": 0,
"Color": "^7700BB",
"Record": "2020-01-01 00:00:00"
},
"Core": {
"Value": 0,
"Color": "^AAAAAA",
"Record": "2020-01-01 00:00:00"
},
"Medal": {
"Value": 0,
"Color": "^FFDD00",
"Record": "2020-01-01 00:00:00"
},
"Merit": {
"Value": 0,
"Color": "^FFFF00",
"Record": "2020-01-01 00:00:00"
},
"GuildCoin": {
"Value": 0,
"Color": "^AAAAAA",
"Record": "2020-01-01 00:00:00"
},
"Storage": {
"Storage": {}
}
},
"Alas": { "Alas": {
"Emulator": { "Emulator": {
"Serial": "auto", "Serial": "auto",
@@ -1955,73 +2023,5 @@
"Storage": { "Storage": {
"Storage": {} "Storage": {}
} }
},
"Dashboard": {
"Oil": {
"Value": 0,
"Limit": 0,
"Color": "^000000",
"Record": "2020-01-01 00:00:00"
},
"Coin": {
"Value": 0,
"Limit": 0,
"Color": "^FFAA33",
"Record": "2020-01-01 00:00:00"
},
"Gem": {
"Value": 0,
"Color": "^FF3333",
"Record": "2020-01-01 00:00:00"
},
"Pt": {
"Value": 0,
"Color": "^00BFFF",
"Record": "2020-01-01 00:00:00"
},
"Cube": {
"Value": 0,
"Color": "^33FFFF",
"Record": "2020-01-01 00:00:00"
},
"ActionPoint": {
"Value": 0,
"Total": 0,
"Color": "^0000FF",
"Record": "2020-01-01 00:00:00"
},
"YellowCoin": {
"Value": 0,
"Color": "^FF8800",
"Record": "2020-01-01 00:00:00"
},
"PurpleCoin": {
"Value": 0,
"Color": "^7700BB",
"Record": "2020-01-01 00:00:00"
},
"Core": {
"Value": 0,
"Color": "^AAAAAA",
"Record": "2020-01-01 00:00:00"
},
"Medal": {
"Value": 0,
"Color": "^FFDD00",
"Record": "2020-01-01 00:00:00"
},
"Merit": {
"Value": 0,
"Color": "^FFFF00",
"Record": "2020-01-01 00:00:00"
},
"GuildCoin": {
"Value": 0,
"Color": "^AAAAAA",
"Record": "2020-01-01 00:00:00"
},
"Storage": {
"Storage": {}
}
} }
} }

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

@@ -1,4 +1,218 @@
{ {
"Dashboard": {
"Oil": {
"Value": {
"type": "input",
"value": 0
},
"Limit": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^000000",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Coin": {
"Value": {
"type": "input",
"value": 0
},
"Limit": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^FFAA33",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Gem": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^FF3333",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Pt": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^00BFFF",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Cube": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^33FFFF",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"ActionPoint": {
"Value": {
"type": "input",
"value": 0
},
"Total": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^0000FF",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"YellowCoin": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^FF8800",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"PurpleCoin": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^7700BB",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Core": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^AAAAAA",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Medal": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^FFDD00",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Merit": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^FFFF00",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"GuildCoin": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^AAAAAA",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Storage": {
"Storage": {
"type": "storage",
"value": {},
"valuetype": "ignore",
"display": "disabled"
}
}
},
"Alas": { "Alas": {
"Emulator": { "Emulator": {
"Serial": { "Serial": {
@@ -9631,219 +9845,5 @@
"display": "disabled" "display": "disabled"
} }
} }
},
"Dashboard": {
"Oil": {
"Value": {
"type": "input",
"value": 0
},
"Limit": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^000000",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Coin": {
"Value": {
"type": "input",
"value": 0
},
"Limit": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^FFAA33",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Gem": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^FF3333",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Pt": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^00BFFF",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Cube": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^33FFFF",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"ActionPoint": {
"Value": {
"type": "input",
"value": 0
},
"Total": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^0000FF",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"YellowCoin": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^FF8800",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"PurpleCoin": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^7700BB",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Core": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^AAAAAA",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Medal": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^FFDD00",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Merit": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^FFFF00",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"GuildCoin": {
"Value": {
"type": "input",
"value": 0
},
"Color": {
"type": "input",
"value": "^AAAAAA",
"display": "hide"
},
"Record": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
}
},
"Storage": {
"Storage": {
"type": "storage",
"value": {},
"valuetype": "ignore",
"display": "disabled"
}
}
} }
} }

2
module/config/config_updater.py
View File

@@ -173,7 +173,7 @@ class ConfigGenerator:
data = {} data = {}
# Add dashboard to args # Add dashboard to args
dashboard_and_task = {**self.task, **self.dashboard} dashboard_and_task = {**self.task, **self.dashboard}
for path, groups in deep_iter(dashboard_and_task, depth=3): for path, groups in deep_iter(dashboard_and_task, min_depth=1, depth=3):
if 'tasks' not in path and 'Dashboard' not in path: if 'tasks' not in path and 'Dashboard' not in path:
continue continue
task = path[2] if 'tasks' in path else path[0] task = path[2] if 'tasks' in path else path[0]