feat: 御魂副本 & 部分用户界面

Author: tbjuechen

.gitignore

@@ -164,3 +164,4 @@ test.*
 /cache/
 
 main.exe
+*.zip

README.md

@@ -1,16 +1,23 @@
 ### 阴阳师脚本
 
+暂时仅支持mumu模拟器，可以通过标准的ip+端口连结任何可以访问的安卓设备。
+
+使用adb-shell，使用adb标准api通过tcp连接到安卓设备，实现截图、虚拟点击等核心功能。
+
+使用opencv的模板匹配模块检测截图中的目标图像位置，在找到目标后进行虚拟点击。
+
 #### 目前实现：
 
 * 基本操作
-* 业原火自动demo
+* 业原火
+* 组队御魂副本
 
 #### todo
 
 ##### 更多功能：
 
-* [ ]  御魂副本
 * [ ]  探索副本
+* [ ]  活动副本
 
 ##### 用户友好
 

logger.py

@@ -44,7 +44,7 @@ def format(self, record):
 console_handler.setLevel(logging.DEBUG)
 
 # create formatter with datefmt and add it to the handler
-formatter = ColoredFormatter(datefmt='%Y-%m-%d %H:%M:%S')
+formatter = ColoredFormatter(datefmt='%H:%M:%S')
 console_handler.setFormatter(formatter)
 
 # add the handler to the logger

main.py

@@ -8,19 +8,17 @@
 
 from logger import logger
 
-from connector import ConnectorPool
-from player import CVPlayer
+from performer import scripts
+from performer.performer import Performer
+
+from InquirerPy import inquirer
+from InquirerPy.base.control import Choice
+
+performer:Performer = inquirer.select(
+    message="Select a script",
+    choices=[Choice(value=script,name=script.description) for script in scripts]
+).execute()(logger=logger)
+
+performer.run()
 
-connect_pool = ConnectorPool(logger)
-connect_pool.add_connector('Mumu', '127.0.0.1', 16384).connect()
-player = CVPlayer()
-while True:
-    current_connector = connect_pool.get_current_connector()
-    screenshot = current_connector.screen_shot()
-    target_list = ['wanted\\refuse.jpg','wanted\\yyh_begin.jpg', 'wanted\\yys_jieshu.jpg', 'wanted\\yys_jixu.jpg']
-    for target in target_list:
-        location = player.locate(target, screenshot)
-        if location:
-            logger.info(f'Found {target} at {location}')
-            current_connector.touch(*location)
 

performer/YH.py

@@ -0,0 +1,11 @@
+from .performer import Performer
+
+class MultiYHPerformer(Performer):
+    description = '组队御魂副本(魂十、魂土、魂王等)'
+    '''多人御魂'''
+    def __init__(self,**kwargs):
+        super().__init__(**kwargs)
+    
+    def main_step(self):
+        target_list = ['refuse.jpg','yys_begin.jpg', 'yys_jieshu.jpg', 'yys_jixu.jpg']
+        self.find_and_touch(target_list)

performer/YYH.py

@@ -0,0 +1,11 @@
+from .performer import Performer
+
+class YYHPerformer(Performer):
+    description = '业原火副本'
+    '''业原火'''
+    def __init__(self,**kwargs):
+        super().__init__(**kwargs)
+    
+    def main_step(self):
+        target_list = ['refuse.jpg','yyh_begin.jpg', 'yys_jieshu.jpg', 'yys_jixu.jpg']
+        self.find_and_touch(target_list)

performer/__init__.py

@@ -0,0 +1,4 @@
+from .YYH import YYHPerformer
+from .YH import MultiYHPerformer
+
+scripts:list = [YYHPerformer, MultiYHPerformer]

performer/performer.py

@@ -0,0 +1,114 @@
+'''
+Author: tbjuechen
+Date: 2024-08-13
+Version: 1.0
+Description: performer class
+License: MIT
+'''
+import os
+import time
+from logging import Logger
+from abc import abstractmethod
+from typing import Type, List
+
+from connector import ConnectorPool
+from connector.connector.base import BaseConnector
+from player.base import BasePlayer
+from player import CVPlayer
+from .utils import is_valid_ip
+
+from InquirerPy import inquirer
+
+class Performer:
+    '''Performer class
+
+    Attributes
+    ----------
+    connect_pool : ConnectorPool
+        The connector pool
+    
+    player : BasePlayer
+        The player
+    '''
+    def __init__(self,
+                 logger:Logger, 
+                 connCls:Type[ConnectorPool]=ConnectorPool, 
+                 playerCls:Type[BasePlayer]=CVPlayer) -> None:
+        self.logger = logger
+        self.connect_pool = connCls()
+        self.player = playerCls()
+        self.init_env()
+        self.time_dleta = inquirer.text(
+            message="Enter the time delta (seconds):",
+            default='1',
+            validate=lambda x: x.isdecimal() and float(x) > 0,
+            invalid_message='Invalid time delta!!!'
+        ).execute()
+    
+    def init_env(self):
+        # set the path
+        wanted_path = os.path.join(os.getcwd(), 'wanted')
+        os.environ['PATH'] += os.pathsep + wanted_path
+        self.logger.debug(f'Add wanted path: {wanted_path}')
+
+    def add_connector(self) -> None:
+        '''interact add connector to the pool
+        '''
+        flag:bool = True  # flag to control the loop
+        while flag:
+            ConnectorType:str = inquirer.select(
+                message="Select a connector type (mumu only for now)",
+                choices=['Mumu', 'Nox', 'BlueStacks', 'Others'],
+            ).execute()
+            ConnectorHost:str = inquirer.text(
+                message="Enter the connector host:",
+                default='127.0.0.1',
+                validate=is_valid_ip,
+                invalid_message='Invalid ip address!!!'
+            ).execute()
+            ConnectorPort:int = inquirer.text(
+                message="Enter the connector port:",
+                default='16384' if ConnectorType == 'Mumu' else '7777',
+                validate=lambda x: x.isdigit() and int(x) in range(65536), 
+                invalid_message='Invalid port number!!!'
+            ).execute()
+            self.connect_pool.add_connector(ConnectorType, ConnectorHost, ConnectorPort).connect()
+            flag = inquirer.confirm(
+                message='Add another connector?',
+                default=False
+            ).execute()
+
+    def find_and_touch(self, target_list:List[str], connector:BaseConnector=None) -> None:
+        '''Find and touch the target in the screenshot
+
+        Parameters
+        ----------
+        target_list : List[str]
+            The list of target image files
+
+        connector : BaseConnector
+            The connector to use, if None, use the current connector
+        '''
+        # use the current connector from pool
+        connector = connector if connector else self.connect_pool.get_current_connector()
+        screenshot:str = connector.screen_shot()
+        for target in target_list:
+            location = self.player.locate(target, screenshot)
+            if location:
+                self.logger.info(f'Found {target} at {location}')
+                connector.touch(*location)
+
+    @abstractmethod
+    def main_step(self):
+        '''Main steps for the performer
+        '''
+        pass
+
+    def run(self) -> None:
+        '''Run the script with preset steps
+        '''
+        self.add_connector()
+        while True:
+            self.main_step()
+            self.logger.debug(f'Sleep for {self.time_dleta} seconds')
+            time.sleep(self.time_dleta)

performer/utils.py

@@ -0,0 +1,26 @@
+'''
+Author: tbjuechen
+Date: 2024-08-13
+Version: 1.0
+Description: utility functions
+'''
+
+import re
+
+# is ip address
+IP_ADRESS_PATTERN = r'\b(?:(?:2[0-4][0-9]|25[0-5]|1[0-9]{2}|[1-9]?[0-9])\.){3}(?:2[0-4][0-9]|25[0-5]|1[0-9]{2}|[1-9]?[0-9])\b'
+
+def is_valid_ip(ip:str)->bool:
+    '''Check if the ip address is valid
+
+    Parameters
+    ----------
+    ip : str
+        The ip address
+
+    Returns
+    -------
+    bool
+        Whether the ip address is valid
+    '''
+    return bool(re.match(IP_ADRESS_PATTERN, ip))

player/base.py

@@ -16,7 +16,7 @@ class BasePlayer(ABC):
     acc : float
         The accuracy of the player model
     '''
-    def __init__(self, acc:float, **kwargs):
+    def __init__(self, acc:float=0.8, **kwargs):
         self.acc = acc
 
     @abstractmethod