LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 14:49:25 +08:00
Code Activity

Merge remote-tracking branch 'LmeSzinc/master' into dev

Browse Source 
# Conflicts:
#	module/config/argument/args.json
This commit is contained in:
0O0o0oOoO00
2026-02-14 13:50:22 +08:00
parent e784b293f9 cc089b6223
commit f5172b27f1
63 changed files with 818 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
module/config/argument/task.yaml
View File

@@ -123,12 +123,6 @@ Event:
EventGeneral:
- EventGeneral
- TaskBalancer
Coalition:
- Scheduler
- Campaign
- Coalition
- StopCondition
- Emotion
Event:
- Scheduler
- Campaign
@@ -194,6 +188,12 @@ Event:
- Hospital
- StopCondition
- Emotion
Coalition:
- Scheduler
- Campaign
- Coalition
- StopCondition
- Emotion
MaritimeEscort:
- Scheduler
- MaritimeEscort
@@ -217,12 +217,6 @@ EventDaily:
menu: 'collapse'
page: 'setting'
tasks:
CoalitionSp:
- Scheduler
- Campaign
- Coalition
- StopCondition
- Emotion
EventA:
- Scheduler
- EventDaily
@@ -278,6 +272,12 @@ EventDaily:
- Campaign
- StopCondition
- Emotion
CoalitionSp:
- Scheduler
- Campaign
- Coalition
- StopCondition
- Emotion
# ==================== Reward ====================