diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 88d0ae1c6..bd6e8db25 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -8742,7 +8742,8 @@ "value": 2, "option": [ 2, - 3 + 3, + 4 ] }, "ShipIndex": { @@ -8776,7 +8777,8 @@ 1, 2, 3, - 4 + 4, + 5 ] }, "ShipIndex": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index be94876fa..c93069f58 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -591,7 +591,7 @@ CoreShop: ShipyardDr: ResearchSeries: value: 2 - option: [ 2, 3 ] + option: [ 2, 3, 4 ] ShipIndex: value: 0 option: [ 0, 1, 2, 3, 4, 5, 6 ] @@ -600,7 +600,7 @@ ShipyardDr: Shipyard: ResearchSeries: value: 1 - option: [ 1, 2, 3, 4 ] + option: [ 1, 2, 3, 4, 5 ] ShipIndex: value: 0 option: [ 0, 1, 2, 3, 4, 5, 6 ] diff --git a/module/config/config_generated.py b/module/config/config_generated.py index dff4678ef..631898b0b 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -358,13 +358,13 @@ class GeneratedConfig: CoreShop_Filter = 'Array' # Group `ShipyardDr` - ShipyardDr_ResearchSeries = 2 # 2, 3 + ShipyardDr_ResearchSeries = 2 # 2, 3, 4 ShipyardDr_ShipIndex = 0 # 0, 1, 2, 3, 4, 5, 6 ShipyardDr_BuyAmount = 2 ShipyardDr_LastRun = datetime.datetime(2020, 1, 1, 0, 0) # Group `Shipyard` - Shipyard_ResearchSeries = 1 # 1, 2, 3, 4 + Shipyard_ResearchSeries = 1 # 1, 2, 3, 4, 5 Shipyard_ShipIndex = 0 # 0, 1, 2, 3, 4, 5, 6 Shipyard_BuyAmount = 2 Shipyard_LastRun = datetime.datetime(2020, 1, 1, 0, 0) diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 4f363de18..9d6006a7a 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -2081,7 +2081,8 @@ "name": "Research Series", "help": "", "2": "DR2", - "3": "DR3" + "3": "DR3", + "4": "DR4" }, "ShipIndex": { "name": "Ship Index", @@ -2114,7 +2115,8 @@ "1": "PR1", "2": "PR2", "3": "PR3", - "4": "PR4" + "4": "PR4", + "5": "PR5" }, "ShipIndex": { "name": "Ship Index", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index df4e43fba..870073473 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -2081,7 +2081,8 @@ "name": "ShipyardDr.ResearchSeries.name", "help": "ShipyardDr.ResearchSeries.help", "2": "2", - "3": "3" + "3": "3", + "4": "4" }, "ShipIndex": { "name": "ShipyardDr.ShipIndex.name", @@ -2114,7 +2115,8 @@ "1": "1", "2": "2", "3": "3", - "4": "4" + "4": "4", + "5": "5" }, "ShipIndex": { "name": "Shipyard.ShipIndex.name", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 6d2e04168..70df271e5 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -2081,7 +2081,8 @@ "name": "科研期数", "help": "", "2": "二期科研", - "3": "三期科研" + "3": "三期科研", + "4": "四期科研" }, "ShipIndex": { "name": "舰船序号", @@ -2114,7 +2115,8 @@ "1": "一期科研", "2": "二期科研", "3": "三期科研", - "4": "四期科研" + "4": "四期科研", + "5": "五期科研" }, "ShipIndex": { "name": "舰船序号", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index c70290e6c..6f201702b 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -2081,7 +2081,8 @@ "name": "科研期數", "help": "", "2": "二期科研", - "3": "三期科研" + "3": "三期科研", + "4": "四期科研" }, "ShipIndex": { "name": "艦船序號", @@ -2114,7 +2115,8 @@ "1": "一期科研", "2": "二期科研", "3": "三期科研", - "4": "四期科研" + "4": "四期科研", + "5": "五期科研" }, "ShipIndex": { "name": "艦船序號", diff --git a/module/ocr/rpc.py b/module/ocr/rpc.py index 9e1d3c7bb..abaaa8ff2 100644 --- a/module/ocr/rpc.py +++ b/module/ocr/rpc.py @@ -171,7 +171,7 @@ class ModelProxy: class ModelProxyFactory: def __getattribute__(self, __name: str) -> ModelProxy: - if __name in ["azur_lane", "cnocr", "jp", "tw"]: + if __name in ["azur_lane", "cnocr", "jp", "tw", "azur_lane_jp"]: if ModelProxy.client is None: ModelProxy.init(address=State.deploy_config.OcrClientAddress) return ModelProxy(lang=__name)