fix: 取消高水位 60 分钟同步档(日返还模型下余额≥80万为常态)
- 高水位 base_interval 3600 → 1800:返还解锁/余额扣减检测延迟从 ≤60min 降到 ≤30min, 消除每日返还后的额度空转窗口与余额虚高扣费窗口;真正的慢同步条件 = is_idle(已独立实现) - All Dead 非晨间 1000000 → 300000:返还可能下午到账,不能睡 60 分钟 - 修复模式打印数值与 base_interval 全部错位的遗留 bug,改为输出实际同步间隔
This commit is contained in:
+21
-27
@@ -1265,7 +1265,11 @@ def active_monitor_loop():
|
|||||||
elif global_min_remaining < 800_000:
|
elif global_min_remaining < 800_000:
|
||||||
base_interval = 2700 # 45 minutes
|
base_interval = 2700 # 45 minutes
|
||||||
else:
|
else:
|
||||||
base_interval = 3600 # 60 minutes
|
# 高水位档收紧(原 60 分钟):日返还模型下余额 ≥80万 是默认状态
|
||||||
|
#(消耗任务维持的 2M 启动资金),60 分钟同步会让"返还解锁"与
|
||||||
|
#"余额扣减"检测延迟 ≤60 分钟(额度空转 / 扣费窗口)。
|
||||||
|
# 真正的慢同步条件 = is_idle(无用量),由下方 base*4 处理。上限 30 分钟。
|
||||||
|
base_interval = 1800 # 30 minutes
|
||||||
|
|
||||||
if is_idle:
|
if is_idle:
|
||||||
current_sync_interval = min(base_interval * 4, 3600)
|
current_sync_interval = min(base_interval * 4, 3600)
|
||||||
@@ -1462,9 +1466,10 @@ def active_monitor_loop():
|
|||||||
200000 # Pretend we have some quota to get ~5min interval
|
200000 # Pretend we have some quota to get ~5min interval
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
# Afternoon/Night: Unlikely to reset
|
# 返还"不定时"(可能下午到账):All Dead 不能睡 60 分钟,
|
||||||
|
# 否则额度到账后最多空转 60 分钟才解锁。收紧到 30 分钟。
|
||||||
global_min_remaining = (
|
global_min_remaining = (
|
||||||
1000000 # Pretend high quota to sleep 60m
|
300000 # 30-minute sync while waiting for reset
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
global_min_remaining = temp_min_remaining
|
global_min_remaining = temp_min_remaining
|
||||||
@@ -1474,31 +1479,20 @@ def active_monitor_loop():
|
|||||||
last_usage_map[m] = u_val
|
last_usage_map[m] = u_val
|
||||||
last_sync_time = now
|
last_sync_time = now
|
||||||
|
|
||||||
if global_min_remaining > 800000:
|
if global_min_remaining <= 100000:
|
||||||
print(
|
mode_icon = "🆘 紧急模式"
|
||||||
f"🌊 High Tide Mode: Sleeping for 60m (Effective Min Rem: {int(global_min_remaining):,}) / 高水位模式:休眠 60 分钟",
|
elif global_min_remaining <= 300000:
|
||||||
flush=True,
|
mode_icon = "⛵ 安全航行模式"
|
||||||
)
|
elif global_min_remaining <= 500000:
|
||||||
elif global_min_remaining > 500000:
|
mode_icon = "🚤 极速模式"
|
||||||
print(
|
elif global_min_remaining <= 800000:
|
||||||
f"🌊 Normal Mode: Sleeping for 30m (Min Rem: {int(global_min_remaining):,}) / 正常模式:休眠 30 分钟",
|
mode_icon = "🌊 正常模式"
|
||||||
flush=True,
|
|
||||||
)
|
|
||||||
elif global_min_remaining > 300000:
|
|
||||||
print(
|
|
||||||
f"🚤 Speed Mode: Sleeping for 10m (Min Rem: {int(global_min_remaining):,}) / 极速模式:休眠 10 分钟",
|
|
||||||
flush=True,
|
|
||||||
)
|
|
||||||
elif global_min_remaining > 100000:
|
|
||||||
print(
|
|
||||||
f"⛵ Safe Sailing Mode: Sleeping for 5m (Min Rem: {int(global_min_remaining):,}) / 安全航行模式:休眠 5 分钟",
|
|
||||||
flush=True,
|
|
||||||
)
|
|
||||||
else:
|
else:
|
||||||
print(
|
mode_icon = "🌊 高水位模式"
|
||||||
f"🆘 Emergency Mode: Sleeping for 2m (Min Rem: {int(global_min_remaining):,}) / 紧急模式:休眠 2 分钟",
|
print(
|
||||||
flush=True,
|
f"{mode_icon}: 下一次同步 {current_sync_interval}s (Min Rem: {int(global_min_remaining):,}) / 同步间隔 {current_sync_interval}s",
|
||||||
)
|
flush=True,
|
||||||
|
)
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Error in monitor loop / 监控循环出错: {e}", flush=True)
|
print(f"Error in monitor loop / 监控循环出错: {e}", flush=True)
|
||||||
|
|||||||
Reference in New Issue
Block a user