|
@@ -157,16 +157,25 @@ class Screenshot(Adb, DroidCast, Scrcpy, Window, NemuIpc):
|
|
|
"""
|
|
"""
|
|
|
if interval is None:
|
|
if interval is None:
|
|
|
origin = self.config.script.optimization.screenshot_interval
|
|
origin = self.config.script.optimization.screenshot_interval
|
|
|
- interval = limit_in(origin, 0.1, 0.3)
|
|
|
|
|
|
|
+ # 分支判断放在夹取之前:写回发生在各自的 clamp 之后,先夹取会按错误的
|
|
|
|
|
+ # 区间改写用户配置。桌面模式 BitBlt 单帧约 5ms,允许更小间隔
|
|
|
|
|
+ if getattr(self, 'is_desktop', False):
|
|
|
|
|
+ interval = limit_in(origin, 0.05, 0.3)
|
|
|
|
|
+ elif self.config.Emulator_ScreenshotMethod == 'nemu_ipc':
|
|
|
|
|
+ # nemu_ipc 截图便宜,允许更小默认
|
|
|
|
|
+ interval = limit_in(origin, 0.1, 0.2)
|
|
|
|
|
+ else:
|
|
|
|
|
+ interval = limit_in(origin, 0.1, 0.3)
|
|
|
if interval != origin:
|
|
if interval != origin:
|
|
|
logger.warning(f'Optimization.ScreenshotInterval {origin} is revised to {interval}')
|
|
logger.warning(f'Optimization.ScreenshotInterval {origin} is revised to {interval}')
|
|
|
self.config.script.optimization.screenshot_interval = interval
|
|
self.config.script.optimization.screenshot_interval = interval
|
|
|
- # Allow nemu_ipc to have a lower default
|
|
|
|
|
- if self.config.Emulator_ScreenshotMethod == 'nemu_ipc':
|
|
|
|
|
- interval = limit_in(origin, 0.1, 0.2)
|
|
|
|
|
elif interval == 'combat':
|
|
elif interval == 'combat':
|
|
|
origin = self.config.script.optimization.combat_screenshot_interval
|
|
origin = self.config.script.optimization.combat_screenshot_interval
|
|
|
- interval = limit_in(origin, 0.3, 1.0)
|
|
|
|
|
|
|
+ if getattr(self, 'is_desktop', False):
|
|
|
|
|
+ # 桌面模式战斗轮询不受 adb 成本约束,允许更小间隔
|
|
|
|
|
+ interval = limit_in(origin, 0.1, 1.0)
|
|
|
|
|
+ else:
|
|
|
|
|
+ interval = limit_in(origin, 0.3, 1.0)
|
|
|
if interval != origin:
|
|
if interval != origin:
|
|
|
logger.warning(f'Optimization.CombatScreenshotInterval {origin} is revised to {interval}')
|
|
logger.warning(f'Optimization.CombatScreenshotInterval {origin} is revised to {interval}')
|
|
|
self.config.script.optimization.combat_screenshot_interval = interval
|
|
self.config.script.optimization.combat_screenshot_interval = interval
|