Bladeren bron

fix(task): Add KekkaiActivation harvest cards

runhey 3 jaren geleden
bovenliggende
commit
aee68b7f66

+ 20 - 0
tasks/ExperienceYoukai/script_task.py

@@ -0,0 +1,20 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from cached_property import cached_property
+
+from module.exception import TaskEnd
+from module.logger import logger
+from module.base.timer import Timer
+
+from tasks.GameUi.game_ui import GameUi
+from tasks.GameUi.page import page_main, page_team, page_shikigami_records
+from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
+from tasks.Component.GeneralRoom.general_room import GeneralRoom
+from tasks.Component.GeneralInvite.general_invite import GeneralInvite
+from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
+from tasks.ExperienceYoukai.assets import ExperienceYoukaiAssets
+
+
+

BIN
tasks/KekkaiActivation/a/a_a_harvest_fish_6.png


BIN
tasks/KekkaiActivation/a/a_a_harvest_kaiko_6.png


BIN
tasks/KekkaiActivation/a/a_a_harvest_moon_3.png


+ 27 - 0
tasks/KekkaiActivation/a/image.json

@@ -169,5 +169,32 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "a_harvest_kaiko_6",
+    "imageName": "a_a_harvest_kaiko_6.png",
+    "roiFront": "898,160,45,38",
+    "roiBack": "868,129,100,100",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "太鼓6"
+  },
+  {
+    "itemName": "a_harvest_fish_6",
+    "imageName": "a_a_harvest_fish_6.png",
+    "roiFront": "898,159,45,38",
+    "roiBack": "869,131,100,100",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "斗鱼6"
+  },
+  {
+    "itemName": "a_harvest_moon_3",
+    "imageName": "a_a_harvest_moon_3.png",
+    "roiFront": "897,159,46,40",
+    "roiBack": "869,127,100,100",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "太阴3"
   }
 ]

+ 6 - 0
tasks/KekkaiActivation/assets.py

@@ -66,6 +66,12 @@ class KekkaiActivationAssets:
 	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")
 	# 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")
+	# 太鼓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")
+	# 斗鱼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")
+	# 太阴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")
 
 
 	# Image Rule Assets

+ 7 - 4
tasks/KekkaiActivation/script_task.py

@@ -354,10 +354,13 @@ class ScriptTask(KU, KekkaiActivationAssets):
         收卡的经验
         :return:
         """
-        self.appear_then_click(self.I_A_HARVEST_EXP)
-        self.appear_then_click(self.I_A_HARVEST_FISH4)  # 斗鱼的如果一直没有领的话
-        self.appear_then_click(self.I_A_HARVEST_KAIKO_4)
-        self.appear_then_click(self.I_A_HARVEST_KAIKO_3)
+        self.appear_then_click(self.I_A_HARVEST_EXP)  # 如果到最后没有领的话有下面的一些图片
+        self.appear_then_click(self.I_A_HARVEST_FISH4)  # 斗鱼4/5区别不大 斗鱼的如果一直没有领的话
+        self.appear_then_click(self.I_A_HARVEST_KAIKO_4)  # 太鼓4
+        self.appear_then_click(self.I_A_HARVEST_KAIKO_3)  # 太鼓3
+        self.appear_then_click(self.I_A_HARVEST_KAIKO_6)  # 太鼓6
+        self.appear_then_click(self.I_A_HARVEST_FISH_6)  # 斗鱼6
+        self.appear_then_click(self.I_A_HARVEST_MOON_3)  # 太阴3
 
 if __name__ == "__main__":
     from module.config.config import Config