Bläddra i källkod

Merge pull request #1190 from BluettDream/dev_fix_kikkai

fix(Kikkai)
huangrunheng 1 år sedan
förälder
incheckning
46e16bac2a

+ 12 - 2
tasks/Component/ReplaceShikigami/replace_shikigami.py

@@ -3,6 +3,7 @@
 # github https://github.com/runhey
 # github https://github.com/runhey
 from module.atom.ocr import RuleOcr
 from module.atom.ocr import RuleOcr
 from module.atom.image import RuleImage
 from module.atom.image import RuleImage
+from module.base.timer import Timer
 from module.logger import logger
 from module.logger import logger
 
 
 from tasks.base_task import BaseTask
 from tasks.base_task import BaseTask
@@ -87,11 +88,16 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
         click_match = _click_match[shikigami_order]
         click_match = _click_match[shikigami_order]
         TIMEOUT_SEC = 120          # 超时时长(秒)
         TIMEOUT_SEC = 120          # 超时时长(秒)
         start_time = time.time()   # 记录起始时间
         start_time = time.time()   # 记录起始时间
+        click_interval_timer = Timer(1.5).start()  # 点击选择式神间隔
+        clicked = False
         while 1:
         while 1:
             # ——1. 先做超时检查——
             # ——1. 先做超时检查——
             if time.time() - start_time > TIMEOUT_SEC:
             if time.time() - start_time > TIMEOUT_SEC:
                 logger.error('寄养等待超过 2 分钟,自动退出')
                 logger.error('寄养等待超过 2 分钟,自动退出')
                 raise GameStuckError('寄养超时(>120 s)')
                 raise GameStuckError('寄养超时(>120 s)')
+            # 恢复点击操作
+            if click_interval_timer.reached_and_reset():
+                clicked = False
             
             
             self.screenshot()
             self.screenshot()
 
 
@@ -99,13 +105,17 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
                 break
                 break
 
 
             if self.appear_then_click(self.I_U_CONFIRM_SMALL, interval=0.5):
             if self.appear_then_click(self.I_U_CONFIRM_SMALL, interval=0.5):
+                clicked = False  # 点击了确认, 恢复选式神的操作
                 continue
                 continue
 
 
-            if self.click(click_match, interval=1.5):
+            # 与下方点击第7个式神操作互斥, 防止确认按钮还没有出现被下方取消掉
+            if not clicked and self.click(click_match, interval=1.5):
+                clicked = True
                 continue
                 continue
-            if self.click(_click_match[6], interval=4.5):
+            if not clicked and self.click(_click_match[6], interval=4.5):
                 # 有的时候第七个格子被占用到寄养上去了
                 # 有的时候第七个格子被占用到寄养上去了
                 # 导致一直无法选上
                 # 导致一直无法选上
+                clicked = True
                 continue
                 continue
             if self.appear_then_click(self.I_U_CIRCLE_ALTERNATE, interval=2.5):
             if self.appear_then_click(self.I_U_CIRCLE_ALTERNATE, interval=2.5):
                 self.appear_then_click(self.I_U_CONFIRM_ALTERNATE, interval=1.5)
                 self.appear_then_click(self.I_U_CONFIRM_ALTERNATE, interval=1.5)

+ 8 - 8
tasks/KekkaiActivation/a/image.json

@@ -3,7 +3,7 @@
     "itemName": "a_harvest_fish4",
     "itemName": "a_harvest_fish4",
     "imageName": "a_a_harvest_fish4.png",
     "imageName": "a_a_harvest_fish4.png",
     "roiFront": "897,159,48,40",
     "roiFront": "897,159,48,40",
-    "roiBack": "872,128,100,100",
+    "roiBack": "872,128,140,181",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "斗鱼收获奖励4星"
     "description": "斗鱼收获奖励4星"
@@ -12,7 +12,7 @@
     "itemName": "a_harvest_exp",
     "itemName": "a_harvest_exp",
     "imageName": "a_a_harvest_exp.png",
     "imageName": "a_a_harvest_exp.png",
     "roiFront": "891,153,49,43",
     "roiFront": "891,153,49,43",
-    "roiBack": "865,121,100,100",
+    "roiBack": "865,121,152,183",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "一般的收获奖励"
     "description": "一般的收获奖励"
@@ -156,7 +156,7 @@
     "itemName": "a_harvest_kaiko_4",
     "itemName": "a_harvest_kaiko_4",
     "imageName": "a_a_harvest_kaiko_4.png",
     "imageName": "a_a_harvest_kaiko_4.png",
     "roiFront": "894,164,48,41",
     "roiFront": "894,164,48,41",
-    "roiBack": "867,132,100,100",
+    "roiBack": "867,132,148,187",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "太鼓4"
     "description": "太鼓4"
