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

fix(Pets): 更新宠物相关规则和描述,调整图像区域

yEs1do 11 месяцев назад
Родитель
Сommit
0963335fac

+ 6 - 6
tasks/Pets/assets.py

@@ -17,12 +17,12 @@ class PetsAssets:
 	I_PET_CLAW = RuleImage(roi_front=(1171,625,55,56), roi_back=(1171,625,55,56), threshold=0.8, method="Template matching", file="./tasks/Pets/pet/pet_pet_claw.png")
 	# 其乐融融 
 	I_PET_HAPPY = RuleImage(roi_front=(853,614,67,70), roi_back=(853,614,67,70), threshold=0.8, method="Template matching", file="./tasks/Pets/pet/pet_pet_happy.png")
-	# 大餐 
-	I_PET_FEAST = RuleImage(roi_front=(747,619,69,61), roi_back=(747,619,69,61), threshold=0.8, method="Template matching", file="./tasks/Pets/pet/pet_pet_feast.png")
+	# 快速喂养 
+	I_PET_FEAST = RuleImage(roi_front=(849,624,69,49), roi_back=(849,624,69,49), threshold=0.8, method="Template matching", file="./tasks/Pets/pet/pet_pet_feast.png")
 	# 玩耍 
 	I_PET_PLAY = RuleImage(roi_front=(788,500,75,75), roi_back=(788,500,75,75), threshold=0.8, method="Template matching", file="./tasks/Pets/pet/pet_pet_play.png")
-	# 投喂 
-	I_PET_FEED = RuleImage(roi_front=(798,497,77,81), roi_back=(798,497,77,81), threshold=0.8, method="Template matching", file="./tasks/Pets/pet/pet_pet_feed.png")
+	# 喂食 
+	I_PET_FEED = RuleImage(roi_front=(899,511,79,68), roi_back=(884,485,127,123), threshold=0.8, method="Template matching", file="./tasks/Pets/pet/pet_pet_feed.png")
 	# 跳过 
 	I_PET_SKIP = RuleImage(roi_front=(1089,119,72,41), roi_back=(999,42,242,147), threshold=0.65, method="Template matching", file="./tasks/Pets/pet/pet_pet_skip.png")
 	# 退出 
@@ -30,8 +30,8 @@ class PetsAssets:
 
 
 	# Ocr Rule Assets
-	# 投喂的体力 
-	O_PET_FEED_AP = RuleOcr(roi=(730,527,57,33), area=(730,527,57,33), mode="Digit", method="Default", keyword="", name="pet_feed_ap")
+	# 喂食的体力 
+	O_PET_FEED_AP = RuleOcr(roi=(817,538,57,33), area=(817,538,57,33), mode="Digit", method="Default", keyword="", name="pet_feed_ap")
 	# 玩耍的体力 
 	O_PET_PLAY_GOLD = RuleOcr(roi=(681,524,74,40), area=(681,524,74,40), mode="Digit", method="Default", keyword="", name="pet_play_gold")
 

+ 2 - 2
tasks/Pets/config.py

@@ -9,8 +9,8 @@ from tasks.Component.config_base import ConfigBase
 
 class PetsConfig(ConfigBase):
     # 其乐融融
-    pets_happy: bool = Field(default=True)
-    # 大餐
+    # pets_happy: bool = Field(default=True)
+    # 快速喂养
     pets_feast: bool = Field(default=True)
 
 class Pets(ConfigBase):

+ 6 - 6
tasks/Pets/pet/image.json

@@ -29,11 +29,11 @@
   {
     "itemName": "pet_feast",
     "imageName": "pet_pet_feast.png",
-    "roiFront": "747,619,69,61",
-    "roiBack": "747,619,69,61",
+    "roiFront": "849,624,69,49",
+    "roiBack": "849,624,69,49",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "大餐"
+    "description": "快速喂养"
   },
   {
     "itemName": "pet_play",
@@ -47,11 +47,11 @@
   {
     "itemName": "pet_feed",
     "imageName": "pet_pet_feed.png",
-    "roiFront": "798,497,77,81",
-    "roiBack": "798,497,77,81",
+    "roiFront": "899,511,79,68",
+    "roiBack": "884,485,127,123",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "投喂"
+    "description": "喂食"
   },
   {
     "itemName": "pet_skip",

+ 3 - 3
tasks/Pets/pet/ocr.json

@@ -1,12 +1,12 @@
 [
   {
     "itemName": "pet_feed_ap",
-    "roiFront": "730,527,57,33",
-    "roiBack": "730,527,57,33",
+    "roiFront": "817,538,57,33",
+    "roiBack": "817,538,57,33",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",
-    "description": "投喂的体力"
+    "description": "喂食的体力"
   },
   {
     "itemName": "pet_play_gold",

BIN
tasks/Pets/pet/pet_pet_feast.png


BIN
tasks/Pets/pet/pet_pet_feed.png


+ 2 - 2
tasks/Pets/script_task.py

@@ -25,8 +25,8 @@ class ScriptTask(GameUi, PetsAssets):
             if self.appear_then_click(self.I_PET_CLAW, interval=1):
                 continue
         logger.info('Enter Pets')
-        if con.pets_happy:
-            self._play()
+        # if con.pets_happy:
+        #     self._play()
         if con.pets_feast:
             self._feed()
         self.ui_click(self.I_PET_EXIT, self.I_CHECK_MAIN)