Просмотр исходного кода

fix(task): Orochi memory of ocr take up too much

runhey 3 лет назад
Родитель
Сommit
a1fbeb428f
3 измененных файлов с 6 добавлено и 6 удалено
  1. 1 1
      tasks/Orochi/assets.py
  2. 1 1
      tasks/Orochi/res/list.json
  3. 4 4
      tasks/Orochi/script_task.py

+ 1 - 1
tasks/Orochi/assets.py

@@ -31,7 +31,7 @@ class OrochiAssets:
 
 	# List Rule Assets
 	# 这个是御魂界面选择不同层数的 
-	L_LAYER_LIST = RuleList(folder="./tasks/Orochi/res", direction="vertical", mode="ocr", roi_back=(276,130,52,500), size=(45, 88), 
+	L_LAYER_LIST = RuleList(folder="./tasks/Orochi/res", direction="vertical", mode="ocr", roi_back=(138,130,359,500), size=(45, 88), 
 					 array=["壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖", "拾", "悲", "神"])
 
 

+ 1 - 1
tasks/Orochi/res/list.json

@@ -2,7 +2,7 @@
   "name": "layer_list",
   "direction": "vertical",
   "type": "ocr",
-  "roiBack": "276,130,52,500",
+  "roiBack": "138,130,359,500",
   "description": "这个是御魂界面选择不同层数的",
   "list": [
     {

+ 4 - 4
tasks/Orochi/script_task.py

@@ -118,7 +118,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
         self.ui_get_current_page()
         self.ui_goto(page_soul_zones)
         self.orochi_enter()
-        layer = self.config.orochi.orochi_config.layer[0]
+        layer = self.config.orochi.orochi_config.layer
         self.check_layer(layer)
         self.check_lock(self.config.orochi.general_battle_config.lock_team_enable)
         # 创建队伍
@@ -266,7 +266,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
         self.ui_get_current_page()
         self.ui_goto(page_soul_zones)
         self.orochi_enter()
-        layer = self.config.orochi.orochi_config.layer[0]
+        layer = self.config.orochi.orochi_config.layer
         self.check_layer(layer)
         self.check_lock(self.config.orochi.general_battle_config.lock_team_enable)
 
@@ -332,7 +332,7 @@ if __name__ == '__main__':
     d = Device(c)
     t = ScriptTask(c, d)
 
-    # t.run()
+    t.run()
 
     # t.check_layer('悲')
 
@@ -341,7 +341,7 @@ if __name__ == '__main__':
         t.screenshot()
         print(t.ocr_appear(t.O_O_TEST_OCR))
         print(t.L_LAYER_LIST.image_appear(t.device.image, '悲'))
-    test_memory()
+    # test_memory()