@@ -165,7 +165,7 @@
     "itemName": "a_harvest_kaiko_3",
     "itemName": "a_harvest_kaiko_3",
     "imageName": "a_a_harvest_kaiko_3.png",
     "imageName": "a_a_harvest_kaiko_3.png",
     "roiFront": "893,163,47,42",
     "roiFront": "893,163,47,42",
-    "roiBack": "865,136,100,100",
+    "roiBack": "865,136,148,178",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
@@ -174,7 +174,7 @@
     "itemName": "a_harvest_kaiko_6",
     "itemName": "a_harvest_kaiko_6",
     "imageName": "a_a_harvest_kaiko_6.png",
     "imageName": "a_a_harvest_kaiko_6.png",
     "roiFront": "898,160,45,38",
     "roiFront": "898,160,45,38",
-    "roiBack": "868,129,100,100",
+    "roiBack": "868,129,146,184",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "太鼓6"
     "description": "太鼓6"
@@ -183,7 +183,7 @@
     "itemName": "a_harvest_fish_6",
     "itemName": "a_harvest_fish_6",
     "imageName": "a_a_harvest_fish_6.png",
     "imageName": "a_a_harvest_fish_6.png",
     "roiFront": "898,159,45,38",
     "roiFront": "898,159,45,38",
-    "roiBack": "869,131,100,100",
+    "roiBack": "869,131,165,184",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "斗鱼6"
     "description": "斗鱼6"
@@ -192,7 +192,7 @@
     "itemName": "a_harvest_moon_3",
     "itemName": "a_harvest_moon_3",
     "imageName": "a_a_harvest_moon_3.png",
     "imageName": "a_a_harvest_moon_3.png",
     "roiFront": "897,159,46,40",
     "roiFront": "897,159,46,40",
-    "roiBack": "869,127,100,100",
+    "roiBack": "869,127,155,184",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "太阴3"
     "description": "太阴3"
@@ -210,7 +210,7 @@
     "itemName": "a_harvest_fish_3",
     "itemName": "a_harvest_fish_3",
     "imageName": "a_a_harvest_fish_3.png",
     "imageName": "a_a_harvest_fish_3.png",
     "roiFront": "891,165,57,39",
     "roiFront": "891,165,57,39",
-    "roiBack": "854,128,132,124",
+    "roiBack": "854,128,160,174",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "斗鱼3"
     "description": "斗鱼3"

+ 8 - 8
tasks/KekkaiActivation/assets.py

@@ -31,9 +31,9 @@ class KekkaiActivationAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 斗鱼收获奖励4星 
 	# 斗鱼收获奖励4星 
