mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 03:58:22 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -2,7 +2,10 @@
|
||||
# Define argument group of tasks.
|
||||
# --------------------
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
# ==================== Alas ====================
|
||||
|
||||
Alas:
|
||||
@@ -22,7 +25,10 @@ Alas:
|
||||
- OldRetire
|
||||
Restart:
|
||||
- Scheduler
|
||||
<<<<<<< HEAD
|
||||
- RestartEmulator
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
|
||||
# ==================== Farm ====================
|
||||
|
||||
@@ -91,6 +97,7 @@ Event:
|
||||
- Emotion
|
||||
- HpControl
|
||||
- EnemyPriority
|
||||
<<<<<<< HEAD
|
||||
Event3:
|
||||
- Scheduler
|
||||
- Campaign
|
||||
@@ -100,6 +107,8 @@ Event:
|
||||
- Emotion
|
||||
- HpControl
|
||||
- EnemyPriority
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
Raid:
|
||||
- Scheduler
|
||||
- Raid
|
||||
@@ -310,7 +319,10 @@ Opsi:
|
||||
- Scheduler
|
||||
- OpsiStronghold
|
||||
- OpsiFleetFilter
|
||||
<<<<<<< HEAD
|
||||
- OpsiFleet
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
OpsiMonthBoss:
|
||||
- Scheduler
|
||||
- OpsiMonthBoss
|
||||
@@ -342,5 +354,8 @@ Tool:
|
||||
- AzurLaneUncensored
|
||||
GameManager:
|
||||
- GameManager
|
||||
<<<<<<< HEAD
|
||||
- GGHandler
|
||||
- PowerLimit
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
|
||||
Reference in New Issue
Block a user