Merge branch 'master' into dev

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: