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

Merge pull request #400 from yiliangxiajiao/fix-KekkaiUtilize-zcsb

结界收取经验适配开启招财上宾
huangrunheng 2 лет назад
Родитель
Сommit
442f0729ff

+ 3 - 1
tasks/KekkaiUtilize/assets.py

@@ -115,8 +115,10 @@ class KekkaiUtilizeAssets:
 	# Ocr Rule Assets
 	# 这个寄养的剩余时间 
 	O_UTILIZE_RES_TIME = RuleOcr(roi=(1140,117,100,30), area=(1140,117,100,30), mode="Duration", method="Default", keyword="", name="utilize_res_time")
-	# 今日以领取经验 
+	# 今日已领取经验 
 	O_BOX_EXP = RuleOcr(roi=(654,538,179,39), area=(654,538,179,39), mode="DigitCounter", method="Default", keyword="", name="box_exp")
+	# 今日已领取经验(招财上宾) 
+	O_BOX_EXP_ZCSB = RuleOcr(roi=(584,542,181,35), area=(584,542,181,35), mode="DigitCounter", method="Default", keyword="", name="box_exp_zcsb")
 
 
 	# Swipe Rule Assets

+ 6 - 3
tasks/KekkaiUtilize/script_task.py

@@ -202,9 +202,12 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
                 if self.appear(self.I_EXP_EXTRACT):
                     # 如果达到今日领取的最大,就不领取了
                     cur, res, totol = self.O_BOX_EXP.ocr(self.device.image)
-                    if cur == res == totol == 0:
-                        continue
-                    if cur == totol and cur + res == totol:
+                    if cur != 0 and totol != 0 and cur == totol and cur + res == totol:
+                        logger.info('Exp box reach max do not collect')
+                        break
+                    # 开启招财上宾后,上限增加20%,数值位置有偏移
+                    cur, res, totol = self.O_BOX_EXP_ZCSB.ocr(self.device.image)
+                    if cur != 0 and totol != 0 and cur == totol * 1.2 and cur + res == totol:
                         logger.info('Exp box reach max do not collect')
                         break
                 if self.appear_then_click(self.I_BOX_EXP, threshold=0.6, interval=1):

+ 10 - 1
tasks/KekkaiUtilize/utilize/ocr.json

@@ -15,6 +15,15 @@
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
-    "description": "今日以领取经验"
+    "description": "今日已领取经验"
+  },
+  {
+    "itemName": "box_exp_zcsb",
+    "roiFront": "584,542,181,35",
+    "roiBack": "584,542,181,35",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "今日已领取经验(招财上宾)"
   }
 ]