Explorar o código

fix(Orochi): 修复组队御魂队员超时 #1544

- 更新 gi_lock/gi_unlock/gi_explore 图片模板的 ROI 坐标
- 同步更新 assets.py 中对应 RuleImage 参数
- 大蛇脚本中将首页/探索检测由 GI 特定图片改为通用检测图片
yuyuyuyuyu hai 6 meses
pai
achega
adc249111c

+ 3 - 3
tasks/Component/GeneralInvite/assets.py

@@ -20,9 +20,9 @@ class GeneralInviteAssets:
 	# description 
 	I_FIRE = RuleImage(roi_front=(1179,602,81,74), roi_back=(1179,602,81,74), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_fire.png")
 	# 锁定阵容的图片 
-	I_LOCK = RuleImage(roi_front=(29,644,29,32), roi_back=(29,644,29,32), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_lock.png")
+	I_LOCK = RuleImage(roi_front=(49,645,29,32), roi_back=(29,633,287,61), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_lock.png")
 	# 还没有锁定阵容 
-	I_UNLOCK = RuleImage(roi_front=(30,647,23,30), roi_back=(30,647,23,30), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_unlock.png")
+	I_UNLOCK = RuleImage(roi_front=(31,647,23,27), roi_back=(26,633,285,57), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_unlock.png")
 	# 如果是到时间会退出房间,这个右边显示一个匹配的图片 
 	I_MATCHING = RuleImage(roi_front=(51,574,52,114), roi_back=(51,574,52,114), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_matching.png")
 	# 永生之海挑战(还未有队友的图片) 
@@ -105,7 +105,7 @@ class GeneralInviteAssets:
 	# 判断是不是在庭院界面 
 	I_GI_HOME = RuleImage(roi_front=(361,34,34,46), roi_back=(361,34,34,46), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_home.png")
 	# 判断是不是在探索界面 
-	I_GI_EXPLORE = RuleImage(roi_front=(1138,119,41,48), roi_back=(1138,119,41,48), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_explore.png")
+	I_GI_EXPLORE = RuleImage(roi_front=(677,11,33,46), roi_back=(677,11,33,46), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_explore.png")
 
 
 	# Ocr Rule Assets

BIN=BIN
tasks/Component/GeneralInvite/gi/gi_gi_explore.png


BIN=BIN
tasks/Component/GeneralInvite/gi/gi_unlock.png


+ 4 - 4
tasks/Component/GeneralInvite/gi/image.json

@@ -38,8 +38,8 @@
   {
     "itemName": "lock",
     "imageName": "gi_lock.png",
-    "roiFront": "29,644,29,32",
-    "roiBack": "29,644,29,32",
+    "roiFront": "49,645,29,32",
+    "roiBack": "29,633,287,61",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "锁定阵容的图片"
@@ -47,8 +47,8 @@
   {
     "itemName": "unlock",
     "imageName": "gi_unlock.png",
-    "roiFront": "30,647,23,30",
-    "roiBack": "30,647,23,30",
+    "roiFront": "31,647,23,27",
+    "roiBack": "26,633,285,57",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "还没有锁定阵容"

+ 2 - 2
tasks/Component/GeneralInvite/gi/member.json

@@ -29,8 +29,8 @@
   {
     "itemName": "gi_explore",
     "imageName": "gi_gi_explore.png",
-    "roiFront": "1138,119,41,48",
-    "roiBack": "1138,119,41,48",
+    "roiFront": "677,11,33,46",
+    "roiBack": "677,11,33,46",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "判断是不是在探索界面"

+ 1 - 1
tasks/Orochi/script_task.py

@@ -254,7 +254,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
 
         while 1:
             # 有一种情况是本来要退出的,但是队长邀请了进入的战斗的加载界面
-            if self.appear(self.I_GI_HOME) or self.appear(self.I_GI_EXPLORE):
+            if self.appear(self.I_CHECK_MAIN) or self.appear(self.I_CHECK_EXPLORATION):
                 break
             # 如果可能在房间就退出
             if self.exit_room():