-	I_A_HARVEST_FISH4 = RuleImage(roi_front=(897,159,48,40), roi_back=(872,128,100,100), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_fish4.png")
+	I_A_HARVEST_FISH4 = RuleImage(roi_front=(897,159,48,40), roi_back=(872,128,140,181), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_fish4.png")
 	# 一般的收获奖励 
 	# 一般的收获奖励 
-	I_A_HARVEST_EXP = RuleImage(roi_front=(891,153,49,43), roi_back=(865,121,100,100), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_exp.png")
+	I_A_HARVEST_EXP = RuleImage(roi_front=(891,153,49,43), roi_back=(865,121,152,183), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_exp.png")
 	# "结界卡" 
 	# "结界卡" 
 	I_A_CARDS_REALM = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_cards_realm.png")
 	I_A_CARDS_REALM = RuleImage(roi_front=(0,0,100,100), roi_back=(0,0,100,100), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_cards_realm.png")
 	# description 
 	# description 
@@ -65,19 +65,19 @@ class KekkaiActivationAssets:
 	# description 
 	# description 
 	I_A_CHECK_CARD = RuleImage(roi_front=(513,32,260,49), roi_back=(513,32,260,49), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_check_card.png")
 	I_A_CHECK_CARD = RuleImage(roi_front=(513,32,260,49), roi_back=(513,32,260,49), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_check_card.png")
 	# 太鼓4 
 	# 太鼓4 
-	I_A_HARVEST_KAIKO_4 = RuleImage(roi_front=(894,164,48,41), roi_back=(867,132,100,100), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_kaiko_4.png")
+	I_A_HARVEST_KAIKO_4 = RuleImage(roi_front=(894,164,48,41), roi_back=(867,132,148,187), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_kaiko_4.png")
 	# description 
 	# description 
-	I_A_HARVEST_KAIKO_3 = RuleImage(roi_front=(893,163,47,42), roi_back=(865,136,100,100), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_kaiko_3.png")
+	I_A_HARVEST_KAIKO_3 = RuleImage(roi_front=(893,163,47,42), roi_back=(865,136,148,178), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_kaiko_3.png")
 	# 太鼓6 
 	# 太鼓6 
-	I_A_HARVEST_KAIKO_6 = RuleImage(roi_front=(898,160,45,38), roi_back=(868,129,100,100), threshold=0.7, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_kaiko_6.png")
+	I_A_HARVEST_KAIKO_6 = RuleImage(roi_front=(898,160,45,38), roi_back=(868,129,146,184), threshold=0.7, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_kaiko_6.png")
 	# 斗鱼6 
 	# 斗鱼6 
-	I_A_HARVEST_FISH_6 = RuleImage(roi_front=(898,159,45,38), roi_back=(869,131,100,100), threshold=0.7, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_fish_6.png")
+	I_A_HARVEST_FISH_6 = RuleImage(roi_front=(898,159,45,38), roi_back=(869,131,165,184), threshold=0.7, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_fish_6.png")
 	# 太阴3 
 	# 太阴3 
-	I_A_HARVEST_MOON_3 = RuleImage(roi_front=(897,159,46,40), roi_back=(869,127,100,100), threshold=0.7, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_moon_3.png")
+	I_A_HARVEST_MOON_3 = RuleImage(roi_front=(897,159,46,40), roi_back=(869,127,155,184), threshold=0.7, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_moon_3.png")
 	# 卸下 
 	# 卸下 
 	I_A_DEMOUNT = RuleImage(roi_front=(939,575,55,47), roi_back=(903,551,107,91), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_demount.png")
 	I_A_DEMOUNT = RuleImage(roi_front=(939,575,55,47), roi_back=(903,551,107,91), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_demount.png")
 	# 斗鱼3 
 	# 斗鱼3 
-	I_A_HARVEST_FISH_3 = RuleImage(roi_front=(891,165,57,39), roi_back=(854,128,132,124), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_fish_3.png")
+	I_A_HARVEST_FISH_3 = RuleImage(roi_front=(891,165,57,39), roi_back=(854,128,160,174), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/a/a_a_harvest_fish_3.png")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets

+ 2 - 0
tasks/KekkaiUtilize/assets.py

@@ -59,6 +59,8 @@ class KekkaiUtilizeAssets:
 	I_EXP_EXTRACT = RuleImage(roi_front=(592,448,100,73), roi_back=(592,448,100,73), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_exp_extract.png")
 	I_EXP_EXTRACT = RuleImage(roi_front=(592,448,100,73), roi_back=(592,448,100,73), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_exp_extract.png")
 	# 盒子经验满 
 	# 盒子经验满 
 	I_BOX_EXP_MAX = RuleImage(roi_front=(889,430,61,64), roi_back=(829,372,228,186), threshold=0.7, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_box_exp_max.png")
 	I_BOX_EXP_MAX = RuleImage(roi_front=(889,430,61,64), roi_back=(829,372,228,186), threshold=0.7, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_box_exp_max.png")
+	# 种树活动关闭标识 
+	I_PLANT_TREE_CLOSE = RuleImage(roi_front=(777,91,36,34), roi_back=(711,52,169,125), threshold=0.8, method="Template matching", file="./tasks/KekkaiUtilize/realm/realm_plant_tree_close.png")
 
 
 
 
 	# Click Rule Assets
 	# Click Rule Assets

+ 9 - 0
tasks/KekkaiUtilize/realm/image.json

@@ -97,5 +97,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "盒子经验满"
     "description": "盒子经验满"
+  },
+  {
+    "itemName": "plant_tree_close",
+    "imageName": "realm_plant_tree_close.png",
+    "roiFront": "777,91,36,34",
+    "roiBack": "711,52,169,125",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "种树活动关闭标识"
   }
   }
 ]
 ]

BIN
tasks/KekkaiUtilize/realm/realm_plant_tree_close.png


+ 4 - 1
tasks/KekkaiUtilize/script_task.py

@@ -198,7 +198,8 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
                 break
                 break
             if self.appear(self.I_SHI_DEFENSE):
             if self.appear(self.I_SHI_DEFENSE):
                 break
                 break
-
+            if self.appear_then_click(self.I_PLANT_TREE_CLOSE):
+                continue
             if self.appear_then_click(self.I_GUILD_REALM, interval=1):
             if self.appear_then_click(self.I_GUILD_REALM, interval=1):
                 continue
                 continue
 
 
@@ -718,6 +719,8 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
                 break
                 break
             if self.appear(self.I_GUILD_REALM):
             if self.appear(self.I_GUILD_REALM):
                 break
                 break
+            if self.appear_then_click(self.I_PLANT_TREE_CLOSE):
+                continue
 
 
             if self.appear_then_click(self.I_UI_BACK_RED, interval=1):
             if self.appear_then_click(self.I_UI_BACK_RED, interval=1):
                 continue
                 continue