Răsfoiți Sursa

fix(task): Now you can do 'CollectiveMissions' with 'Soul' missions

runhey 3 ani în urmă
părinte
comite
cfbef85d61

+ 1 - 1
config/template.json

@@ -860,7 +860,7 @@
       "server_update": "09:00:00"
     },
     "missions_config": {
-      "missions_rule": "契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵二 > 御灵一 > 御魂五 > 御魂四"
+      "missions_rule": "契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵二 > 御灵一 > 御魂二 > 御魂一"
     }
   },
   "hunt": {

+ 17 - 0
tasks/CollectiveMissions/assets.py

@@ -78,3 +78,20 @@ class CollectiveMissionsAssets:
 	S_CM_MATTER_4 = RuleSwipe(roi_front=(689,524,21,22), roi_back=(903,518,46,32), mode="default", name="cm_matter_4")
 
 
+	# Image Rule Assets
+	# 提交 
+	I_SL_SUBMIT = RuleImage(roi_front=(835,588,145,61), roi_back=(835,588,145,61), threshold=0.8, method="Template matching", file="./tasks/CollectiveMissions/soul/soul_sl_submit.png")
+
+
+	# Long Click Rule Assets
+	# 长按 
+	L_SL_LONG = RuleLongClick(roi_front=(178,194,58,49), roi_back=(178,194,58,49), duration=1500, name="sl_long")
+
+
+	# Ocr Rule Assets
+	# +0 级 
+	O_SL_LEVEL = RuleOcr(roi=(174,139,30,24), area=(174,139,30,24), mode="Single", method="Default", keyword="古", name="sl_level")
+	# 将提交xx次任务 
+	O_SL_NUMBER = RuleOcr(roi=(813,94,187,39), area=(813,94,187,39), mode="Single", method="Default", keyword="", name="sl_number")
+
+

+ 8 - 2
tasks/CollectiveMissions/config.py

@@ -2,7 +2,7 @@
 # @author runhey
 # github https://github.com/runhey
 from datetime import timedelta
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, validator
 
 from tasks.Component.config_base import MultiLine
 from tasks.Component.config_scheduler import Scheduler
@@ -14,9 +14,15 @@ from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 
 class MissionsConfig(BaseModel):
     # 契灵 > 觉醒二 > 觉醒一 > 御灵二 > 御灵一 > 御魂五 > 御魂四
-    missions_rule: MultiLine = Field(default='契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵二 > 御灵一 > 御魂五 > 御魂四',
+    missions_rule: MultiLine = Field(default='契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵二 > 御灵一 > 御魂二 > 御魂一',
                                      description='missions_rule_help')
 
+    @validator('missions_rule', pre=True, always=True)
+    def mr_validator(cls, v):
+        if isinstance(v, str):
+            return v.replace('御魂五', '御魂二').replace('御魂四', '御魂一')
+        return v
+
 
 class CollectiveMissions(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)

+ 52 - 10
tasks/CollectiveMissions/script_task.py

@@ -25,8 +25,8 @@ class MC(str, Enum):
     AW3 = '觉醒三'
     GR1 = '御灵一'
     GR2 = '御灵二'
-    SO4 = '御魂四'
-    SO5 = '御魂五'
+    SO1 = '御魂一'
+    SO2 = '御魂二'
     FRIEND = '好友'
     UNKNOWN = '未知'
 
@@ -67,10 +67,9 @@ class ScriptTask(GameUi, CollectiveMissionsAssets):
         elif mission == MC.AW1 or mission == MC.AW2 or mission == MC.AW3 or mission == MC.GR1 or mission == MC.GR2:
             # 其他就捐材料
             self._donate(index)
-        elif mission == MC.SO4 or mission == MC.SO5:
+        elif mission == MC.SO1 or mission == MC.SO2:
             # 御魂就捐御魂
-            # TODO
-            logger.warning('Not support donate soul')
+            self._soul(index)
 
         # 退出
         while 1:
@@ -115,10 +114,10 @@ class ScriptTask(GameUi, CollectiveMissionsAssets):
             return MC.GR1
         elif result_2 == '御灵二':
             return MC.GR2
-        elif result_2 == '御魂四':
-            return MC.SO4
-        elif result_2 == '御魂五':
-            return MC.SO5
+        elif result_2 == '御魂一':
+            return MC.SO1
+        elif result_2 == '御魂二':
+            return MC.SO2
         return MC.UNKNOWN
 
     def detect_best(self) -> tuple:
@@ -185,7 +184,6 @@ class ScriptTask(GameUi, CollectiveMissionsAssets):
                 break
         logger.info('Finish to collect bondling rewards')
 
-
     def _donate(self, index: int):
         """
         捐赠材料
@@ -278,6 +276,50 @@ class ScriptTask(GameUi, CollectiveMissionsAssets):
         logger.info('Donate finished')
         return True
 
+    def _soul(self, index: int):
+        """
+        搞收御魂的任务
+        :param index:
+        :return:
+        """
+        match_click = {
+            0: self.C_CM_1,
+            1: self.C_CM_2,
+            2: self.C_CM_3,
+        }
+        self.ui_click(match_click[index], self.I_SL_SUBMIT)
+        while 1:
+            self.screenshot()
+            number_text = self.O_SL_NUMBER.ocr(self.device.image)
+            submit_number = int(re.findall(r'\d+', number_text)[-1])
+            if submit_number > 0:
+                break
+
+            if self.ocr_appear(self.O_SL_LEVEL):
+                # 如果没有识别到这个,那就说明没有御魂可以提交了,要退出
+                logger.warning('No soul can be submit')
+                self.ui_click(self.I_UI_BACK_RED, self.I_CM_RECORDS)
+                return False
+
+            if self.click(self.L_SL_LONG, interval=2.5):
+                time.sleep(1)
+                continue
+        # 领取奖励
+        logger.info('Start to collect soul rewards')
+        check_timer = Timer(3)
+        check_timer.start()
+        while 1:
+            self.screenshot()
+            if self.ui_reward_appear_click(True):
+                check_timer.reset()
+                continue
+            if self.appear_then_click(self.I_SL_SUBMIT, interval=1):
+                check_timer.reset()
+                continue
+            if check_timer.reached():
+                break
+        logger.info('Finish to collect soul rewards')
+        self.wait_until_appear(self.I_CM_RECORDS)
 
 
 

+ 11 - 0
tasks/CollectiveMissions/soul/image.json

@@ -0,0 +1,11 @@
+[
+  {
+    "itemName": "sl_submit",
+    "imageName": "soul_sl_submit.png",
+    "roiFront": "835,588,145,61",
+    "roiBack": "835,588,145,61",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "提交"
+  }
+]

+ 9 - 0
tasks/CollectiveMissions/soul/long_click.json

@@ -0,0 +1,9 @@
+[
+  {
+    "itemName": "sl_long",
+    "roiFront": "178,194,58,49",
+    "roiBack": "178,194,58,49",
+    "duration": 1500,
+    "description": "长按"
+  }
+]

+ 20 - 0
tasks/CollectiveMissions/soul/ocr.json

@@ -0,0 +1,20 @@
+[
+  {
+    "itemName": "sl_level",
+    "roiFront": "174,139,30,24",
+    "roiBack": "174,139,30,24",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "古",
+    "description": "+0 级"
+  },
+  {
+    "itemName": "sl_number",
+    "roiFront": "813,94,187,39",
+    "roiBack": "813,94,187,39",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "",
+    "description": "将提交xx次任务"
+  }
+]

BIN
tasks/CollectiveMissions/soul/soul_sl_submit.png


+ 5 - 1
tasks/base_task.py

@@ -500,7 +500,11 @@ class BaseTask(GlobalGameAssets):
             self.screenshot()
             if self.appear(stop):
                 break
-            if self.appear_then_click(click, interval=1):
+            if isinstance(click, RuleImage) and self.appear_then_click(click, interval=1):
+                continue
+            if isinstance(click, RuleClick) and self.click(click, interval=1):
+                continue
+            elif isinstance(click, RuleOcr) and self.ocr_appear_click(click, interval=1):
                 continue
 
     def ui_click_until_disappear(self, click):