Merge branch 'master' into dev

2026-03-12 09:48:20 +08:00 · 2021-11-30 00:09:01 +08:00
parent e8de1bcefb 2e4f6cba6b
commit 15a9d76fbb
12 changed files with 267 additions and 29 deletions
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@@ -2846,7 +2846,7 @@
      },
      "CommissionFilter": {
        "type": "textarea",
-        "value": "DailyEvent\n> Gem-8 > Gem-4 > Gem-2\n> NightDrill-8 > NightDrill-7 > NightDrill-6\n> ExtraDrill-0:20 > ExtraDrill-1 > ExtraDrill-2 > ExtraDrill-3 > ExtraDrill-3:20 > ExtraDrill-5:20\n> Box-6 > Box-3 > Box-1\n> DailyCube-0:30 > UrgentCube-1:30 > DailyCube-1:30 > UrgentCube-1:45 > UrgentCube-2:15 > UrgentCube-3\n> Major\n> DailyChip > DailyResource\n> UrgentBook-2:30 > UrgentBook-2 > UrgentBook-1:20 > UrgentBook-1:40\n> Daily-0:20 > Daily-0:30 > Daily-1:00 > Daily-1:30 > Daily-2:00\n> NightOil > NightCube\n> shortest"
+        "value": "DailyEvent\n> Gem-8 > Gem-4 > Gem-2\n> NightDrill-8 > NightDrill-7 > NightDrill-6\n> ExtraDrill-0:20 > ExtraDrill-1 > ExtraDrill-2 > ExtraDrill-2:40 > ExtraDrill-3:20 > ExtraDrill-5:20\n> Box-6 > Box-3 > Box-1\n> DailyCube-0:30 > UrgentCube-1:30 > DailyCube-1:30 > UrgentCube-1:45 > UrgentCube-2:15 > UrgentCube-3\n> Major\n> DailyChip > DailyResource\n> UrgentBook-2:30 > UrgentBook-2 > UrgentBook-1:20 > UrgentBook-1:40\n> Daily-0:20 > Daily-0:30 > Daily-1:00 > Daily-1:30 > Daily-2:00\n> NightOil > NightCube\n> shortest"
      }
    }
  },
@@ -2883,6 +2883,28 @@
        "type": "textarea",
        "value": "SameT4 > SameT3 > SameT2 > SameT1\n> BlueT2 > YellowT2 > RedT2\n> BlueT3 > YellowT3 > RedT3\n> BlueT4 > YellowT4 > RedT4\n> BlueT1 > YellowT1 > RedT1\n> first"
      }
+    },
+    "ControlExpOverflow": {
+      "Enable": {
+        "type": "checkbox",
+        "value": true
+      },
+      "T4Allow": {
+        "type": "input",
+        "value": 100
+      },
+      "T3Allow": {
+        "type": "input",
+        "value": 100
+      },
+      "T2Allow": {
+        "type": "input",
+        "value": 200
+      },
+      "T1Allow": {
+        "type": "input",
+        "value": 200
+      }
    }
  },
  "Research": {
--- a/module/config/argument/argument.yaml
+++ b/module/config/argument/argument.yaml
@@ -6,7 +6,7 @@

 Scheduler:
  Enable: false
-  NextRun: 
+  NextRun:
    value: 2020-01-01 00:00:00
    validate: datetime
  Command: Alas
@@ -128,7 +128,7 @@ Emotion:
  CalculateEmotion: true
  IgnoreLowEmotionWarn: false
  Fleet1Value: 119
-  Fleet1Record: 
+  Fleet1Record:
    value: 2020-01-01 00:00:00
    validate: datetime
  Fleet1Control:
@@ -139,7 +139,7 @@ Emotion:
    option: [not_in_dormitory, dormitory_floor_1, dormitory_floor_2]
  Fleet1Oath: false
  Fleet2Value: 119
-  Fleet2Record: 
+  Fleet2Record:
    value: 2020-01-01 00:00:00
    validate: datetime
  Fleet2Control:
@@ -199,7 +199,7 @@ Commission:
    DailyEvent
    > Gem-8 > Gem-4 > Gem-2
    > NightDrill-8 > NightDrill-7 > NightDrill-6
-    > ExtraDrill-0:20 > ExtraDrill-1 > ExtraDrill-2 > ExtraDrill-3 > ExtraDrill-3:20 > ExtraDrill-5:20
+    > ExtraDrill-0:20 > ExtraDrill-1 > ExtraDrill-2 > ExtraDrill-2:40 > ExtraDrill-3:20 > ExtraDrill-5:20
    > Box-6 > Box-3 > Box-1
    > DailyCube-0:30 > UrgentCube-1:30 > DailyCube-1:30 > UrgentCube-1:45 > UrgentCube-2:15 > UrgentCube-3
    > Major
@@ -216,6 +216,12 @@ Tactical:
    > BlueT4 > YellowT4 > RedT4
    > BlueT1 > YellowT1 > RedT1
    > first
+ControlExpOverflow:
+  Enable: true
+  T4Allow: 100
+  T3Allow: 100
+  T2Allow: 200
+  T1Allow: 200
 Research:
  UseCube: false
  UseCoin: true
@@ -381,7 +387,7 @@ Exercise:
  LowHpThreshold: 0.4
  LowHpConfirmWait: 0.1
  OpponentRefreshValue: 0
-  OpponentRefreshRecord: 
+  OpponentRefreshRecord:
    value: 2020-01-01 00:00:00
    validate: datetime
 Sos:
--- a/module/config/argument/task.yaml
+++ b/module/config/argument/task.yaml
@@ -87,6 +87,7 @@ Commission:
 Tactical:
  - Scheduler
  - Tactical
+  - ControlExpOverflow
 Research:
  - Scheduler
  - Research
--- a/module/config/config_generated.py
+++ b/module/config/config_generated.py
@@ -142,11 +142,18 @@ class GeneratedConfig:

    # Group `Commission`
    Commission_DoMajorCommission = False
-    Commission_CommissionFilter = 'DailyEvent\n> Gem-8 > Gem-4 > Gem-2\n> NightDrill-8 > NightDrill-7 > NightDrill-6\n> ExtraDrill-0:20 > ExtraDrill-1 > ExtraDrill-2 > ExtraDrill-3 > ExtraDrill-3:20 > ExtraDrill-5:20\n> Box-6 > Box-3 > Box-1\n> DailyCube-0:30 > UrgentCube-1:30 > DailyCube-1:30 > UrgentCube-1:45 > UrgentCube-2:15 > UrgentCube-3\n> Major\n> DailyChip > DailyResource\n> UrgentBook-2:30 > UrgentBook-2 > UrgentBook-1:20 > UrgentBook-1:40\n> Daily-0:20 > Daily-0:30 > Daily-1:00 > Daily-1:30 > Daily-2:00\n> NightOil > NightCube\n> shortest'
+    Commission_CommissionFilter = 'DailyEvent\n> Gem-8 > Gem-4 > Gem-2\n> NightDrill-8 > NightDrill-7 > NightDrill-6\n> ExtraDrill-0:20 > ExtraDrill-1 > ExtraDrill-2 > ExtraDrill-2:40 > ExtraDrill-3:20 > ExtraDrill-5:20\n> Box-6 > Box-3 > Box-1\n> DailyCube-0:30 > UrgentCube-1:30 > DailyCube-1:30 > UrgentCube-1:45 > UrgentCube-2:15 > UrgentCube-3\n> Major\n> DailyChip > DailyResource\n> UrgentBook-2:30 > UrgentBook-2 > UrgentBook-1:20 > UrgentBook-1:40\n> Daily-0:20 > Daily-0:30 > Daily-1:00 > Daily-1:30 > Daily-2:00\n> NightOil > NightCube\n> shortest'

    # Group `Tactical`
    Tactical_TacticalFilter = 'SameT4 > SameT3 > SameT2 > SameT1\n> BlueT2 > YellowT2 > RedT2\n> BlueT3 > YellowT3 > RedT3\n> BlueT4 > YellowT4 > RedT4\n> BlueT1 > YellowT1 > RedT1\n> first'

+    # Group `ControlExpOverflow`
+    ControlExpOverflow_Enable = True
+    ControlExpOverflow_T4Allow = 100
+    ControlExpOverflow_T3Allow = 100
+    ControlExpOverflow_T2Allow = 200
+    ControlExpOverflow_T1Allow = 200
+
    # Group `Research`
    Research_UseCube = False
    Research_UseCoin = True
--- a/module/config/i18n/en-US.json
+++ b/module/config/i18n/en-US.json
@@ -880,6 +880,32 @@
      "help": "Generally does not need to be modified or re-arranged but can do so if desired"
    }
  },
+  "ControlExpOverflow": {
+    "_info": {
+      "name": "Control EXP Overflow Settings",
+      "help": "Control waste amount of EXP on a specific book tier to save on time\nFor example, if remain = 1100, use ColorT3_Exp despite losing out on 100 EXP"
+    },
+    "Enable": {
+      "name": "Enable",
+      "help": "Disable for no overflow across all tiers\nOtherwise enable then set specific tier's overflow for customization"
+    },
+    "T4Allow": {
+      "name": "T4 Overflow Allow",
+      "help": "0 ~ any positive integer"
+    },
+    "T3Allow": {
+      "name": "T3 Overflow Allow",
+      "help": "0 ~ any positive integer"
+    },
+    "T2Allow": {
+      "name": "T2 Overflow Allow",
+      "help": "0 ~ any positive integer"
+    },
+    "T1Allow": {
+      "name": "T1 Overflow Allow",
+      "help": "0 ~ any positive integer"
+    }
+  },
  "Research": {
    "_info": {
      "name": "Research Academy Settings",
--- a/module/config/i18n/ja-JP.json
+++ b/module/config/i18n/ja-JP.json
@@ -880,6 +880,32 @@
      "help": "Tactical.TacticalFilter.help"
    }
  },
+  "ControlExpOverflow": {
+    "_info": {
+      "name": "ControlExpOverflow._info.name",
+      "help": "ControlExpOverflow._info.help"
+    },
+    "Enable": {
+      "name": "ControlExpOverflow.Enable.name",
+      "help": "ControlExpOverflow.Enable.help"
+    },
+    "T4Allow": {
+      "name": "ControlExpOverflow.T4Allow.name",
+      "help": "ControlExpOverflow.T4Allow.help"
+    },
+    "T3Allow": {
+      "name": "ControlExpOverflow.T3Allow.name",
+      "help": "ControlExpOverflow.T3Allow.help"
+    },
+    "T2Allow": {
+      "name": "ControlExpOverflow.T2Allow.name",
+      "help": "ControlExpOverflow.T2Allow.help"
+    },
+    "T1Allow": {
+      "name": "ControlExpOverflow.T1Allow.name",
+      "help": "ControlExpOverflow.T1Allow.help"
+    }
+  },
  "Research": {
    "_info": {
      "name": "Research._info.name",
--- a/module/config/i18n/zh-CN.json
+++ b/module/config/i18n/zh-CN.json
@@ -880,6 +880,32 @@
      "help": "一般不需要修改"
    }
  },
+  "ControlExpOverflow": {
+    "_info": {
+      "name": "ControlExpOverflow._info.name",
+      "help": "ControlExpOverflow._info.help"
+    },
+    "Enable": {
+      "name": "ControlExpOverflow.Enable.name",
+      "help": "ControlExpOverflow.Enable.help"
+    },
+    "T4Allow": {
+      "name": "ControlExpOverflow.T4Allow.name",
+      "help": "ControlExpOverflow.T4Allow.help"
+    },
+    "T3Allow": {
+      "name": "ControlExpOverflow.T3Allow.name",
+      "help": "ControlExpOverflow.T3Allow.help"
+    },
+    "T2Allow": {
+      "name": "ControlExpOverflow.T2Allow.name",
+      "help": "ControlExpOverflow.T2Allow.help"
+    },
+    "T1Allow": {
+      "name": "ControlExpOverflow.T1Allow.name",
+      "help": "ControlExpOverflow.T1Allow.help"
+    }
+  },
  "Research": {
    "_info": {
      "name": "科研",
--- a/module/config/i18n/zh-TW.json
+++ b/module/config/i18n/zh-TW.json
@@ -880,6 +880,32 @@
      "help": "一般不需要修改"
    }
  },
+  "ControlExpOverflow": {
+    "_info": {
+      "name": "ControlExpOverflow._info.name",
+      "help": "ControlExpOverflow._info.help"
+    },
+    "Enable": {
+      "name": "ControlExpOverflow.Enable.name",
+      "help": "ControlExpOverflow.Enable.help"
+    },
+    "T4Allow": {
+      "name": "ControlExpOverflow.T4Allow.name",
+      "help": "ControlExpOverflow.T4Allow.help"
+    },
+    "T3Allow": {
+      "name": "ControlExpOverflow.T3Allow.name",
+      "help": "ControlExpOverflow.T3Allow.help"
+    },
+    "T2Allow": {
+      "name": "ControlExpOverflow.T2Allow.name",
+      "help": "ControlExpOverflow.T2Allow.help"
+    },
+    "T1Allow": {
+      "name": "ControlExpOverflow.T1Allow.name",
+      "help": "ControlExpOverflow.T1Allow.help"
+    }
+  },
  "Research": {
    "_info": {
      "name": "科研",