Merge pull request #1556 from runhey/dev

Dev

Author: runhey

assets/i18n/zh-CN.json

@@ -7,6 +7,8 @@
   "skill_mode": "技能本模式",
   "costume_shikigami_6": "月下火舞",
   "costume_shikigami_7": "赤溟幽界",
+  "costume_shikigami_8": "童梦基地",
+  "costume_shikigami_9": "眠鹿之森",
   "costume_carpbanner_type": "鲤鱼旗皮肤",
   "costume_carpbanner_default": "吉鲤游风",
   "costume_carpbanner_1": "无垢莲台",
@@ -25,16 +27,13 @@
   "Usage": "使用说明",
   "checkin_big_god_usage_help": "自动领取网易大神APP的阴阳师福利礼包。\n\n使用前准备：\n1. 开启模拟器的Root模式\n2. 模拟器中安装并登录「网易大神」APP\n3. 在大神APP中绑定阴阳师角色\n\nFrida Server 会自动推送到模拟器并启动，无需手动操作。",
   "costume_main_14": "雪月华庭",
-  "goto_main": "前往主界面",
+  "goto_main": "前往庭院",
   "close_game": "关闭游戏",
-  "close_emulator_or_goto_main": "关闭模拟器&前往主界面",
-  "close_emulator_or_close_game": "关闭模拟器&关闭游戏",
-  "close_game_limit_time": "关闭游戏等待时间",
-  "close_game_limit_time_help": "此时间内不会关闭游戏, 防止运行间隔时间短的多个任务导致反复开关游戏",
-  "close_emulator_limit_time": "关闭模拟器等待时间",
-  "close_emulator_limit_time_help": "此时间内不会关闭模拟器, 防止运行间隔时间短的多个任务导致反复开关模拟器",
+  "close_game_wait_duration": "关闭游戏的等待时长",
+  "close_game_wait_duration_help": "距离下一个任务超过此分钟数时关闭游戏（上方选项为前往庭院时无效）；设为0表示禁用",
+  "close_emulator_wait_duration": "关闭模拟器的等待时长",
+  "close_emulator_wait_duration_help": "距离下一个任务超过此分钟数时关闭模拟器；设为0表示禁用",
   "emulator_startup_lead_time": "模拟器预热时间",
   "emulator_startup_lead_time_help": "在开始运行任务之前提前启动模拟器的时间"
 }
 
-

script.py

@@ -330,8 +330,6 @@ def _handle_wait_during_idle(self, next_run: datetime) -> bool:
         strategy_map = {
             "close_game": self._wait_close_game,
             "goto_main": self._wait_goto_main,
-            "close_emulator_or_goto_main": self._wait_close_emulator_or_goto_main,
-            "close_emulator_or_close_game": self._wait_close_emulator_or_close_game,
         }
         func = strategy_map.get(method)
         if func is None:
@@ -376,9 +374,23 @@ def _wait_close_game(self, next_run: datetime) -> bool:
             logger.info("Emulator is down, skip close_game/goto_main action and wait with preheat")
             return self._wait_until_with_emulator_preheat(next_run)
 
-        close_game_limit_time = self.config.script.optimization.close_game_limit_time
-        close_game_limit = self._time_to_timedelta(close_game_limit_time)
-        if close_game_limit > timedelta(0) and next_run > datetime.now() + close_game_limit:
+        close_game_wait_duration = self.config.script.optimization.close_game_wait_duration
+        close_game_wait = self._time_to_timedelta(close_game_wait_duration)
+        close_emulator_wait_duration = self.config.script.optimization.close_emulator_wait_duration
+        close_emulator_wait = self._time_to_timedelta(close_emulator_wait_duration)
+
+        if close_emulator_wait > timedelta(0) and next_run > datetime.now() + close_emulator_wait:
+            logger.info("Close emulator during wait")
+            self.device.emulator_stop()
+            self._emulator_down = True
+
+            if not self._wait_until_with_emulator_preheat(next_run):
+                return False
+
+            self.run("Restart")
+            return True
+
+        if close_game_wait <= timedelta(0):
             logger.info("Close game during wait")
             self.device.app_stop()
             self.device.release_during_wait()
@@ -387,7 +399,16 @@ def _wait_close_game(self, next_run: datetime) -> bool:
             self.run("Restart")
             return True
 
-        logger.info("Wait without closing game (close_game limit time not reached)")
+        if next_run > datetime.now() + close_game_wait:
+            logger.info("Close game during wait")
+            self.device.app_stop()
+            self.device.release_during_wait()
+            if not self.wait_until(next_run):
+                return False
+            self.run("Restart")
+            return True
+
+        logger.info("Wait without closing game (close_game wait duration not reached)")
         self.device.release_during_wait()
         if not self.wait_until(next_run):
             return False
