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

Merge pull request #19 from runhey/dev

Dev
huangrunheng 3 лет назад
Родитель
Сommit
87b5043d46
66 измененных файлов с 935 добавлено и 347 удалено
  1. 36 37
      config/template.json
  2. 22 16
      deploy/launcher/oas-gui.bat
  3. 3 0
      deploy/process.py
  4. 1 0
      module/config/config.py
  5. 2 0
      module/config/config_menu.py
  6. 26 7
      module/config/config_model.py
  7. BIN
      module/config/i18n/zh_CN.qm
  8. 14 3
      module/config/i18n/zh_CN.ts
  9. 58 0
      module/config/utils.py
  10. 245 0
      module/daemon/benchmark.py
  11. 7 0
      module/daemon/daemon_base.py
  12. 1 0
      module/device/connection.py
  13. 2 2
      module/device/control.py
  14. 16 9
      module/device/device.py
  15. 1 1
      module/device/method/droidcast.py
  16. 1 0
      module/device/method/window.py
  17. 2 1
      module/gui/utils.py
  18. 1 1
      script.py
  19. BIN
      tasks/ActivityShikigami/as/as_back_green.png
  20. BIN
      tasks/ActivityShikigami/as/as_battle.png
  21. BIN
      tasks/ActivityShikigami/as/as_drum.png
  22. BIN
      tasks/ActivityShikigami/as/as_fire.png
  23. BIN
      tasks/ActivityShikigami/as/as_lock.png
  24. BIN
      tasks/ActivityShikigami/as/as_shi.png
  25. BIN
      tasks/ActivityShikigami/as/as_unlock.png
  26. 65 0
      tasks/ActivityShikigami/as/image.json
  27. 11 0
      tasks/ActivityShikigami/as/ocr.json
  28. 34 0
      tasks/ActivityShikigami/assets.py
  29. 23 0
      tasks/ActivityShikigami/config.py
  30. 102 0
      tasks/ActivityShikigami/script_task.py
  31. 2 1
      tasks/AreaBoss/config.py
  32. 1 1
      tasks/AreaBoss/script_task.py
  33. 0 67
      tasks/CoinChallenge/assets.py
  34. BIN
      tasks/CoinChallenge/res/res_new1.png
  35. BIN
      tasks/CoinChallenge/res/res_new2.png
  36. BIN
      tasks/CoinChallenge/res/res_new3.png
  37. 0 1
      tasks/CoinChallenge/res/test.json
  38. 0 20
      tasks/CoinChallenge/res/test_click.json
  39. 0 23
      tasks/CoinChallenge/res/test_long_click.json
  40. 0 65
      tasks/CoinChallenge/res/test_ocr.json
  41. 0 30
      tasks/CoinChallenge/res/test_swipe.json
  42. 12 0
      tasks/Component/BaseActivity/assets.py
  43. 25 0
      tasks/Component/BaseActivity/base_activity.py
  44. 19 9
      tasks/Component/GeneralBattle/general_battle.py
  45. 30 0
      tasks/Component/config_base.py
  46. 33 5
      tasks/Component/config_scheduler.py
  47. 1 0
      tasks/DemonEncounter/config.py
  48. 2 1
      tasks/EternitySea/config.py
  49. 2 1
      tasks/ExperienceYoukai/config.py
  50. 2 2
      tasks/FallenSun/config.py
  51. 1 0
      tasks/General/config.py
  52. 1 1
      tasks/GlobalGame/config.py
  53. 2 1
      tasks/GoldYoukai/config.py
  54. 1 1
      tasks/Hunt/config.py
  55. 3 2
      tasks/Nian/config.py
  56. 2 1
      tasks/Orochi/config.py
  57. 2 2
      tasks/OrochiMoans/config.py
  58. 2 2
      tasks/RealmRaid/config.py
  59. 1 1
      tasks/RealmRaid/script_task.py
  60. 3 2
      tasks/Restart/config.py
  61. 14 10
      tasks/Restart/config_scheduler.py
  62. 27 0
      tasks/Restart/script_task.py
  63. 5 4
      tasks/Script/config_device.py
  64. 2 2
      tasks/Script/config_error.py
  65. 2 2
      tasks/Sougenbi/config.py
  66. 65 13
      tasks/base_task.py

+ 36 - 37
config/template.json

