diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..09449d6 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,12 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +otechie: # Replace with a single Otechie username +custom: ['https://i.loli.net/2019/07/13/5d2963e5cc1eb22973.png'] \ No newline at end of file diff --git a/data/activity_infos.json b/data/activity_infos.json index 9b50c37..688bf24 100644 --- a/data/activity_infos.json +++ b/data/activity_infos.json @@ -22,15 +22,15 @@ "expire_at": "2021-03-30 23:59:59" }, { - "url": "https://www.bilibili.com/blackboard/BDF2021.html", - "title": "哔哩哔哩舞蹈嘉年华2021", - "description": "BDF2021等你来玩!活动期间每天分享页面,新增一次机会。", - "sid": "12a6d7e9-7813-11eb-8597-246e966235d8", + "url": "https://www.bilibili.com/blackboard/activity-yellowVSgreen7th.html", + "title": "哔哩哔哩,黄绿合战7th", + "description": "神仙打架、大型选择困难症的噩梦!鬼畜区的巅峰对决,每日两两battle,为你带来最棒的视听盛宴!", + "sid": "13096c11-e89a-11eb-8597-246e966235d8", "login": "true", "follow": "false", "share": "true", "draw_times": 1, - "expire_at": "2021-07-15 11:59:59" + "expire_at": "2021-08-12 11:59:59" } ] } \ No newline at end of file diff --git a/data/capsule_infos.json b/data/capsule_infos.json index 1554e38..8301b77 100644 --- a/data/capsule_infos.json +++ b/data/capsule_infos.json @@ -7,7 +7,7 @@ "_url": "注释: 活动地址", "url": "https://www.bilibili.com/blackboard/activity-kiOl0D1nF8.html", "_title": "注释: 活动标题", - "title": "原神1.6版本UP主激励计划", + "title": "原神2.0版本UP主激励计划", "_description": "注释: 活动描述", "description": "每日在原神分区任意直播间观看,20分钟1张、1小时2张、2小时3张,每日最高6张。", "_room_id": "注释: 活动直播间,如果为0,则取分区随机一个", @@ -17,28 +17,145 @@ "_parent_area_id": "注释: 主分区id", "parent_area_id": 3, "_coin_id": "注释: 抽奖id", - "coin_id": 165, + "coin_id": 209, "_pool_id": "注释: 抽奖id", - "pool_id": 179, + "pool_id": 219, "_watch_time": "注释: 观看时长 单位秒", "watch_time": 7320, "_draw_times": "注释: 抽奖次数", "draw_times": 6, "_expire_at": "注释: 活动有效时间", - "expire_at": "2021-07-20 23:59:59" + "expire_at": "2021-08-31 23:59:59" + }, + { + "url": "https://www.bilibili.com/blackboard/activity-aCrSakaiX5.html", + "title": "永劫无间无拘创作挑战赛", + "description": "视频投稿&主播开播,瓜分40万奖金!", + "room_id": 0, + "area_id": 443, + "parent_area_id": 6, + "coin_id": 198, + "pool_id": 208, + "watch_time": 3700, + "draw_times": 3, + "expire_at": "2021-08-08 23:59:59" + }, + { + "url": "https://www.bilibili.com/blackboard/activity-jCibw9bk8l.html", + "title": "我的世界暑期直播大挑战", + "description": "我的世界暑期直播大挑战", + "room_id": 0, + "area_id": 249, + "parent_area_id": 6, + "coin_id": 207, + "pool_id": 216, + "watch_time": 7320, + "draw_times": 3, + "expire_at": "2021-08-15 23:59:59" + }, + { + "url": "https://www.bilibili.com/blackboard/activity-TVWStSTDRs.html", + "title": "游戏直播嘉年华-极限大挑战", + "description": "每日观看满10/30/60分钟可获得1/2/3枚心愿币", + "room_id": 0, + "area_id": 0, + "parent_area_id": 6, + "coin_id": 189, + "pool_id": 205, + "watch_time": 0, + "draw_times": 6, + "expire_at": "2021-08-15 23:59:59" + }, + { + "url": "https://www.bilibili.com/blackboard/activity-Bj5ru05xgK.html", + "title": "第五人格超级预言家", + "description": "在第五人格分区累计观看直播10分钟/30分钟/60分钟即可获得 应援券1张/2张/3张", + "room_id": 0, + "area_id": 163, + "parent_area_id": 3, + "coin_id": 172, + "pool_id": 184, + "watch_time": 3700, + "draw_times": 6, + "expire_at": "2021-09-01 23:59:59" + }, + { + "url": "https://www.bilibili.com/blackboard/activity-3F5JplgtKh.html", + "title": "《怪物猎人物语2:毁灭之翼》", + "description": "《怪物猎人物语2:毁灭之翼》", + "room_id": 0, + "area_id": 481, + "parent_area_id": 6, + "coin_id": 200, + "pool_id": 213, + "watch_time": 3700, + "draw_times": 6, + "expire_at": "2021-07-22 23:59:59" + }, + { + "url": "https://live.bilibili.com/76", + "title": "守望先锋", + "description": "OWL2021开始了", + "room_id": 76, + "area_id": 87, + "parent_area_id": 2, + "coin_id": 131, + "pool_id": 145, + "watch_time": 1000, + "draw_times": 3, + "expire_at": "2021-09-01 23:59:59" + }, + { + "url": "https://live.bilibili.com/828", + "title": "剑网3大师赛", + "description": "剑网3大师赛", + "room_id": 828, + "area_id": 82, + "parent_area_id": 2, + "coin_id": 190, + "pool_id": 203, + "watch_time": 3700, + "draw_times": 11, + "expire_at": "2021-09-01 23:59:59" + }, + { + "url": "https://www.bilibili.com/blackboard/activity-HmADkQuRGP.html", + "title": "《斩妖行》主播招募", + "description": "《斩妖行》主播招募", + "room_id": 0, + "area_id": 358, + "parent_area_id": 6, + "coin_id": 202, + "pool_id": 209, + "watch_time": 7320, + "draw_times": 6, + "expire_at": "2021-07-23 23:59:59" + }, + { + "url": "https://www.bilibili.com/blackboard/activity-YJ7JPyI9iJ.html", + "title": "《战意》国潮新赛季激励计划", + "description": "20万奖金助力将军凯旋", + "room_id": 0, + "area_id": 383, + "parent_area_id": 2, + "coin_id": 199, + "pool_id": 207, + "watch_time": 1600, + "draw_times": 6, + "expire_at": "2021-08-07 23:59:59" }, { "url": "https://live.bilibili.com/11218604", - "title": "2021PCL春季赛观赛任务", - "description": "每日在PGI直播间观看,10、15、30", + "title": "PCL夏季赛", + "description": "每日在PGI直播间观看,5、10", "room_id": 11218604, "area_id": 0, "parent_area_id": 2, - "coin_id": 170, - "pool_id": 183, - "watch_time": 3720, - "draw_times": 3, - "expire_at": "2021-06-27 23:59:59" + "coin_id": 211, + "pool_id": 218, + "watch_time": 1000, + "draw_times": 2, + "expire_at": "2021-08-29 23:59:59" }, { "url": "https://live.bilibili.com/6", @@ -51,18 +168,6 @@ "watch_time": 3720, "draw_times": 3, "expire_at": "2021-05-31 23:59:59" - }, - { - "url": "https://live.bilibili.com/23", - "title": "PEL和平精英职业联赛", - "description": "每日在PEL直播间观看,5分钟1张", - "room_id": 13242892, - "area_id": 0, - "parent_area_id": 2, - "coin_id": 109, - "watch_time": 3720, - "draw_times": 2, - "expire_at": "2021-06-13 23:59:59" } ] } \ No newline at end of file diff --git a/src/core/Log.php b/src/core/Log.php index 5a7c627..6550ed9 100644 --- a/src/core/Log.php +++ b/src/core/Log.php @@ -48,7 +48,8 @@ class Log private static function prefix(): string { if (getConf('multiple', 'print')) { - return '[' . getConf('user_identity', 'print') ?? getConf('username', 'login.account') . ']'; + // return '[' . (getConf('user_identity', 'print') ?? getConf('username', 'login.account')) . ']'; + return sprintf("[%s]",getConf('user_identity', 'print') ?? getConf('username', 'login.account')); } return ''; }