Merge branch 'master' into app

# Conflicts: # module/config/config.py # module/reward/reward.py
2026-03-23 10:58:01 +08:00 · 2021-09-30 21:26:25 +08:00
parent 8780477758 57af3bcc83
commit 38f55a3a26
48 changed files with 435 additions and 5 deletions
--- a/module/config/argparser.py
+++ b/module/config/argparser.py
@@ -359,6 +359,23 @@ def main(ini_name=''):
        help='要开发的舰船在开发船坞界面底部的位置。最左边为1，最右边为6。',
        choices=['1', '2', '3', '4', '5', '6'], gooey_options={'label_color': '#4B5F83'})

+    reward_gacha = reward_parser.add_argument_group('Gacha',
+        'Submit build order for daily achievement. Previous orders will be dequeued '
+        'before submitting to allow maximum inputs and drills will be used if any '
+        'are still in progress',
+        gooey_options={'label_color': '#931D03'})
+    reward_gacha.add_argument('--buy_gacha_order', default=default('--buy_gacha_order'),
+        choices=['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'], help='Number to buy altogether.',
+        gooey_options={'label_color': '#4B5F83'})
+    reward_gacha.add_argument('--gacha_pool_target', default=default('--gacha_pool_target'),
+        choices=['light', 'heavy', 'special', 'event', 'wishing_well'],
+        help='Target build pool to gacha in, players should select their '
+             'desired ship(s) beforehand if configuring to \'wishing_well\'.',
+        gooey_options={'label_color': '#4B5F83'})
+    reward_gacha.add_argument('--drill_after_gacha', default=default('--drill_after_gacha'),
+        choices=['是', '否'], help='Use drills after submission.',
+        gooey_options={'label_color': '#4B5F83'})
+
    # ==========设备设置==========
    emulator_parser = subs.add_parser('设备设置')
    emulator = emulator_parser.add_argument_group('模拟器', '需要运行一次来保存选项, 会检查游戏是否启动\n若启动了游戏, 触发一次收菜', gooey_options={'label_color': '#931D03'})
--- a/module/config/argparser_en.py
+++ b/module/config/argparser_en.py
@@ -403,6 +403,23 @@ def main(ini_name=''):
             'so players must first verify the location themselves before selecting.\nleftmost = 1, rightmost = 6',
        choices=['1', '2', '3', '4', '5', '6'], gooey_options={'label_color': '#4B5F83'})

+    reward_gacha = reward_parser.add_argument_group('Gacha',
+        'Submit build order for daily achievement. Previous orders will be dequeued '
+        'before submitting to allow maximum inputs and drills will be used if any '
+        'are still in progress',
+        gooey_options={'label_color': '#931D03'})
+    reward_gacha.add_argument('--buy_gacha_order', default=default('--buy_gacha_order'),
+        choices=['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'], help='Number to buy altogether.',
+        gooey_options={'label_color': '#4B5F83'})
+    reward_gacha.add_argument('--gacha_pool_target', default=default('--gacha_pool_target'),
+        choices=['light', 'heavy', 'special', 'event', 'wishing_well'],
+        help='Target build pool to gacha in, players should select their '
+             'desired ship(s) beforehand if configuring to \'wishing_well\'.',
+        gooey_options={'label_color': '#4B5F83'})
+    reward_gacha.add_argument('--drill_after_gacha', default=default('--drill_after_gacha'),
+        choices=['yes', 'no'], help='Use drills after submission.',
+        gooey_options={'label_color': '#4B5F83'})
+
    # ==========emulator==========
    emulator_parser = subs.add_parser('emulator')
    emulator = emulator_parser.add_argument_group('Emulator', 'Need to Press start to save your settings, it will check whether the game is started \nIf the game has not started, it will be started', gooey_options={'label_color': '#931D03'})
--- a/module/config/argparser_jp.py
+++ b/module/config/argparser_jp.py
@@ -403,6 +403,23 @@ def main(ini_name=''):
             'so players must first verify the location themselves before selecting.\nleftmost = 1, rightmost = 6',
        choices=['1', '2', '3', '4', '5', '6'], gooey_options={'label_color': '#4B5F83'})

+    reward_gacha = reward_parser.add_argument_group('Gacha',
+        'Submit build order for daily achievement. Previous orders will be dequeued '
+        'before submitting to allow maximum inputs and drills will be used if any '
+        'are still in progress',
+        gooey_options={'label_color': '#931D03'})
+    reward_gacha.add_argument('--buy_gacha_order', default=default('--buy_gacha_order'),
+        choices=['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'], help='Number to buy altogether.',
+        gooey_options={'label_color': '#4B5F83'})
+    reward_gacha.add_argument('--gacha_pool_target', default=default('--gacha_pool_target'),
+        choices=['light', 'heavy', 'special', 'event', 'wishing_well'],
+        help='Target build pool to gacha in, players should select their '
+             'desired ship(s) beforehand if configuring to \'wishing_well\'.',
+        gooey_options={'label_color': '#4B5F83'})
+    reward_gacha.add_argument('--drill_after_gacha', default=default('--drill_after_gacha'),
+        choices=['yes', 'no'], help='Use drills after submission.',
+        gooey_options={'label_color': '#4B5F83'})
+
    # ==========emulator==========
    emulator_parser = subs.add_parser('emulator')
    emulator = emulator_parser.add_argument_group('Emulator', 'Need to Press start to save your settings, it will check whether the game is started \nIf the game has not started, it will be started', gooey_options={'label_color': '#931D03'})
--- a/module/config/argparser_tw.py
+++ b/module/config/argparser_tw.py
@@ -358,6 +358,23 @@ def main(ini_name=''):
        help='要開發的艦船在開發船塢界面底部的位置。最左邊為1，最右邊為6。',
        choices=['1', '2', '3', '4', '5', '6'], gooey_options={'label_color': '#4B5F83'})

+    reward_gacha = reward_parser.add_argument_group('Gacha',
+        'Submit build order for daily achievement. Previous orders will be dequeued '
+        'before submitting to allow maximum inputs and drills will be used if any '
+        'are still in progress',
+        gooey_options={'label_color': '#931D03'})
+    reward_gacha.add_argument('--buy_gacha_order', default=default('--buy_gacha_order'),
+        choices=['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10'], help='Number to buy altogether.',
+        gooey_options={'label_color': '#4B5F83'})
+    reward_gacha.add_argument('--gacha_pool_target', default=default('--gacha_pool_target'),
+        choices=['light', 'heavy', 'special', 'event', 'wishing_well'],
+        help='Target build pool to gacha in, players should select their '
+             'desired ship(s) beforehand if configuring to \'wishing_well\'.',
+        gooey_options={'label_color': '#4B5F83'})
+    reward_gacha.add_argument('--drill_after_gacha', default=default('--drill_after_gacha'),
+        choices=['是', '否'], help='Use drills after submission.',
+        gooey_options={'label_color': '#4B5F83'})
+
    # ==========設備設定==========
    emulator_parser = subs.add_parser('設備設定')
    emulator = emulator_parser.add_argument_group('模擬器', '需要運行一次來保存選項, 會檢查遊戲是否啟動\n若啟動了遊戲, 觸發一次收菜', gooey_options={'label_color': '#931D03'})
--- a/module/config/dictionary.py
+++ b/module/config/dictionary.py
@@ -194,6 +194,9 @@ dic_true_eng_to_eng = {
    'buy_shipyard_bp': 'buy_shipyard_bp',
    'shipyard_series': 'shipyard_series',
    'shipyard_index': 'shipyard_index',
+    'buy_gacha_order': 'buy_gacha_order',
+    'gacha_pool_target': 'gacha_pool_target',
+    'drill_after_gacha': 'drill_after_gacha',
    'serial': 'serial',
    'package_name': 'package_name',
    'enable_error_log_and_screenshot_save': 'enable_error_log_and_screenshot_save',
@@ -389,6 +392,11 @@ dic_true_eng_to_eng = {
    'ranger': 'ranger',
    'hermes': 'hermes',
    'any': 'any',
+    'light': 'light',
+    'heavy': 'heavy',
+    'special': 'special',
+    'event': 'event',
+    'wishing_well': 'wishing_well',

    # Research filter preset
    'customized': 'customized',
@@ -565,6 +573,9 @@ dic_chi_to_eng = {
    '购买蓝图': 'buy_shipyard_bp',
    '科研期数': 'shipyard_series',
    '舰船索引': 'shipyard_index',
+    'buy_gacha_order': 'buy_gacha_order',
+    'gacha_pool_target': 'gacha_pool_target',
+    'drill_after_gacha': 'drill_after_gacha',
    '设备': 'serial',
    '包名': 'package_name',
    '出错时保存log和截图': 'enable_error_log_and_screenshot_save',
@@ -768,6 +779,11 @@ dic_chi_to_eng = {
    '突击者': 'ranger',
    '竞技神': 'hermes',
    '任意航母': 'any',
+    'light': 'light',
+    'heavy': 'heavy',
+    'special': 'special',
+    'event': 'event',
+    'wishing_well': 'wishing_well',

    # Research filter preset
    '自定义': 'customized',
@@ -945,6 +961,9 @@ dic_tchi_to_eng = {
    '購買藍圖': 'buy_shipyard_bp',
    '科研期數': 'shipyard_series',
    '艦船索引': 'shipyard_index',
+    'buy_gacha_order': 'buy_gacha_order',
+    'gacha_pool_target': 'gacha_pool_target',
+    'drill_after_gacha': 'drill_after_gacha',
    '設備': 'serial',
    '包名': 'package_name',
    '出錯時保存log和截圖': 'enable_error_log_and_screenshot_save',
@@ -1148,6 +1167,11 @@ dic_tchi_to_eng = {
    '突擊者': 'ranger',
    '競技神': 'hermes',
    '任意航母': 'any',
+    'light': 'light',
+    'heavy': 'heavy',
+    'special': 'special',
+    'event': 'event',
+    'wishing_well': 'wishing_well',

    # Research filter preset
    '自定義': 'customized',