mirror of
https://github.com/0O0o0oOoO00/Alas.git
synced 2026-05-14 13:29:25 +08:00
Merge branch 'master' into dev
This commit is contained in:
@@ -71,6 +71,12 @@ Event:
|
||||
EventGeneral:
|
||||
- EventGeneral
|
||||
- TaskBalancer
|
||||
Coalition:
|
||||
- Scheduler
|
||||
- Campaign
|
||||
- Coalition
|
||||
- StopCondition
|
||||
- Emotion
|
||||
Event:
|
||||
- Scheduler
|
||||
- Campaign
|
||||
@@ -100,12 +106,6 @@ Event:
|
||||
- Hospital
|
||||
- StopCondition
|
||||
- Emotion
|
||||
Coalition:
|
||||
- Scheduler
|
||||
- Campaign
|
||||
- Coalition
|
||||
- StopCondition
|
||||
- Emotion
|
||||
MaritimeEscort:
|
||||
- Scheduler
|
||||
- MaritimeEscort
|
||||
@@ -126,6 +126,12 @@ EventDaily:
|
||||
menu: 'collapse'
|
||||
page: 'setting'
|
||||
tasks:
|
||||
CoalitionSp:
|
||||
- Scheduler
|
||||
- Campaign
|
||||
- Coalition
|
||||
- StopCondition
|
||||
- Emotion
|
||||
EventA:
|
||||
- Scheduler
|
||||
- EventDaily
|
||||
@@ -181,12 +187,6 @@ EventDaily:
|
||||
- Campaign
|
||||
- StopCondition
|
||||
- Emotion
|
||||
CoalitionSp:
|
||||
- Scheduler
|
||||
- Campaign
|
||||
- Coalition
|
||||
- StopCondition
|
||||
- Emotion
|
||||
|
||||
# ==================== Reward ====================
|
||||
|
||||
|
||||
Reference in New Issue
Block a user