@@ -398,29 +419,11 @@ def _wait_goto_main(self, next_run: datetime) -> bool:
             logger.info("Emulator is down, skip goto_main and wait with preheat")
             return self._wait_until_with_emulator_preheat(next_run)
 
-        logger.info("Goto main page during wait")
-        self.run("GotoMain")
-        self.device.release_during_wait()
-        return self.wait_until(next_run)
-
-    def _wait_close_emulator_or_goto_main(self, next_run: datetime) -> bool:
-        return self._wait_close_emulator_or(next_run, self._wait_goto_main)
-
-    def _wait_close_emulator_or_close_game(self, next_run: datetime) -> bool:
-        return self._wait_close_emulator_or(next_run, self._wait_close_game)
-
-    def _wait_close_emulator_or(self, next_run: datetime, fallback_waiter: Callable[[datetime], bool]) -> bool:
-        close_emulator_limit_time = self.config.script.optimization.close_emulator_limit_time
-        close_emulator_limit = self._time_to_timedelta(close_emulator_limit_time)
-
-        now = datetime.now()
-        if close_emulator_limit > timedelta(0) and next_run > now + close_emulator_limit:
+        close_emulator_wait_duration = self.config.script.optimization.close_emulator_wait_duration
+        close_emulator_wait = self._time_to_timedelta(close_emulator_wait_duration)
+        if close_emulator_wait > timedelta(0) and next_run > datetime.now() + close_emulator_wait:
             logger.info("Close emulator during wait")
-            if not self._emulator_down:
-                self.device.emulator_stop()
-            else:
-                logger.info("Emulator already closed")
-
+            self.device.emulator_stop()
             self._emulator_down = True
 
             if not self._wait_until_with_emulator_preheat(next_run):
@@ -429,7 +432,10 @@ def _wait_close_emulator_or(self, next_run: datetime, fallback_waiter: Callable[
             self.run("Restart")
             return True
 
-        return fallback_waiter(next_run)
+        logger.info("Goto main page during wait")
+        self.run("GotoMain")
+        self.device.release_during_wait()
+        return self.wait_until(next_run)
 
     def _wait_stay_there(self, next_run: datetime) -> bool:
         if self._emulator_down:

tasks/Component/Costume/assets.py

@@ -116,7 +116,7 @@ class CostumeAssets:
 
 	# Image Rule Assets
 	# description 
-	I_CHECK_MAIN_4 = RuleImage(roi_front=(513,139,48,55), roi_back=(149,108,1068,100), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main4/main4_check_main_4.png")
+	I_CHECK_MAIN_4 = RuleImage(roi_front=(885,192,37,32), roi_back=(149,108,1005,144), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main4/main4_check_main_4.png")
 	# description 
 	I_MAIN_GOTO_EXPLORATION_4 = RuleImage(roi_front=(439,234,32,48), roi_back=(150,201,847,100), threshold=0.8, method="Template matching", file="./tasks/Component/Costume/main4/main4_main_goto_exploration_4.png")
 	#  

tasks/Component/Costume/config.py

@@ -48,6 +48,7 @@ class ShikigamiType(str, Enum):
     COSTUME_SHIKIGAMI_6 = 'costume_shikigami_6'  # 月下火舞
     COSTUME_SHIKIGAMI_7 = 'costume_shikigami_7'  # 赤溟幽界
     COSTUME_SHIKIGAMI_8 = 'costume_shikigami_8'  # 童梦基地
+    COSTUME_SHIKIGAMI_9 = 'costume_shikigami_9'  # 眠鹿之森
 
 # 签到主题
 class SignType(str, Enum):

tasks/Component/Costume/costume_base.py

@@ -77,7 +77,7 @@
         'I_ST_SOULS': f'I_ST_SOULS_{i}',
         'I_ST_REPLACE': f'I_ST_REPLACE_{i}',
     }
-    for i in range(1, 9)  # 目前支持 COSTUME_SHIKIGAMI_1 到 COSTUME_SHIKIGAMI_8
+    for i in range(1, 10)  # 目前支持 COSTUME_SHIKIGAMI_1 到 COSTUME_SHIKIGAMI_9
 }
 
 class CostumeBase:

tasks/Component/Costume/main4/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "check_main_4",
     "imageName": "main4_check_main_4.png",
-    "roiFront": "513,139,48,55",
-    "roiBack": "149,108,1068,100",
+    "roiFront": "885,192,37,32",
+    "roiBack": "149,108,1005,144",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"