Merge branch 'lkeme:master' into master

This commit is contained in:
菜狗 2021-09-02 09:48:04 +08:00 committed by GitHub
commit b0f5df6e72
4 changed files with 5 additions and 6 deletions

View File

@ -17,7 +17,7 @@
<p align="center">
<img src="https://img.shields.io/badge/Version-1.0.0.210822-orange.svg?longCache=true&style=for-the-badge">
<img src="https://img.shields.io/badge/PHP-7.3+-green.svg?longCache=true&style=for-the-badge">
<img src="https://img.shields.io/badge/PHP-8.0+-green.svg?longCache=true&style=for-the-badge">
<img src="https://img.shields.io/badge/Composer-latest-blueviolet.svg?longCache=true&style=for-the-badge">
<img src="https://img.shields.io/badge/License-mit-blue.svg?longCache=true&style=for-the-badge">

View File

@ -108,7 +108,7 @@ enable = false
drop_rate = 0
attempt = "5,10"
; 直播天选时刻|抽取类型(0: 无限制; 1: 关注主播; 2: 粉丝勋章; 3大航海 4用户等级5主站等级)|自动取关(测试功能)|过滤关键词|逗号分隔
; 直播天选时刻|抽取类型(0: 无限制; 1: 关注主播; 2: 粉丝勋章; 3大航海 4用户等级5主站等级)|自动取关(测试功能)依赖于award_record|过滤关键词|逗号分隔
[live_anchor]
enable = false
limit_type = "0,1"

View File

@ -37,9 +37,9 @@ class App
/**
* @use 初始化数据文件夹
* @param int $permissions
* @return $this
* @return void
*/
private function initDataFolder(int $permissions = 0777): App
private function initDataFolder(int $permissions = 0777): void
{
// log task cache
$data_folder = [APP_LOG_PATH, APP_TASK_PATH, APP_CACHE_PATH];
@ -49,7 +49,6 @@ class App
chmod($path, $permissions);
}
}
return $this;
}
/**

View File

@ -86,7 +86,7 @@ class AwardRecord
}
}
self::$anchor_lock = time() + 6 * 60 * 60;
self::$anchor_lock = time() + 10 * 60;
}
/**