1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-25 19:25:01 +08:00

Fix: Merge Conflict

This commit is contained in:
SarContDeli
2022-12-01 10:54:54 +08:00
parent d9ffcf3e63
commit 677821960b
2 changed files with 11 additions and 0 deletions

View File

@@ -1746,6 +1746,9 @@
"OpsiFleet": { "OpsiFleet": {
"Fleet": 1, "Fleet": 1,
"Submarine": false "Submarine": false
},
"Storage": {
"Storage": {}
} }
}, },
"OpsiCrossMonth": { "OpsiCrossMonth": {

View File

@@ -8342,6 +8342,14 @@
"value": false, "value": false,
"display": "hide" "display": "hide"
} }
},
"Storage": {
"Storage": {
"type": "storage",
"value": {},
"valuetype": "ignore",
"display": "disabled"
}
} }
}, },
"OpsiCrossMonth": { "OpsiCrossMonth": {