diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fd67c7..d569e5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,18 @@ # Release Notes # 本项目Log +## v0.3.0.200425 alpha (2020-04-25) + +### Added +- + +### Changed +- + +### Fixed +- 修复休眠机制 +- + ## v0.3.0.200424 alpha (2020-04-24) ### Added diff --git a/src/plugin/Barrage.php b/src/plugin/Barrage.php index 8a88d92..b34c25a 100644 --- a/src/plugin/Barrage.php +++ b/src/plugin/Barrage.php @@ -23,6 +23,7 @@ class Barrage if (self::getLock() > time() || getenv('USE_DANMU') == 'false') { return; } + self::setPauseStatus(); $room_id = empty(getenv('DANMU_ROOMID')) ? Live::getUserRecommend() : Live::getRealRoomID(getenv('DANMU_ROOMID')); $msg = empty(getenv('DANMU_CONTENT')) ? self::getMsgInfo() : getenv('DANMU_CONTENT'); diff --git a/src/plugin/Heart.php b/src/plugin/Heart.php index 1be0a74..6e27939 100644 --- a/src/plugin/Heart.php +++ b/src/plugin/Heart.php @@ -23,6 +23,7 @@ class Heart if (self::getLock() > time()) { return; } + self::setPauseStatus(); self::webHeart(); self::appHeart(); self::setLock(5 * 60); diff --git a/src/plugin/MaterialObject.php b/src/plugin/MaterialObject.php index 81670f0..26c2b90 100644 --- a/src/plugin/MaterialObject.php +++ b/src/plugin/MaterialObject.php @@ -27,6 +27,7 @@ class MaterialObject if (getenv('USE_MO') == 'false') { return; } + self::setPauseStatus(); if (self::getLock() > time()) { return; } diff --git a/src/plugin/Schedule.php b/src/plugin/Schedule.php index 0c56586..8f9a14c 100644 --- a/src/plugin/Schedule.php +++ b/src/plugin/Schedule.php @@ -25,11 +25,13 @@ class Schedule // 日常类 private static $fillable = ['Login', 'Schedule', 'Daily', 'Judge', 'MasterSite', 'GiftSend', 'Task', 'Silver2Coin', 'GroupSignIn', 'AwardRecord', 'Statistics']; // 任务类 - private static $guarded_first = ['Barrage', 'GiftHeart', 'Heart', 'Silver', 'MaterialObject']; + private static $guarded_first = ['Barrage', 'GiftHeart', 'Silver', 'MaterialObject']; // 监控类 private static $guarded_second = ['AloneTcpClient', 'ZoneTcpClient',]; // 抽奖类 private static $guarded_third = ['StormRaffle', 'GuardRaffle', 'PkRaffle', 'GiftRaffle', 'AnchorRaffle']; + // 特殊 老爷处理 + private static $guarded_fourth = ['Heart']; public static function run() { @@ -95,6 +97,9 @@ class Schedule $unlock_time = 60 * 60; self::$unlock_hour = date('H'); $classname_list = array_merge(self::$guarded_first, self::$guarded_second, self::$guarded_third); + if (!User::isMaster()) { + $classname_list = array_merge($classname_list, self::$guarded_fourth); + } self::stopProc($classname_list, $unlock_time, true); Log::warning('进入自定义休眠时间范围,暂停非必要任务,自动开启!'); break;