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

阴阳寮集体任务新增了指定任务类型

徐旭光 1 год назад
Родитель
Сommit
fe36e9cd88

+ 2 - 0
tasks/CollectiveMissions/assets.py

@@ -40,6 +40,8 @@ class CollectiveMissionsAssets:
 	I_CM_ADD_4 = RuleImage(roi_front=(904,510,47,47), roi_back=(904,510,47,47), threshold=0.8, method="Template matching", file="./tasks/CollectiveMissions/cm/cm_cm_add_4.png")
 	# 领取奖励 
 	I_CM_REWARDS = RuleImage(roi_front=(567,463,145,60), roi_back=(200,458,914,88), threshold=0.8, method="Template matching", file="./tasks/CollectiveMissions/cm/cm_cm_rewards.png")
+	# description 
+	I_CM_SWITCH = RuleImage(roi_front=(414,478,43,58), roi_back=(310,453,282,114), threshold=0.8, method="Template matching", file="./tasks/CollectiveMissions/cm/cm_cm_switch.png")
 
 
 	# Ocr Rule Assets

BIN
tasks/CollectiveMissions/cm/cm_cm_switch.png


+ 9 - 0
tasks/CollectiveMissions/cm/image.json

@@ -88,5 +88,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "领取奖励"
+  },
+  {
+    "itemName": "cm_switch",
+    "imageName": "cm_cm_switch.png",
+    "roiFront": "414,478,43,58",
+    "roiBack": "310,453,282,114",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
 ]

+ 2 - 0
tasks/CollectiveMissions/config.py

@@ -17,6 +17,8 @@ class MissionsConfig(BaseModel):
     missions_rule: MultiLine = Field(default='契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵三 > 御灵二 > 御灵一 > 御魂二 > 御魂一 > 远远不够',
                                      description='missions_rule_help')
     setup_when_bondling: bool = Field(default=True, description='setup_when_bondling_help')
+    missions_select: str = Field(default='觉醒三',
+                                description='指定的任务')
 
     @validator('missions_rule', pre=True, always=True)
     def mr_validator(cls, v):

+ 23 - 0
tasks/CollectiveMissions/script_task.py

@@ -59,6 +59,9 @@ class ScriptTask(GameUi, CollectiveMissionsAssets):
             logger.warning('Today\'s missions have been completed')
             self.set_next_run(task='CollectiveMissions', success=False, finish=True)
             raise TaskEnd('CollectiveMissions')
+        #切换为目标任务
+        mission_name = self.config.collective_missions.missions_config.missions_select
+        self.select_mission(mission_name)
         # 判断最优的任务是哪一个
         mission, index = self.detect_best()
         logger.info(f'Best mission is {mission}')
@@ -277,6 +280,26 @@ class ScriptTask(GameUi, CollectiveMissionsAssets):
         logger.info('Donate finished')
         return True
 
+    def select_mission(self, missions_select: str) -> bool:
+        """
+        尝试在当前界面中识别并选择指定名称的好友
+        :param friend_name: 要选择的好友名称
+        :return: 成功选择返回True
+        """
+
+        while 1:
+            self.screenshot()
+            # 识别当前任务
+            missions = self.detect_one(self.O_CM_1, self.O_CM_2)
+            logger.info(f"当前任务: {missions}")
+            logger.info(f"目标任务: {missions_select}")
+            if missions == missions_select:
+                logger.info(f"成功切换任务")
+                return True
+            else:
+                logger.info(f"尝试切换任务")
+                self.appear_then_click(self.I_CM_SWITCH, interval=1)
+
     def _soul(self, index: int):
         """
         搞收御魂的任务