Merge pull request #4524 from LmeSzinc/dev

Bug fix

Author: LmeSzinc

module/config/argument/args.json

@@ -8004,7 +8004,8 @@
         "value": 2,
         "option": [
           2,
-          3
+          3,
+          4
         ]
       },
       "ShipIndex": {
@@ -8038,7 +8039,8 @@
           1,
           2,
           3,
-          4
+          4,
+          5
         ]
       },
       "ShipIndex": {

module/config/argument/argument.yaml

@@ -537,7 +537,7 @@ CoreShop:
 ShipyardDr:
   ResearchSeries:
     value: 2
-    option: [ 2, 3 ]
+    option: [ 2, 3, 4 ]
   ShipIndex:
     value: 0
     option: [ 0, 1, 2, 3, 4, 5, 6 ]
@@ -546,7 +546,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 ]

module/config/config_generated.py

@@ -294,13 +294,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)

module/config/i18n/en-US.json

@@ -1841,7 +1841,8 @@
       "name": "Research Series",
       "help": "",
       "2": "DR2",
-      "3": "DR3"
+      "3": "DR3",
+      "4": "DR4"
     },
     "ShipIndex": {
       "name": "Ship Index",
@@ -1874,7 +1875,8 @@
       "1": "PR1",
       "2": "PR2",
       "3": "PR3",
-      "4": "PR4"
+      "4": "PR4",
+      "5": "PR5"
     },
     "ShipIndex": {
       "name": "Ship Index",

module/config/i18n/ja-JP.json

@@ -1841,7 +1841,8 @@
       "name": "ShipyardDr.ResearchSeries.name",
       "help": "ShipyardDr.ResearchSeries.help",
       "2": "2",
-      "3": "3"
+      "3": "3",
+      "4": "4"
     },
     "ShipIndex": {
       "name": "ShipyardDr.ShipIndex.name",
@@ -1874,7 +1875,8 @@
       "1": "1",
       "2": "2",
       "3": "3",
-      "4": "4"
+      "4": "4",
+      "5": "5"
     },
     "ShipIndex": {
       "name": "Shipyard.ShipIndex.name",

module/config/i18n/zh-CN.json

@@ -1841,7 +1841,8 @@
       "name": "科研期数",
       "help": "",
       "2": "二期科研",
-      "3": "三期科研"
+      "3": "三期科研",
+      "4": "四期科研"
     },
     "ShipIndex": {
       "name": "舰船序号",
@@ -1874,7 +1875,8 @@
       "1": "一期科研",
       "2": "二期科研",
       "3": "三期科研",
-      "4": "四期科研"
+      "4": "四期科研",
+      "5": "五期科研"
     },
     "ShipIndex": {
       "name": "舰船序号",

module/config/i18n/zh-TW.json

@@ -1841,7 +1841,8 @@
       "name": "科研期數",
       "help": "",
       "2": "二期科研",
-      "3": "三期科研"
+      "3": "三期科研",
+      "4": "四期科研"
     },
     "ShipIndex": {
       "name": "艦船序號",
@@ -1874,7 +1875,8 @@
       "1": "一期科研",
       "2": "二期科研",
       "3": "三期科研",
-      "4": "四期科研"
+      "4": "四期科研",
+      "5": "五期科研"
     },
     "ShipIndex": {
       "name": "艦船序號",

module/ocr/rpc.py

@@ -171,7 +171,7 @@ def debug(self, img_list):
 
 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)