1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-22 15:19:29 +08:00

Merge branch '0O0o0oOoO00-alas/smallkai' into dev

This commit is contained in:
LA_DI_DA
2024-02-02 00:12:39 +08:00
2 changed files with 45 additions and 45 deletions

View File

@@ -2935,8 +2935,8 @@
],
"display": "hide",
"option_bold": [
"event_20211229_cn",
"event_20210527_cn"
"event_20210527_cn",
"event_20211229_cn"
],
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
@@ -8112,8 +8112,8 @@
"event_20231221_cn"
],
"option_bold": [
"event_20211229_cn",
"event_20210527_cn"
"event_20210527_cn",
"event_20211229_cn"
],
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
@@ -8559,8 +8559,8 @@
"event_20231221_cn"
],
"option_bold": [
"event_20211229_cn",
"event_20210527_cn"
"event_20210527_cn",
"event_20211229_cn"
],
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
@@ -9006,8 +9006,8 @@
"event_20231221_cn"
],
"option_bold": [
"event_20211229_cn",
"event_20210527_cn"
"event_20210527_cn",
"event_20211229_cn"
],
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
@@ -10744,7 +10744,7 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"raid_20200624",
@@ -10969,7 +10969,7 @@
"value": "12-4"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"coalition_20230323"
@@ -11668,7 +11668,7 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"event_20200227_cn",
@@ -11735,8 +11735,8 @@
"event_20231221_cn"
],
"option_bold": [
"event_20211229_cn",
"event_20210527_cn"
"event_20210527_cn",
"event_20211229_cn"
],
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
@@ -12132,7 +12132,7 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"event_20200227_cn",
@@ -12199,8 +12199,8 @@
"event_20231221_cn"
],
"option_bold": [
"event_20211229_cn",
"event_20210527_cn"
"event_20210527_cn",
"event_20211229_cn"
],
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
@@ -12596,7 +12596,7 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"event_20200227_cn",
@@ -12663,8 +12663,8 @@
"event_20231221_cn"
],
"option_bold": [
"event_20211229_cn",
"event_20210527_cn"
"event_20210527_cn",
"event_20211229_cn"
],
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
@@ -13060,7 +13060,7 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"event_20200227_cn",
@@ -13127,8 +13127,8 @@
"event_20231221_cn"
],
"option_bold": [
"event_20211229_cn",
"event_20210527_cn"
"event_20210527_cn",
"event_20211229_cn"
],
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
@@ -13514,7 +13514,7 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"event_20200227_cn",
@@ -13581,8 +13581,8 @@
"event_20231221_cn"
],
"option_bold": [
"event_20211229_cn",
"event_20210527_cn"
"event_20210527_cn",
"event_20211229_cn"
],
"cn": "event_20211229_cn",
"en": "event_20211229_cn",
@@ -13975,7 +13975,7 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"raid_20200624",
@@ -14202,7 +14202,7 @@
"display": "hide"
},
"Event": {
"type": "state",
"type": "select",
"value": "campaign_main",
"option": [
"coalition_20230323"

View File

@@ -171,8 +171,8 @@ EventA:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
# Event:
# type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@@ -189,8 +189,8 @@ EventB:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
# Event:
# type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@@ -207,8 +207,8 @@ EventC:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
# Event:
# type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@@ -225,8 +225,8 @@ EventD:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
# Event:
# type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@@ -243,8 +243,8 @@ EventSp:
ServerUpdate: 00:00
Campaign:
Name: sp
Event:
type: state
# Event:
# type: state
Mode: normal
Use2xBook: false
AmbushEvade: true
@@ -259,8 +259,8 @@ EventSp:
Raid:
Campaign:
Name: dynamic
Event:
type: state
# Event:
# type: state
Mode: normal
UseClearMode: true
UseFleetLock: true
@@ -285,8 +285,8 @@ RaidDaily:
ServerUpdate: 00:00
Campaign:
Name: dynamic
Event:
type: state
# Event:
# type: state
Mode: normal
UseClearMode: true
UseFleetLock: true
@@ -316,8 +316,8 @@ Coalition:
FailureInterval: 30
ServerUpdate: 00:00
Campaign:
Event:
type: state
# Event:
# type: state
Mode: normal
UseClearMode: true
UseFleetLock: true
@@ -342,8 +342,8 @@ CoalitionSp:
ServerUpdate: 00:00
Campaign:
Name: sp
Event:
type: state
# Event:
# type: state
Mode: normal
UseClearMode: true
UseFleetLock: true