Merge branch 'master' into feature/enter-press

DeIn221 · Sep 8, 2021 · 59b8d32 · 59b8d32
2 parents 9617801 + 4c0fc07
commit 59b8d32
Show file tree

Hide file tree

Showing 17 changed files with 7,194 additions and 378 deletions.
diff --git a/data/age.json b/data/age.json
diff --git a/data/age.xlsx b/data/age.xlsx
diff --git a/data/events.json b/data/events.json
@@ -1948,7 +1948,7 @@
             "SPR": 1
         },
         "include": "EVT?[10228]",
-        "exclude": "EVT?[10229,11171,11093,10610,10611,10612]"
+        "exclude": "EVT?[10229,11171,11232,11093,10610,10611,10612]"
     },
     "10230": {
         "id": 10230,
@@ -1957,7 +1957,7 @@
             "SPR": -2
         },
         "include": "EVT?[10198,10155,10156,10226]",
-        "exclude": "(EVT?[10230,10016,10017])|(TLT?[1015])",
+        "exclude": "(EVT?[10230,10016,11232,10017])|(TLT?[1015])",
         "branch": [
             "TLT?[1027]:10232",
             "SPR<2:10062"
@@ -2011,7 +2011,7 @@
         "id": 10236,
         "event": "你年龄大了，随便找了一个将就着结婚了。",
         "include": "EVT?[10009]",
-        "exclude": "(EVT?[10235,10236,10234,10250,10233,10231,10230,10229,10610,10611,10612,10088])|(TLT?[1027])"
+        "exclude": "(EVT?[10235,10236,10234,10250,10233,10231,10230,10229,11232,10610,10611,10612,10088])|(TLT?[1027])"
     },
     "10237": {
         "id": 10237,
@@ -4992,7 +4992,7 @@
             "SPR": 1
         },
         "include": "EVT?[10606]",
-        "exclude": "(EVT?[10611,10610,10612,20596])|(TLT?[1027])"
+        "exclude": "(EVT?[10611,10610,11232,10612,20596])|(TLT?[1027])"
     },
     "10612": {
         "id": 10612,
@@ -5001,7 +5001,7 @@
             "SPR": 1
         },
         "include": "EVT?[10579,10580,10581,10582,10583,10584]",
-        "exclude": "(EVT?[10612,10610,10611])|(TLT?[1027])"
+        "exclude": "(EVT?[10612,11232,10610,10611])|(TLT?[1027])"
     },
     "10613": {
         "id": 10613,
@@ -8217,7 +8217,7 @@
         "id": 11093,
         "event": "你结婚了。",
         "include": "EVT?[10956,10957]",
-        "exclude": "(EVT?[11093,10612,11171,10229,10610,10611])|(TLT?[1027])"
+        "exclude": "(EVT?[11093,10612,11171,11232,10229,10610,10611])|(TLT?[1027])"
     },
     "11094": {
         "id": 11094,
@@ -8707,7 +8707,7 @@
         "id": 11171,
         "event": "你结婚了。",
         "include": "EVT?[10010]",
-        "exclude": "(EVT?[11171,10612,11093,10229,10610,10611])|(TLT?[1027])"
+        "exclude": "(EVT?[11171,11232,10612,11093,10229,10610,10611])|(TLT?[1027])"
     },
     "11172": {
         "id": 11172,
@@ -10748,6 +10748,42 @@
         "include": "TLT?[1132]",
         "exclude": "EVT?[11469]"
     },
+    "11470": {
+        "id": 11470,
+        "event": "为维护网络文明环境，日本将被和谐为月本。",
+        "exclude": "EVT?[11470]"
+    },
+    "11471": {
+        "id": 11471,
+        "event": "超级管理员（Admin）已被击败。",
+        "include": "EVT?[10010]",
+        "exclude": "EVT?[11471]"
+    },
+    "11472": {
+        "id": 11472,
+        "event": "4月10号，一些兄弟们失去了家园，只留下了那段话，暗号不变，江湖再见，滴，滴滴。天王盖地虎……",
+        "include": "EVT?[10010]",
+        "exclude": "EVT?[11472]"
+    },
+    "11473": {
+        "id": 11473,
+        "event": "据一位资深游戏制作者透露：某游戏的第六代作品正在紧密制作当中，他们已经建好了文件夹，确定消息可靠。",
+        "include": "EVT?[10010]",
+        "exclude": "EVT?[11473]"
+    },
+    "11474": {
+        "id": 11474,
+        "event": "湾区程序员建国，禁止变更需求被列入宪法。",
+        "exclude": "EVT?[11474]"
+    },
+    "11475": {
+        "id": 11475,
+        "exclude": "EVT?[11475]"
+    },
+    "11476": {
+        "id": 11476,
+        "exclude": "EVT?[11476]"
+    },
     "20007": {
         "id": 20007,
         "event": "你喜欢看画面人设好看的动漫。",

diff --git a/data/events.xlsx b/data/events.xlsx