Merge pull request #43 from cwlm/dev

better config file
cwlm · Sep 23, 2024 · 77ca92d · 77ca92d
2 parents e92bc32 + e8accef
commit 77ca92d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 38 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "sjtuautorun"
-version = "0.3.0.2"
+version = "0.3.1.0"
 description = "交我润"
 readme = "README.md"
 authors = ["cwlm_ma"]

diff --git a/sjtuautorun/__init__.py b/sjtuautorun/__init__.py
@@ -1 +1 @@
-__version__ = "0.3.0.2"
+__version__ = "0.3.1.0"
diff --git a/sjtuautorun/constants/colors.py b/sjtuautorun/constants/colors.py
diff --git a/sjtuautorun/controller/run_timer.py b/sjtuautorun/controller/run_timer.py
@@ -54,7 +54,7 @@ def start(self):
         if pos is None:
             raise ImageNotFoundErr("Cannot find the go running icon")
         self.Android.click(pos[0], pos[1])
-        self.logger.info("Start successfully!")
+        self.logger.info("Started successfully!")
 
     def restart(self, times=0):
         try:

diff --git a/sjtuautorun/controller/windows_controller.py b/sjtuautorun/controller/windows_controller.py
@@ -26,10 +26,10 @@ class WindowsController:
     def __init__(self, config, logger) -> None:
         self.logger = logger
 
-        self.emulator_name = config["emulator_name"]
         self.emulator_dir = config["emulator_dir"]  # 模拟器路径
         self.exe_name = os.path.basename(self.emulator_dir)  # 自动获得模拟器的进程名
-        self.emulator_index = (int(re.search(r'\d+', self.emulator_name).group()) - 5554) / 2
+        self.emulator_index = config["emulator_index"]  # 模拟器序号
+        self.emulator_name = f"emulator-{5554+self.emulator_index*2}"  # 模拟器名
 
     # ======================== 网络 ========================
 

diff --git a/sjtuautorun/data/default_settings.yaml b/sjtuautorun/data/default_settings.yaml
@@ -1,6 +1,6 @@
 emulator:
   emulator_dir: ""
-  emulator_name: emulator-5554 # 雷电模拟器使用多开器请修改该项为 "emulator-5556"
+  emulator_index: 1 # 雷电模拟器使用多开器请修改该项为对应的模拟器id
 
 DELAY: 1.5
 PLAN_ROOT: