1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-30 05:03:54 +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

@@ -61,15 +61,12 @@ Event2:
Event:
type: state
AmbushEvade: true
<<<<<<< HEAD
Event3:
Campaign:
Mode: normal
Event:
display: disabled
AmbushEvade: true
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
EventA:
Scheduler:
SuccessInterval: 30
@@ -424,12 +421,9 @@ OpsiStronghold:
SuccessInterval: 60
FailureInterval: 60
ServerUpdate: 00:00
<<<<<<< HEAD
OpsiFleet:
Fleet: 1
Submarine: true
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
OpsiMeowfficerFarming:
Scheduler:
SuccessInterval: 30
@@ -442,7 +436,6 @@ OpsiHazard1Leveling:
ServerUpdate: 00:00, 12:00
OpsiFleet:
Submarine: false
<<<<<<< HEAD
# ==================== GGHandler ====================
GGHandler:
@@ -475,5 +468,3 @@ Dashboard:
Color: ^FFDD00
GuildCoin:
Color: ^AAAAAA
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0