Explorar o código

feat(Bougan Enmusubi no Kami): add climb

runhey %!s(int64=3) %!d(string=hai) anos
pai
achega
528dbdce53

BIN=BIN
tasks/ActivityShikigami/as/as_ap.png


BIN=BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN=BIN
tasks/ActivityShikigami/as/as_battle.png


BIN=BIN
tasks/ActivityShikigami/as/as_fire.png


BIN=BIN
tasks/ActivityShikigami/as/as_lock.png


BIN=BIN
tasks/ActivityShikigami/as/as_shi.png


BIN=BIN
tasks/ActivityShikigami/as/as_switch.png


BIN=BIN
tasks/ActivityShikigami/as/as_unlock.png


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

@@ -2,8 +2,8 @@
   {
     "itemName": "shi",
     "imageName": "as_shi.png",
-    "roiFront": "455,346,29,53",
-    "roiBack": "122,333,1029,76",
+    "roiFront": "135,146,64,53",
+    "roiBack": "80,132,1029,76",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "进入活动"
@@ -20,11 +20,11 @@
   {
     "itemName": "battle",
     "imageName": "as_battle.png",
-    "roiFront": "1037,330,52,57",
-    "roiBack": "1037,330,52,57",
+    "roiFront": "568,171,52,177",
+    "roiBack": "568,171,52,177",
     "method": "Template matching",
     "threshold": 0.8,
-    "description": "description"
+    "description": "进入爬塔"
   },
   {
     "itemName": "drum",
@@ -38,8 +38,8 @@
   {
     "itemName": "lock",
     "imageName": "as_lock.png",
-    "roiFront": "794,653,30,32",
-    "roiBack": "794,653,30,32",
+    "roiFront": "806,642,30,32",
+    "roiBack": "806,642,30,32",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "上锁图标"
@@ -47,8 +47,8 @@
   {
     "itemName": "unlock",
     "imageName": "as_unlock.png",
-    "roiFront": "796,653,27,35",
-    "roiBack": "796,653,27,35",
+    "roiFront": "807,640,27,35",
+    "roiBack": "807,640,27,35",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "还未上锁图片"
@@ -56,8 +56,8 @@
   {
     "itemName": "fire",
     "imageName": "as_fire.png",
-    "roiFront": "1140,585,75,73",
-    "roiBack": "1140,585,75,73",
+    "roiFront": "1123,563,106,116",
+    "roiBack": "1123,563,106,116",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击战斗"
@@ -65,8 +65,8 @@
   {
     "itemName": "ap",
     "imageName": "as_ap.png",
-    "roiFront": "1126,510,27,37",
-    "roiBack": "1126,510,27,37",
+    "roiFront": "1116,498,27,37",
+    "roiBack": "1116,498,27,37",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "体力按钮"
@@ -74,8 +74,8 @@
   {
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
-    "roiFront": "1125,516,27,27",
-    "roiBack": "1125,516,27,27",
+    "roiFront": "1109,502,27,27",
+    "roiBack": "1109,502,27,27",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "活动体力"
@@ -83,8 +83,8 @@
   {
     "itemName": "switch",
     "imageName": "as_switch.png",
-    "roiFront": "1207,514,33,30",
-    "roiBack": "1207,514,33,30",
+    "roiFront": "1207,505,33,30",
+    "roiBack": "1207,505,33,30",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "切换按键"

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

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "1180,678,82,30",
-    "roiBack": "1180,678,86,30",
+    "roiFront": "1113,671,97,30",
+    "roiBack": "1113,671,97,30",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   {
     "itemName": "remain_ap_activity",
-    "roiFront": "722,23,87,34",
-    "roiBack": "722,23,96,34",
+    "roiFront": "884,20,106,34",
+    "roiBack": "884,20,106,34",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 11 - 11
tasks/ActivityShikigami/assets.py

@@ -12,25 +12,25 @@ class ActivityShikigamiAssets:
 
 	# Image Rule Assets
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(455,346,29,53), roi_back=(122,333,1029,76), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(135,146,64,53), roi_back=(80,132,1029,76), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(23,18,49,49), roi_back=(23,18,49,49), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
-	# description 
-	I_BATTLE = RuleImage(roi_front=(1037,330,52,57), roi_back=(1037,330,52,57), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	# 进入爬塔 
+	I_BATTLE = RuleImage(roi_front=(568,171,52,177), roi_back=(568,171,52,177), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
 	# 归鹿之途 
 	I_DRUM = RuleImage(roi_front=(902,379,41,43), roi_back=(902,379,41,43), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	# 上锁图标 
-	I_LOCK = RuleImage(roi_front=(794,653,30,32), roi_back=(794,653,30,32), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
+	I_LOCK = RuleImage(roi_front=(806,642,30,32), roi_back=(806,642,30,32), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
-	I_UNLOCK = RuleImage(roi_front=(796,653,27,35), roi_back=(796,653,27,35), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
+	I_UNLOCK = RuleImage(roi_front=(807,640,27,35), roi_back=(807,640,27,35), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 点击战斗 
-	I_FIRE = RuleImage(roi_front=(1140,585,75,73), roi_back=(1140,585,75,73), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	I_FIRE = RuleImage(roi_front=(1123,563,106,116), roi_back=(1123,563,106,116), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	# 体力按钮 
-	I_AP = RuleImage(roi_front=(1126,510,27,37), roi_back=(1126,510,27,37), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	I_AP = RuleImage(roi_front=(1116,498,27,37), roi_back=(1116,498,27,37), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
-	I_AP_ACTIVITY = RuleImage(roi_front=(1125,516,27,27), roi_back=(1125,516,27,27), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	I_AP_ACTIVITY = RuleImage(roi_front=(1109,502,27,27), roi_back=(1109,502,27,27), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
 	# 切换按键 
-	I_SWITCH = RuleImage(roi_front=(1207,514,33,30), roi_back=(1207,514,33,30), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
+	I_SWITCH = RuleImage(roi_front=(1207,505,33,30), roi_back=(1207,505,33,30), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
 	# 购买活动的体力 
 	I_BUY_JADE = RuleImage(roi_front=(836,619,38,42), roi_back=(789,614,143,52), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buy_jade.png")
 	# 增加到最大 
@@ -41,9 +41,9 @@ class ActivityShikigamiAssets:
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(1180,678,82,30), area=(1180,678,86,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(1113,671,97,30), area=(1113,671,97,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
-	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(722,23,87,34), area=(722,23,96,34), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
+	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(884,20,106,34), area=(884,20,106,34), 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")
 

+ 24 - 7
tasks/ActivityShikigami/script_task.py

@@ -1,8 +1,7 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
-from datetime import datetime, timedelta
-import time
+from datetime import datetime, timedelta, time
 
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
@@ -20,12 +19,14 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
 
         config = self.config.activity_shikigami
         self.limit_time: timedelta = config.general_climb.limit_time
+        if isinstance(self.limit_time, time):
+            self.limit_time = timedelta(hours=self.limit_time.hour, minutes=self.limit_time.minute,
+                                        seconds=self.limit_time.second)
         self.limit_count = config.general_climb.limit_count
 
         self.home_main()
 
         # 设定是否锁定阵容
-        self.wait_until_appear(self.I_BACK_GREEN)
         if config.general_battle.lock_team_enable:
             logger.info("Lock team")
             while 1:
@@ -100,14 +101,15 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
         logger.hr("Enter Shikigami", 2)
         while 1:
             self.screenshot()
+            if self.appear(self.I_FIRE):
+                break
             if self.appear_then_click(self.I_SHI, interval=1):
                 continue
             if self.appear_then_click(self.I_DRUM, interval=1):
                 continue
             if self.appear_then_click(self.I_BATTLE, interval=1):
                 continue
-            if self.appear(self.I_FIRE):
-                break
+
 
 
     def main_home(self) -> bool:
@@ -118,10 +120,13 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
         logger.hr("Exit Shikigami", 2)
         while 1:
             self.screenshot()
-            if self.appear_then_click(self.I_BACK_GREEN, interval=1):
-                continue
             if self.appear(self.I_SHI):
                 break
+            if self.appear_then_click(self.I_UI_BACK_YELLOW, interval=1):
+                continue
+            if self.appear_then_click(self.I_BACK_GREEN, interval=1):
+                continue
+
 
     def check_ap_remain(self, current_ap: ApMode) -> bool:
         """
@@ -165,3 +170,15 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
                     break
                 if self.appear(self.I_AP_ACTIVITY, interval=1):
                     self.appear_then_click(self.I_SWITCH, interval=2)
+
+
+
+if __name__ == '__main__':
+    from module.config.config import Config
+    from module.device.device import Device
+    from memory_profiler import profile
+    c = Config('oas1')
+    d = Device(c)
+    t = ScriptTask(c, d)
+
+    t.run()

+ 22 - 2
tasks/Component/BaseActivity/config_activity.py

@@ -2,9 +2,11 @@
 # @author runhey
 # github https://github.com/runhey
 from datetime import time, timedelta
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, validator
 from enum import Enum
 
+from module.logger import logger
+
 from tasks.Component.config_base import ConfigBase, TimeDelta
 
 class ApMode(str, Enum):
@@ -14,7 +16,7 @@ class ApMode(str, Enum):
 
 class GeneralClimb(ConfigBase):
     # 限制执行的时间
-    limit_time: TimeDelta = Field(default=TimeDelta(hours=1), description='limit_time_help')
+    limit_time: time = Field(default=time(minute=30), description='limit_time_help')
     # 限制执行的次数
     limit_count: int = Field(default=50, description='limit_count_help')
     # 每日使用体力挑战的最大次数,默认是300
@@ -27,4 +29,22 @@ class GeneralClimb(ConfigBase):
     # 在我的设计理念中:活动体力>游戏体力。所以不提供从300挂满然后才到挂活动币
     activity_toggle: bool = Field(default=False, description='activity_toggle_help')
 
+    @validator('limit_time', pre=True, always=True)
+    def parse_limit_time(cls, value):
+        if isinstance(value, str):
+            if value.isdigit():
+                try:
+                    value = int(value)
+                except ValueError:
+                    logger.warning('Invalid limit_time value. Expected format: seconds')
+                    return time(hour=0, minute=30, second=0)
+                delta = timedelta(seconds=value)
+                return time(hour=delta.seconds // 3600, minute=delta.seconds // 60 % 60, second=delta.seconds % 60)
+            else:
+                try:
+                    return time.fromisoformat(value)
+                except ValueError:
+                    logger.warning('Invalid limit_time value. Expected format: HH:MM:SS')
+                    return time(hour=0, minute=30, second=0)
+        return value