Эх сурвалжийг харах

Merge pull request #122 from YuuLong/master

fix: Change the roi of ticket of GoryouRealm.
huangrunheng 3 жил өмнө
parent
commit
a84ed4ed6c

+ 2 - 2
tasks/GoryouRealm/assets.py

@@ -31,7 +31,7 @@ class GoryouRealmAssets:
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
-	# 多少张票 
-	O_GR_TICKET = RuleOcr(roi=(934,21,84,41), area=(934,21,84,41), mode="Digit", method="Default", keyword="", name="gr_ticket")
+	# 多少张票
+	O_GR_TICKET = RuleOcr(roi=(920,21,100,41), area=(920,21,100,41), mode="Digit", method="Default", keyword="", name="gr_ticket")
 
 
 
 

+ 3 - 3
tasks/GoryouRealm/gr/ocr.json

@@ -1,11 +1,11 @@
 [
 [
   {
   {
     "itemName": "gr_ticket",
     "itemName": "gr_ticket",
-    "roiFront": "934,21,84,41",
-    "roiBack": "934,21,84,41",
+    "roiFront": "920,21,100,41",
+    "roiBack": "920,21,100,41",
     "mode": "Digit",
     "mode": "Digit",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
     "description": "多少张票"
     "description": "多少张票"
   }
   }
-]
+]

+ 4 - 1
tasks/RealmRaid/script_task.py

@@ -293,6 +293,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RealmRaidAssets):
 
 
         if total == 0:
         if total == 0:
             self.reward_detect_click(False)
             self.reward_detect_click(False)
+            # 增加出现聊天框遮挡,处理奖励之后,重新识别票数
+            cu, res, total = self.O_NUMBER.ocr(self.device.image)
         if cu == 0 and cu + res == total:
         if cu == 0 and cu + res == total:
             logger.warning(f'Execute raid failed, no ticket')
             logger.warning(f'Execute raid failed, no ticket')
             return False
             return False
@@ -393,7 +395,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RealmRaidAssets):
         """
         """
         if screenshot:
         if screenshot:
             self.screenshot()
             self.screenshot()
-        self.screenshot()
+        # 由于更改识别顺序,退出战斗之后,需要先等待回到个人突破界面,即识别到红色退出按钮,再进行奖励判断
+        self.wait_until_appear(self.I_BACK_RED)
         text = self.O_TEXT.ocr(self.device.image)
         text = self.O_TEXT.ocr(self.device.image)
         # 识别突破卷区域,如果识别到了且其中含有文字,即有聊天框遮挡则进入循环,等待三胜奖励出现并点击,循环退出条件为识别到票(即*/*的形式)
         # 识别突破卷区域,如果识别到了且其中含有文字,即有聊天框遮挡则进入循环,等待三胜奖励出现并点击,循环退出条件为识别到票(即*/*的形式)
         if text != "":
         if text != "":