Upd: MAA Roguelike (#3724)

* Fix: Wrong params in MAA infrast * Upd: MAA Roguelike
2026-03-12 05:08:19 +08:00 · 2024-05-06 00:47:30 +08:00
parent b80f3533a1
commit 543154eb8b
9 changed files with 144 additions and 39 deletions
--- a/submodule/AlasMaaBridge/module/config/argument/args.json
+++ b/submodule/AlasMaaBridge/module/config/argument/args.json
@@ -652,7 +652,7 @@
    "MaaInfrast": {
      "Facility": {
        "type": "textarea",
-        "value": "Mfg > Trade > Power > Control > Reception > Office > Dorm"
+        "value": "Training > Mfg > Trade > Power > Control > Reception > Office > Dorm"
      },
      "Drones": {
        "type": "select",
@@ -908,7 +908,8 @@
        "value": 0,
        "option": [
          0,
-          1
+          1,
+          4
        ]
      },
      "StartsCount": {
@@ -927,6 +928,10 @@
        "type": "select",
        "value": "指挥分队",
        "option": [
+          "永恒狩猎分队",
+          "生活至上分队",
+          "科学主义分队",
+          "特训分队",
          "心胜于物分队",
          "物尽其用分队",
          "以人为本分队",
@@ -964,6 +969,19 @@
          "friend_support",
          "nonfriend_support"
        ]
+      },
+      "startWithEliteTwo": {
+        "type": "select",
+        "value": "no_use",
+        "option": [
+          "no_use",
+          "start_with_elite_two",
+          "only_start_with_elite_two"
+        ]
+      },
+      "refreshTraderWithDice": {
+        "type": "checkbox",
+        "value": false
      }
    },
    "Storage": {
--- a/submodule/AlasMaaBridge/module/config/argument/argument.yaml
+++ b/submodule/AlasMaaBridge/module/config/argument/argument.yaml
@@ -41,13 +41,13 @@ MaaEmulator:
    valuetype: str
  PackageName:
    value: Official
-    option: [Official, Bilibili, YoStarEN, YoStarJP, YoStarKR, txwy]
+    option: [ Official, Bilibili, YoStarEN, YoStarJP, YoStarKR, txwy ]
  MaaPath:
    value: D:/Program Files/MAA
    type: textarea
  TouchMethod:
    value: minitouch
-    option: [minitouch, maatouch, adb]
+    option: [ minitouch, maatouch, adb ]
  DeploymentWithPause:
    value: false
 MaaRecord:
@@ -57,11 +57,11 @@ MaaRecord:
 MaaFight:
  Stage:
    value: last
-    option: [last, 1-7, LS-6, CA-5, SK-5, AP-5, CE-6, PR-A-1, PR-A-2, PR-B-1, PR-B-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2, custom]
+    option: [ last, 1-7, LS-6, CA-5, SK-5, AP-5, CE-6, PR-A-1, PR-A-2, PR-B-1, PR-B-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2, custom ]
  CustomStage: null
  MedicineTactics:
    value: no_use
-    option: [no_use, expiring, run_out]
+    option: [ no_use, expiring, run_out ]
  Medicine: null
  Stone: null
  Times: null
@@ -74,25 +74,25 @@ MaaFightWeekly:
  Enable: true
  Monday:
    value: default
-    option: [default, LS-6, SK-5, AP-5, PR-A-1, PR-A-2, PR-B-1, PR-B-2]
+    option: [ default, LS-6, SK-5, AP-5, PR-A-1, PR-A-2, PR-B-1, PR-B-2 ]
  Tuesday:
    value: default
-    option: [default, LS-6, CA-5, CE-6, PR-B-1, PR-B-2, PR-D-1, PR-D-2]
+    option: [ default, LS-6, CA-5, CE-6, PR-B-1, PR-B-2, PR-D-1, PR-D-2 ]
  Wednesday:
    value: default
-    option: [default, LS-6, CA-5, SK-5, PR-C-1, PR-C-2, PR-D-1, PR-D-2]
+    option: [ default, LS-6, CA-5, SK-5, PR-C-1, PR-C-2, PR-D-1, PR-D-2 ]
  Thursday:
    value: default
-    option: [default, LS-6, AP-5, CE-6, PR-A-1, PR-A-2, PR-C-1, PR-C-2]
+    option: [ default, LS-6, AP-5, CE-6, PR-A-1, PR-A-2, PR-C-1, PR-C-2 ]
  Friday:
    value: default
-    option: [default, LS-6, CA-5, SK-5, PR-A-1, PR-A-2, PR-B-1, PR-B-2]
+    option: [ default, LS-6, CA-5, SK-5, PR-A-1, PR-A-2, PR-B-1, PR-B-2 ]
  Saturday:
    value: default
-    option: [default, LS-6, SK-5, AP-5, CE-6, PR-B-1, PR-B-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2]
+    option: [ default, LS-6, SK-5, AP-5, CE-6, PR-B-1, PR-B-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2 ]
  Sunday:
    value: default
-    option: [default, LS-6, CA-5, AP-5, CE-6, PR-A-1, PR-A-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2]
+    option: [ default, LS-6, CA-5, AP-5, CE-6, PR-A-1, PR-A-2, PR-C-1, PR-C-2, PR-D-1, PR-D-2 ]

 MaaRecruit:
  Refresh: true
@@ -106,11 +106,11 @@ MaaRecruit:

 MaaInfrast:
  Facility:
-    value: Mfg > Trade > Power > Control > Reception > Office > Dorm
+    value: Training > Mfg > Trade > Power > Control > Reception > Office > Dorm
    type: textarea
  Drones:
    value: Money
-    option: [_NotUse, Money, SyntheticJade, CombatRecord, PureGold, OriginStone, Chip]
+    option: [ _NotUse, Money, SyntheticJade, CombatRecord, PureGold, OriginStone, Chip ]
  WorkThreshold: 12
  ShiftThreshold: 4
  Notstationed: true
@@ -121,7 +121,7 @@ MaaCustomInfrast:
  Enable: false
  BuiltinConfig:
    value: custom
-    option: [custom, 153-3, 243-3, 243-4, 252-3, 333-3]
+    option: [ custom, 153-3, 243-3, 243-4, 252-3, 333-3 ]
  Filename:
    value: null
    type: textarea
@@ -144,23 +144,27 @@ MaaMall:
 MaaRoguelike:
  Theme:
    value: Sami
-    option: [Phantom, Mizuki, Sami]
+    option: [ Phantom, Mizuki, Sami ]
  Mode:
    value: 0
-    option: [0, 1]
+    option: [ 0, 1, 4 ]
  StartsCount: 9999999
  InvestmentsCount: 9999999
  StopWhenInvestmentFull: false
  Squad:
    value: 指挥分队
-    option: [心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队]
+    option: [ 永恒狩猎分队, 生活至上分队, 科学主义分队, 特训分队, 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队 ]
  Roles:
    value: 取长补短
-    option: [先手必胜, 稳扎稳打, 取长补短, 随心所欲]
+    option: [ 先手必胜, 稳扎稳打, 取长补短, 随心所欲 ]
  CoreChar: null
  Support:
    value: no_use
    option: [ no_use, friend_support, nonfriend_support ]
+  startWithEliteTwo:
+    value: no_use
+    option: [ no_use, start_with_elite_two, only_start_with_elite_two ]
+  refreshTraderWithDice: false

 MaaAward:
  Mail: False
--- a/submodule/AlasMaaBridge/module/config/config_generated.py
+++ b/submodule/AlasMaaBridge/module/config/config_generated.py
@@ -69,7 +69,7 @@ class GeneratedConfig:
    MaaRecruit_Expedite = False

    # Group `MaaInfrast`
-    MaaInfrast_Facility = 'Mfg > Trade > Power > Control > Reception > Office > Dorm'
+    MaaInfrast_Facility = 'Training > Mfg > Trade > Power > Control > Reception > Office > Dorm'
    MaaInfrast_Drones = 'Money'  # _NotUse, Money, SyntheticJade, CombatRecord, PureGold, OriginStone, Chip
    MaaInfrast_WorkThreshold = 12
    MaaInfrast_ShiftThreshold = 4
@@ -96,14 +96,16 @@ class GeneratedConfig:

    # Group `MaaRoguelike`
    MaaRoguelike_Theme = 'Sami'  # Phantom, Mizuki, Sami
-    MaaRoguelike_Mode = 0  # 0, 1
+    MaaRoguelike_Mode = 0  # 0, 1, 4
    MaaRoguelike_StartsCount = 9999999
    MaaRoguelike_InvestmentsCount = 9999999
    MaaRoguelike_StopWhenInvestmentFull = False
-    MaaRoguelike_Squad = '指挥分队'  # 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队
+    MaaRoguelike_Squad = '指挥分队'  # 永恒狩猎分队, 生活至上分队, 科学主义分队, 特训分队, 心胜于物分队, 物尽其用分队, 以人为本分队, 指挥分队, 集群分队, 后勤分队, 矛头分队, 突击战术分队, 堡垒战术分队, 远程战术分队, 破坏战术分队, 研究分队, 高规格分队
    MaaRoguelike_Roles = '取长补短'  # 先手必胜, 稳扎稳打, 取长补短, 随心所欲
    MaaRoguelike_CoreChar = None
    MaaRoguelike_Support = 'no_use'  # no_use, friend_support, nonfriend_support
+    MaaRoguelike_startWithEliteTwo = 'no_use'  # no_use, start_with_elite_two, only_start_with_elite_two
+    MaaRoguelike_refreshTraderWithDice = False

    # Group `MaaAward`
    MaaAward_Mail = False
--- a/submodule/AlasMaaBridge/module/config/i18n/en-US.json
+++ b/submodule/AlasMaaBridge/module/config/i18n/en-US.json
@@ -494,7 +494,8 @@
      "name": "MaaRoguelike.Mode.name",
      "help": "MaaRoguelike.Mode.help",
      "0": "0",
-      "1": "1"
+      "1": "1",
+      "4": "4"
    },
    "StartsCount": {
      "name": "MaaRoguelike.StartsCount.name",
@@ -511,6 +512,10 @@
    "Squad": {
      "name": "MaaRoguelike.Squad.name",
      "help": "MaaRoguelike.Squad.help",
+      "永恒狩猎分队": "永恒狩猎分队",
+      "生活至上分队": "生活至上分队",
+      "科学主义分队": "科学主义分队",
+      "特训分队": "特训分队",
      "心胜于物分队": "心胜于物分队",
      "物尽其用分队": "物尽其用分队",
      "以人为本分队": "以人为本分队",
@@ -543,6 +548,17 @@
      "no_use": "no_use",
      "friend_support": "friend_support",
      "nonfriend_support": "nonfriend_support"
+    },
+    "startWithEliteTwo": {
+      "name": "MaaRoguelike.startWithEliteTwo.name",
+      "help": "MaaRoguelike.startWithEliteTwo.help",
+      "no_use": "no_use",
+      "start_with_elite_two": "start_with_elite_two",
+      "only_start_with_elite_two": "only_start_with_elite_two"
+    },
+    "refreshTraderWithDice": {
+      "name": "MaaRoguelike.refreshTraderWithDice.name",
+      "help": "MaaRoguelike.refreshTraderWithDice.help"
    }
  },
  "MaaAward": {
--- a/submodule/AlasMaaBridge/module/config/i18n/ja-JP.json
+++ b/submodule/AlasMaaBridge/module/config/i18n/ja-JP.json
@@ -494,7 +494,8 @@
      "name": "MaaRoguelike.Mode.name",
      "help": "MaaRoguelike.Mode.help",
      "0": "0",
-      "1": "1"
+      "1": "1",
+      "4": "4"
    },
    "StartsCount": {
      "name": "MaaRoguelike.StartsCount.name",
@@ -511,6 +512,10 @@
    "Squad": {
      "name": "MaaRoguelike.Squad.name",
      "help": "MaaRoguelike.Squad.help",
+      "永恒狩猎分队": "永恒狩猎分队",
+      "生活至上分队": "生活至上分队",
+      "科学主义分队": "科学主义分队",
+      "特训分队": "特训分队",
      "心胜于物分队": "心胜于物分队",
      "物尽其用分队": "物尽其用分队",
      "以人为本分队": "以人为本分队",
@@ -543,6 +548,17 @@
      "no_use": "no_use",
      "friend_support": "friend_support",
      "nonfriend_support": "nonfriend_support"
+    },
+    "startWithEliteTwo": {
+      "name": "MaaRoguelike.startWithEliteTwo.name",
+      "help": "MaaRoguelike.startWithEliteTwo.help",
+      "no_use": "no_use",
+      "start_with_elite_two": "start_with_elite_two",
+      "only_start_with_elite_two": "only_start_with_elite_two"
+    },
+    "refreshTraderWithDice": {
+      "name": "MaaRoguelike.refreshTraderWithDice.name",
+      "help": "MaaRoguelike.refreshTraderWithDice.help"
    }
  },
  "MaaAward": {
--- a/submodule/AlasMaaBridge/module/config/i18n/zh-CN.json
+++ b/submodule/AlasMaaBridge/module/config/i18n/zh-CN.json
@@ -494,7 +494,8 @@
      "name": "策略",
      "help": "",
      "0": "刷蜡烛",
-      "1": "刷源石锭"
+      "1": "刷源石锭",
+      "4": "刷开局"
    },
    "StartsCount": {
      "name": "开始探索X次后停止任务",
@@ -511,9 +512,13 @@
    "Squad": {
      "name": "开局分队",
      "help": "",
-      "心胜于物分队": "心胜于物分队",
-      "物尽其用分队": "物尽其用分队",
-      "以人为本分队": "以人为本分队",
+      "永恒狩猎分队": "永恒狩猎分队(萨米)",
+      "生活至上分队": "生活至上分队(萨米)",
+      "科学主义分队": "科学主义分队(萨米)",
+      "特训分队": "特训分队(萨米)",
+      "心胜于物分队": "心胜于物分队(水月)",
+      "物尽其用分队": "物尽其用分队(水月)",
+      "以人为本分队": "以人为本分队(水月)",
      "指挥分队": "指挥分队",
      "集群分队": "集群分队",
      "后勤分队": "后勤分队",
@@ -522,7 +527,7 @@
      "堡垒战术分队": "堡垒战术分队",
      "远程战术分队": "远程战术分队",
      "破坏战术分队": "破坏战术分队",
-      "研究分队": "研究分队",
+      "研究分队": "研究分队(傀影、水月)",
      "高规格分队": "高规格分队"
    },
    "Roles": {
@@ -543,6 +548,17 @@
      "no_use": "不使用",
      "friend_support": "好友助战",
      "nonfriend_support": "好友+非好友助战"
+    },
+    "startWithEliteTwo": {
+      "name": "凹「开局干员」精二直升",
+      "help": "需要选择职业队",
+      "no_use": "不凹精二直升",
+      "start_with_elite_two": "凹精二直升",
+      "only_start_with_elite_two": "只凹直升精二，不进行作战"
+    },
+    "refreshTraderWithDice": {
+      "name": "刷新商店(指路鳞)",
+      "help": "只支持水月与深蓝之树"
    }
  },
  "MaaAward": {
--- a/submodule/AlasMaaBridge/module/config/i18n/zh-TW.json
+++ b/submodule/AlasMaaBridge/module/config/i18n/zh-TW.json
@@ -494,7 +494,8 @@
      "name": "MaaRoguelike.Mode.name",
      "help": "MaaRoguelike.Mode.help",
      "0": "0",
-      "1": "1"
+      "1": "1",
+      "4": "4"
    },
    "StartsCount": {
      "name": "MaaRoguelike.StartsCount.name",
@@ -511,6 +512,10 @@
    "Squad": {
      "name": "MaaRoguelike.Squad.name",
      "help": "MaaRoguelike.Squad.help",
+      "永恒狩猎分队": "永恒狩猎分队",
+      "生活至上分队": "生活至上分队",
+      "科学主义分队": "科学主义分队",
+      "特训分队": "特训分队",
      "心胜于物分队": "心胜于物分队",
      "物尽其用分队": "物尽其用分队",
      "以人为本分队": "以人为本分队",
@@ -543,6 +548,17 @@
      "no_use": "no_use",
      "friend_support": "friend_support",
      "nonfriend_support": "nonfriend_support"
+    },
+    "startWithEliteTwo": {
+      "name": "MaaRoguelike.startWithEliteTwo.name",
+      "help": "MaaRoguelike.startWithEliteTwo.help",
+      "no_use": "no_use",
+      "start_with_elite_two": "start_with_elite_two",
+      "only_start_with_elite_two": "only_start_with_elite_two"
+    },
+    "refreshTraderWithDice": {
+      "name": "MaaRoguelike.refreshTraderWithDice.name",
+      "help": "MaaRoguelike.refreshTraderWithDice.help"
    }
  },
  "MaaAward": {