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

Merge pull request #1327 from runhey/dev

Automated PR 2025.12.25
huangrunheng 10 месяцев назад
Родитель
Сommit
3b9eb82de1
37 измененных файлов с 332 добавлено и 334 удалено
  1. 1 1
      README.md
  2. 3 2
      module/device/control.py
  3. 2 1
      module/device/screenshot.py
  4. 18 5
      module/server/script_process.py
  5. 1 1
      requirements-in.txt
  6. 1 2
      requirements.txt
  7. BIN
      tasks/ActivityShikigami/0110/0110_c_confirm1.png
  8. BIN
      tasks/ActivityShikigami/0110/0110_n_battle.png
  9. BIN
      tasks/ActivityShikigami/0110/0110_n_confirm.png
  10. 0 26
      tasks/ActivityShikigami/0110/click.json
  11. 0 29
      tasks/ActivityShikigami/0110/image.json
  12. 180 0
      tasks/ActivityShikigami/README.md
  13. BIN
      tasks/ActivityShikigami/as/as_act_map_switch.png
  14. BIN
      tasks/ActivityShikigami/as/as_antivity_win.png
  15. BIN
      tasks/ActivityShikigami/as/as_battle.png
  16. BIN
      tasks/ActivityShikigami/as/as_battle_1.png
  17. BIN
      tasks/ActivityShikigami/as/as_battle_org.png
  18. BIN
      tasks/ActivityShikigami/as/as_boss.png
  19. BIN
      tasks/ActivityShikigami/as/as_check_act_list_climb_act.png
  20. BIN
      tasks/ActivityShikigami/as/as_check_ap100.png
  21. BIN
      tasks/ActivityShikigami/as/as_check_battle_2.png
  22. BIN
      tasks/ActivityShikigami/as/as_drum.png
  23. BIN
      tasks/ActivityShikigami/as/as_entry_activity.png
  24. BIN
      tasks/ActivityShikigami/as/as_pass_act_locat.png
  25. 0 42
      tasks/ActivityShikigami/as/click.json
  26. 0 72
      tasks/ActivityShikigami/as/image.json
  27. 0 20
      tasks/ActivityShikigami/as/ocr.json
  28. 7 64
      tasks/ActivityShikigami/assets.py
  29. 0 9
      tasks/ActivityShikigami/fire/image.json
  30. 25 15
      tasks/ActivityShikigami/fire/ocr.json
  31. 25 39
      tasks/ActivityShikigami/script_task.py
  32. 62 0
      tasks/ActivityShikigami/script_test.py
  33. 1 1
      tasks/Exploration/assets.py
  34. 1 1
      tasks/Exploration/res/image.json
  35. 2 2
      tasks/Orochi/assets.py
  36. 2 2
      tasks/Orochi/o/image.json
  37. 1 0
      tasks/SixRealms/moon_sea/l101.py

+ 1 - 1
README.md

@@ -84,7 +84,7 @@ OAS 在其基础上进行了如下优化:
 相对于其他的游戏,阴阳师玩家总体而言对脚本这类工具具有极高的排斥性。树大招风,无论你是否喜欢 OAS ,我们都希望你不在互联网上进行宣传,这保护 OAS , 也保护开发者们。
 
 为此保持较高的入群门槛: 
-#### QQ交流群: 465946275
+#### QQ交流群: 1群465946275 2群1076565458
 - 你的QQ等级必须大于32级(🌞🌞),注册时间超过一年,低等级账号成分复杂,还请见谅。
 - 你必须拥有一个 Github 账户来点一个 **Star** (这并不影响你入群后取消Star),同样的要求注册时间过半年。
 - 入群验证填入你的 Github `username`(不是`name`),无需在意问题是什么,由QQ机器人审核(机器永远的对的)。

+ 3 - 2
module/device/control.py

@@ -4,6 +4,7 @@ from module.base.timer import Timer
 from module.base.utils import *
 # from module.device.method.hermit import Hermit
 # from module.device.method.maatouch import MaaTouch
+from module.device.env import IS_WINDOWS
 from module.device.method.minitouch import Minitouch
 from module.device.method.adb import Adb
 from module.device.method.scrcpy import Scrcpy
@@ -22,7 +23,7 @@ class Control(Minitouch, Adb, Scrcpy, Window):
             'ADB': self.click_adb,
             'uiautomator2': self.click_uiautomator2,
             'minitouch': self.click_minitouch,
-            'window_message': self.click_window_message
+            'window_message': self.click_window_message if IS_WINDOWS else None,
             # 'Hermit': self.click_hermit,
             # 'MaaTouch': self.click_maatouch,
         }
@@ -33,7 +34,7 @@ class Control(Minitouch, Adb, Scrcpy, Window):
             'ADB': self.long_click_adb,
             'uiautomator2': self.long_click_uiautomator2,
             'minitouch': self.long_click_minitouch,
