1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-05-16 03:24:04 +08:00

merge alas

This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions

View File

@@ -250,14 +250,10 @@ class OperationSiren(OSMap):
OpsiFleet_Fleet=self.config.cross_get('OpsiMeowfficerFarming.OpsiFleet.Fleet'),
OpsiFleet_Submarine=False,
OpsiMeowfficerFarming_ActionPointPreserve=0,
<<<<<<< HEAD
OpsiMeowfficerFarming_HazardLevel=
self.config.cross_get('OpsiMeowfficerFarming'
'.OpsiMeowfficerFarming'
'.HazardLevel'),
=======
OpsiMeowfficerFarming_HazardLevel=3,
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
OpsiMeowfficerFarming_TargetZone=0,
)
while 1: