Merge branch 'dev'

module/config/config_generated.py

@@ -76,6 +76,16 @@ class GeneratedConfig:
     OldRetire_SSR = False
     OldRetire_RetireAmount = 'retire_all'  # retire_all, retire_10
 
+    # Group `Downtime`
+    Downtime_Window = None
+    Downtime_Title = None
+
+    # Group `DowntimeStrategy`
+    DowntimeStrategy_AutoFetch = False
+    DowntimeStrategy_ManageExercise = False
+    DowntimeStrategy_ExerciseClearTime = '15:00:00'
+    DowntimeStrategy_ManageDaily = False
+
     # Group `Campaign`
     Campaign_Name = '12-4'
     Campaign_Event = 'campaign_main'  # campaign_main
@@ -112,8 +122,10 @@ class GeneratedConfig:
     # Group `Submarine`
     Submarine_Fleet = 0  # 0, 1, 2
     Submarine_AutoRecommend = False
-    Submarine_Mode = 'do_not_use'  # do_not_use, hunt_only, boss_only, hunt_and_boss, every_combat
     Submarine_AutoSearchMode = 'sub_standby'  # sub_standby, sub_auto_call
+    Submarine_HuntMode = 'do_not_use'  # do_not_use, hunt
+    Submarine_CallMode = 'do_not_use'  # do_not_use, boss_only, every_combat
+    Submarine_Timing = 'default'  # default, wait_for_boss
     Submarine_DistanceToBoss = '2_grid_to_boss'  # to_boss_position, 1_grid_to_boss, 2_grid_to_boss, use_open_ocean_support
 
     # Group `Emotion`
@@ -225,6 +237,7 @@ class GeneratedConfig:
     AddNewStudent_Enable = False
     AddNewStudent_Favorite = False
     AddNewStudent_MinLevel = 50
+    AddNewStudent_EnableNotify = False
 
     # Group `Research`
     Research_UseCube = 'only_05_hour'  # always_use, only_05_hour, only_no_project, do_not_use
@@ -679,6 +692,9 @@ class GeneratedConfig:
     # Group `GameManager`
     GameManager_AutoRestart = True
 
+    # Group `DowntimeFetch`
+    DowntimeFetch_FetcherTest = False
+
     # Group `Oil`
     Oil_Value = 0
     Oil_Limit = 0