-            'window_message': self.long_click_window_message,
+            'window_message': self.long_click_window_message if IS_WINDOWS else None,
             'scrcpy': self.long_click_scrcpy
             # 'Hermit': self.click_hermit,
             # 'MaaTouch': self.click_maatouch,

+ 2 - 1
module/device/screenshot.py

@@ -11,6 +11,7 @@ from PIL import Image
 from module.base.decorator import cached_property
 from module.base.timer import Timer
 from module.base.utils import get_color, image_size, limit_in, save_image
+from module.device.env import IS_WINDOWS
 from module.device.method.adb import Adb
 from module.device.method.windows import Window
 from module.device.method.droidcast import DroidCast
@@ -43,7 +44,7 @@ class Screenshot(Adb, DroidCast, Scrcpy, Window, NemuIpc):
             'DroidCast': self.screenshot_droidcast,
             'DroidCast_raw': self.screenshot_droidcast_raw,
             'scrcpy': self.screenshot_scrcpy,
-            'window_background': self.screenshot_window_background,
+            'window_background': self.screenshot_window_background if IS_WINDOWS else None,
             'nemu_ipc': self.screenshot_nemu_ipc
         }
 

+ 18 - 5
module/server/script_process.py

@@ -2,6 +2,8 @@
 # @author runhey
 # 脚本进程
 # github https://github.com/runhey
+import sys, os
+import signal
 import multiprocessing
 from asyncio import QueueEmpty, CancelledError, sleep
 from enum import Enum
@@ -10,12 +12,14 @@ from module.logger import logger
 
 from module.server.script_websocket import ScriptWSManager
 
+
 class ScriptState(int, Enum):
     INACTIVE = 0
     RUNNING = 1
     WARNING = 2
     UPDATING = 3
 
+
 class ScriptProcess(ScriptWSManager):
 
     def __init__(self, config_name: str) -> None:
@@ -26,9 +30,6 @@ class ScriptProcess(ScriptWSManager):
         self.state: ScriptState = ScriptState.INACTIVE
         self._process = None
 
-
-
-
     async def start(self):
         self.state = ScriptState.RUNNING
         await self.broadcast_state({"state": self.state})
@@ -40,10 +41,10 @@ class ScriptProcess(ScriptWSManager):
         self._process = multiprocessing.Process(target=func,
                                                 args=(self.config_name, self.state_queue, self.log_pipe_in,),
                                                 name=self.config_name,
-                                                daemon=True)
+                                                daemon=True
+                                                )
         self._process.start()
 
-
     async def stop(self):
         self.state = ScriptState.INACTIVE
         await self.broadcast_state({"state": self.state})
@@ -54,6 +55,10 @@ class ScriptProcess(ScriptWSManager):
             logger.warning(f'Script {self.config_name} is not running')
             return
         self._process.terminate()
+        self._process.join(timeout=0.7)
+        if self._process.is_alive():
+            logger.error(f'Script {self.config_name} subprocess terminate failed')
+            self._process.kill()
         self._process = None
 
     async def coroutine_broadcast_state(self):
@@ -114,6 +119,14 @@ class ScriptProcess(ScriptWSManager):
 
 
 def func(config: str, state_queue: multiprocessing.Queue, log_pipe_in) -> None:
+    def signal_handler(signum, frame):
+        logger.info(f'Script {config} received signal {signum}, exiting gracefully')
+        log_pipe_in.close()
+        state_queue.close()
+        sys.exit(0)
+
+    signal.signal(signal.SIGTERM, signal_handler)
+    signal.signal(signal.SIGINT, signal_handler)
 
     def start_log() -> None:
         try:

+ 1 - 1
requirements-in.txt

@@ -17,7 +17,7 @@ cn2an==0.5.23
 # Web
 paho-mqtt==1.6.1
 fastapi==0.104.1
-uvicorn==0.23.2
+uvicorn==0.38.0
 websockets==11.0.3
 zerorpc==0.6.3
 pydantic==2.10.0

+ 1 - 2
requirements.txt

@@ -5,7 +5,6 @@
 #    pip-compile --annotation-style=line --output-file=requirements.txt requirements-in.txt
 #
 
-
 adbutils==0.11.0          # via -r requirements-in.txt, uiautomator2
 annotated-types==0.7.0    # via pydantic
 anyio==3.7.1              # via fastapi, starlette
@@ -80,7 +79,7 @@ typing-extensions==4.12.2  # via fastapi, pydantic, pydantic-core, uvicorn
 uiautomator2==2.16.17     # via -r requirements-in.txt
 uiautomator2cache==0.3.0.1  # via -r requirements-in.txt
 urllib3==2.1.0            # via requests
-uvicorn==0.23.2           # via -r requirements-in.txt
+uvicorn==0.38.0           # via -r requirements-in.txt
 websockets==11.0.3        # via -r requirements-in.txt
 whichcraft==0.6.1         # via adbutils, uiautomator2
 wrapt==1.15.0             # via -r requirements-in.txt, deprecated

