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

# Conflicts: # module/config/argument/args.json
2026-05-14 11:19:26 +08:00 · 2026-01-16 22:55:35 +08:00
parent 3de944a46a 12df3efeba
commit c1e325820a
19 changed files with 59 additions and 51 deletions
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@@ -3496,6 +3496,7 @@
        ],
        "display": "hide",
        "option_cn": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -3529,7 +3530,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -3564,6 +3564,7 @@
          "event_20200227_cn"
        ],
        "option_en": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -3597,7 +3598,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -3636,6 +3636,7 @@
          "event_20200227_cn"
        ],
        "option_jp": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -3669,7 +3670,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -4284,6 +4284,7 @@
          "event_20251218_cn"
        ],
        "option_cn": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -4317,7 +4318,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -4352,6 +4352,7 @@
          "event_20200227_cn"
        ],
        "option_en": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -4385,7 +4386,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -4424,6 +4424,7 @@
          "event_20200227_cn"
        ],
        "option_jp": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -4457,7 +4458,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -5021,6 +5021,7 @@
          "event_20251218_cn"
        ],
        "option_cn": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -5054,7 +5055,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -5089,6 +5089,7 @@
          "event_20200227_cn"
        ],
        "option_en": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -5122,7 +5123,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -5161,6 +5161,7 @@
          "event_20200227_cn"
        ],
        "option_jp": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -5194,7 +5195,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -5758,6 +5758,7 @@
          "event_20251218_cn"
        ],
        "option_cn": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -5791,7 +5792,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -5826,6 +5826,7 @@
          "event_20200227_cn"
        ],
        "option_en": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -5859,7 +5860,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -5898,6 +5898,7 @@
          "event_20200227_cn"
        ],
        "option_jp": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -5931,7 +5932,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -6495,6 +6495,7 @@
          "event_20251218_cn"
        ],
        "option_cn": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -6528,7 +6529,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -6563,6 +6563,7 @@
          "event_20200227_cn"
        ],
        "option_en": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -6596,7 +6597,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -6635,6 +6635,7 @@
          "event_20200227_cn"
        ],
        "option_jp": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -6668,7 +6669,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -7232,6 +7232,7 @@
          "event_20251218_cn"
        ],
        "option_cn": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -7265,7 +7266,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -7300,6 +7300,7 @@
          "event_20200227_cn"
        ],
        "option_en": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -7333,7 +7334,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -7372,6 +7372,7 @@
          "event_20200227_cn"
        ],
        "option_jp": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -7405,7 +7406,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -7969,6 +7969,7 @@
          "event_20251218_cn"
        ],
        "option_cn": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -8002,7 +8003,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -8037,6 +8037,7 @@
          "event_20200227_cn"
        ],
        "option_en": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -8070,7 +8071,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -8109,6 +8109,7 @@
          "event_20200227_cn"
        ],
        "option_jp": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -8142,7 +8143,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -10163,6 +10163,7 @@
          "event_20251218_cn"
        ],
        "option_cn": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -10196,7 +10197,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -10231,6 +10231,7 @@
          "event_20200227_cn"
        ],
        "option_en": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -10264,7 +10265,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -10303,6 +10303,7 @@
          "event_20200227_cn"
        ],
        "option_jp": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -10336,7 +10337,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -10917,6 +10917,7 @@
          "event_20251218_cn"
        ],
        "option_cn": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -10950,7 +10951,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -10985,6 +10985,7 @@
          "event_20200227_cn"
        ],
        "option_en": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -11018,7 +11019,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -11057,6 +11057,7 @@
          "event_20200227_cn"
        ],
        "option_jp": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -11090,7 +11091,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -11671,6 +11671,7 @@
          "event_20251218_cn"
        ],
        "option_cn": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -11704,7 +11705,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -11739,6 +11739,7 @@
          "event_20200227_cn"
        ],
        "option_en": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -11772,7 +11773,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -11811,6 +11811,7 @@
          "event_20200227_cn"
        ],
        "option_jp": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -11844,7 +11845,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -12425,6 +12425,7 @@
          "event_20251218_cn"
        ],
        "option_cn": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -12458,7 +12459,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -12493,6 +12493,7 @@
          "event_20200227_cn"
        ],
        "option_en": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -12526,7 +12527,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -12565,6 +12565,7 @@
          "event_20200227_cn"
        ],
        "option_jp": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -12598,7 +12599,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -13169,6 +13169,7 @@
          "event_20251218_cn"
        ],
        "option_cn": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -13202,7 +13203,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -13237,6 +13237,7 @@
          "event_20200227_cn"
        ],
        "option_en": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -13270,7 +13271,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -13309,6 +13309,7 @@
          "event_20200227_cn"
        ],
        "option_jp": [
+          "event_20231221_cn",
          "event_20251218_cn",
          "event_20230914_cn",
          "event_20230803_cn",
@@ -13342,7 +13343,6 @@
          "event_20220324_cn",
          "event_20240229_cn",
          "event_20211229_cn",
-          "event_20231221_cn",
          "event_20231123_cn",
          "event_20210916_cn",
          "event_20231026_cn",
@@ -16089,7 +16089,8 @@
          "noshiro",
          "sirius",
          "new_jersey",
-          "taihou"
+          "taihou",
+          "aegir"
        ]
      }
    },
--- a/module/config/argument/argument.yaml
+++ b/module/config/argument/argument.yaml
@@ -600,7 +600,7 @@ PrivateQuarters:
    TargetInteract: true
    TargetShip:
      value: anchorage
-      option: [ anchorage, noshiro, sirius, new_jersey, taihou ]
+      option: [ anchorage, noshiro, sirius, new_jersey, taihou, aegir ]
 # ==================== Daily ====================

 Daily:
--- a/module/config/config_generated.py
+++ b/module/config/config_generated.py
@@ -348,7 +348,7 @@ class GeneratedConfig:
    PrivateQuarters_BuyRoses = True
    PrivateQuarters_BuyCake = False
    PrivateQuarters_TargetInteract = True
-    PrivateQuarters_TargetShip = 'anchorage'  # anchorage, noshiro, sirius, new_jersey, taihou
+    PrivateQuarters_TargetShip = 'anchorage'  # anchorage, noshiro, sirius, new_jersey, taihou, aegir

    # Group `Daily`
    Daily_UseDailySkip = True
--- a/module/config/i18n/en-US.json
+++ b/module/config/i18n/en-US.json
@@ -797,7 +797,7 @@
      "event_20230914_cn": "Effulgence Before Eclipse Rerun",
      "event_20231026_cn": "Tempesta and the Fountain of Youth",
      "event_20231123_cn": "The Ninja Scrolls: Azur Flash",
-      "event_20231221_cn": "Light-Chasing Sea of Stars",
+      "event_20231221_cn": "Light-Chasing Sea of Stars Rerun",
      "event_20240229_cn": "Snowrealm Peregrination",
      "event_20240425_cn": "Heart-Linking Harmony",
      "event_20240521_cn": "Light of the Martyrium",
@@ -2181,7 +2181,8 @@
      "noshiro": "Noshiro",
      "sirius": "Sirius",
      "new_jersey": "New Jersey",
-      "taihou": "Taihou"
+      "taihou": "Taihou",
+      "aegir": "Aegir"
    }
  },
  "Daily": {
--- a/module/config/i18n/ja-JP.json
+++ b/module/config/i18n/ja-JP.json
@@ -797,7 +797,7 @@
      "event_20230914_cn": "須臾望月抄（復刻）",
      "event_20231026_cn": "テンペスタと若返りの泉",
      "event_20231123_cn": "蒼閃忍法帖",
-      "event_20231221_cn": "光追う星の海",
+      "event_20231221_cn": "光追う星の海（復刻）",
      "event_20240229_cn": "銀界遊廻",
      "event_20240425_cn": "共鳴のパッション",
      "event_20240521_cn": "赫輝のマルティリウム",
@@ -2181,7 +2181,8 @@
      "noshiro": "noshiro",
      "sirius": "sirius",
      "new_jersey": "new_jersey",
-      "taihou": "taihou"
+      "taihou": "taihou",
+      "aegir": "aegir"
    }
  },
  "Daily": {
--- a/module/config/i18n/zh-CN.json
+++ b/module/config/i18n/zh-CN.json
@@ -797,7 +797,7 @@
      "event_20230914_cn": "复刻须臾望月抄",
      "event_20231026_cn": "飓风与青春之泉",
      "event_20231123_cn": "苍闪忍法帖",
-      "event_20231221_cn": "星海逐光",
+      "event_20231221_cn": "复刻星海逐光",
      "event_20240229_cn": "雪境迷踪",
      "event_20240425_cn": "共鸣的PASSION",
      "event_20240521_cn": "绽放于辉光之城",
@@ -2181,7 +2181,8 @@
      "noshiro": "能代",
      "sirius": "天狼星",
      "new_jersey": "新泽西",
-      "taihou": "鹩"
+      "taihou": "鹩",
+      "aegir": "埃吉尔"
    }
  },
  "Daily": {
--- a/module/config/i18n/zh-TW.json
+++ b/module/config/i18n/zh-TW.json
@@ -2181,7 +2181,8 @@
      "noshiro": "能代",
      "sirius": "天狼星",
      "new_jersey": "紐澤西",
-      "taihou": "大鳳"
+      "taihou": "大鳳",
+      "aegir": "埃吉爾"
    }
  },
  "Daily": {