Kaynağa Gözat

feat(task): add activity shikigami

runhey 3 yıl önce
ebeveyn
işleme
f3d640e34c

+ 36 - 37
config/template.json

@@ -10,8 +10,8 @@
       "adb_restart": false
     },
     "error": {
-      "handle_error": false,
-      "save_error": false,
+      "handle_error": true,
+      "save_error": true,
       "screenshot_length": 1
     },
     "optimization": {
@@ -25,11 +25,10 @@
     "scheduler": {
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
-      "priority": 0,
-      "command": "Restart",
-      "success_interval": 0,
-      "failure_interval": 0,
-      "server_update": "00:00"
+      "priority": 5,
+      "success_interval": "1 day, 0:00:00",
+      "failure_interval": "1 day, 0:00:00",
+      "server_update": "06:00:00"
     }
   },
   "global_game": {
@@ -46,9 +45,9 @@
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
-      "interval_days": 1,
-      "interval_hours": 0,
-      "interval_minutes": 0
+      "success_interval": "1 day, 0:00:00",
+      "failure_interval": "1 day, 0:00:00",
+      "server_update": "06:00:00"
     },
     "general_battle": {
       "lock_team_enable": false,
@@ -75,9 +74,9 @@
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
-      "interval_days": 1,
-      "interval_hours": 0,
-      "interval_minutes": 0
+      "success_interval": "1 day, 0:00:00",
+      "failure_interval": "1 day, 0:00:00",
+      "server_update": "06:00:00"
     }
   },
   "gold_youkai": {
@@ -85,9 +84,9 @@
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
-      "interval_days": 1,
-      "interval_hours": 0,
-      "interval_minutes": 0
+      "success_interval": "1 day, 0:00:00",
+      "failure_interval": "1 day, 0:00:00",
+      "server_update": "06:00:00"
     }
   },
   "nian": {
@@ -95,9 +94,9 @@
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
-      "interval_days": 1,
-      "interval_hours": 0,
-      "interval_minutes": 0
+      "success_interval": "1 day, 0:00:00",
+      "failure_interval": "1 day, 0:00:00",
+      "server_update": "06:00:00"
     }
   },
   "realm_raid": {
@@ -105,9 +104,9 @@
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
-      "interval_days": 1,
-      "interval_hours": 0,
-      "interval_minutes": 0
+      "success_interval": "1 day, 0:00:00",
+      "failure_interval": "1 day, 0:00:00",
+      "server_update": "06:00:00"
     },
     "raid_config": {
       "raid_mode": "retreat_four_attack_nine",
@@ -135,9 +134,9 @@
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
-      "interval_days": 1,
-      "interval_hours": 0,
-      "interval_minutes": 0
+      "success_interval": "1 day, 0:00:00",
+      "failure_interval": "1 day, 0:00:00",
+      "server_update": "06:00:00"
     }
   },
   "orochi_moans": {
@@ -145,9 +144,9 @@
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
-      "interval_days": 1,
-      "interval_hours": 0,
-      "interval_minutes": 0
+      "success_interval": "1 day, 0:00:00",
+      "failure_interval": "1 day, 0:00:00",
+      "server_update": "06:00:00"
     }
   },
   "sougenbi": {
@@ -155,9 +154,9 @@
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
-      "interval_days": 1,
-      "interval_hours": 0,
-      "interval_minutes": 0
+      "success_interval": "1 day, 0:00:00",
+      "failure_interval": "1 day, 0:00:00",
+      "server_update": "06:00:00"
     }
   },
   "fallen_sun": {
@@ -165,9 +164,9 @@
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
-      "interval_days": 1,
-      "interval_hours": 0,
-      "interval_minutes": 0
+      "success_interval": "1 day, 0:00:00",
+      "failure_interval": "1 day, 0:00:00",
+      "server_update": "06:00:00"
     }
   },
   "eternity_sea": {
@@ -175,9 +174,9 @@
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
-      "interval_days": 1,
-      "interval_hours": 0,
-      "interval_minutes": 0
+      "success_interval": "1 day, 0:00:00",
+      "failure_interval": "1 day, 0:00:00",
+      "server_update": "06:00:00"
     }
   }
 }

+ 2 - 0
module/config/config_menu.py