BIN
tasks/ActivityShikigami/0110/0110_c_confirm1.png


BIN
tasks/ActivityShikigami/0110/0110_n_battle.png


BIN
tasks/ActivityShikigami/0110/0110_n_confirm.png


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

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

+ 0 - 29
tasks/ActivityShikigami/0110/image.json

@@ -1,29 +0,0 @@
-[
-  {
-    "itemName": "n_battle",
-    "imageName": "0110_n_battle.png",
-    "roiFront": "131,164,86,86",
-    "roiBack": "119,50,1075,635",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "n_confirm",
-    "imageName": "0110_n_confirm.png",
-    "roiFront": "670,402,176,63",
-    "roiBack": "670,402,176,63",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
-  {
-    "itemName": "c_confirm1",
-    "imageName": "0110_c_confirm1.png",
-    "roiFront": "560,341,37,38",
-    "roiBack": "560,341,37,38",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  }
-]

+ 180 - 0
tasks/ActivityShikigami/README.md

@@ -0,0 +1,180 @@
+## 这里是约定哪些是需要更新的     ./script_test.py 是对应的测试
+
+
+
+## 关于页面导航(`./as/page.json`文件)
+
+#### 图片 `shi` 表示进入到活动的主页面,截图的时候往上截图一点,因为快结束的时候图片下方会显示还有多少小时结束
+
+![image-20251220103009134](https://runhey-img-stg1.oss-cn-chengdu.aliyuncs.com/img3/202512201030265.png)
+
+#### 图片`to_battle_main` 和 `to_battle_boss` 分别表示进入默认的挑战界面和boss挑战界面
+
+![image-20251220103500219](https://runhey-img-stg1.oss-cn-chengdu.aliyuncs.com/img3/202512201035354.png)
+
+#### 图片`check_battle_main` 表示到达了这个默认战斗界面       |  `battle_main_to_records`表示从这里进入式神录来切换御魂
+
+#### 图片`check_battle_boss`  和 `battle_boss_to_records` 类似的
+
+![image-20251220104003594](https://runhey-img-stg1.oss-cn-chengdu.aliyuncs.com/img3/202512201040758.png)
+
+#### 可能需要更新的如 `back_green`、 `red_exit` 和 `skip_button`  这些表示退出的时候碰到的时候会出现的
+
+#### OAS 内部有一个专门的类来存放通用的图片。  路径在`./tasks/GlobalGame/ui`  有需要直接使用
+
+![image-20251220104718877](https://runhey-img-stg1.oss-cn-chengdu.aliyuncs.com/img3/202512201047907.png)
+
+
+
+## 关于战斗更新 (`./fire/ocr.json`文件)
+
+#### OCR `remain_ap`  表示体力模式下剩余多少次数  `fire` 表示点击挑战
+
+![image-20251220111306772](https://runhey-img-stg1.oss-cn-chengdu.aliyuncs.com/img3/202512201113931.png)
+
+活动币模式下 `remain_pass`  和 boss 模式下也是类似
+
+![image-20251220111505769](https://runhey-img-stg1.oss-cn-chengdu.aliyuncs.com/img3/202512201115927.png)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

BIN
tasks/ActivityShikigami/as/as_act_map_switch.png


BIN
tasks/ActivityShikigami/as/as_antivity_win.png


BIN
tasks/ActivityShikigami/as/as_battle.png


BIN
tasks/ActivityShikigami/as/as_battle_1.png


BIN
tasks/ActivityShikigami/as/as_battle_org.png


BIN
tasks/ActivityShikigami/as/as_boss.png


BIN
tasks/ActivityShikigami/as/as_check_act_list_climb_act.png


BIN
tasks/ActivityShikigami/as/as_check_ap100.png


BIN
tasks/ActivityShikigami/as/as_check_battle_2.png


BIN
tasks/ActivityShikigami/as/as_drum.png


BIN
tasks/ActivityShikigami/as/as_entry_activity.png


BIN
tasks/ActivityShikigami/as/as_pass_act_locat.png


+ 0 - 42
tasks/ActivityShikigami/as/click.json

@@ -28,47 +28,5 @@
     "roiFront": "42,94,1207,543",
     "roiBack": "42,94,1207,543",
     "description": "description"
-  },
-  {
-    "itemName": "buff_1_up",
-    "roiFront": "204,626,134,39",
-    "roiBack": "204,626,134,39",
-    "description": "替换buff1"
-  },
-  {
-    "itemName": "buff_2_up",
-    "roiFront": "414,625,134,39",
-    "roiBack": "414,625,134,39",
-    "description": "替换buff2"
-  },
-  {
-    "itemName": "buff_3_up",
-    "roiFront": "619,625,134,39",
-    "roiBack": "619,625,134,39",
-    "description": "替换buff3"
-  },
-  {
-    "itemName": "buff_4_up",
-    "roiFront": "831,625,134,39",
-    "roiBack": "831,625,134,39",
-    "description": "替换buff4"
-  },
-  {
-    "itemName": "buff_5_up",
-    "roiFront": "1043,624,134,39",
-    "roiBack": "1043,624,134,39",
-    "description": "替换buff5"
-  },
-  {
-    "itemName": "buff_1_box",
-    "roiFront": "333,338,70,72",
-    "roiBack": "333,338,70,72",
-    "description": "上阵buff_1位置"
-  },
-  {
-    "itemName": "buff_2_box",
-    "roiFront": "877,220,59,62",
-    "roiBack": "877,220,59,62",
-    "description": "上阵buff_2位置"
   }
 ]

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

@@ -1,22 +1,4 @@
 [
-  {
-    "itemName": "battle_1",
-    "imageName": "as_battle_1.png",
-    "roiFront": "541,197,149,26",
-    "roiBack": "506,622,273,96",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "进入爬塔1"
-  },
-  {
-    "itemName": "drum",
-    "imageName": "as_drum.png",
-    "roiFront": "327,627,145,28",
-    "roiBack": "256,462,301,232",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "归鹿之途"
-  },
   {
     "itemName": "lock",
     "imageName": "as_lock.png",
@@ -88,59 +70,5 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
-  },
-  {
-    "itemName": "boss",
-    "imageName": "as_boss.png",
-    "roiFront": "165,339,33,132",
-    "roiBack": "103,218,160,355",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "爬塔进入首领战"
-  },
-  {
-    "itemName": "check_boss",
-    "imageName": "as_check_boss.png",
-    "roiFront": "87,18,126,37",
-    "roiBack": "63,0,172,81",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "爬塔boss战页面检查图像"
-  },
-  {
-    "itemName": "check_battle_2",
-    "imageName": "as_check_battle_2.png",
-    "roiFront": "22,632,61,69",
-    "roiBack": "1,601,109,117",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "爬塔活动副页检查标志"
-  },
-  {
-    "itemName": "entry_activity",
-    "imageName": "as_entry_activity.png",
-    "roiFront": "508,318,46,42",
-    "roiBack": "56,56,971,633",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "进入门票活动"
-  },
-  {
-    "itemName": "check_act_list_climb_act",
-    "imageName": "as_check_act_list_climb_act.png",
-    "roiFront": "538,194,497,193",
-    "roiBack": "415,67,773,390",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "活动列表页爬塔活动"
-  },
-  {
-    "itemName": "pass_act_locat",
-    "imageName": "as_pass_act_locat.png",
-    "roiFront": "1214,395,29,31",
-    "roiBack": "1179,373,100,86",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "门票活动定位"
   }
 ]

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

@@ -1,20 +0,0 @@
-[
-  {
-    "itemName": "remain_ap100",
-    "roiFront": "922,21,112,39",
-    "roiBack": "913,8,131,62",
-    "mode": "Digit",
-    "method": "Default",
-    "keyword": "",
-    "description": "100体活动门票检测"
-  },
-  {
-    "itemName": "enter_ap100",
-    "roiFront": "73,98,95,32",
-    "roiBack": "5,79,256,108",
-    "mode": "Single",
-    "method": "Default",
-    "keyword": "将魂试炼",
-    "description": "进入100体活动标识"
-  }
-]

+ 7 - 64
tasks/ActivityShikigami/assets.py

@@ -10,26 +10,6 @@ from module.atom.list import RuleList
 class ActivityShikigamiAssets: 
 
 
-	# Click Rule Assets
-	# description 
-	C_CLICK1 = RuleClick(roi_front=(120,138,130,75), roi_back=(120,138,130,75), name="click1")
-	# description 
-	C_CLICK2 = RuleClick(roi_front=(121,234,125,81), roi_back=(121,234,125,81), name="click2")
-	# description 
-	C_CLICK3 = RuleClick(roi_front=(126,337,118,77), roi_back=(126,337,118,77), name="click3")
-	# description 
-	C_CLICK4 = RuleClick(roi_front=(124,438,126,77), roi_back=(124,438,126,77), name="click4")
-
-
-	# Image Rule Assets
-	# description 
-	I_N_BATTLE = RuleImage(roi_front=(131,164,86,86), roi_back=(119,50,1075,635), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_n_battle.png")
-	# description 
-	I_N_CONFIRM = RuleImage(roi_front=(670,402,176,63), roi_back=(670,402,176,63), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_n_confirm.png")
-	# description 
-	I_C_CONFIRM1 = RuleImage(roi_front=(560,341,37,38), roi_back=(560,341,37,38), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_c_confirm1.png")
-
-
 	# Click Rule Assets
 	# description 
 	C_RANDOM_LEFT = RuleClick(roi_front=(17,69,132,599), roi_back=(17,70,137,599), name="random_left")
@@ -41,27 +21,9 @@ class ActivityShikigamiAssets:
 	C_RANDOM_BOTTOM = RuleClick(roi_front=(179,577,972,100), roi_back=(179,579,972,100), name="random_bottom")
 	# description 
 	C_RANDOM_ALL = RuleClick(roi_front=(42,94,1207,543), roi_back=(42,94,1207,543), name="random_all")
-	# 替换buff1 
-	C_BUFF_1_UP = RuleClick(roi_front=(204,626,134,39), roi_back=(204,626,134,39), name="buff_1_up")
-	# 替换buff2 
-	C_BUFF_2_UP = RuleClick(roi_front=(414,625,134,39), roi_back=(414,625,134,39), name="buff_2_up")
-	# 替换buff3 
-	C_BUFF_3_UP = RuleClick(roi_front=(619,625,134,39), roi_back=(619,625,134,39), name="buff_3_up")
-	# 替换buff4 
-	C_BUFF_4_UP = RuleClick(roi_front=(831,625,134,39), roi_back=(831,625,134,39), name="buff_4_up")
-	# 替换buff5 
-	C_BUFF_5_UP = RuleClick(roi_front=(1043,624,134,39), roi_back=(1043,624,134,39), name="buff_5_up")
-	# 上阵buff_1位置 
-	C_BUFF_1_BOX = RuleClick(roi_front=(333,338,70,72), roi_back=(333,338,70,72), name="buff_1_box")
-	# 上阵buff_2位置 
-	C_BUFF_2_BOX = RuleClick(roi_front=(877,220,59,62), roi_back=(877,220,59,62), name="buff_2_box")
 
 
 	# Image Rule Assets
-	# 进入爬塔1 
-	I_BATTLE_1 = RuleImage(roi_front=(541,197,149,26), roi_back=(506,622,273,96), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle_1.png")
-	# 归鹿之途 
-	I_DRUM = RuleImage(roi_front=(327,627,145,28), roi_back=(256,462,301,232), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	# 上锁图标 
 	I_LOCK = RuleImage(roi_front=(825,657,28,25), roi_back=(739,613,276,85), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
@@ -78,25 +40,6 @@ class ActivityShikigamiAssets:
 	I_ADD_MAX = RuleImage(roi_front=(17,24,33,37), roi_back=(974,524,57,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_add_max.png")
 	# description 
 	I_TOGGLE_BUTTON = RuleImage(roi_front=(1193,463,27,25), roi_back=(1169,146,73,403), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_toggle_button.png")
-	# 爬塔进入首领战 
-	I_BOSS = RuleImage(roi_front=(165,339,33,132), roi_back=(103,218,160,355), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_boss.png")
-	# 爬塔boss战页面检查图像 
-	I_CHECK_BOSS = RuleImage(roi_front=(87,18,126,37), roi_back=(63,0,172,81), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_boss.png")
-	# 爬塔活动副页检查标志 
-	I_CHECK_BATTLE_2 = RuleImage(roi_front=(22,632,61,69), roi_back=(1,601,109,117), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_battle_2.png")
-	# 进入门票活动 
-	I_ENTRY_ACTIVITY = RuleImage(roi_front=(508,318,46,42), roi_back=(56,56,971,633), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_entry_activity.png")
-	# 活动列表页爬塔活动 
-	I_CHECK_ACT_LIST_CLIMB_ACT = RuleImage(roi_front=(538,194,497,193), roi_back=(415,67,773,390), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_check_act_list_climb_act.png")
-	# 门票活动定位 
-	I_PASS_ACT_LOCAT = RuleImage(roi_front=(1214,395,29,31), roi_back=(1179,373,100,86), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_pass_act_locat.png")
-
-
-	# Ocr Rule Assets
-	# 100体活动门票检测 
-	O_REMAIN_AP100 = RuleOcr(roi=(922,21,112,39), area=(913,8,131,62), mode="Digit", method="Default", keyword="", name="remain_ap100")
-	# 进入100体活动标识 
-	O_ENTER_AP100 = RuleOcr(roi=(73,98,95,32), area=(5,79,256,108), mode="Single", method="Default", keyword="将魂试炼", name="enter_ap100")
 
 
 	# Image Rule Assets
@@ -121,8 +64,6 @@ class ActivityShikigamiAssets:
 
 
 	# Image Rule Assets
-	# 征伐斗场 
-	I_BATTLE = RuleImage(roi_front=(813,254,35,135), roi_back=(754,140,154,315), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/fire/as_battle.png")
 	# description 
 	I_PASS_1 = RuleImage(roi_front=(359,295,100,53), roi_back=(68,203,1138,369), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/fire/fire_pass_1.png")
 	# description 
@@ -152,6 +93,8 @@ class ActivityShikigamiAssets:
 
 
 	# Ocr Rule Assets
+	# 挑战 
+	O_FIRE = RuleOcr(roi=(1137,599,83,44), area=(1129,570,100,100), mode="Single", method="Default", keyword="挑战", name="fire")
 	# 体力的数量检测 
 	O_REMAIN_AP = RuleOcr(roi=(749,18,73,29), area=(749,18,73,29), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
@@ -159,12 +102,12 @@ class ActivityShikigamiAssets:
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	# 活动票数(没有百分比) 
-	O_REMAIN_AP_ACTIVITY2 = RuleOcr(roi=(1115,25,88,29), area=(1107,14,103,50), mode="Digit", method="Default", keyword="", name="remain_ap_activity2")
-	# 从左侧进入战斗 
-	O_ENTRY_ACTIVITY = RuleOcr(roi=(73,189,98,32), area=(72,188,98,32), mode="Single", method="Default", keyword="临战演武", name="entry_activity")
+	O_REMAIN_PASS2 = RuleOcr(roi=(1115,25,88,29), area=(1107,14,103,50), mode="Digit", method="Default", keyword="", name="remain_pass2")
 	# boss剩余攻击次数 
 	O_REMAIN_BOSS = RuleOcr(roi=(1113,669,131,31), area=(1099,659,162,52), mode="DigitCounter", method="Default", keyword="", name="remain_boss")
-	# 挑战 
-	O_FIRE = RuleOcr(roi=(1137,599,83,44), area=(1129,570,100,100), mode="Single", method="Default", keyword="挑战", name="fire")
+	# 100体活动门票检测 
+	O_REMAIN_AP100 = RuleOcr(roi=(922,21,112,39), area=(913,8,131,62), mode="Digit", method="Default", keyword="", name="remain_ap100")
+	# 进入100体活动标识 
+	O_ENTER_AP100 = RuleOcr(roi=(73,98,95,32), area=(5,79,256,108), mode="Single", method="Default", keyword="将魂试炼", name="enter_ap100")
 
 

+ 0 - 9
tasks/ActivityShikigami/fire/image.json

@@ -1,13 +1,4 @@
 [
-  {
-    "itemName": "battle",
-    "imageName": "as_battle.png",
-    "roiFront": "813,254,35,135",
-    "roiBack": "754,140,154,315",
-    "method": "Template matching",
-    "threshold": 0.7,
-    "description": "征伐斗场"
-  },
   {
     "itemName": "pass_1",
     "imageName": "fire_pass_1.png",

+ 25 - 15
tasks/ActivityShikigami/fire/ocr.json

@@ -1,4 +1,13 @@
 [
+  {
+    "itemName": "fire",
+    "roiFront": "1137,599,83,44",
+    "roiBack": "1129,570,100,100",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "挑战",
+    "description": "挑战"
+  },
   {
     "itemName": "remain_ap",
     "roiFront": "749,18,73,29",
@@ -27,7 +36,7 @@
     "description": "还有多少次购买体力的机会"
   },
   {
-    "itemName": "remain_ap_activity2",
+    "itemName": "remain_pass2",
     "roiFront": "1115,25,88,29",
     "roiBack": "1107,14,103,50",
     "mode": "Digit",
@@ -35,15 +44,6 @@
     "keyword": "",
     "description": "活动票数(没有百分比)"
   },
-  {
-    "itemName": "entry_activity",
-    "roiFront": "73,189,98,32",
-    "roiBack": "72,188,98,32",
-    "mode": "Single",
-    "method": "Default",
-    "keyword": "临战演武",
-    "description": "从左侧进入战斗"
-  },
   {
     "itemName": "remain_boss",
     "roiFront": "1113,669,131,31",
@@ -53,13 +53,23 @@
     "keyword": "",
     "description": "boss剩余攻击次数"
   },
+
+    {
+    "itemName": "remain_ap100",
+    "roiFront": "922,21,112,39",
+    "roiBack": "913,8,131,62",
+    "mode": "Digit",
+    "method": "Default",
+    "keyword": "",
+    "description": "100体活动门票检测"
+  },
   {
-    "itemName": "fire",
-    "roiFront": "1137,599,83,44",
-    "roiBack": "1129,570,100,100",
+    "itemName": "enter_ap100",
+    "roiFront": "73,98,95,32",
+    "roiBack": "5,79,256,108",
     "mode": "Single",
     "method": "Default",
-    "keyword": "挑战",
-    "description": "挑战"
+    "keyword": "将魂试炼",
+    "description": "进入100体活动标识"
   }
 ]

+ 25 - 39
tasks/ActivityShikigami/script_task.py

@@ -143,6 +143,9 @@ class StateMachine(BaseTask):
 
 
 class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
+    """
+    更新前请先看 ./README.md
+    """
 
     def run(self) -> None:
         self.limit_time: timedelta = self.conf.general_climb.limit_time_v
@@ -172,6 +175,9 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         raise TaskEnd
 
     def _run_pass(self):
+        """
+            更新前请先看 ./README.md
+        """
         logger.hr(f'Start run climb type PASS', 1)
         self.ui_click(self.I_TO_BATTLE_MAIN, stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         self.switch_soul(self.I_BATTLE_MAIN_TO_RECORDS, self.I_CHECK_BATTLE_MAIN)
@@ -188,15 +194,15 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             if self.ui_reward_appear_click():
                 continue
             # 击败魇兽将直接前往下一层
-            if self.appear(self.I_PASS12):
-                logger.info('Found魇兽将')
-                from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig as GBC1
-                _battle_config = GBC1(lock_team_enable=True)
-                _battle_config.lock_team_enable = True
-                self.ui_click(self.I_PASS12, stop=self.I_PASS_13)
-                self.ui_click_until_disappear(self.I_PASS_13, interval=1)
-                self.run_general_battle(config=_battle_config)
-                continue
+            # if self.appear(self.I_PASS12):
+            #     logger.info('Found魇兽将')
+            #     from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig as GBC1
+            #     _battle_config = GBC1(lock_team_enable=True)
+            #     _battle_config.lock_team_enable = True
+            #     self.ui_click(self.I_PASS12, stop=self.I_PASS_13)
+            #     self.ui_click_until_disappear(self.I_PASS_13, interval=1)
+            #     self.run_general_battle(config=_battle_config)
+            #     continue
             # 领箱子
             if self.appear_then_click(self.I_PASS_5):
                 logger.info('Found箱子')
@@ -225,7 +231,7 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
                         logger.info('Select one done')
                         continue
             # 下一层
-            if self.appear_then_click(self.I_PASS_7, interval=1):
+            if self.appear_then_click(self.I_PASS_7, interval=1, threshold=0.65):
                 logger.info('Next layer')
                 continue
             if click_limit_timer.reached():
@@ -245,7 +251,6 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             if not self.check_tickets_enough():
                 logger.warning(f'No tickets left, wait for next time')
                 break
-            # 点击战斗前随机休息
             if self.conf.general_climb.random_sleep:
                 random_sleep(probability=0.2)
             if self.start_battle():
@@ -254,6 +259,9 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_TO_BATTLE_MAIN, interval=1)
 
     def _run_ap(self):
+        """
+            更新前请先看 ./README.md
+        """
         logger.hr(f'Start run climb type AP')
         self.ui_click(self.I_TO_BATTLE_MAIN, stop=self.I_CHECK_BATTLE_MAIN, interval=1)
         self.switch_soul(self.I_BATTLE_MAIN_TO_RECORDS, self.I_CHECK_BATTLE_MAIN)
@@ -274,7 +282,6 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             if not self.check_tickets_enough():
                 logger.warning(f'No tickets left, wait for next time')
                 break
-            # 点击战斗前随机休息
             if self.conf.general_climb.random_sleep:
                 random_sleep(probability=0.2)
             if self.start_battle():
@@ -283,7 +290,10 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_TO_BATTLE_MAIN, interval=1)
 
     def _run_boss(self):
-        pass
+        """
+        更新前请先看 ./README.md
+        """
+        logger.hr(f'Start run climb type BOSS')
 
     def start_battle(self):
         click_times, max_times = 0, random.randint(2, 4)
@@ -294,10 +304,8 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             if click_times >= max_times:
                 logger.warning(f'Climb {self.climb_type} cannot enter, maybe already end, try next')
                 return
-            if ((self.appear_then_click(self.I_C_CONFIRM1, interval=0.6) or
-                 self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1) or
-                 self.appear_then_click(self.I_UI_CONFIRM, interval=1)) or
-                    self.appear_then_click(self.I_N_CONFIRM, interval=1)):
+            if (self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1) or
+                    self.appear_then_click(self.I_UI_CONFIRM, interval=1) ):
                 continue
             if self.ocr_appear_click(self.O_FIRE, interval=2):
                 click_times += 1
@@ -354,28 +362,6 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
                 self.random_click_swipt()
         return True
 
-    # def exit_battle(self, skip_first: bool = False) -> bool:
-    #     """
-    #     在战斗的时候强制退出战斗
-    #     :param skip_first: 是否跳过第一次截屏
-    #     :return: 退出战斗成功True or 失败False
-    #     """
-    #     timeout_timer = Timer(6).start()
-    #     exit_clicked = False
-    #     while not timeout_timer.reached():
-    #         self.maybe_screenshot(skip_first)
-    #         skip_first = False
-    #         # 不在战斗界面, 认为退出成功
-    #         if not self.is_in_battle(False):
-    #             return True
-    #         if exit_clicked:
-    #             self.appear_then_click(self.I_EXIT_ENSURE)
-    #         if not exit_clicked and self.appear_then_click(self.I_EXIT):
-    #             exit_clicked = True
-    #         sleep(random.uniform(0.5, 1.5))
-    #     # 还在战斗界面且超时则退出失败
-    #     return False
-
     def switch_soul(self, enter_button: RuleImage, cur_img: RuleImage):
         conf = self.conf.switch_soul_config
         conf.validate_switch_soul()

+ 62 - 0
tasks/ActivityShikigami/script_test.py

@@ -0,0 +1,62 @@
+
+import datetime
+from abc import ABC
+
+from module.config.config import Config
+from module.device.device import Device
+
+from tasks.ActivityShikigami.page import page_climb_act
+from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
+from tasks.ActivityShikigami.script_task import ScriptTask
+
+
+class ImplScriptTask(ScriptTask, ABC):
+    def test_battle_main(self) -> bool:
+        # 从别的地方到活动主页面
+        self.ui_get_current_page()
+        self.ui_goto(page_climb_act)
+        # 从活动主页面到默认战斗页面
+        self.ui_click(self.I_TO_BATTLE_MAIN, stop=self.I_CHECK_BATTLE_MAIN, interval=1)
+        # 从默认战斗页面到式神录 再返回
+        self.ui_click(self.I_BATTLE_MAIN_TO_RECORDS, stop=self.I_CHECK_RECORDS, interval=1)
+        self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_CHECK_BATTLE_MAIN, interval=1)
+        self.ui_click(self.I_UI_BACK_YELLOW, stop=self.I_TO_BATTLE_MAIN, interval=1)
+        return True
+
+
+class ScriptTest:
+    def __init__(self, config: str = 'oas1'):
+        self.config = Config(config)
+        self.device = Device(self.config)
+        self.task = ImplScriptTask(self.config, self.device)
+
+
+if __name__ == '__main__':
+    test = ScriptTest(config='oas1')
+    assert test.task.test_battle_main()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 1 - 1
tasks/Exploration/assets.py

@@ -92,7 +92,7 @@ class ExplorationAssets:
 	# 确定按钮 
 	I_E_SURE_BUTTON = RuleImage(roi_front=(1131,425,43,37), roi_back=(1077,367,165,152), threshold=0.65, method="Template matching", file="./tasks/Exploration/res/res_e_sure_button.png")
 	# 设置按钮 
-	I_E_SETTINGS_BUTTON = RuleImage(roi_front=(37,692,53,26), roi_back=(37,692,53,26), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_e_settings_button.png")
+	I_E_SETTINGS_BUTTON = RuleImage(roi_front=(37,692,53,26), roi_back=(37,692,53,26), threshold=0.65, method="Template matching", file="./tasks/Exploration/res/res_e_settings_button.png")
 	# 普通怪 
 	I_NORMAL_BATTLE_BUTTON = RuleImage(roi_front=(636,263,42,39), roi_back=(0,0,1279,719), threshold=0.8, method="Template matching", file="./tasks/Exploration/res/res_normal_battle_button.png")
 	# boss 

+ 1 - 1
tasks/Exploration/res/image.json

@@ -95,7 +95,7 @@
     "roiFront": "37,692,53,26",
     "roiBack": "37,692,53,26",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.65,
     "description": "设置按钮"
   },
   {

+ 2 - 2
tasks/Orochi/assets.py

@@ -16,9 +16,9 @@ class OrochiAssets:
 	# 组队 
 	I_FORM_TEAM = RuleImage(roi_front=(937,591,100,100), roi_back=(937,591,100,100), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_form_team.png")
 	# description 
-	I_OROCHI_LOCK = RuleImage(roi_front=(575,561,22,26), roi_back=(548,546,109,62), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi_lock.png")
+	I_OROCHI_LOCK = RuleImage(roi_front=(575,561,22,26), roi_back=(466,546,191,62), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi_lock.png")
 	# description 
-	I_OROCHI_UNLOCK = RuleImage(roi_front=(575,561,21,21), roi_back=(550,544,121,60), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi_unlock.png")
+	I_OROCHI_UNLOCK = RuleImage(roi_front=(575,561,21,21), roi_back=(483,544,188,60), threshold=0.8, method="Template matching", file="./tasks/Orochi/o/o_orochi_unlock.png")
 	# 点击挑战 
 	I_OROCHI_FIRE = RuleImage(roi_front=(1095,577,131,124), roi_back=(1095,577,131,124), threshold=0.6, method="Template matching", file="./tasks/Orochi/o/o_orochi_fire.png")
 	# 式神录 

+ 2 - 2
tasks/Orochi/o/image.json

@@ -21,7 +21,7 @@
     "itemName": "orochi_lock",
     "imageName": "o_orochi_lock.png",
     "roiFront": "575,561,22,26",
-    "roiBack": "548,546,109,62",
+    "roiBack": "466,546,191,62",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -30,7 +30,7 @@
     "itemName": "orochi_unlock",
     "imageName": "o_orochi_unlock.png",
     "roiFront": "575,561,21,21",
-    "roiBack": "550,544,121,60",
+    "roiBack": "483,544,188,60",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

+ 1 - 0
tasks/SixRealms/moon_sea/l101.py

@@ -31,6 +31,7 @@ class MoonSeaL101(MoonSeaSkills):
         self.cnt_skill101 += 1
         logger.info(f'Skill 101 level: {self.cnt_skill101}')
         logger.info('Buy skill 101 done')
+        self.wait_animate_stable(self.O_COIN_NUM, timeout=2)
         return True
 
     def refresh_store(self) -> bool: