Merge pull request #1400 from bookbug666/dev_alt

Add: Submarine supports in GemsFarming;EnemyFilter in SOS;Replace old EventAb and Cd with individual EventABCD

module/config/i18n/zh-CN.json

@@ -78,12 +78,20 @@
       "name": "活动图-2",
       "help": ""
     },
-    "EventAb": {
-      "name": "活动每日AB图",
+    "EventA": {
+      "name": "活动每日A图",
       "help": ""
     },
-    "EventCd": {
-      "name": "活动每日CD图",
+    "EventB": {
+      "name": "活动每日B图",
+      "help": ""
+    },
+    "EventC": {
+      "name": "活动每日C图",
+      "help": ""
+    },
+    "EventD": {
+      "name": "活动每日D图",
       "help": ""
     },
     "EventSp": {
@@ -940,7 +948,7 @@
     },
     "VanguardChange": {
       "name": "更换前排",
-      "help": "换前排通过找一艘150心情等级100的白鹰白皮驱逐完成，所以尽量保证有足够多的驱逐在后排休息。\n不启用将不更换前排"
+      "help": "换前排通过找一艘150心情等级100的白鹰白皮驱逐完成，所以尽量保证有足够多的驱逐在后排休息。\n国服以外则为150心情等级100的白鹰白船驱逐。\n不启用将不更换前排"
     },
     "VanguardEquipChange": {
       "name": "更换前排的装备",
@@ -974,23 +982,9 @@
       "help": "当本地时间超过给定数值后，禁用所有活动任务，'2020-01-01 00:00:00' 表示不限制，触发一次后时间将被重置\n设置后能防止活动结束后忘记关闭任务的事情发生"
     }
   },
-  "EventAb": {
+  "EventDaily": {
     "_info": {
-      "name": "活动每日AB图",
-      "help": ""
-    },
-    "StageFilter": {
-      "name": "活动每日过滤器",
-      "help": "按过滤器顺序出击"
-    },
-    "LastStage": {
-      "name": "上一个完成的关卡",
-      "help": "自动更新的数值，将跳过过滤器中已完成的关卡，过0点重置"
-    }
-  },
-  "EventCd": {
-    "_info": {
-      "name": "活动每日CD图",
+      "name": "活动每日",
       "help": ""
     },
     "StageFilter": {