@@ -20,6 +20,8 @@ class ConfigMenu:
         self.menu["Soul Zones"] = ['Orochi', 'Sougenbi', 'FallenSun', 'EternitySea']
         # 日常的任务
         self.menu["Daily Task"] = ['AreaBoss', 'GoldYoukai', 'ExperienceYoukai', 'Nian', 'RealmRaid']
+        # 活动的任务
+        self.menu["Activity Task"] = ['ActivityShikigami']
 
         # 开发工具
         self.menu["Tools"] = ['Image Rule', 'Ocr Rule', 'Click Rule', 'Long Click Rule', 'Swipe Rule', 'List Rule']

+ 6 - 1
module/config/config_model.py

@@ -25,7 +25,9 @@ from tasks.FallenSun.config import FallenSun
 from tasks.EternitySea.config import EternitySea
 from tasks.RealmRaid.config import RealmRaid
 
-
+# 这一部分是活动的配置-----------------------------------------------------------------------------------------------------
+from tasks.ActivityShikigami.config import ActivityShikigami
+# ----------------------------------------------------------------------------------------------------------------------
 
 
 
@@ -49,6 +51,9 @@ class ConfigModel(ConfigBase):
     fallen_sun: FallenSun = Field(default_factory=FallenSun)
     eternity_sea: EternitySea = Field(default_factory=EternitySea)
 
+    # 这些是活动的
+    activity_shikigami: ActivityShikigami = Field(default_factory=ActivityShikigami)
+
 
     # @validator('script')
     # def script_validator(cls, v):

BIN
module/config/i18n/zh_CN.qm


+ 14 - 3
module/config/i18n/zh_CN.ts

@@ -311,9 +311,9 @@
 	<message><source>Enable</source><translation>启用该功能</translation></message>
 	<message><source>Next Run</source><translation>下一次运行时间</translation></message>
 	<message><source>Priority</source><translation>任务优先级</translation></message>
-	<message><source>Interval Days</source><translation>下次执行的间隔天数</translation></message>
-	<message><source>Interval Hours</source><translation>下次执行的间隔小时</translation></message>
-	<message><source>Interval Minutes</source><translation>下次执行的间隔分钟</translation></message>
+	<message><source>Success Interval</source><translation>执行任务成功后设定下次执行的间隔时间</translation></message>
+	<message><source>Failure Interval</source><translation>执行任务失败后设定下次执行的间隔时间</translation></message>
+	<message><source>Server Update</source><translation>服务器更新时间</translation></message>
 	<message><source>enable_help</source><translation>将这个任务加入调度器</translation></message>
 	<message><source>next_run_help</source><translation>会根据下面的间隔时间自动计算时间,清空后回车即可设置为当前</translation></message>
 	<message><source>priority_help</source><translation>如果设置调度规则为基于优先级,则该选项有效
@@ -321,6 +321,9 @@
 	<message><source>interval_days_help</source><translation>可取[0~7]</translation></message>
 	<message><source>interval_hours_help</source><translation>可取[0~24]</translation></message>
 	<message><source>interval_minutes_help</source><translation>可取[0~60]</translation></message>
+	<message><source>success_interval_help</source><translation>一般默认,时间格式:"[days] [hours]:[minutes]:[seconds]"</translation></message>
+	<message><source>failure_interval_help</source><translation>一般默认即可,时间格式同上,不按照格式输入会无法正确设置</translation></message>
+	<message><source>server_update_help</source><translation>服务器更新时间,占位符,还没想好怎么用</translation></message>
 </context>
 <context>
     <name>Args</name>
@@ -371,4 +374,12 @@
 	<message><source>when_network_error_help</source><translation>重启游戏</translation></message>
 	<message><source>home_client_clear_help</source><translation>有时会出现进入庭院要求清理缓存</translation></message>
 </context>
+<context>
+    <name>Args</name>
+	<message><source>ShikigamiConfig</source><translation>活动</translation></message>
+	<message><source>Limit Time</source><translation>限制运行时间</translation></message>
+	<message><source>Limit Count</source><translation>限制挑战次数</translation></message>
+	<message><source>limit_time_help</source><translation>单位秒</translation></message>
+	<message><source>limit_count_help</source><translation>两个限制需要同时设置,最先达到就会退出</translation></message>
+</context>
 </TS>

+ 2 - 2
script.py

@@ -443,6 +443,6 @@ class Script:
 
 if __name__ == "__main__":
     script = Script("oas1")
-    print(script.get_next_task())
-    # script.run("AreaBoss")
+    # print(script.get_next_task())
+    script.run("ActivityShikigami")
     # script.run('RealmRaid')

