Browse Source

悬赏封印邀请特定好友功能

ChengRanORZ 2 năm trước cách đây
mục cha
commit
903a3f5c66

+ 3 - 3
.gitignore

@@ -34,9 +34,9 @@ module/config/argument/setting.json
 !dev_tools/ViewWizard2/ViewWizard2.exe
 !dev_tools/ViewWizard3/ViewWizard.exe
 hya
-
-
-
+deploy/launcher/oas-backend.bat
+deploy/launcher/oas-server.bat
+oas-backend.bat
 
 
 

+ 2 - 2
dev_tools/assets_extract.py

@@ -357,7 +357,7 @@ class AssetsExtractor:
         将自身的_resule写入文件
         :return:
         """
-        with open(self.assets_file, 'w', encoding='utf-8') as f:
+        with open(self.assets_file, 'w', encoding='utf-8', newline='\n') as f:
             f.write(self._result)
 
     def extract(self) -> str:
@@ -408,7 +408,7 @@ class AllAssetsExtractor:
         self.task_paths = [x for x in self.task_paths if 'Component' not in x]
         self.task_paths.extend([str(x) for x in (self.task_path / 'Component').iterdir() if x.is_dir()])
 
-        process_map(self.work, self.task_paths, max_workers=4)
+        process_map(self.work, self.task_paths, max_workers=1)
 
     @staticmethod
     def work(task_path: str):

+ 52 - 5
tasks/WantedQuests/assets.py

@@ -65,15 +65,62 @@ class WantedQuestsAssets:
 	# description 
 	I_WQ_INVITE_3 = RuleImage(roi_front=(754,366,39,42), roi_back=(728,339,100,100), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_invite_3.png")
 	# description 
-	I_WQ_FIREND_1 = RuleImage(roi_front=(245,190,175,70), roi_back=(245,190,175,70), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_1.png")
+	I_WQ_FRIEND_1 = RuleImage(roi_front=(240,185,180,80), roi_back=(240,185,180,80), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_friend_1.png")
 	# description 
-	I_WQ_FIREND_2 = RuleImage(roi_front=(537,190,175,70), roi_back=(537,190,175,70), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_2.png")
+	I_WQ_FRIEND_2 = RuleImage(roi_front=(530,185,180,80), roi_back=(530,185,180,80), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_friend_2.png")
 	# description 
-	I_WQ_FIREND_3 = RuleImage(roi_front=(245,286,175,70), roi_back=(245,286,175,70), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_3.png")
+	I_WQ_FRIEND_3 = RuleImage(roi_front=(240,285,180,80), roi_back=(240,285,180,80), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_friend_3.png")
 	# description 
-	I_WQ_FIREND_4 = RuleImage(roi_front=(537,286,175,70), roi_back=(537,286,175,70), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_4.png")
+	I_WQ_FRIEND_4 = RuleImage(roi_front=(530,285,180,80), roi_back=(530,285,180,80), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_friend_4.png")
 	# description 
-	I_WQ_FIREND_5 = RuleImage(roi_front=(245,382,175,70), roi_back=(245,382,175,70), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_5.png")
+	I_WQ_FRIEND_5 = RuleImage(roi_front=(240,385,180,80), roi_back=(240,385,180,80), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_friend_5.png")
+	# 悬赏封印邀请确定按钮 
+	I_WQ_INVITE_ENSURE = RuleImage(roi_front=(500,540,132,60), roi_back=(500,540,140,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_ensure.png")
+	# 悬赏封印邀请取消按钮 
+	I_WQ_INVITE_CANCEL = RuleImage(roi_front=(230,540,132,60), roi_back=(230,540,140,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_cancel.png")
+	# 邀请好友被选中标记 
+	I_WQ_INVITE_SELECTED = RuleImage(roi_front=(380,185,32,32), roi_back=(380,185,345,350), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_selected.png")
+	# 邀请同服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息 
+	I_WQ_INVITE_SAME_SVR = RuleImage(roi_front=(170,90,60,35), roi_back=(170,90,105,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_same_svr.png")
+	# 邀请跨服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息 
+	I_WQ_INVITE_DIFF_SVR = RuleImage(roi_front=(280,90,60,35), roi_back=(280,90,105,65), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_invite_diff_svr.png")
+	# 从左到右第一个协作任务的类型 
+	I_WQ_COOPERATION_TYPE_GOLD_1 = RuleImage(roi_front=(195,505,180,90), roi_back=(195,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_gold.png")
+	# 从左到右第一个协作任务的类型 
+	I_WQ_COOPERATION_TYPE_JADE_1 = RuleImage(roi_front=(195,505,180,90), roi_back=(195,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_jade.png")
+	# 从左到右第一个协作任务的类型为狗粮 
+	I_WQ_COOPERATION_TYPE_DOG_FOOD_1 = RuleImage(roi_front=(195,505,180,90), roi_back=(195,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_dog_food.png")
+	# 从左到右第一个协作任务的类型为猫粮 
+	I_WQ_COOPERATION_TYPE_CAT_FOOD_1 = RuleImage(roi_front=(195,505,180,90), roi_back=(195,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_cat_food.png")
+	# 从左到右第一个协作任务的类型 
+	I_WQ_COOPERATION_TYPE_SUSHI_1 = RuleImage(roi_front=(195,505,180,90), roi_back=(195,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_sushi.png")
+	# 从左到右第二个协作任务的类型 
+	I_WQ_COOPERATION_TYPE_GOLD_2 = RuleImage(roi_front=(490,505,180,90), roi_back=(490,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_gold.png")
+	# 从左到右第二个协作任务的类型 
+	I_WQ_COOPERATION_TYPE_JADE_2 = RuleImage(roi_front=(490,505,180,90), roi_back=(490,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_jade.png")
+	# 从左到右第二个协作任务的类型为狗粮 
+	I_WQ_COOPERATION_TYPE_DOG_FOOD_2 = RuleImage(roi_front=(490,505,180,90), roi_back=(490,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_dog_food.png")
+	# 从左到右第二个协作任务的类型为猫粮 
+	I_WQ_COOPERATION_TYPE_CAT_FOOD_2 = RuleImage(roi_front=(490,505,180,90), roi_back=(490,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_cat_food.png")
+	# 从左到右第二个协作任务的类型 
+	I_WQ_COOPERATION_TYPE_SUSHI_2 = RuleImage(roi_front=(490,505,180,90), roi_back=(490,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_sushi.png")
+	# 从左到右第三个协作任务的类型 
+	I_WQ_COOPERATION_TYPE_GOLD_3 = RuleImage(roi_front=(790,505,180,90), roi_back=(790,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_gold.png")
+	# 从左到右第三个协作任务的类型 
+	I_WQ_COOPERATION_TYPE_JADE_3 = RuleImage(roi_front=(790,505,180,90), roi_back=(790,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_jade.png")
+	# 从左到右第三个协作任务的类型为狗粮 
+	I_WQ_COOPERATION_TYPE_DOG_FOOD_3 = RuleImage(roi_front=(790,505,180,90), roi_back=(790,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_dog_food.png")
+	# 从左到右第三个协作任务的类型为猫粮 
+	I_WQ_COOPERATION_TYPE_CAT_FOOD_3 = RuleImage(roi_front=(790,505,180,90), roi_back=(790,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_cat_food.png")
+	# 从左到右第三个协作任务的类型 
+	I_WQ_COOPERATION_TYPE_SUSHI_3 = RuleImage(roi_front=(790,505,180,90), roi_back=(790,505,180,90), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/wq_cooperation_type_sushi.png")
+
+
+	# Ocr Rule Assets
+	# 邀请好友界面 好友列表第一列 
+	O_WQ_INVITE_COLUMN_1 = RuleOcr(roi=(240,185,190,340), area=(240,185,190,340), mode="FULL", method="Default", keyword="", name="wq_invite_column_1")
+	# 邀请好友界面 好友列表第二列 
+	O_WQ_INVITE_COLUMN_2 = RuleOcr(roi=(520,185,190,340), area=(520,185,190,340), mode="FULL", method="Default", keyword="", name="wq_invite_column_2")
 
 
 	# Image Rule Assets

+ 53 - 6
tasks/WantedQuests/config.py

@@ -2,7 +2,8 @@
 # @author runhey
 # github https://github.com/runhey
 from datetime import timedelta, time
-from pydantic import BaseModel, Field
+from enum import Enum
+from pydantic import BaseModel, Field, validator
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, Time
@@ -10,15 +11,61 @@ from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleCon
 from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 
 
-class WantedQuestsConfig(BaseModel):
-    before_end: Time = Field(default=Time(0, 0, 0), description='before_end_help')
+class CooperationType(int, Enum):
+    """
+        用于区分悬赏封印协作类型
+    """
+    Gold = 1
+    Jade = 2
+    Food = 4
+    Sushi = 8
 
 
-class WantedQuests(ConfigBase):
-    scheduler: Scheduler = Field(default_factory=Scheduler)
-    wanted_quests_config: WantedQuestsConfig = Field(default_factory=WantedQuestsConfig)
+class CooperationSelectMask(int, Enum):
+    NoInvite = 0
+    GoldOnly = 1
+    JadeOnly = 2
+    GoldAndJade = 3
+    FoodOnly = 4
+    GoldAndFood = 5
+    JadeAndFood = 6
+    GoldAndJadeAndFood = 7
+    SushiOnly = 8
+    GoldAndSushi = 9
+    JadeAndSushi = 10
+    GoldAndJadeAndSushi = 11
+    FoodAndSushi = 12
+    GoldAndFoodAndSushi = 13
+    JadeAndFoodAndSushi = 14
+    Any = 15
+
 
+class CooperationSelectMaskDescription(str, Enum):
+    NoInvite = 'NoInvite'
+    GoldOnly = 'GoldOnly'
+    JadeOnly = 'JadeOnly'
+    GoldAndJade = 'GoldAndJade'
+    FoodOnly = 'FoodOnly'
+    GoldAndFood = 'GoldAndFood'
+    JadeAndFood = 'JadeAndFood'
+    GoldAndJadeAndFood = 'GoldAndJadeAndFood'
+    SushiOnly = 'SushiOnly'
+    GoldAndSushi = 'GoldAndSushi'
+    JadeAndSushi = 'JadeAndSushi'
+    GoldAndJadeAndSushi = 'GoldAndJadeAndSushi'
+    FoodAndSushi = 'FoodAndSushi'
+    GoldAndFoodAndSushi = 'GoldAndFoodAndSushi'
+    JadeAndFoodAndSushi = 'JadeAndFoodAndSushi'
+    Any = 'Any'
 
 
+class WantedQuestsConfig(BaseModel):
+    before_end: Time = Field(default=Time(0, 0, 0), description='before_end_help')
+    invite_friend_name: str = Field(default=str(""), description="协作任务邀请特定人员")
+    cooperation_type: CooperationSelectMaskDescription = Field(default=CooperationSelectMaskDescription.Any, description="协作悬赏类型,其余协作任务不会邀请特定人员.仅当邀请特定人员时生效")
+
 
 
+class WantedQuests(ConfigBase):
+    scheduler: Scheduler = Field(default_factory=Scheduler)
+    wanted_quests_config: WantedQuestsConfig = Field(default_factory=WantedQuestsConfig)

+ 200 - 20
tasks/WantedQuests/invite/image.json

@@ -27,48 +27,228 @@
     "description": "description"
   },
   {
-    "itemName": "wq_firend_1",
-    "imageName": "invite_wq_firend_1.png",
-    "roiFront": "245,190,175,70",
-    "roiBack": "245,190,175,70",
+    "itemName": "wq_friend_1",
+    "imageName": "invite_wq_friend_1.png",
+    "roiFront": "240,185,180,80",
+    "roiBack": "240,185,180,80",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
   },
   {
-    "itemName": "wq_firend_2",
-    "imageName": "invite_wq_firend_2.png",
-    "roiFront": "537,190,175,70",
-    "roiBack": "537,190,175,70",
+    "itemName": "wq_friend_2",
+    "imageName": "invite_wq_friend_2.png",
+    "roiFront": "530,185,180,80",
+    "roiBack": "530,185,180,80",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
   },
   {
-    "itemName": "wq_firend_3",
-    "imageName": "invite_wq_firend_3.png",
-    "roiFront": "245,286,175,70",
-    "roiBack": "245,286,175,70",
+    "itemName": "wq_friend_3",
+    "imageName": "invite_wq_friend_3.png",
+    "roiFront": "240,285,180,80",
+    "roiBack": "240,285,180,80",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
   },
   {
-    "itemName": "wq_firend_4",
-    "imageName": "invite_wq_firend_4.png",
-    "roiFront": "537,286,175,70",
-    "roiBack": "537,286,175,70",
+    "itemName": "wq_friend_4",
+    "imageName": "invite_wq_friend_4.png",
+    "roiFront": "530,285,180,80",
+    "roiBack": "530,285,180,80",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
   },
   {
-    "itemName": "wq_firend_5",
-    "imageName": "invite_wq_firend_5.png",
-    "roiFront": "245,382,175,70",
-    "roiBack": "245,382,175,70",
+    "itemName": "wq_friend_5",
+    "imageName": "invite_wq_friend_5.png",
+    "roiFront": "240,385,180,80",
+    "roiBack": "240,385,180,80",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "wq_invite_ensure",
+    "imageName": "wq_invite_ensure.png",
+    "roiFront": "500,540,132,60",
+    "roiBack": "500,540,140,65",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "悬赏封印邀请确定按钮"
+  },
+  {
+    "itemName": "wq_invite_cancel",
+    "imageName": "wq_invite_cancel.png",
+    "roiFront": "230,540,132,60",
+    "roiBack": "230,540,140,65",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "悬赏封印邀请取消按钮"
+  },
+  {
+    "itemName": "wq_invite_selected",
+    "imageName": "wq_invite_selected.png",
+    "roiFront": "380,185,32,32",
+    "roiBack": "380,185,345,350",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "邀请好友被选中标记"
+  },
+  {
+    "itemName": "wq_invite_same_svr",
+    "imageName": "wq_invite_same_svr.png",
+    "roiFront": "170,90,60,35",
+    "roiBack": "170,90,105,65",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "邀请同服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息"
+  },
+  {
+    "itemName": "wq_invite_diff_svr",
+    "imageName": "wq_invite_diff_svr.png",
+    "roiFront": "280,90,60,35",
+    "roiBack": "280,90,105,65",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "邀请跨服好友,由于选中与未选中亮度有区别,查找图片可能会出错,建议只使用位置信息"
+  },
+  {
+    "itemName": "wq_cooperation_type_gold_1",
+    "imageName": "wq_cooperation_type_gold.png",
+    "roiFront": "195,505,180,90",
+    "roiBack": "195,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第一个协作任务的类型"
+  },
+  {
+    "itemName": "wq_cooperation_type_jade_1",
+    "imageName": "wq_cooperation_type_jade.png",
+    "roiFront": "195,505,180,90",
+    "roiBack": "195,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第一个协作任务的类型"
+  },
+  {
+    "itemName": "wq_cooperation_type_dog_food_1",
+    "imageName": "wq_cooperation_type_dog_food.png",
+    "roiFront": "195,505,180,90",
+    "roiBack": "195,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第一个协作任务的类型为狗粮"
+  },
+  {
+    "itemName": "wq_cooperation_type_cat_food_1",
+    "imageName": "wq_cooperation_type_cat_food.png",
+    "roiFront": "195,505,180,90",
+    "roiBack": "195,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第一个协作任务的类型为猫粮"
+  },
+  {
+    "itemName": "wq_cooperation_type_sushi_1",
+    "imageName": "wq_cooperation_type_sushi.png",
+    "roiFront": "195,505,180,90",
+    "roiBack": "195,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第一个协作任务的类型"
+  },
+  {
+    "itemName": "wq_cooperation_type_gold_2",
+    "imageName": "wq_cooperation_type_gold.png",
+    "roiFront": "490,505,180,90",
+    "roiBack": "490,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第二个协作任务的类型"
+  },
+  {
+    "itemName": "wq_cooperation_type_jade_2",
+    "imageName": "wq_cooperation_type_jade.png",
+    "roiFront": "490,505,180,90",
+    "roiBack": "490,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第二个协作任务的类型"
+  },
+  {
+    "itemName": "wq_cooperation_type_dog_food_2",
+    "imageName": "wq_cooperation_type_dog_food.png",
+    "roiFront": "490,505,180,90",
+    "roiBack": "490,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第二个协作任务的类型为狗粮"
+  },
+  {
+    "itemName": "wq_cooperation_type_cat_food_2",
+    "imageName": "wq_cooperation_type_cat_food.png",
+    "roiFront": "490,505,180,90",
+    "roiBack": "490,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第二个协作任务的类型为猫粮"
+  },
+  {
+    "itemName": "wq_cooperation_type_sushi_2",
+    "imageName": "wq_cooperation_type_sushi.png",
+    "roiFront": "490,505,180,90",
+    "roiBack": "490,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第二个协作任务的类型"
+  },
+  {
+    "itemName": "wq_cooperation_type_gold_3",
+    "imageName": "wq_cooperation_type_gold.png",
+    "roiFront": "790,505,180,90",
+    "roiBack": "790,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第三个协作任务的类型"
+  },
+  {
+    "itemName": "wq_cooperation_type_jade_3",
+    "imageName": "wq_cooperation_type_jade.png",
+    "roiFront": "790,505,180,90",
+    "roiBack": "790,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第三个协作任务的类型"
+  },
+  {
+    "itemName": "wq_cooperation_type_dog_food_3",
+    "imageName": "wq_cooperation_type_dog_food.png",
+    "roiFront": "790,505,180,90",
+    "roiBack": "790,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第三个协作任务的类型为狗粮"
+  },
+  {
+    "itemName": "wq_cooperation_type_cat_food_3",
+    "imageName": "wq_cooperation_type_cat_food.png",
+    "roiFront": "790,505,180,90",
+    "roiBack": "790,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第三个协作任务的类型为猫粮"
+  },
+  {
+    "itemName": "wq_cooperation_type_sushi_3",
+    "imageName": "wq_cooperation_type_sushi.png",
+    "roiFront": "790,505,180,90",
+    "roiBack": "790,505,180,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "从左到右第三个协作任务的类型"
   }
 ]

+ 20 - 0
tasks/WantedQuests/invite/ocr.json

@@ -0,0 +1,20 @@
+[
+  {
+    "itemName": "wq_invite_column_1",
+    "roiFront": "240,185,190,340",
+    "roiBack": "240,185,190,340",
+    "mode": "FULL",
+    "method": "Default",
+    "keyword": "",
+    "description": "邀请好友界面 好友列表第一列"
+  },
+  {
+    "itemName": "wq_invite_column_2",
+    "roiFront": "520,185,190,340",
+    "roiBack": "520,185,190,340",
+    "mode": "FULL",
+    "method": "Default",
+    "keyword": "",
+    "description": "邀请好友界面 好友列表第二列"
+  }
+]

BIN
tasks/WantedQuests/invite/wq_cooperation_type_cat_food.png


BIN
tasks/WantedQuests/invite/wq_cooperation_type_dog_food.png


BIN
tasks/WantedQuests/invite/wq_cooperation_type_gold.png


BIN
tasks/WantedQuests/invite/wq_cooperation_type_jade.png


BIN
tasks/WantedQuests/invite/wq_cooperation_type_sushi.png


BIN
tasks/WantedQuests/invite/wq_invite_cancel.png


BIN
tasks/WantedQuests/invite/wq_invite_diff_svr.png


BIN
tasks/WantedQuests/invite/wq_invite_ensure.png


BIN
tasks/WantedQuests/invite/wq_invite_same_svr.png


BIN
tasks/WantedQuests/invite/wq_invite_selected.png


+ 155 - 35
tasks/WantedQuests/script_task.py

@@ -6,6 +6,8 @@ import copy
 from time import sleep
 from datetime import timedelta, time, datetime
 from cached_property import cached_property
+from enum import Enum
+from module.atom.image import RuleImage
 
 from module.exception import TaskEnd
 from module.logger import logger
@@ -17,9 +19,12 @@ from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.GeneralInvite.general_invite import GeneralInvite
 from tasks.Secret.script_task import ScriptTask as SecretScriptTask
-from tasks.WantedQuests.config import WantedQuestsConfig
+from tasks.WantedQuests.config import WantedQuestsConfig, CooperationType, CooperationSelectMask, \
+    CooperationSelectMaskDescription
 from tasks.WantedQuests.assets import WantedQuestsAssets
 from tasks.Component.Costume.config import MainType
+from typing import List
+
 
 class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
 
@@ -74,7 +79,6 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
                 logger.info('No wanted quests')
                 break
 
-
         self.next_run()
         raise TaskEnd('WantedQuests')
 
@@ -129,7 +133,14 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
                 return False
         # 已追踪所有任务
         logger.info('All wanted quests are traced')
-        self.invite_five()
+
+        # 存在协作任务则邀请
+        self.screenshot()
+        if self.appear(self.I_WQ_INVITE_1) or self.appear(self.I_WQ_INVITE_2) or self.appear(self.I_WQ_INVITE_3):
+            if self.config.wanted_quests.wanted_quests_config.invite_friend_name:
+                self.all_cooperation_invite(self.config.wanted_quests.wanted_quests_config.invite_friend_name)
+            else:
+                self.invite_five()
         self.ui_click_until_disappear(self.I_UI_BACK_RED)
         self.ui_goto(page_exploration)
         return True
@@ -156,6 +167,7 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
             return
         # 找到一个最优的关卡来挑战
         challenge = True if num_challenge >= 10 else False
+
         def check_battle(cha: bool, wq_type, wq_info) -> tuple:
             battle = False
             self.screenshot()
@@ -178,7 +190,7 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
             if one_number > num_want:
                 return battle, 1
             else:
-                return battle, num_want // one_number + 1
+                return battle, num_want // one_number + (1 if num_want % one_number > 0 else 0)
 
         battle, num, goto = None, None, None
         if not battle:
@@ -202,7 +214,6 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
             logger.warning('No wanted quests can be challenged')
             return False
 
-
     def challenge(self, goto, num):
         self.ui_click(goto, self.I_WQC_FIRE)
         self.ui_click(self.I_WQC_LOCK, self.I_WQC_UNLOCK)
@@ -244,38 +255,150 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
                 continue
         logger.info('Secret mission finished')
 
+    def invite_random(self, add_button: RuleImage):
+        self.screenshot()
+        if not self.appear(add_button):
+            return False
+        self.ui_click(add_button, self.I_WQ_INVITE_ENSURE, interval=2.5)
+        logger.info('enter invite form')
+        sleep(1)
+        self.click(self.I_WQ_FRIEND_1)
+        sleep(0.4)
+        self.click(self.I_WQ_FRIEND_2)
+        sleep(0.4)
+        self.click(self.I_WQ_FRIEND_3)
+        sleep(0.4)
+        self.click(self.I_WQ_FRIEND_4)
+        sleep(0.4)
+        self.click(self.I_WQ_FRIEND_5)
+        sleep(0.2)
+        self.screenshot()
+        if not self.appear(self.I_SELECTED):
+            logger.warning('No friend selected')
+            return False
+        self.ui_click_until_disappear(self.I_INVITE_ENSURE)
+        sleep(0.5)
+
     def invite_five(self):
         """
         邀请好友,默认点五个
         :return:
         """
-        def invite(add_button):
+
+        logger.hr('Invite friends')
+        self.invite_random(self.I_WQ_INVITE_1)
+        self.invite_random(self.I_WQ_INVITE_2)
+        self.invite_random(self.I_WQ_INVITE_3)
+
+    def all_cooperation_invite(self, name: str):
+        """
+            所有的协作任务依次邀请
+        @param name: 被邀请的朋友名
+        @return:
+
+        """
+        self.screenshot()
+        if not self.appear(self.I_WQ_INVITE_1):
+            return False
+
+        ret = self.get_cooperation_info()
+        if len(ret) == 0:
+            logger.info("no Cooperation found")
+            return False
+        typeMask=15
+        typeMask = CooperationSelectMask [self.config.wanted_quests.wanted_quests_config.cooperation_type.value]
+        for item in ret:
+            # 该任务是需要邀请的任务类型
+            if not (item['type'] & typeMask):
+                # BUG 存在多个协作任务时,邀请完第一个协作任务对方接受后,未邀请的任务位置无法确定(缺少信息)
+                # 例如 按顺序存在 abc 3个协作任务,邀请完a,好友接受后,这三个任务在界面上的顺序变化,abc 还是bca
+                # 如果顺序不变 则应该没有问题
+                logger.info("协作任务类型 %s 需要邀请的协作任务类型 %s 故跳过", item['type'], typeMask)
+                break
+            '''
+               尝试5次 如果邀请失败 等待20s 重新尝试
+               阴阳师BUG: 好友明明在线 但邀请界面找不到该好友(好友未接受任何协作任务的情况下)
+           '''
+            index = 0
+            while index < 5:
+                if self.cooperation_invite(item['inviteBtn'], name):
+                    item['inviteResult'] = True
+                    index = 5
+                logger.info("未找到该好友,等待20s,剩余邀请次数 %d", 5 - index - 1)
+                index += 1
+                sleep(20) if index < 5 else sleep(0)
+                # BUG 等待过程如果出现协作邀请 将会卡住 未防止卡住
+                self.screenshot()
+        return ret
+
+    def cooperation_invite(self, btn: RuleImage, name: str):
+        """
+            单个协作任务邀请
+        @param btn:
+        @param name:
+        @return:
+        """
+        self.ui_click(btn, self.I_WQ_INVITE_ENSURE, interval=2.5)
+
+        # 选人
+        self.O_WQ_INVITE_COLUMN_1.keyword = name
+        self.O_WQ_INVITE_COLUMN_2.keyword = name
+
+        find = False
+        for i in range(2):
             self.screenshot()
-            if not self.appear(add_button):
-                return False
-            self.ui_click(add_button, self.I_INVITE_ENSURE, interval=2.5)
-            sleep(1)
-            self.click(self.I_WQ_FIREND_1)
-            sleep(0.4)
-            self.click(self.I_WQ_FIREND_2)
-            sleep(0.4)
-            self.click(self.I_WQ_FIREND_3)
-            sleep(0.4)
-            self.click(self.I_WQ_FIREND_4)
-            sleep(0.4)
-            self.click(self.I_WQ_FIREND_5)
-            sleep(0.2)
+            in_col_1 = self.ocr_appear_click(self.O_WQ_INVITE_COLUMN_1)
+            in_col_2 = self.ocr_appear_click(self.O_WQ_INVITE_COLUMN_2)
+            find = in_col_2 or in_col_1
+            if find:
+                self.screenshot()
+                if self.appear(self.I_WQ_INVITE_SELECTED):
+                    logger.info("friend found and selected")
+                    break
+                # TODO OCR识别到文字 但是没有选中 尝试重新选择  (选择好友时,弹出协作邀请导致选择好友失败)
+            # 在当前服务器没找到,切换服务器
+            self.click(self.I_WQ_INVITE_DIFF_SVR)
+            # NOTE 跨服好友刷新缓慢,切换标签页难以检测,姑且用延时.非常卡的模拟器可能出问题
+            sleep(2)
+        # 没有找到需要邀请的人,点击取消 返回悬赏封印界面
+        if not find:
             self.screenshot()
-            if not self.appear(self.I_SELECTED):
-                logger.warning('No friend selected')
-                return False
-            self.ui_click_until_disappear(self.I_INVITE_ENSURE)
-            sleep(0.5)
+            self.click(self.I_WQ_INVITE_CANCEL)
+            return False
+        #
+        self.ui_click_until_disappear(self.I_WQ_INVITE_ENSURE)
+        return True
 
-        logger.hr('Invite friends')
-        invite(self.I_WQ_INVITE_1)
-        invite(self.I_WQ_INVITE_2)
-        invite(self.I_WQ_INVITE_3)
+    def get_cooperation_info(self) -> List:
+        """
+            获取协作任务详情
+        @return: 协作任务类型与邀请按钮
+        """
+        self.screenshot()
+        retList = []
+        i = 0
+        for index in range(3):
+            btn = self.__getattribute__("I_WQ_INVITE_" + str(index + 1))
+            if not self.appear(btn):
+                break
+            if self.appear(self.__getattribute__("I_WQ_COOPERATION_TYPE_JADE_" + str(index + 1))):
+                retList.append({'type': CooperationType.Jade, 'inviteBtn': btn})
+                continue
+            if self.appear(self.__getattribute__("I_WQ_COOPERATION_TYPE_DOG_FOOD_" + str(index + 1))):
+                retList.append({'type': CooperationType.Food, 'inviteBtn': btn})
+                continue
+            if self.appear(self.__getattribute__("I_WQ_COOPERATION_TYPE_CAT_FOOD_" + str(index + 1))):
+                retList.append({'type': CooperationType.Food, 'inviteBtn': btn})
+                continue
+            if self.appear(self.__getattribute__("I_WQ_COOPERATION_TYPE_SUSHI_" + str(index + 1))):
+                retList.append({'type': CooperationType.Sushi, 'inviteBtn': btn})
+                continue
+            # NOTE 因为食物协作里面也有金币奖励 ,所以判断金币协作放在最后面
+            if self.appear(self.__getattribute__("I_WQ_COOPERATION_TYPE_GOLD_" + str(index + 1))):
+                retList.append({'type': CooperationType.Gold, 'inviteBtn': btn})
+                continue
+
+        return retList
 
     @cached_property
     def special_main(self) -> bool:
@@ -289,14 +412,11 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
-    c = Config('oas1')
+
+    c = Config('回归')
     d = Device(c)
     t = ScriptTask(c, d)
     t.screenshot()
 
-    # t.run()
-    t.invite_five()
+    t.run()
     # print(t.appear(t.I_WQ_CHECK_TASK))
-
-
-