Bladeren bron

逢魔增加购买体力选项

yEs1do 1 jaar geleden
bovenliggende
commit
b7520e3099

+ 4 - 2
tasks/DemonEncounter/assets.py

@@ -84,9 +84,11 @@ class DemonEncounterAssets:
 	# 左下角小指针 
 	I_DE_LOCATION = RuleImage(roi_front=(26,653,44,47), roi_back=(26,653,44,47), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_de_location.png")
 	# 逢魔蓝票 
-	I_BLUE_PIAO = RuleImage(roi_front=(420,226,444,262), roi_back=(420,226,444,262), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/blue_piao.png")
+	I_MYSTERY_AMULET = RuleImage(roi_front=(596,314,84,82), roi_back=(581,294,115,116), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_mystery_amulet.png")
+	# 逢魔体力 
+	I_SUSHI = RuleImage(roi_front=(602,318,72,54), roi_back=(581,294,115,116), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_sushi.png")
 	# 50勾玉购买 
-	I_JADE_50 = RuleImage(roi_front=(420,226,444,262), roi_back=(420,226,444,262), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/jade_50.png")
+	I_JADE_50 = RuleImage(roi_front=(593,425,84,46), roi_back=(548,405,182,83), threshold=0.8, method="Template matching", file="./tasks/DemonEncounter/demon/demon_jade_50.png")
 
 
 	# Image Rule Assets

+ 6 - 0
tasks/DemonEncounter/config.py

@@ -10,6 +10,11 @@ from tasks.Component.config_base import ConfigBase, TimeDelta
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Utils.config_enum import ShikigamiClass
 
+# 宝箱购买项目
+class BoxBuyConfig(BaseModel):
+    # 默认购买蓝票,未添加选项,没人会不买吧!
+    box_buy_sushi: bool = Field(default=False, description='逢魔宝箱是否购买体力')
+
 class BestDemonBossSelect(BaseModel):
     enable: bool = Field(
         default=False,
@@ -70,6 +75,7 @@ class UtilizeScheduler(Scheduler):
 
 class DemonEncounter(ConfigBase):
     scheduler: UtilizeScheduler = Field(default_factory=UtilizeScheduler)
+    box_buy_config: BoxBuyConfig = Field(default_factory=BoxBuyConfig)
     best_demon_boss_config: BestDemonBossSelect = Field(default_factory=BestDemonBossSelect)
     demon_soul_config: DemonConfig = Field(default_factory=DemonConfig)
     best_demon_soul_config: BestDemonConfig = Field(default_factory=BestDemonConfig)

+ 0 - 0
tasks/DemonEncounter/demon/jade_50.png → tasks/DemonEncounter/demon/demon_jade_50.png


+ 0 - 0
tasks/DemonEncounter/demon/blue_piao.png → tasks/DemonEncounter/demon/demon_mystery_amulet.png


BIN
tasks/DemonEncounter/demon/demon_sushi.png


+ 16 - 7
tasks/DemonEncounter/demon/image.json

@@ -54,19 +54,28 @@
     "description": "左下角小指针"
   },
   {
-    "itemName": "blue_piao",
-    "imageName": "blue_piao.png",
-    "roiFront": "420,226,444,262",
-    "roiBack": "420,226,444,262",
+    "itemName": "mystery_amulet",
+    "imageName": "demon_mystery_amulet.png",
+    "roiFront": "596,314,84,82",
+    "roiBack": "581,294,115,116",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "逢魔蓝票"
   },
+  {
+    "itemName": "sushi",
+    "imageName": "demon_sushi.png",
+    "roiFront": "602,318,72,54",
+    "roiBack": "581,294,115,116",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "逢魔体力"
+  },
   {
     "itemName": "jade_50",
-    "imageName": "jade_50.png",
-    "roiFront": "420,226,444,262",
-    "roiBack": "420,226,444,262",
+    "imageName": "demon_jade_50.png",
+    "roiFront": "593,425,84,46",
+    "roiBack": "548,405,182,83",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "50勾玉购买"

+ 13 - 5
tasks/DemonEncounter/script_task.py

@@ -389,6 +389,7 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
             return LanternClass.BATTLE
 
     def _box(self, target_click):
+        box_buy_config = self.config.demon_encounter.box_buy_config
         while 1:
             self.screenshot()
             if self.appear(self.I_JADE_50):
@@ -397,13 +398,20 @@ class ScriptTask(GameUi, GeneralBattle, DemonEncounterAssets, SwitchSoul):
                 continue
         while 1:
             self.screenshot()
-            if self.appear(self.I_BLUE_PIAO):
-                if self.click(self.I_JADE_50):
-                    logger.info('Buy a mystery amulet for 50 jade')
-                    continue
-            if not self.appear(self.I_BLUE_PIAO):
+            if not self.appear(self.I_MYSTERY_AMULET) or not self.appear(self.I_SUSHI):
                 if self.appear_then_click(self.I_DE_FIND, interval=2.5):
                     break
+            # 默认购买蓝票
+            if self.appear(self.I_MYSTERY_AMULET):
+                logger.info('Buy a mystery amulet for 50 jade')
+                self.click(self.I_JADE_50)
+                continue
+            # 可选购买体力
+            if box_buy_config.box_buy_sushi and self.appear(self.I_SUSHI):
+                logger.info('Buy one hundred sushi for 50 jade')
+                self.click(self.I_JADE_50)
+                continue
+            
 
     def _mail(self, target_click):
         # 答题