BIN
tasks/ActivityShikigami/as/as_back_green.png


BIN
tasks/ActivityShikigami/as/as_battle.png


BIN
tasks/ActivityShikigami/as/as_drum.png


BIN
tasks/ActivityShikigami/as/as_fire.png


BIN
tasks/ActivityShikigami/as/as_lock.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_unlock.png


+ 65 - 0
tasks/ActivityShikigami/as/image.json

@@ -0,0 +1,65 @@
+[
+  {
+    "itemName": "shi",
+    "imageName": "as_shi.png",
+    "roiFront": "455,346,29,53",
+    "roiBack": "122,333,1029,76",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "进入活动"
+  },
+  {
+    "itemName": "back_green",
+    "imageName": "as_back_green.png",
+    "roiFront": "23,18,49,49",
+    "roiBack": "23,18,49,49",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "左上角返回"
+  },
+  {
+    "itemName": "battle",
+    "imageName": "as_battle.png",
+    "roiFront": "1037,330,52,57",
+    "roiBack": "1037,330,52,57",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "drum",
+    "imageName": "as_drum.png",
+    "roiFront": "902,379,41,43",
+    "roiBack": "902,379,41,43",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "归鹿之途"
+  },
+  {
+    "itemName": "lock",
+    "imageName": "as_lock.png",
+    "roiFront": "794,653,30,32",
+    "roiBack": "794,653,30,32",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "上锁图标"
+  },
+  {
+    "itemName": "unlock",
+    "imageName": "as_unlock.png",
+    "roiFront": "796,653,27,35",
+    "roiBack": "796,653,27,35",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "还未上锁图片"
+  },
+  {
+    "itemName": "fire",
+    "imageName": "as_fire.png",
+    "roiFront": "1140,585,75,73",
+    "roiBack": "1140,585,75,73",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击战斗"
+  }
+]

+ 11 - 0
tasks/ActivityShikigami/as/ocr.json

@@ -0,0 +1,11 @@
+[
+  {
+    "itemName": "number",
+    "roiFront": "1180,678,86,30",
+    "roiBack": "1180,678,86,30",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "Ocr-description"
+  }
+]

+ 34 - 0
tasks/ActivityShikigami/assets.py

@@ -0,0 +1,34 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by module/dev_tools/assets_extract.py.
+# Don't modify it manually.
+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_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_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_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_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")
+
+
+	# Ocr Rule Assets
+	# Ocr-description 
+	O_NUMBER = RuleOcr(roi=(1180,678,86,30), area=(1180,678,86,30), mode="DigitCounter", method="Default", keyword="", name="number")
+
+

+ 23 - 0
tasks/ActivityShikigami/config.py

@@ -0,0 +1,23 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from datetime import time, timedelta
+from pydantic import BaseModel, Field
+
+from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
+from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase, TimeDelta
+
+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')
+
+
+class ActivityShikigami(ConfigBase):
+    scheduler: Scheduler = Field(default_factory=Scheduler)
+    shikigami: ShikigamiConfig = Field(default_factory=ShikigamiConfig)
+    general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
+
+
+
+

+ 102 - 0
tasks/ActivityShikigami/script_task.py

@@ -0,0 +1,102 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from datetime import datetime, timedelta
+import time
+
+from tasks.base_task import BaseTask
+from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+from tasks.AreaBoss.assets import AreaBossAssets
+from tasks.Component.BaseActivity.base_activity import BaseActivity
+from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
+from module.logger import logger
+from module.exception import TaskEnd
+
+
+class ScriptTask(BaseActivity, ActivityShikigamiAssets):
+
+    def run(self) -> None:
+
+        config = self.config.activity_shikigami
+        self.limit_time: timedelta = config.shikigami.limit_time
+        self.limit_count = config.shikigami.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:
+                self.screenshot()
+                if self.appear_then_click(self.I_UNLOCK, interval=1):
+                    continue
+                if self.appear(self.I_LOCK):
+                    break
+        else:
+            logger.info("Unlock team")
+            while 1:
+                self.screenshot()
+                if self.appear_then_click(self.I_LOCK, interval=1):
+                    continue
+                if self.appear(self.I_UNLOCK):
+                    break
+
+
+
+
+        while 1:
+            if self.limit_time is not None and self.limit_time + self.start_time < datetime.now():
+                logger.info("Time out")
+                break
+            if self.current_count >= self.limit_count:
+                logger.info("Count out")
+                break
+
+            # 点击战斗
+            self.wait_until_appear(self.I_FIRE)
+            logger.info("Click battle")
+            while 1:
+                self.screenshot()
+                if self.appear_then_click(self.I_FIRE, interval=1):
+                    continue
+                if not self.appear(self.I_FIRE):
+                    break
+
+            if self.run_general_battle(config=config.general_battle):
+                logger.info("General battle success")
+
+        self.main_home()
+        self.set_next_run(task="ActivityShikigami", success=True)
+        raise TaskEnd
+
+
+    def home_main(self) -> bool:
+        """
+        从庭院到活动的爬塔界面
+        :return:
+        """
+        logger.hr("Enter Shikigami", 2)
+        while 1:
+            self.screenshot()
+            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:
+        """
+        从活动的爬塔界面到庭院
+        :return:
+        """
+        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
+