@@ -10,8 +10,8 @@
       "adb_restart": false
       "adb_restart": false
     },
     },
     "error": {
     "error": {
-      "handle_error": false,
-      "save_error": false,
+      "handle_error": true,
+      "save_error": true,
       "screenshot_length": 1
       "screenshot_length": 1
     },
     },
     "optimization": {
     "optimization": {
@@ -25,11 +25,10 @@
     "scheduler": {
     "scheduler": {
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "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": {
   "global_game": {
@@ -46,9 +45,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "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": {
     "general_battle": {
       "lock_team_enable": false,
       "lock_team_enable": false,
@@ -75,9 +74,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "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": {
   "gold_youkai": {
@@ -85,9 +84,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "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": {
   "nian": {
@@ -95,9 +94,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "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": {
   "realm_raid": {
@@ -105,9 +104,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "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_config": {
       "raid_mode": "retreat_four_attack_nine",
       "raid_mode": "retreat_four_attack_nine",
@@ -135,9 +134,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "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": {
   "orochi_moans": {
@@ -145,9 +144,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "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": {
   "sougenbi": {
@@ -155,9 +154,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "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": {
   "fallen_sun": {
@@ -165,9 +164,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "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": {
   "eternity_sea": {
@@ -175,9 +174,9 @@
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "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"
     }
     }
   }
   }
 }
 }

+ 22 - 16
deploy/launcher/oas-gui.bat

@@ -1,7 +1,7 @@
 ::[Bat To Exe Converter]
 ::[Bat To Exe Converter]
 ::
 ::
 ::YAwzoRdxOk+EWAjk
 ::YAwzoRdxOk+EWAjk
-::fBw5plQjdCyDJGyX8VAjFJOkoIxy0O5J9Ik47fvw++WXnkESU+1xcYzUug==
+::fBw5plQjdCqDJGuB5E0jIQ9bXh2+M2qpS7wS+/z64+a7pkgNWO0mRIPaz7qNKOUB1knrcplj33lV+A==
 ::YAwzuBVtJxjWCl3EqQJgSA==
 ::YAwzuBVtJxjWCl3EqQJgSA==
 ::ZR4luwNxJguZRRnk
 ::ZR4luwNxJguZRRnk
 ::Yhs/ulQjdF+5
 ::Yhs/ulQjdF+5
@@ -26,7 +26,7 @@
 ::ZQ0/vhVqMQ3MEVWAtB9wSA==
 ::ZQ0/vhVqMQ3MEVWAtB9wSA==
 ::Zg8zqx1/OA3MEVWAtB9wSA==
 ::Zg8zqx1/OA3MEVWAtB9wSA==
 ::dhA7pRFwIByZRRnk
 ::dhA7pRFwIByZRRnk
-::Zh4grVQjdCyDJGyX8VAjFJOkoIxy0O5J9Ik47fvw++WXnkIcR6w6YIq7
+::Zh4grVQjdCqDJGuB5E0jIQ9bXh2+M2qpS7wS+/z64+a7rUwOGucnfe8=
 ::YB416Ek+ZG8=
 ::YB416Ek+ZG8=
 ::
 ::
 ::
 ::
@@ -34,34 +34,40 @@
 @rem
 @rem
 @echo off
 @echo off
 
 
+color F0
+title oas Updater
+
+
+
+:: 璉��亦恣������
+>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+
+:: 憒��餈𥪜��潔�蝑劐� 0嚗���齿鰵�臬𢆡�𡁏𧋦隞亥繮�𣇉恣������
+if %errorlevel% neq 0 (
+    echo Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
+    echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
+    "%temp%\getadmin.vbs"
+    del "%temp%\getadmin.vbs"
+    exit /B
+)
+
+cd /d "%~dp0"
 set "_root=%~dp0"
 set "_root=%~dp0"
 set "_root=%_root:~0,-1%"
 set "_root=%_root:~0,-1%"
 cd "%_root%"
 cd "%_root%"
 echo "%_root%
 echo "%_root%
 
 
-color F0
-
 set "_pyBin=%_root%\toolkit"
 set "_pyBin=%_root%\toolkit"
 set "_GitBin=%_root%\toolkit\Git\mingw64\bin"
 set "_GitBin=%_root%\toolkit\Git\mingw64\bin"
 set "_adbBin=%_root%\toolkit\Lib\site-packages\adbutils\binaries"
 set "_adbBin=%_root%\toolkit\Lib\site-packages\adbutils\binaries"
 set "PATH=%_root%\toolkit\alias;%_root%\toolkit\command;%_pyBin%;%_pyBin%\Scripts;%_GitBin%;%_adbBin%;%PATH%"
 set "PATH=%_root%\toolkit\alias;%_root%\toolkit\command;%_pyBin%;%_pyBin%\Scripts;%_GitBin%;%_adbBin%;%PATH%"
 
 
-title oas Updater
+
 python -m deploy.installer
 python -m deploy.installer
 if %errorlevel% neq 0 (
 if %errorlevel% neq 0 (
     pause > nul
     pause > nul
 ) else (
 ) else (
-    REM 璉��亦恣������
-    >nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
-    
-    REM 憒��銝𠹺��∪𦶢隞斤�餈𥪜��潔蛹0嚗��銵函內�瑟�蝞∠��䀹��?
-    if "%errorlevel%"=="0" (
-        REM 隞亦恣���頨思遢餈鞱� Python �𡁏𧋦
-        start /B pythonw gui.py
-    ) else (
-        REM 憒��瘝⊥�蝞∠��䀹��琜��嗘蝙�?PowerShell �𣂼�銝箇恣���頨思遢撟嗉�銵諹��?
-        PowerShell -Command "Start-Process -Verb RunAs pythonw  -ArgumentList gui.py"
-)
+    start /B pythonw gui.py
 )
 )
 
 
 REM �喲𡡒�芾澈蝒堒藁
 REM �喲𡡒�芾澈蝒堒藁

+ 3 - 0
deploy/process.py

@@ -64,5 +64,8 @@ class ProcessManager(DeployConfig):
         logger.hr(f'Kill existing Alas', 0)
         logger.hr(f'Kill existing Alas', 0)
         self.kill_by_name('oas.exe')
         self.kill_by_name('oas.exe')
         self.kill_by_name('python.exe')
         self.kill_by_name('python.exe')
+        self.kill_by_name('pythonw.exe')
 
 
 
 
+if __name__ == '__main__':
+    ProcessManager().kill_by_name('pythonw')

+ 1 - 0
module/config/config.py

@@ -213,3 +213,4 @@ if __name__ == '__main__':
     print(config.get_next())
     print(config.get_next())
 
 
 
 
+

+ 2 - 0
module/config/config_menu.py

@@ -20,6 +20,8 @@ class ConfigMenu:
         self.menu["Soul Zones"] = ['Orochi', 'Sougenbi', 'FallenSun', 'EternitySea']
         self.menu["Soul Zones"] = ['Orochi', 'Sougenbi', 'FallenSun', 'EternitySea']
         # 日常的任务
         # 日常的任务
         self.menu["Daily Task"] = ['AreaBoss', 'GoldYoukai', 'ExperienceYoukai', 'Nian', 'RealmRaid']
         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']
         self.menu["Tools"] = ['Image Rule', 'Ocr Rule', 'Click Rule', 'Long Click Rule', 'Swipe Rule', 'List Rule']

+ 26 - 7
module/config/config_model.py

@@ -10,6 +10,7 @@ from module.config.utils import *
 from module.logger import logger
 from module.logger import logger
 
 
 # 导入配置的Python文件
 # 导入配置的Python文件
+from tasks.Component.config_base import ConfigBase
 from tasks.Script.config import Script
 from tasks.Script.config import Script
 from tasks.Restart.config import Restart
 from tasks.Restart.config import Restart
 from tasks.GlobalGame.config import GlobalGame
 from tasks.GlobalGame.config import GlobalGame
@@ -24,11 +25,13 @@ from tasks.FallenSun.config import FallenSun
 from tasks.EternitySea.config import EternitySea
 from tasks.EternitySea.config import EternitySea
 from tasks.RealmRaid.config import RealmRaid
 from tasks.RealmRaid.config import RealmRaid
 
 
+# 这一部分是活动的配置-----------------------------------------------------------------------------------------------------
+from tasks.ActivityShikigami.config import ActivityShikigami
+# ----------------------------------------------------------------------------------------------------------------------
 
 
 
 
 
 
-
-class ConfigModel(BaseModel):
+class ConfigModel(ConfigBase):
     config_name: str = "oas"
     config_name: str = "oas"
     script: Script = Field(default_factory=Script)
     script: Script = Field(default_factory=Script)
     restart: Restart = Field(default_factory=Restart)
     restart: Restart = Field(default_factory=Restart)
@@ -48,6 +51,9 @@ class ConfigModel(BaseModel):
     fallen_sun: FallenSun = Field(default_factory=FallenSun)
     fallen_sun: FallenSun = Field(default_factory=FallenSun)
     eternity_sea: EternitySea = Field(default_factory=EternitySea)
     eternity_sea: EternitySea = Field(default_factory=EternitySea)
 
 
+    # 这些是活动的
+    activity_shikigami: ActivityShikigami = Field(default_factory=ActivityShikigami)
+
 
 
     # @validator('script')
     # @validator('script')
     # def script_validator(cls, v):
     # def script_validator(cls, v):
@@ -111,7 +117,18 @@ class ConfigModel(BaseModel):
         if task_gui is None:
         if task_gui is None:
             logger.error(f'{task} is no inexistence')
             logger.error(f'{task} is no inexistence')
             return ''
             return ''
-        return task_gui.schema_json()
+
+        schema2 = task_gui.schema()
+        # https://github.com/pydantic/pydantic/discussions/5687
+        if 'definitions' in schema2:
+            if 'Scheduler' in schema2['definitions']:
+                if 'properties' in schema2['definitions']['Scheduler']:
+                    properties = schema2['definitions']['Scheduler']['properties']
+                    if 'success_interval' in properties:
+                        properties['success_interval']['type'] = 'string'
+                    if 'failure_interval' in properties:
+                        properties['failure_interval']['type'] = 'string'
+        return json.dumps(schema2)
 
 
     def gui_task(self, task: str) -> str:
     def gui_task(self, task: str) -> str:
         """
         """
@@ -166,9 +183,11 @@ if __name__ == "__main__":
     except ValidationError as e:
     except ValidationError as e:
         print(e)
         print(e)
         c = ConfigModel()
         c = ConfigModel()
-    # c.write_json('oas1', c.dict())
-    # c.write_json('oas1', c.schema())
-    # for key, value in c.dict().items():
-    #     print(ConfigModel.type(key))
+
+    c.gui_args('Nian')
+    print(c.gui_task('Nian'))
+    print(c.gui_task('AreaBoss'))
+    print(c.dict()['nian']['scheduler']['success_interval'])
+    c.save()
 
 
 
 

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>Enable</source><translation>启用该功能</translation></message>
 	<message><source>Next Run</source><translation>下一次运行时间</translation></message>
 	<message><source>Next Run</source><translation>下一次运行时间</translation></message>
 	<message><source>Priority</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>enable_help</source><translation>将这个任务加入调度器</translation></message>
 	<message><source>next_run_help</source><translation>会根据下面的间隔时间自动计算时间,清空后回车即可设置为当前</translation></message>
 	<message><source>next_run_help</source><translation>会根据下面的间隔时间自动计算时间,清空后回车即可设置为当前</translation></message>
 	<message><source>priority_help</source><translation>如果设置调度规则为基于优先级,则该选项有效
 	<message><source>priority_help</source><translation>如果设置调度规则为基于优先级,则该选项有效
@@ -321,6 +321,9 @@
 	<message><source>interval_days_help</source><translation>可取[0~7]</translation></message>
 	<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_hours_help</source><translation>可取[0~24]</translation></message>
 	<message><source>interval_minutes_help</source><translation>可取[0~60]</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>
 <context>
 <context>
     <name>Args</name>
     <name>Args</name>
@@ -371,4 +374,12 @@
 	<message><source>when_network_error_help</source><translation>重启游戏</translation></message>
 	<message><source>when_network_error_help</source><translation>重启游戏</translation></message>
 	<message><source>home_client_clear_help</source><translation>有时会出现进入庭院要求清理缓存</translation></message>
 	<message><source>home_client_clear_help</source><translation>有时会出现进入庭院要求清理缓存</translation></message>
 </context>
 </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>
 </TS>

+ 58 - 0
module/config/utils.py

@@ -184,3 +184,61 @@ def convert_to_underscore(text: str) -> str:
 
 
     return result
     return result
 
 
+def get_server_last_update(daily_trigger):
+    """
+    Args:
+        daily_trigger (list[str], str): [ "00:00", "12:00", "18:00",]
+
+    Returns:
+        datetime.datetime
+    """
+    if isinstance(daily_trigger, str):
+        daily_trigger = daily_trigger.replace(' ', '').split(',')
+
+    diff = server_time_offset()
+    local_now = datetime.now()
+    trigger = []
+    for t in daily_trigger:
+        h, m = [int(x) for x in t.split(':')]
+        future = local_now.replace(hour=h, minute=m, second=0, microsecond=0) + diff
+        s = (future - local_now).total_seconds() % 86400 - 86400
+        future = local_now + timedelta(seconds=s)
+        trigger.append(future)
+    update = sorted(trigger)[-1]
+    return update
+
+
+def nearest_future(future, interval=120):
+    """
+    Get the neatest future time.
+    Return the last one if two things will finish within `interval`.
+
+    Args:
+        future (list[datetime.datetime]):
+        interval (int): Seconds
+
+    Returns:
+        datetime.datetime:
+    """
+    future = [datetime.fromisoformat(f) if isinstance(f, str) else f for f in future]
+    future = sorted(future)
+    next_run = future[0]
+    for finish in future:
+        if finish - next_run < timedelta(seconds=interval):
+            next_run = finish
+
+    return next_run
+
+
+
+def dict_to_kv(dictionary, allow_none=True):
+    """
+    Args:
+        dictionary: Such as `{'path': 'Scheduler.ServerUpdate', 'value': True}`
+        allow_none (bool):
+
+    Returns:
+        str: Such as `path='Scheduler.ServerUpdate', value=True`
+    """
+    return ', '.join([f'{k}={repr(v)}' for k, v in dictionary.items() if allow_none or v is not None])
+

+ 245 - 0
module/daemon/benchmark.py

@@ -0,0 +1,245 @@
+import time
+import typing as t
+
+import numpy as np
+from rich.table import Table
+from rich.text import Text
+
+from module.base.utils import float2str as float2str_
+from module.base.utils import random_rectangle_point
+from module.daemon.daemon_base import DaemonBase
+from module.config.config import Config
+from module.device.device import Device
+from module.exception import RequestHumanTakeover
+from module.logger import logger
+
+
+def float2str(n, decimal=3):
+    if not isinstance(n, (float, int)):
+        return str(n)
+    else:
+        return float2str_(n, decimal=decimal) + 's'
+
+
+class Benchmark(DaemonBase):
+    TEST_TOTAL = 15
+    TEST_BEST = int(TEST_TOTAL * 0.8)
+
+    def benchmark_test(self, func, *args, **kwargs):
+        """
+        Args:
+            func: Function to test.
+            *args: Passes to func.
+            **kwargs: Passes to func.
+
+        Returns:
+            float: Time cost on average.
+        """
+        logger.hr(f'Benchmark test', level=2)
+        logger.info(f'Testing function: {func.__name__}')
+        record = []
+
+        for n in range(1, self.TEST_TOTAL + 1):
+            start = time.time()
+
+            try:
+                func(*args, **kwargs)
+            except RequestHumanTakeover:
+                logger.critical('RequestHumanTakeover')
+                logger.warning(f'Benchmark tests failed on func: {func.__name__}')
+                return 'Failed'
+            except Exception as e:
+                logger.exception(e)
+                logger.warning(f'Benchmark tests failed on func: {func.__name__}')
+                return 'Failed'
+
+            cost = time.time() - start
+            logger.attr(
+                f'{str(n).rjust(2, "0")}/{self.TEST_TOTAL}',
+                f'{float2str(cost)}'
+            )
+            record.append(cost)
+
+        logger.info('Benchmark tests done')
+        average = float(np.mean(np.sort(record)[:self.TEST_BEST]))
+        logger.info(f'Time cost {float2str(average)} ({self.TEST_BEST} best results out of {self.TEST_TOTAL} tests)')
+        return average
+
+    @staticmethod
+    def evaluate_screenshot(cost):
+        if not isinstance(cost, (float, int)):
+            return Text(cost, style="bold bright_red")
+
+        if cost < 0.10:
+            return Text('Ultra Fast', style="bold bright_green")
+        if cost < 0.20:
+            return Text('Very Fast', style="bright_green")
+        if cost < 0.30:
+            return Text('Fast', style="green")
+        if cost < 0.50:
+            return Text('Medium', style="yellow")
+        if cost < 0.75:
+            return Text('Slow', style="red")
+        if cost < 1.00:
+            return Text('Very Slow', style="bright_red")
+        return Text('Ultra Slow', style="bold bright_red")
+
+    @staticmethod
+    def evaluate_click(cost):
+        if not isinstance(cost, (float, int)):
+            return Text(cost, style="bold bright_red")
+
+        if cost < 0.1:
+            return Text('Fast', style="bright_green")
+        if cost < 0.2:
+            return Text('Medium', style="yellow")
+        if cost < 0.4:
+            return Text('Slow', style="red")
+        return Text('Very Slow', style="bright_red")
+
+    @staticmethod
+    def show(test, data, evaluate_func):
+        """
+        +--------------+--------+--------+
+        |  Screenshot  |  time  | Speed  |
+        +--------------+--------+--------+
+        |     ADB      | 0.319s |  Fast  |
+        | uiautomator2 | 0.476s | Medium |
+        |  aScreenCap  | Failed | Failed |
+        +--------------+--------+--------+
+        """
+        # table = PrettyTable()
+        # table.field_names = [test, 'Time', 'Speed']
+        # for row in data:
+        #     table.add_row([row[0], f'{float2str(row[1])}', evaluate_func(row[1])])
+
+        # for row in table.get_string().split('\n'):
+        #     logger.info(row)
+        table = Table(show_lines=True)
+        table.add_column(
+            test, header_style="bright_cyan", style="cyan", no_wrap=True
+        )
+        table.add_column("Time", style="magenta")
+        table.add_column("Speed", style="green")
+        for row in data:
+            table.add_row(
+                row[0],
+                float2str(row[1]),
+                evaluate_func(row[1]),
+            )
+        logger.print(table, justify='center')
+
+    def benchmark(self, screenshot: t.Tuple[str] = (), click: t.Tuple[str] = ()):
+        logger.hr('Benchmark', level=1)
+        logger.info(f'Testing screenshot methods: {screenshot}')
+        logger.info(f'Testing click methods: {click}')
+
+        screenshot_result = []
+        for method in screenshot:
+            result = self.benchmark_test(self.device.screenshot_methods[method])
+            screenshot_result.append([method, result])
+
+        area = (120, 20, 200, 50)  # Somewhere safe to click.
+        click_result = []
+        for method in click:
+            x, y = random_rectangle_point(area)
+            result = self.benchmark_test(self.device.click_methods[method], x, y)
+            click_result.append([method, result])
+
+        def compare(res):
+            res = res[1]
+            if not isinstance(res, (int, float)):
+                return 100
+            else:
+                return res
+
+        logger.hr('Benchmark Results', level=1)
+        fastest_screenshot = 'ADB_nc'
+        fastest_click = 'minitouch'
+        if screenshot_result:
+            self.show(test='Screenshot', data=screenshot_result, evaluate_func=self.evaluate_screenshot)
+            fastest = sorted(screenshot_result, key=lambda item: compare(item))[0]
+            logger.info(f'Recommend screenshot method: {fastest[0]} ({float2str(fastest[1])})')
+            fastest_screenshot = fastest[0]
+        if click_result:
+            self.show(test='Control', data=click_result, evaluate_func=self.evaluate_click)
+            fastest = sorted(click_result, key=lambda item: compare(item))[0]
+            logger.info(f'Recommend control method: {fastest[0]} ({float2str(fastest[1])})')
+            fastest_click = fastest[0]
+
+        return fastest_screenshot, fastest_click
+
+    def get_test_methods(self) -> t.Tuple[t.Tuple[str], t.Tuple[str]]:
+        device = self.config.Benchmark_DeviceType
+        # device == 'emulator'
+        screenshot = ['ADB', 'ADB_nc', 'uiautomator2', 'DroidCast_raw', 'DroidCast', 'window_background']
+        click = ['ADB', 'uiautomator2', 'minitouch', 'window_message']
+
+        def remove(*args):
+            return [l for l in screenshot if l not in args]
+
+        # No ascreencap on Android > 9
+        if device in ['emulator_android_12', 'android_phone_12']:
+            screenshot = remove('aScreenCap', 'aScreenCap_nc')
+        # No nc loopback
+        if device in ['plone_cloud_with_adb']:
+            screenshot = remove('ADB_nc', 'aScreenCap_nc')
+        # VMOS
+        if device == 'android_phone_vmos':
+            screenshot = ['ADB', 'aScreenCap', 'DroidCast', 'DroidCast_raw']
+            click = ['ADB', 'Hermit', 'MaaTouch']
+
+        # scene = self.config.Benchmark_TestScene
+        # if 'screenshot' not in scene:
+        #     screenshot = []
+        # if 'click' not in scene:
+        #     click = []
+
+        return tuple(screenshot), tuple(click)
+
+    def run(self):
+        try:
+            self.config.override(Emulator_ScreenshotMethod='ADB')
+            self.device.uninstall_minicap()
+
+        except RequestHumanTakeover:
+            logger.critical('Request human takeover')
+            return
+
+        logger.attr('DeviceType', self.config.Benchmark_DeviceType)
+        logger.attr('TestScene', self.config.Benchmark_TestScene)
+        screenshot, click = self.get_test_methods()
+        self.benchmark(screenshot, click)
+
+    def run_simple_screenshot_benchmark(self):
+        """
+        Returns:
+            str: The fastest screenshot method on current device.
+        """
+        screenshot = ['ADB', 'ADB_nc', 'uiautomator2', 'DroidCast_raw', 'DroidCast', 'window_background']
+
+        def remove(*args):
+            return [l for l in screenshot if l not in args]
+
+        sdk = self.device.sdk_ver
+        logger.info(f'sdk_ver: {sdk}')
+        if not (21 <= sdk <= 28):
+            screenshot = remove('aScreenCap', 'aScreenCap_nc')
+        if self.device.is_chinac_phone_cloud:
+            screenshot = remove('ADB_nc', 'aScreenCap_nc')
+        screenshot = tuple(screenshot)
+
+        self.TEST_TOTAL = 3
+        self.TEST_BEST = 1
+        method, _ = self.benchmark(screenshot, tuple())
+
+        return method
+
+
+if __name__ == '__main__':
+    config = Config('oas1')
+    device = Device(config)
+    b = Benchmark(config=config, device=device)
+    # print(b.run_simple_screenshot_benchmark())
+    screenshot, click = b.get_test_methods()
+    b.benchmark(set(), click)

+ 7 - 0
module/daemon/daemon_base.py

@@ -0,0 +1,7 @@
+from tasks.base_task import BaseTask
+
+
+class DaemonBase(BaseTask):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.device.disable_stuck_detection()

+ 1 - 0
module/device/connection.py

@@ -697,6 +697,7 @@ class Connection(ConnectionAttr):
                 c.send_command("host:devices")
                 c.send_command("host:devices")
                 c.check_okay()
                 c.check_okay()
                 output = c.read_string_block()
                 output = c.read_string_block()
+                logger.debug(output)
                 for line in output.splitlines():
                 for line in output.splitlines():
                     parts = line.strip().split("\t")
                     parts = line.strip().split("\t")
                     if len(parts) != 2:
                     if len(parts) != 2:

+ 2 - 2
module/device/control.py

@@ -72,7 +72,7 @@ class Control(Minitouch, Adb, Scrcpy, Window):
             self.handle_control_check(control_name)
             self.handle_control_check(control_name)
         x, y = ensure_int(x, y)
         x, y = ensure_int(x, y)
         logger.info(
         logger.info(
-            'Click %s , name: %s' % (point2str(x, y), control_name)
+            'Click %s @ %s' % (point2str(x, y), control_name)
         )
         )
         method = self.click_methods.get(
         method = self.click_methods.get(
             self.config.script.device.control_method,
             self.config.script.device.control_method,
@@ -142,7 +142,7 @@ class Control(Minitouch, Adb, Scrcpy, Window):
             duration = 0.8
             duration = 0.8
         duration = ensure_time(duration)
         duration = ensure_time(duration)
         logger.info(
         logger.info(
-            'Click %s @ %s' % (point2str(x, y), duration)
+            'Click %s @ %s %s' % (point2str(x, y), control_name, duration)
         )
         )
         method = self.long_click_methods.get(
         method = self.long_click_methods.get(
             self.config.script.emulator.control_method,
             self.config.script.emulator.control_method,

+ 16 - 9
module/device/device.py

@@ -45,13 +45,14 @@ class Device(Screenshot, Control, AppControl, EmulatorManager):
         """
         """
         logger.info('run_simple_screenshot_benchmark')
         logger.info('run_simple_screenshot_benchmark')
         # Check resolution first
         # Check resolution first
-        self.resolution_check_uiautomator2()
+        # self.resolution_check_uiautomator2()
         # Perform benchmark
         # Perform benchmark
-        # from module.daemon.benchmark import Benchmark
-        # bench = Benchmark(config=self.config, device=self)
-        # method = bench.run_simple_screenshot_benchmark()
-        # # Set
-        # self.config.Emulator_ScreenshotMethod = method
+        from module.daemon.benchmark import Benchmark
+        bench = Benchmark(config=self.config, device=self)
+        method = bench.run_simple_screenshot_benchmark()
+        # Set
+        self.config.script.device.screenshot_method = method
+        self.config.save()
 
 
     def handle_night_commission(self, daily_trigger='21:00', threshold=30):
     def handle_night_commission(self, daily_trigger='21:00', threshold=30):
         """
         """
@@ -104,6 +105,12 @@ class Device(Screenshot, Control, AppControl, EmulatorManager):
             self._scrcpy_server_stop()
             self._scrcpy_server_stop()
 
 
     def stuck_record_add(self, button):
     def stuck_record_add(self, button):
+        """
+        当你要设置这个时候检测为长时间的时候,你需要在这里添加
+        如果取消后,需要在`stuck_record_clear`中清除
+        :param button:
+        :return:
+        """
         self.detect_record.add(str(button))
         self.detect_record.add(str(button))
 
 
     def stuck_record_clear(self):
     def stuck_record_clear(self):
@@ -220,6 +227,6 @@ class Device(Screenshot, Control, AppControl, EmulatorManager):
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":
     device = Device(config="oas1")
     device = Device(config="oas1")
-    cv2.imshow("imgSrceen", device.screenshot())  # 显示
-    cv2.waitKey(0)
-    cv2.destroyAllWindows()
+    # cv2.imshow("imgSrceen", device.screenshot())  # 显示
+    # cv2.waitKey(0)
+    # cv2.destroyAllWindows()

+ 1 - 1
module/device/method/droidcast.py

@@ -65,7 +65,7 @@ def retry(func):
                     self.droidcast_init()
                     self.droidcast_init()
             # DroidCastVersionIncompatible
             # DroidCastVersionIncompatible
             except DroidCastVersionIncompatible as e:
             except DroidCastVersionIncompatible as e:
-                logger.error(e)
+                logger.warning(e)
 
 
                 def init():
                 def init():
                     self.droidcast_init()
                     self.droidcast_init()

+ 1 - 0
module/device/method/window.py

@@ -147,6 +147,7 @@ class Window(Handle):
         # print(f"我点击的x:{x}, y:{y}")
         # print(f"我点击的x:{x}, y:{y}")
         emulator_type = len(self.control_handle_list)
         emulator_type = len(self.control_handle_list)
         if emulator_type == 2:  # mumu模拟器
         if emulator_type == 2:  # mumu模拟器
+            SendMessage(self.control_handle_list[0], WM_ACTIVATE, WA_ACTIVE, 0)  # 激活窗口
             SendMessage(self.control_handle_list[0], WM_LBUTTONDOWN, 0, MAKELONG(x, y+self.mumu_head_height))  # 模拟鼠标按下 先是父窗口 上面的框高度是57
             SendMessage(self.control_handle_list[0], WM_LBUTTONDOWN, 0, MAKELONG(x, y+self.mumu_head_height))  # 模拟鼠标按下 先是父窗口 上面的框高度是57
             time.sleep((random.randint(100, 200)) / 1000.0)  # 点击弹起改为随机,时间100ms-200ms
             time.sleep((random.randint(100, 200)) / 1000.0)  # 点击弹起改为随机,时间100ms-200ms
             SendMessage(self.control_handle_list[1], WM_LBUTTONUP, 0, MAKELONG(x, y))  # 模拟鼠标弹起 后是子窗口
             SendMessage(self.control_handle_list[1], WM_LBUTTONUP, 0, MAKELONG(x, y))  # 模拟鼠标弹起 后是子窗口

+ 2 - 1
module/gui/utils.py

@@ -22,7 +22,8 @@ def is_admin():
     Check if the program is running as an admin.
     Check if the program is running as an admin.
     """
     """
     try:
     try:
-        return ctypes.windll.shell32.IsUserAnAdmin()
+        result = ctypes.windll.shell32.IsUserAnAdmin()
+        return result == 1
     except:
     except:
         return False
         return False
 
 

+ 1 - 1
script.py

@@ -444,5 +444,5 @@ class Script:
 if __name__ == "__main__":
 if __name__ == "__main__":
     script = Script("oas1")
     script = Script("oas1")
     # print(script.get_next_task())
     # print(script.get_next_task())
-    script.run("AreaBoss")
+    script.run("ActivityShikigami")
     # script.run('RealmRaid')
     # 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
+

+ 2 - 1
tasks/AreaBoss/config.py

@@ -5,10 +5,11 @@ from pydantic import BaseModel, Field
 
 
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 from tasks.AreaBoss.config_boss import Boss
 from tasks.AreaBoss.config_boss import Boss
 
 
 
 
-class AreaBoss(BaseModel):
+class AreaBoss(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
     general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
     general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
     boss: Boss = Field(default_factory=Boss)
     boss: Boss = Field(default_factory=Boss)

+ 1 - 1
tasks/AreaBoss/script_task.py

@@ -166,7 +166,7 @@ class ScriptTask(GeneralBattle, AreaBossAssets):
 
 
         # 退出
         # 退出
         self.go_back()
         self.go_back()
-        self.set_next_run(task='AreaBoss')
+        self.set_next_run(task='AreaBoss', success=True)
 
 
         # 以抛出异常的形式结束
         # 以抛出异常的形式结束
         raise TaskEnd
         raise TaskEnd

+ 0 - 67
tasks/CoinChallenge/assets.py

@@ -1,67 +0,0 @@
-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 CoinChallengeAssets: 
-
-
-	# Image Rule Assets
-	# description 
-	I_NEW1 = RuleImage(roi_front=(157,240,70,79), roi_back=(41,185,279,207), threshold=0.8, method="Template matching", file="./tasks/CoinChallenge/res/res_new1.png")
-	# description 
-	I_NEW2 = RuleImage(roi_front=(362,243,100,100), roi_back=(803,101,100,100), threshold=0.8, method="Template matching", file="./tasks/CoinChallenge/res/res_new2.png")
-	# desc55 
-	I_NEW3 = RuleImage(roi_front=(568,212,240,220), roi_back=(0,0,100,100), threshold=0.9, method="Template matching", file="./tasks/CoinChallenge/res/res_new3.png")
-
-
-	# Click Rule Assets
-	# description 
-	C_NEW1 = RuleClick(roi_front=(268,268,100,100), roi_back=(614,214,100,100), name="new1")
-	# description 
-	C_NEW2 = RuleClick(roi_front=(171,236,100,100), roi_back=(554,225,100,100), name="new2")
-	# desc444n 
-	C_NEW3 = RuleClick(roi_front=(180,150,100,100), roi_back=(596,247,100,100), name="new3")
-
-
-	# Long Click Rule Assets
-	# description 
-	L_NEW1 = RuleLongClick(roi_front=(208,151,100,100), roi_back=(542,279,100,100), duration=1500, name="new1")
-	# description 
-	L_NEW2 = RuleLongClick(roi_front=(355,191,100,100), roi_back=(526,323,100,100), duration=1500, name="new2")
-	# de66666n 
-	L_NEW3 = RuleLongClick(roi_front=(112,156,100,100), roi_back=(469,200,100,100), duration=1000, name="new3")
-
-
-	# Ocr Rule Assets
-	# Ocr-description 
-	O_NEW_FULL = RuleOcr(roi=(255,129,628,100), area=(637,418,100,100), mode="Full", method="Default", keyword="探索", name="new_full")
-	# Ocr-description 
-	O_NEW_SINGLE_V = RuleOcr(roi=(564,255,105,159), area=(0,0,100,100), mode="Single", method="Default", keyword="式神育成", name="new_single_v")
-	# Ocr-description 
-	O_NEW_SINGLE_H = RuleOcr(roi=(78,19,143,63), area=(314,169,100,100), mode="Single", method="Default", keyword="式神育成", name="new_single_h")
-	# Ocr-description 
-	O_DIGIT = RuleOcr(roi=(434,173,25,43), area=(0,0,100,100), mode="Digit", method="Default", keyword="", name="digit")
-	# Ocr-description 
-	O_DIGIT_COUNTER = RuleOcr(roi=(1134,6,100,56), area=(0,0,100,100), mode="DigitCounter", method="Default", keyword="", name="digit_counter")
-	# Ocr-description 
-	O_DURATION = RuleOcr(roi=(923,256,100,46), area=(0,0,100,100), mode="Duration", method="Default", keyword="育成_结界卡剩余时间", name="duration")
-	# Ocr-description 
-	O_NEW_DUR_00 = RuleOcr(roi=(848,624,76,37), area=(0,0,100,100), mode="Duration", method="Default", keyword="", name="new_dur_00")
-
-
-	# Swipe Rule Assets
-	# description 
-	S_NEW1 = RuleSwipe(roi_front=(253,212,100,100), roi_back=(652,292,100,100), mode="default", name="new1")
-	# description 
-	S_NEW2 = RuleSwipe(roi_front=(265,272,100,100), roi_back=(622,338,100,100), mode="default", name="new2")
-	# description 
-	S_NEW3 = RuleSwipe(roi_front=(198,160,100,100), roi_back=(626,305,100,100), mode="default", name="new3")
-	# description 
-	S_NEW4 = RuleSwipe(roi_front=(150,145,100,100), roi_back=(535,199,100,100), mode="vector", name="new4")
-
-

BIN
tasks/CoinChallenge/res/res_new1.png


BIN
tasks/CoinChallenge/res/res_new2.png


BIN
tasks/CoinChallenge/res/res_new3.png


+ 0 - 1
tasks/CoinChallenge/res/test.json

@@ -1 +0,0 @@
-[{"itemName":"new1","imageName":"res_new1.png","roiFront":"157,240,70,79","roiBack":"41,185,279,207","method":"Template matching","threshold":0.8,"description":"description"},{"itemName":"new2","imageName":"res_new2.png","roiFront":"362,243,100,100","roiBack":"803,101,100,100","method":"Template matching","threshold":0.8,"description":"description"},{"itemName":"new3","imageName":"res_new3.png","roiFront":"568,212,240,220","roiBack":"0,0,100,100","method":"Template matching","threshold":0.9,"description":"desc55"}]

+ 0 - 20
tasks/CoinChallenge/res/test_click.json

@@ -1,20 +0,0 @@
-[
-    {
-        "itemName": "new1",
-        "roiFront": "268,268,100,100",
-        "roiBack": "614,214,100,100",
-        "description": "description"
-    },
-    {
-        "itemName": "new2",
-        "roiFront": "171,236,100,100",
-        "roiBack": "554,225,100,100",
-        "description": "description"
-    },
-    {
-        "itemName": "new3",
-        "roiFront": "180,150,100,100",
-        "roiBack": "596,247,100,100",
-        "description": "desc444n"
-    }
-]

+ 0 - 23
tasks/CoinChallenge/res/test_long_click.json

@@ -1,23 +0,0 @@
-[
-    {
-        "itemName": "new1",
-        "roiFront": "208,151,100,100",
-        "roiBack": "542,279,100,100",
-        "duration": 1500,
-        "description": "description"
-    },
-    {
-        "itemName": "new2",
-        "roiFront": "355,191,100,100",
-        "roiBack": "526,323,100,100",
-        "duration": 1500,
-        "description": "description"
-    },
-    {
-        "itemName": "new3",
-        "roiFront": "112,156,100,100",
-        "roiBack": "469,200,100,100",
-        "duration": 1000,
-        "description": "de66666n"
-    }
-]

+ 0 - 65
tasks/CoinChallenge/res/test_ocr.json

@@ -1,65 +0,0 @@
-[
-  {
-    "itemName": "new_full",
-    "roiFront": "255,129,628,100",
-    "roiBack": "637,418,100,100",
-    "mode": "Full",
-    "method": "Default",
-    "keyword": "探索",
-    "description": "Ocr-description"
-  },
-  {
-    "itemName": "new_single_v",
-    "roiFront": "564,255,105,159",
-    "roiBack": "0,0,100,100",
-    "mode": "Single",
-    "method": "Default",
-    "keyword": "式神育成",
-    "description": "Ocr-description"
-  },
-  {
-    "itemName": "new_single_h",
-    "roiFront": "78,19,143,63",
-    "roiBack": "314,169,100,100",
-    "mode": "Single",
-    "method": "Default",
-    "keyword": "式神育成",
-    "description": "Ocr-description"
-  },
-  {
-    "itemName": "digit",
-    "roiFront": "434,173,25,43",
-    "roiBack": "0,0,100,100",
-    "mode": "Digit",
-    "method": "Default",
-    "keyword": "",
-    "description": "Ocr-description"
-  },
-  {
-    "itemName": "digit_counter",
-    "roiFront": "1134,6,100,56",
-    "roiBack": "0,0,100,100",
-    "mode": "DigitCounter",
-    "method": "Default",
-    "keyword": "",
-    "description": "Ocr-description"
-  },
-  {
-    "itemName": "duration",
-    "roiFront": "923,256,100,46",
-    "roiBack": "0,0,100,100",
-    "mode": "Duration",
-    "method": "Default",
-    "keyword": "育成_结界卡剩余时间",
-    "description": "Ocr-description"
-  },
-  {
-    "itemName": "new_dur_00",
-    "roiFront": "848,624,76,37",
-    "roiBack": "0,0,100,100",
-    "mode": "Duration",
-    "method": "Default",
-    "keyword": "",
-    "description": "Ocr-description"
-  }
-]

+ 0 - 30
tasks/CoinChallenge/res/test_swipe.json

@@ -1,30 +0,0 @@
-[
-    {
-        "itemName": "new1",
-        "roiFront": "253,212,100,100",
-        "roiBack": "652,292,100,100",
-        "mode": "default",
-        "description": "description"
-    },
-    {
-        "itemName": "new2",
-        "roiFront": "265,272,100,100",
-        "roiBack": "622,338,100,100",
-        "mode": "default",
-        "description": "description"
-    },
-    {
-        "itemName": "new3",
-        "roiFront": "198,160,100,100",
-        "roiBack": "626,305,100,100",
-        "mode": "default",
-        "description": "description"
-    },
-    {
-        "itemName": "new4",
-        "roiFront": "150,145,100,100",
-        "roiBack": "535,199,100,100",
-        "mode": "vector",
-        "description": "description"
-    }
-]

+ 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:
+        """

+ 19 - 9
tasks/Component/GeneralBattle/general_battle.py

@@ -21,6 +21,10 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
         运行脚本
         运行脚本
         :return:
         :return:
         """
         """
+        # 本人选择的策略是只要进来了就算一次,不管是不是打完了
+        logger.hr("General battle start", 2)
+        self.current_count += 1
+        logger.info(f"Current count: {self.current_count}")
         if config is None:
         if config is None:
             config = GeneralBattleConfig().dict()
             config = GeneralBattleConfig().dict()
 
 
@@ -32,7 +36,7 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
         if not config.lock_team_enable:
         if not config.lock_team_enable:
             logger.info("Lock team is not 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("Preset is enable")
                 # 点击预设按钮
                 # 点击预设按钮
                 logger.info("Click preset button")
                 logger.info("Click preset button")
@@ -57,7 +61,7 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
                 self.device.click(x, y)
                 self.device.click(x, y)
 
 
                 # 选择预设的队伍
                 # 选择预设的队伍
-                logger.info("select preset team")
+                logger.info("Select preset team")
                 time.sleep(0.5)
                 time.sleep(0.5)
                 match config.preset_team:
                 match config.preset_team:
                     case 1: x, y = self.C_PRESET_TEAM_1.coord()
                     case 1: x, y = self.C_PRESET_TEAM_1.coord()
@@ -68,7 +72,7 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
                 self.device.click(x, y)
                 self.device.click(x, y)
 
 
                 # 点击预设确认
                 # 点击预设确认
-                logger.info("click preset ensure")
+                logger.info("Click preset ensure")
                 while 1:
                 while 1:
                     self.screenshot()
                     self.screenshot()
                     if self.appear_then_click(self.I_PRESET_ENSURE, threshold=0.8):
                     if self.appear_then_click(self.I_PRESET_ENSURE, threshold=0.8):
@@ -77,9 +81,9 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
                         break
                         break
 
 
             # 点击buff按钮
             # 点击buff按钮
-            if config.buff_enable:
-                logger.info("buff is enable")
-                logger.info("click buff button")
+            if config.buff_enable and self.current_count == 1:
+                logger.info("Buff is enable")
+                logger.info("Click buff button")
                 while 1:
                 while 1:
                     self.screenshot()
                     self.screenshot()
                     if self.appear_then_click(self.I_BUFF, interval=1.5):
                     if self.appear_then_click(self.I_BUFF, interval=1.5):
@@ -119,8 +123,12 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
             # 点击绿标
             # 点击绿标
             self.device.click(x, y)
             self.device.click(x, y)
 
 
+        # 有的时候是长战斗,需要在设置stuck检测为长战斗
+        # 但是无需取消设置,因为如果有点击或者滑动的话 handle_control_check会自行取消掉
+        self.device.stuck_record_add('BATTLE_STATUS_S')
+
         # 战斗过程 随机点击和滑动 防封
         # 战斗过程 随机点击和滑动 防封
-        logger.info("battle process")
+        logger.info("Start battle process")
         win: bool = False
         win: bool = False
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
@@ -152,9 +160,11 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
                             self.swipe(self.S_BATTLE_RANDOM_LEFT, interval=20)
                             self.swipe(self.S_BATTLE_RANDOM_LEFT, interval=20)
                         case 2:
                         case 2:
                             self.swipe(self.S_BATTLE_RANDOM_RIGHT, interval=20)
                             self.swipe(self.S_BATTLE_RANDOM_RIGHT, interval=20)
+                    # 重新设置为长战斗
+                    self.device.stuck_record_add('BATTLE_STATUS_S')
 
 
         # 再次确认战斗结果
         # 再次确认战斗结果
-        logger.info("reconfirm the results of the battle")
+        logger.info("Reconfirm the results of the battle")
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if win:
             if win:
@@ -171,7 +181,7 @@ class GeneralBattle(BaseTask, GeneralBattleAssets):
                     return False
                     return False
         # 最后保证能点击 获得奖励
         # 最后保证能点击 获得奖励
         self.wait_until_appear(self.I_REWARD)
         self.wait_until_appear(self.I_REWARD)
-        logger.info("get reward")
+        logger.info("Get reward")
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             # 如果出现领奖励
             # 如果出现领奖励

+ 30 - 0
tasks/Component/config_base.py

@@ -0,0 +1,30 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+
+from datetime import timedelta
+from pydantic import BaseModel, datetime_parse
+
+
+
+def format_timedelta(tdelta: timedelta):
+    days = tdelta.days
+    hours, rem = divmod(tdelta.seconds, 3600)
+    minutes, seconds = divmod(rem, 60)
+    return f"{days:02d} {hours:02d}:{minutes:02d}:{seconds:02d}"
+
+class TimeDelta(timedelta):
+    def __str__(self):
+        return format_timedelta(self)
+
+    def __repr__(self):
+        return format_timedelta(self)
+
+class ConfigBase(BaseModel):
+    class Config:
+        json_encoders = {
+            TimeDelta: format_timedelta
+        }
+
+
+

+ 33 - 5
tasks/Component/config_scheduler.py

@@ -1,17 +1,21 @@
 # This Python file uses the following encoding: utf-8
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
+import re
 from enum import Enum
 from enum import Enum
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, time
 from pydantic import BaseModel, ValidationError, validator, Field
 from pydantic import BaseModel, ValidationError, validator, Field
 
 
-class Scheduler(BaseModel):
+from tasks.Component.config_base import ConfigBase, TimeDelta
+
+class Scheduler(ConfigBase):
     enable: bool = Field(default=False, description='enable_help')
     enable: bool = Field(default=False, description='enable_help')
     next_run: datetime = Field(default="2023-01-01 00:00:00", description='next_run_help')
     next_run: datetime = Field(default="2023-01-01 00:00:00", description='next_run_help')
     priority: int = Field(default=5, description='priority_help')
     priority: int = Field(default=5, description='priority_help')
-    interval_days: int = Field(default=1, description='interval_days_help')
-    interval_hours: int = Field(default=0, description='interval_hours_help')
-    interval_minutes: int = Field(default=0, description='interval_minutes_help')
+
+    success_interval: TimeDelta = Field(default=TimeDelta(days=1), description='success_interval_help')
+    failure_interval: TimeDelta = Field(default=TimeDelta(days=1), description='failure_interval_help')
+    server_update: time = Field(default=time(hour=6, minute=0, second=0), description='server_update_help')
 
 
     @validator('next_run', pre=True, always=True)
     @validator('next_run', pre=True, always=True)
     def parse_next_run(cls, value):
     def parse_next_run(cls, value):
@@ -22,3 +26,27 @@ class Scheduler(BaseModel):
                 raise ValueError('Invalid next_run value. Expected format: YYYY-MM-DD HH:MM:SS')
                 raise ValueError('Invalid next_run value. Expected format: YYYY-MM-DD HH:MM:SS')
         return value
         return value
 
 
+    @validator('success_interval', 'failure_interval', pre=True)
+    def parse_interval(cls, value):
+        if isinstance(value, str):
+            try:
+                pattern = r'(\d{1,2})\s+(\d{1,2}):(\d{1,2}):(\d{1,2})'
+                match = re.match(pattern, value)
+                if match:
+                    days = int(match.group(1))
+                    hours = int(match.group(2))
+                    minutes = int(match.group(3))
+                    seconds = int(match.group(4))
+                    return TimeDelta(days=days, hours=hours, minutes=minutes, seconds=seconds)
+                return TimeDelta(days=1, hours=0, minutes=0, seconds=0)
+            except ValueError:
+                raise ValueError('Invalid interval value. Expected format: seconds')
+        return value
+
+
+if __name__ == "__main__":
+    s = Scheduler(success_interval='1 2:3:4')
+    print(s.json())
+    print(s.dict())
+
+

+ 1 - 0
tasks/DemonEncounter/config.py

@@ -2,4 +2,5 @@
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
+from tasks.Component.config_base import ConfigBase
 
 

+ 2 - 1
tasks/EternitySea/config.py

@@ -4,7 +4,8 @@
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
 
 
 
-class EternitySea(BaseModel):
+class EternitySea(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)

+ 2 - 1
tasks/ExperienceYoukai/config.py

@@ -4,7 +4,8 @@
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
 
-class ExperienceYoukai(BaseModel):
+class ExperienceYoukai(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
 
 

+ 2 - 2
tasks/FallenSun/config.py

@@ -4,8 +4,8 @@
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
 
-
-class FallenSun(BaseModel):
+class FallenSun(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
 
 

+ 1 - 0
tasks/General/config.py

@@ -3,5 +3,6 @@
 # github https://github.com/runhey
 # github https://github.com/runhey
 
 
 from pydantic import BaseModel, ValidationError, validator, Field
 from pydantic import BaseModel, ValidationError, validator, Field
+from tasks.Component.config_base import ConfigBase
 
 
 from module.logger import logger
 from module.logger import logger

+ 1 - 1
tasks/GlobalGame/config.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
 
 
 from tasks.GlobalGame.config_emergency import Emergency
 from tasks.GlobalGame.config_emergency import Emergency
-
+from tasks.Component.config_base import ConfigBase
 
 
 class GlobalGame(BaseModel):
 class GlobalGame(BaseModel):
     emergency: Emergency = Field(default_factory=Emergency)
     emergency: Emergency = Field(default_factory=Emergency)

+ 2 - 1
tasks/GoldYoukai/config.py

@@ -4,7 +4,8 @@
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
 
 
 
-class GoldYoukai(BaseModel):
+class GoldYoukai(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)

+ 1 - 1
tasks/Hunt/config.py

@@ -4,4 +4,4 @@
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
-
+from tasks.Component.config_base import ConfigBase

+ 3 - 2
tasks/Nian/config.py

@@ -1,11 +1,12 @@
 # This Python file uses the following encoding: utf-8
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
+from datetime import timedelta
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
 
-
-class Nian(BaseModel):
+class Nian(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
 
 

+ 2 - 1
tasks/Orochi/config.py

@@ -4,7 +4,8 @@
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
 
-class Orochi(BaseModel):
+class Orochi(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
 
 

+ 2 - 2
tasks/OrochiMoans/config.py

@@ -4,8 +4,8 @@
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
 
-
-class OrochiMoans(BaseModel):
+class OrochiMoans(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
 
 

+ 2 - 2
tasks/RealmRaid/config.py

@@ -6,7 +6,7 @@ from enum import Enum
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
-
+from tasks.Component.config_base import ConfigBase
 
 
 class RaidMode(str, Enum):
 class RaidMode(str, Enum):
     NORMAL = 'retreat_four_attack_nine'
     NORMAL = 'retreat_four_attack_nine'
@@ -22,7 +22,7 @@ class RaidConfig(BaseModel):
     attack_number: AttackNumber = Field(title='Attack Number', default=AttackNumber.ALL,
     attack_number: AttackNumber = Field(title='Attack Number', default=AttackNumber.ALL,
                                         description='')
                                         description='')
 
 
-class RealmRaid(BaseModel):
+class RealmRaid(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
     raid_config: RaidConfig = Field(default_factory=RaidConfig)
     raid_config: RaidConfig = Field(default_factory=RaidConfig)
     general_battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
     general_battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)

+ 1 - 1
tasks/RealmRaid/script_task.py

@@ -78,7 +78,7 @@ class ScriptTask(GeneralBattle, GameUi, RealmRaidAssets):
         # 点击左上角的关闭
         # 点击左上角的关闭
         self.explore_home()
         self.explore_home()
 
 
-        self.set_next_run(task='RealmRaid')
+        self.set_next_run(task='RealmRaid', success=True)
         raise TaskEnd
         raise TaskEnd
 
 
 
 

+ 3 - 2
tasks/Restart/config.py

@@ -3,8 +3,9 @@
 # github https://github.com/runhey
 # github https://github.com/runhey
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
 
 
-from tasks.Restart.config_scheduler import Scheduler
+from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
 
-class Restart(BaseModel):
+class Restart(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
 
 

+ 14 - 10
tasks/Restart/config_scheduler.py

@@ -8,17 +8,21 @@ from pydantic import BaseModel, ValidationError, validator, Field
 from module.logger import logger
 from module.logger import logger
 
 
 class Scheduler(BaseModel):
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
-    next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=0,
-                          description='default 0')
-    command: str = Field(default='Restart',
-                         description='none')
+    enable: bool = Field(default=True, description='none')
+    next_run: datetime = Field(default="2023-01-01 00:00:00", description='无需手动修改')
+    priority: int = Field(default=0, description='重启的优先级最高,数值为0,保持默认即可')
+
     success_interval: float = Field(default=0,
     success_interval: float = Field(default=0,
                                     description='none')
                                     description='none')
     failure_interval: float = Field(default=0,
     failure_interval: float = Field(default=0,
                                     description='none')
                                     description='none')
-    server_update: time = Field(default="00:00",
-                                description='none')
+    server_update: time = Field(default="00:00", description='none')
+
+    @validator('next_run', pre=True, always=True)
+    def parse_next_run(cls, value):
+        if isinstance(value, str):
+            try:
+                return datetime.fromisoformat(value)
+            except ValueError:
+                raise ValueError('Invalid next_run value. Expected format: YYYY-MM-DD HH:MM:SS')
+        return value

+ 27 - 0
tasks/Restart/script_task.py

@@ -0,0 +1,27 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+
+
+from tasks.Restart.config_scheduler import Scheduler
+from module.logger import logger
+from tasks.Restart.assets import RestartAssets
+from tasks.base_task import BaseTask
+from module.exception import TaskEnd
+
+
+
+
+class ScriptTask(BaseTask):
+
+    def run(self) -> None:
+        raise TaskEnd('ScriptTask end')
+
+
+
+
+
+
+
+
+

+ 5 - 4
tasks/Script/config_device.py

@@ -11,11 +11,12 @@ class PackageName(str, Enum):
     NETEASE_ONMYOJI = 'com.netease.onmyoji.wyzymnqsd_cps'  # 网易自家的阴阳师
     NETEASE_ONMYOJI = 'com.netease.onmyoji.wyzymnqsd_cps'  # 网易自家的阴阳师
 
 
 class ScreenshotMethod(str, Enum):
 class ScreenshotMethod(str, Enum):
-    ADB = 'adb'
-    ADB_NC = 'adb_nc'
+    AUTO = 'auto'
+    ADB = 'ADB'
+    ADB_NC = 'ADB_nc'
     UIAUTOMATOR2 = 'uiautomator2'
     UIAUTOMATOR2 = 'uiautomator2'
-    DROIDCAST = 'droidcast'
-    DROIDCAST_RAW = 'droidcast_raw'
+    DROIDCAST = 'Droidcast'
+    DROIDCAST_RAW = 'Droidcast_raw'
     SCRCPY = 'scrcpy'
     SCRCPY = 'scrcpy'
     WINDOW_BACKGROUND = 'window_background'
     WINDOW_BACKGROUND = 'window_background'
 
 

+ 2 - 2
tasks/Script/config_error.py

@@ -7,9 +7,9 @@ from module.logger import logger
 
 
 
 
 class Error(BaseModel):
 class Error(BaseModel):
-    handle_error: bool = Field(default=False,
+    handle_error: bool = Field(default=True,
                                description='handle_error_help')
                                description='handle_error_help')
-    save_error: bool = Field(default=False,
+    save_error: bool = Field(default=True,
                              description='')
                              description='')
     screenshot_length: int = Field(default=1,
     screenshot_length: int = Field(default=1,
                                    description='')
                                    description='')

+ 2 - 2
tasks/Sougenbi/config.py

@@ -4,8 +4,8 @@
 from pydantic import BaseModel, Field
 from pydantic import BaseModel, Field
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
 
-
-class Sougenbi(BaseModel):
+class Sougenbi(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
 
 

+ 65 - 13
tasks/base_task.py

@@ -3,7 +3,7 @@
 # github https://github.com/runhey
 # github https://github.com/runhey
 import numpy as np
 import numpy as np
 
 
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, time
 from typing import Union
 from typing import Union
 
 
 from module.config.utils import convert_to_underscore
 from module.config.utils import convert_to_underscore
@@ -17,11 +17,12 @@ from module.ocr.base_ocr import OcrMode, OcrMethod
 from module.logger import logger
 from module.logger import logger
 from module.base.timer import Timer
 from module.base.timer import Timer
 from module.config.config import Config
 from module.config.config import Config
+from module.config.utils import get_server_next_update, nearest_future, dict_to_kv
 from module.device.device import Device
 from module.device.device import Device
 from tasks.GlobalGame.assets import GlobalGameAssets
 from tasks.GlobalGame.assets import GlobalGameAssets
 from tasks.GlobalGame.config_emergency import FriendInvitation, WhenNetworkAbnormal, WhenNetworkError
 from tasks.GlobalGame.config_emergency import FriendInvitation, WhenNetworkAbnormal, WhenNetworkError
 
 
-from module.exception import GameStuckError
+from module.exception import GameStuckError, ScriptError
 
 
 
 
 
 
@@ -33,7 +34,9 @@ class BaseTask(GlobalGameAssets):
     name: str
     name: str
     stage: 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:
     def __init__(self, config: Config, device: Device) -> None:
         self.config = config
         self.config = config
@@ -43,11 +46,14 @@ class BaseTask(GlobalGameAssets):
 
 
         self.start_time = datetime.now()  # 启动的时间
         self.start_time = datetime.now()  # 启动的时间
 
 
-        self.friend_timer = None
+        self.friend_timer = None  # 这个是用来记录勾协的时间的
         if self.config.global_game.emergency.invitation_detect_interval:
         if self.config.global_game.emergency.invitation_detect_interval:
             self.interval_time = 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.friend_timer = Timer(self.interval_time)
 
 
+        # 战斗次数相关
+        self.current_count = 0  # 战斗次数
+
     def screenshot(self):
     def screenshot(self):
         """
         """
         截图 引入中间函数的目的是 为了解决如协作的这类突发的事件
         截图 引入中间函数的目的是 为了解决如协作的这类突发的事件
@@ -61,6 +67,7 @@ class BaseTask(GlobalGameAssets):
             # 如果是全部接受
             # 如果是全部接受
             if invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.ACCEPT:
             if invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.ACCEPT:
                 # 如果是接受邀请
                 # 如果是接受邀请
+                logger.info(f"Accept friend invitation")
                 while 1:
                 while 1:
                     if self.appear_then_click(self.I_ACCEPT):
                     if self.appear_then_click(self.I_ACCEPT):
                         continue
                         continue
@@ -68,6 +75,7 @@ class BaseTask(GlobalGameAssets):
                         break
                         break
             # 如果是全部拒绝
             # 如果是全部拒绝
             elif invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.REJECT:
             elif invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.REJECT:
+                logger.info(f"Reject friend invitation")
                 while 1:
                 while 1:
                     if self.appear_then_click(self.I_REJECT):
                     if self.appear_then_click(self.I_REJECT):
                         continue
                         continue
@@ -75,6 +83,7 @@ class BaseTask(GlobalGameAssets):
                         break
                         break
             # 最后一个是仅仅接受勾协
             # 最后一个是仅仅接受勾协
             elif invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.ONLY_JADE:
             elif invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.ONLY_JADE:
+                logger.info(f"Accept jade invitation")
                 while 1:
                 while 1:
                     if self.appear_then_click(self.I_ACCEPT):
                     if self.appear_then_click(self.I_ACCEPT):
                         continue
                         continue
@@ -82,10 +91,12 @@ class BaseTask(GlobalGameAssets):
                         break
                         break
             # 判断网络异常
             # 判断网络异常
             if self.appear(self.I_NETWORK_ABNORMAL):
             if self.appear(self.I_NETWORK_ABNORMAL):
+                logger.warning(f"Network abnormal")
                 raise GameStuckError
                 raise GameStuckError
 
 
             # 判断网络错误
             # 判断网络错误
             if self.appear(self.I_NETWORK_ERROR):
             if self.appear(self.I_NETWORK_ERROR):
+                logger.warning(f"Network error")
                 raise GameStuckError
                 raise GameStuckError
 
 
         return self.device.image
         return self.device.image
@@ -395,28 +406,69 @@ class BaseTask(GlobalGameAssets):
                 x1, y1, x2, y2 = target.swipe_pos(after=after)
                 x1, y1, x2, y2 = target.swipe_pos(after=after)
                 self.device.swipe(p1=(x1, y1), p2=(x2, y2))
                 self.device.swipe(p1=(x1, y1), p2=(x2, y2))
 
 
-    def set_next_run(self, task: str, finish: bool = False) -> None:
+    def set_next_run(self, task: str, finish: bool = False,
+                     success: bool=None, server: bool=None, target: timedelta=None) -> None:
         """
         """
         设置下次运行时间  当然这个也是可以重写的
         设置下次运行时间  当然这个也是可以重写的
+        :param target: 可以自定义的下次运行时间
+        :param server: delay to nearest Scheduler.ServerUpdate
+        :param success: 判断是成功的还是失败的时间间隔
         :param task: 任务名称,大驼峰的
         :param task: 任务名称,大驼峰的
         :param finish: 是完成任务后的时间为基准还是开始任务的时间为基准
         :param finish: 是完成任务后的时间为基准还是开始任务的时间为基准
         :return:
         :return:
         """
         """
+
+        # 任务预处理
+        if not task:
+            task = self.config.task.command
         task = convert_to_underscore(task)
         task = convert_to_underscore(task)
         task_object = getattr(self.config.model, task, None)
         task_object = getattr(self.config.model, task, None)
         if not task_object:
         if not task_object:
             logger.warning(f'No task named {task}')
             logger.warning(f'No task named {task}')
             return
             return
+        scheduler = getattr(task_object, 'scheduler', None)
+        if not scheduler:
+            logger.warning(f'No scheduler in {task}')
+            return
 
 
+        # 任务开始时间
         if finish:
         if finish:
             start_time = datetime.now()
             start_time = datetime.now()
         else:
         else:
             start_time = self.start_time
             start_time = self.start_time
-        delta = timedelta(days=task_object.scheduler.interval_days,
-                          hours=task_object.scheduler.interval_hours,
-                          minutes=task_object.scheduler.interval_minutes, )
-        next_run = start_time + delta
-        next_run.replace(microsecond=0)
-
-        task_object.scheduler.next_run = next_run
-        self.config.save()
+
+        # 依次判断是否有自定义的下次运行时间
+        run = []
+        if success is not None:
+            interval = (
+                scheduler.success_interval
+                if success
+                else scheduler.failure_interval
+            )
+            run.append(start_time + interval)
+        if server is not None:
+            if server:
+                server = scheduler.server_update
+                run.append(get_server_next_update(server))
+        if target is not None:
+            target = [target] if not isinstance(target, list) else target
+            target = nearest_future(target)
+            run.append(target)
+        # 排序
+        if len(run):
+            run = min(run).replace(microsecond=0)
+            kv = dict_to_kv(
+                {
+                    "success": success,
+                    "server_update": server,
+                    "target": target,
+                },
+                allow_none=False,
+            )
+            logger.info(f"Delay task `{task}` to {run} ({kv})")
+            scheduler.next_run = run
+            self.config.save()
+        else:
+            raise ScriptError(
+                "Missing argument in delay_next_run, should set at least one"
+            )