1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00

Compare commits

..

No commits in common. "1e5a7d444b3bb1d242fee6861256a87c0b7632a4" and "e0b231bc5834d434eb89bc91f1dae37298d43f75" have entirely different histories.

8 changed files with 638 additions and 648 deletions

View File

@ -469,6 +469,57 @@
"Storage": {}
}
},
"Coalition": {
"Scheduler": {
"Enable": false,
"NextRun": "2020-01-01 00:00:00",
"Command": "Coalition",
"SuccessInterval": 30,
"FailureInterval": 30,
"ServerUpdate": "00:00"
},
"Campaign": {
"Name": "dynamic",
"Event": "campaign_main",
"Mode": "normal",
"UseClearMode": true,
"UseFleetLock": true,
"UseAutoSearch": false,
"Use2xBook": false,
"AmbushEvade": true,
"ClearAfterSinking": false
},
"Coalition": {
"Mode": "hard",
"Fleet": "single"
},
"StopCondition": {
"OilLimit": 1000,
"RunCount": 0,
"MapAchievement": "non_stop",
"StageIncrease": false,
"GetNewShip": false,
"ReachLevel": 0
},
"Emotion": {
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet1Onsen": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false,
"Fleet2Onsen": false
},
"Storage": {
"Storage": {}
}
},
"Event": {
"Scheduler": {
"Enable": false,
@ -713,57 +764,6 @@
"Storage": {}
}
},
"Coalition": {
"Scheduler": {
"Enable": false,
"NextRun": "2020-01-01 00:00:00",
"Command": "Coalition",
"SuccessInterval": 30,
"FailureInterval": 30,
"ServerUpdate": "00:00"
},
"Campaign": {
"Name": "dynamic",
"Event": "campaign_main",
"Mode": "normal",
"UseClearMode": true,
"UseFleetLock": true,
"UseAutoSearch": false,
"Use2xBook": false,
"AmbushEvade": true,
"ClearAfterSinking": false
},
"Coalition": {
"Mode": "hard",
"Fleet": "single"
},
"StopCondition": {
"OilLimit": 1000,
"RunCount": 0,
"MapAchievement": "non_stop",
"StageIncrease": false,
"GetNewShip": false,
"ReachLevel": 0
},
"Emotion": {
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet1Onsen": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false,
"Fleet2Onsen": false
},
"Storage": {
"Storage": {}
}
},
"MaritimeEscort": {
"Scheduler": {
"Enable": false,
@ -860,6 +860,57 @@
"Storage": {}
}
},
"CoalitionSp": {
"Scheduler": {
"Enable": false,
"NextRun": "2020-01-01 00:00:00",
"Command": "CoalitionSp",
"SuccessInterval": 30,
"FailureInterval": 30,
"ServerUpdate": "00:00"
},
"Campaign": {
"Name": "sp",
"Event": "campaign_main",
"Mode": "normal",
"UseClearMode": true,
"UseFleetLock": true,
"UseAutoSearch": false,
"Use2xBook": false,
"AmbushEvade": true,
"ClearAfterSinking": false
},
"Coalition": {
"Mode": "sp",
"Fleet": "single"
},
"StopCondition": {
"OilLimit": 1000,
"RunCount": 0,
"MapAchievement": "non_stop",
"StageIncrease": false,
"GetNewShip": false,
"ReachLevel": 0
},
"Emotion": {
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet1Onsen": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false,
"Fleet2Onsen": false
},
"Storage": {
"Storage": {}
}
},
"EventA": {
"Scheduler": {
"Enable": false,
@ -1311,57 +1362,6 @@
"Storage": {}
}
},
"CoalitionSp": {
"Scheduler": {
"Enable": false,
"NextRun": "2020-01-01 00:00:00",
"Command": "CoalitionSp",
"SuccessInterval": 30,
"FailureInterval": 30,
"ServerUpdate": "00:00"
},
"Campaign": {
"Name": "sp",
"Event": "campaign_main",
"Mode": "normal",
"UseClearMode": true,
"UseFleetLock": true,
"UseAutoSearch": false,
"Use2xBook": false,
"AmbushEvade": true,
"ClearAfterSinking": false
},
"Coalition": {
"Mode": "sp",
"Fleet": "single"
},
"StopCondition": {
"OilLimit": 1000,
"RunCount": 0,
"MapAchievement": "non_stop",
"StageIncrease": false,
"GetNewShip": false,
"ReachLevel": 0
},
"Emotion": {
"Mode": "calculate",
"Fleet1Value": 119,
"Fleet1Record": "2020-01-01 00:00:00",
"Fleet1Control": "prevent_yellow_face",
"Fleet1Recover": "not_in_dormitory",
"Fleet1Oath": false,
"Fleet1Onsen": false,
"Fleet2Value": 119,
"Fleet2Record": "2020-01-01 00:00:00",
"Fleet2Control": "prevent_yellow_face",
"Fleet2Recover": "not_in_dormitory",
"Fleet2Oath": false,
"Fleet2Onsen": false
},
"Storage": {
"Storage": {}
}
},
"Commission": {
"Scheduler": {
"Enable": false,

File diff suppressed because it is too large Load Diff

View File

@ -756,7 +756,7 @@ CoreShop:
ShipyardDr:
ResearchSeries:
value: 2
option: [ 2, 3, 4, 5 ]
option: [ 2, 3, 4 ]
ShipIndex:
value: 0
option: [ 0, 1, 2, 3, 4, 5, 6 ]
@ -765,7 +765,7 @@ ShipyardDr:
Shipyard:
ResearchSeries:
value: 1
option: [ 1, 2, 3, 4, 5, 6 ]
option: [ 1, 2, 3, 4, 5 ]
ShipIndex:
value: 0
option: [ 0, 1, 2, 3, 4, 5, 6 ]

View File

@ -451,13 +451,13 @@ class GeneratedConfig:
CoreShop_Filter = 'Array'
# Group `ShipyardDr`
ShipyardDr_ResearchSeries = 2 # 2, 3, 4, 5
ShipyardDr_ResearchSeries = 2 # 2, 3, 4
ShipyardDr_ShipIndex = 0 # 0, 1, 2, 3, 4, 5, 6
ShipyardDr_BuyAmount = 2
ShipyardDr_LastRun = datetime.datetime(2020, 1, 1, 0, 0)
# Group `Shipyard`
Shipyard_ResearchSeries = 1 # 1, 2, 3, 4, 5, 6
Shipyard_ResearchSeries = 1 # 1, 2, 3, 4, 5
Shipyard_ShipIndex = 0 # 0, 1, 2, 3, 4, 5, 6
Shipyard_BuyAmount = 2
Shipyard_LastRun = datetime.datetime(2020, 1, 1, 0, 0)

View File

@ -3593,8 +3593,7 @@
"help": "",
"2": "DR2",
"3": "DR3",
"4": "DR4",
"5": "DR5"
"4": "DR4"
},
"ShipIndex": {
"name": "Ship Index",
@ -3628,8 +3627,7 @@
"2": "PR2",
"3": "PR3",
"4": "PR4",
"5": "PR5",
"6": "PR6"
"5": "PR5"
},
"ShipIndex": {
"name": "Ship Index",

View File

@ -3593,8 +3593,7 @@
"help": "ShipyardDr.ResearchSeries.help",
"2": "2",
"3": "3",
"4": "4",
"5": "5"
"4": "4"
},
"ShipIndex": {
"name": "ShipyardDr.ShipIndex.name",
@ -3628,8 +3627,7 @@
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6"
"5": "5"
},
"ShipIndex": {
"name": "Shipyard.ShipIndex.name",

View File

@ -3593,8 +3593,7 @@
"help": "",
"2": "二期科研",
"3": "三期科研",
"4": "四期科研",
"5": "五期科研"
"4": "四期科研"
},
"ShipIndex": {
"name": "舰船序号",
@ -3628,8 +3627,7 @@
"2": "二期科研",
"3": "三期科研",
"4": "四期科研",
"5": "五期科研",
"6": "六期科研"
"5": "五期科研"
},
"ShipIndex": {
"name": "舰船序号",

View File

@ -3593,8 +3593,7 @@
"help": "",
"2": "二期科研",
"3": "三期科研",
"4": "四期科研",
"5": "五期科研"
"4": "四期科研"
},
"ShipIndex": {
"name": "艦船序號",
@ -3628,8 +3627,7 @@
"2": "二期科研",
"3": "三期科研",
"4": "四期科研",
"5": "五期科研",
"6": "六期科研"
"5": "五期科研"
},
"ShipIndex": {
"name": "艦船序號",