+ 12 - 0
tasks/Component/BaseActivity/assets.py

@@ -0,0 +1,12 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by module/dev_tools/assets_extract.py.
+# Don't modify it manually.
+class BaseActivityAssets: 
+	pass
+

+ 25 - 0
tasks/Component/BaseActivity/base_activity.py

@@ -0,0 +1,25 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+from abc import abstractmethod
+
+class BaseActivity(GeneralBattle):
+    @abstractmethod
+    def run(self) -> None:
+        pass
+
+    @abstractmethod
+    def home_main(self) -> bool:
+        """
+        从庭院到活动的爬塔界面
+        :return:
+        """
+        pass
+
+    @abstractmethod
+    def main_home(self) -> bool:
+        """
+        从活动的爬塔界面到庭院
+        :return:
+        """

+ 7 - 3
tasks/Component/GeneralBattle/general_battle.py

@@ -21,6 +21,10 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
         运行脚本
         :return:
         """
+        # 本人选择的策略是只要进来了就算一次,不管是不是打完了
+        logger.hr("General battle start", 2)
+        self.current_count += 1
+        logger.info(f"Current count: {self.current_count}")
         if config is None:
             config = GeneralBattleConfig().dict()
 
@@ -32,7 +36,7 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
         if not config.lock_team_enable:
             logger.info("Lock team is not enable")
             # 如果启动更换队伍
-            if config.preset_enable:
+            if config.preset_enable and self.current_count == 1:
                 logger.info("Preset is enable")
                 # 点击预设按钮
                 logger.info("Click preset button")
@@ -77,7 +81,7 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
                         break
 
             # 点击buff按钮
-            if config.buff_enable:
+            if config.buff_enable and self.current_count == 1:
                 logger.info("Buff is enable")
                 logger.info("Click buff button")
                 while 1:
@@ -124,7 +128,7 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
         self.device.stuck_record_add('BATTLE_STATUS_S')
 
         # 战斗过程 随机点击和滑动 防封
-        logger.hr("Battle process", 2)
+        logger.info("Start battle process")
         win: bool = False
         while 1:
             self.screenshot()

+ 8 - 3
tasks/base_task.py

@@ -3,7 +3,7 @@
 # github https://github.com/runhey
 import numpy as np
 
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, time
 from typing import Union
 
 from module.config.utils import convert_to_underscore
@@ -34,7 +34,9 @@ class BaseTask(GlobalGameAssets):
     name: str
     stage: str
 
-    limit_time: datetime  # 限制运行的时间,是软时间,不是硬时间
+    limit_time: timedelta = None  # 限制运行的时间,是软时间,不是硬时间
+    limit_count: int = None  # 限制运行的次数
+    current_count: int = None  # 当前运行的次数
 
     def __init__(self, config: Config, device: Device) -> None:
         self.config = config
@@ -44,11 +46,14 @@ class BaseTask(GlobalGameAssets):
 
         self.start_time = datetime.now()  # 启动的时间
 
-        self.friend_timer = None
+        self.friend_timer = None  # 这个是用来记录勾协的时间的
         if self.config.global_game.emergency.invitation_detect_interval:
             self.interval_time = self.config.global_game.emergency.invitation_detect_interval
             self.friend_timer = Timer(self.interval_time)
 
+        # 战斗次数相关
+        self.current_count = 0  # 战斗次数
+
     def screenshot(self):
         """
         截图 引入中间函数的目的是 为了解决如协作的这类突发的事件