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

feat(ActivityShikigami): Update

huangrunheng 1 год назад
Родитель
Сommit
9080ae709e

+ 26 - 0
tasks/ActivityShikigami/0110/click.json

@@ -0,0 +1,26 @@
+[
+  {
+    "itemName": "click1",
+    "roiFront": "120,138,130,75",
+    "roiBack": "120,138,130,75",
+    "description": "description"
+  },
+  {
+    "itemName": "click2",
+    "roiFront": "121,234,125,81",
+    "roiBack": "121,234,125,81",
+    "description": "description"
+  },
+  {
+    "itemName": "click3",
+    "roiFront": "126,337,118,77",
+    "roiBack": "126,337,118,77",
+    "description": "description"
+  },
+  {
+    "itemName": "click4",
+    "roiFront": "124,438,126,77",
+    "roiBack": "124,438,126,77",
+    "description": "description"
+  }
+]

BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN
tasks/ActivityShikigami/as/as_battle.png


BIN
tasks/ActivityShikigami/as/as_fire.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_switch.png


+ 11 - 11
tasks/ActivityShikigami/as/image.json

@@ -2,7 +2,7 @@
   {
     "itemName": "shi",
     "imageName": "as_shi.png",
-    "roiFront": "545,254,33,34",
+    "roiFront": "519,223,33,34",
     "roiBack": "64,115,1110,427",
     "method": "Template matching",
     "threshold": 0.7,
@@ -20,8 +20,8 @@
   {
     "itemName": "battle",
     "imageName": "as_battle.png",
-    "roiFront": "1080,229,35,145",
-    "roiBack": "1028,155,138,315",
+    "roiFront": "668,377,35,145",
+    "roiBack": "613,296,138,315",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入爬塔"
@@ -56,8 +56,8 @@
   {
     "itemName": "fire",
     "imageName": "as_fire.png",
-    "roiFront": "1134,579,84,78",
-    "roiBack": "1107,522,142,174",
+    "roiFront": "1133,566,84,78",
+    "roiBack": "1099,522,150,174",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击战斗"
@@ -65,8 +65,8 @@
   {
     "itemName": "ap",
     "imageName": "as_ap.png",
-    "roiFront": "1127,509,23,24",
-    "roiBack": "1092,487,103,71",
+    "roiFront": "1130,526,23,24",
+    "roiBack": "1092,497,103,71",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "体力按钮"
@@ -74,8 +74,8 @@
   {
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
-    "roiFront": "1124,514,21,21",
-    "roiBack": "1090,500,84,54",
+    "roiFront": "1129,529,21,21",
+    "roiBack": "1101,509,84,54",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "活动体力"
@@ -83,8 +83,8 @@
   {
     "itemName": "switch",
     "imageName": "as_switch.png",
-    "roiFront": "1212,514,23,23",
-    "roiBack": "1200,497,69,56",
+    "roiFront": "1217,527,23,23",
+    "roiBack": "1199,507,69,56",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "切换按键"

+ 4 - 4
tasks/ActivityShikigami/as/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "1150,673,88,25",
-    "roiBack": "1150,673,88,25",
+    "roiFront": "1139,680,97,25",
+    "roiBack": "1139,680,97,25",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   {
     "itemName": "remain_ap_activity",
-    "roiFront": "909,25,95,30",
-    "roiBack": "909,25,95,30",
+    "roiFront": "717,25,95,30",
+    "roiBack": "717,25,95,30",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 19 - 8
tasks/ActivityShikigami/assets.py

@@ -10,6 +10,17 @@ from module.atom.list import RuleList
 class ActivityShikigamiAssets: 
 
 
+	# Click Rule Assets
+	# description 
+	C_CLICK1 = RuleClick(roi_front=(120,138,130,75), roi_back=(120,138,130,75), name="click1")
+	# description 
+	C_CLICK2 = RuleClick(roi_front=(121,234,125,81), roi_back=(121,234,125,81), name="click2")
+	# description 
+	C_CLICK3 = RuleClick(roi_front=(126,337,118,77), roi_back=(126,337,118,77), name="click3")
+	# description 
+	C_CLICK4 = RuleClick(roi_front=(124,438,126,77), roi_back=(124,438,126,77), name="click4")
+
+
 	# Image Rule Assets
 	# description 
 	I_N_BATTLE = RuleImage(roi_front=(131,164,86,86), roi_back=(119,50,1075,635), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_n_battle.png")
@@ -34,11 +45,11 @@ class ActivityShikigamiAssets:
 
 	# Image Rule Assets
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(545,254,33,34), roi_back=(64,115,1110,427), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(519,223,33,34), roi_back=(64,115,1110,427), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(23,27,44,44), roi_back=(23,27,44,44), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	# 进入爬塔 
-	I_BATTLE = RuleImage(roi_front=(1080,229,35,145), roi_back=(1028,155,138,315), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	I_BATTLE = RuleImage(roi_front=(668,377,35,145), roi_back=(613,296,138,315), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
 	# 归鹿之途 
 	I_DRUM = RuleImage(roi_front=(885,310,29,145), roi_back=(860,244,87,232), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	# 上锁图标 
@@ -46,13 +57,13 @@ class ActivityShikigamiAssets:
 	# 还未上锁图片 
 	I_UNLOCK = RuleImage(roi_front=(823,654,28,28), roi_back=(776,610,112,87), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 点击战斗 
-	I_FIRE = RuleImage(roi_front=(1134,579,84,78), roi_back=(1107,522,142,174), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	I_FIRE = RuleImage(roi_front=(1133,566,84,78), roi_back=(1099,522,150,174), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	# 体力按钮 
-	I_AP = RuleImage(roi_front=(1127,509,23,24), roi_back=(1092,487,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	I_AP = RuleImage(roi_front=(1130,526,23,24), roi_back=(1092,497,103,71), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
-	I_AP_ACTIVITY = RuleImage(roi_front=(1124,514,21,21), roi_back=(1090,500,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	I_AP_ACTIVITY = RuleImage(roi_front=(1129,529,21,21), roi_back=(1101,509,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
 	# 切换按键 
-	I_SWITCH = RuleImage(roi_front=(1212,514,23,23), roi_back=(1200,497,69,56), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
+	I_SWITCH = RuleImage(roi_front=(1217,527,23,23), roi_back=(1199,507,69,56), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
 	# 购买活动的体力 
 	I_BUY_JADE = RuleImage(roi_front=(1004,192,38,42), roi_back=(836,619,38,42), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buy_jade.png")
 	# 增加到最大 
@@ -63,9 +74,9 @@ class ActivityShikigamiAssets:
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(1150,673,88,25), area=(1150,673,88,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(1139,680,97,25), area=(1139,680,97,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
-	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(909,25,95,30), area=(909,25,95,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
+	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(717,25,95,30), area=(717,25,95,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 

+ 12 - 3
tasks/ActivityShikigami/config.py

@@ -1,6 +1,7 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
+from enum import Enum
 from datetime import time, timedelta
 from pydantic import BaseModel, Field
 
@@ -10,14 +11,22 @@ from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, TimeDelta
 from tasks.Component.BaseActivity.config_activity import GeneralClimb
 
+
+class ShikigamiType(str, Enum):
+    FOOD_TYPE_1 = 'shikigami_type_1'
+    FOOD_TYPE_2 = 'shikigami_type_2'
+    FOOD_TYPE_3 = 'shikigami_type_3'
+    FOOD_TYPE_4 = 'shikigami_type_4'
+
 class ShikigamiConfig(BaseModel):
-    limit_time: TimeDelta = Field(default=TimeDelta(hours=0, minutes=30, seconds=0), description='limit_time_help')
-    limit_count: int = Field(default=10, description='limit_count_help')
+    # limit_time: TimeDelta = Field(default=TimeDelta(hours=0, minutes=30, seconds=0), description='limit_time_help')
+    # limit_count: int = Field(default=10, description='limit_count_help')
+    food_type: ShikigamiType = Field(default=ShikigamiType.FOOD_TYPE_1, description='food_type_help')
 
 
 class ActivityShikigami(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
-    # shikigami: ShikigamiConfig = Field(default_factory=ShikigamiConfig)
+    shikigami: ShikigamiConfig = Field(default_factory=ShikigamiConfig)
     general_climb: GeneralClimb = Field(default_factory=GeneralClimb)
     general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
     switch_soul_config: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)

+ 11 - 8
tasks/ActivityShikigami/script_task.py

@@ -46,12 +46,9 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
         self.ui_goto(page_main)
         self.home_main()
 
-        # # 2024-11-06 ---------------------start
-        config.general_climb.ap_mode = ApMode.AP_GAME
         # 选择是游戏的体力还是活动的体力
         current_ap = config.general_climb.ap_mode
-        # self.switch(current_ap)
-        # # 2024-11-06 ---------------------end
+        self.switch(current_ap)
 
         # 设定是否锁定阵容
         if config.general_battle.lock_team_enable:
@@ -139,10 +136,16 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
             self.screenshot()
             if self.appear(self.I_FIRE):
                 break
-            # 2024-04-04 --------------start
-            if self.appear_then_click(self.I_N_BATTLE, interval=1):
-                continue
-            # 2024-04-04 --------------end
+            # 2024-12-04 --------------start
+            from tasks.ActivityShikigami.config import ShikigamiType
+            map_click = {
+                ShikigamiType.FOOD_TYPE_1: self.C_CLICK1,
+                ShikigamiType.FOOD_TYPE_2: self.C_CLICK2,
+                ShikigamiType.FOOD_TYPE_3: self.C_CLICK3,
+                ShikigamiType.FOOD_TYPE_4: self.C_CLICK4,
+            }
+            self.click(map_click[self.config.model.activity_shikigami.shikigami.food_type], interval=4)
+            # 2024-12-04 --------------end
             if self.appear_then_click(self.I_SHI, interval=1):
                 continue
             if self.appear_then_click(self.I_DRUM, interval=1):

+ 1 - 1
tasks/base_task.py

@@ -117,7 +117,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
         self.device.detect_record = detect_record
         # 如果接受邀请则立即执行悬赏任务
         if click_button == self.I_G_ACCEPT:
-            self.set_next_run(task='WantedQuests', target=datetime.now())
+            self.set_next_run(task='WantedQuests', target=datetime.now().replace(microsecond=0))
         return True
 
     def screenshot(self):