diff --git a/DOC.md b/DOC.md index c654b2a..afce528 100644 --- a/DOC.md +++ b/DOC.md @@ -17,7 +17,7 @@ B 站直播实用脚本 |--------------------|--------------------|--------------------| |Login |21.03.27 |账号登录 | |Schedule |21.03.27 |休眠控制 | -|MasterSite |21.03.27 |主站助手 | +|MainSite |21.03.27 |主站助手 | |Daily |21.03.27 |每日礼包 | |Heart |21.03.27 |双端心跳 | |DailyTask |21.03.27 |每日任务 | diff --git a/data/activity_infos.json b/data/activity_infos.json index f17831b..746e99e 100644 --- a/data/activity_infos.json +++ b/data/activity_infos.json @@ -54,6 +54,18 @@ "draw_times": 2, "expire_at": "2021-05-05 23:59:59" }, + { + "url": "https://www.bilibili.com/blackboard/gaming_on_bilibili.html", + "title": "上B站看电竞", + "description": "活动期间每天分享页面，新增一次机会。", + "sid": "0b87bd83-8565-11eb-8597-246e966235d8", + "login": "true", + "follow": "false", + "share": "true", + "draw_times": 1, + "expire_at": "2021-04-30 23:59:59", + "remarks": "时间不名，暂定一个月。" + }, { "url": "https://www.bilibili.com/blackboard/activity-YxhUEb7UwQ.html", "title": "种草大作战特别篇", diff --git a/src/core/App.php b/src/core/App.php index 93117f1..fccc7d2 100644 --- a/src/core/App.php +++ b/src/core/App.php @@ -68,7 +68,7 @@ class App $plugins = [ 'Login', 'Schedule', - 'MasterSite', + 'MainSite', 'Daily', 'ManGa', 'GameMatch', diff --git a/src/plugin/AnchorRaffle.php b/src/plugin/AnchorRaffle.php index 1845a3c..234a5c6 100644 --- a/src/plugin/AnchorRaffle.php +++ b/src/plugin/AnchorRaffle.php @@ -222,7 +222,7 @@ class AnchorRaffle extends BaseRaffle ]); } $results = Curl::async('app', $url, $tasks); - # print_r($results); + // print_r($results); return $results; } diff --git a/src/plugin/CapsuleLottery.php b/src/plugin/CapsuleLottery.php index 151a61f..1720ae3 100644 --- a/src/plugin/CapsuleLottery.php +++ b/src/plugin/CapsuleLottery.php @@ -352,7 +352,7 @@ class CapsuleLottery Log::notice("开始抽奖#{$num} {$raw}"); // {"code":0,"message":"0","ttl":1,"data":{"status":false,"isEntity":false,"info":{"coin":1},"awards":[{"name":"谢谢参与","num":1,"text":"谢谢参与 X 1","web_url":"https://i0.hdslb.com/bfs/live/b0fccfb3bac2daae35d7e514a8f6d31530b9add2.png","mobile_url":"https://i0.hdslb.com/bfs/live/b0fccfb3bac2daae35d7e514a8f6d31530b9add2.png","usage":{"text":"很遗憾您未能中奖","url":""},"type":32,"expire":"当天","gift_type":"7290bc172e5ab9e151eb141749adb9dd","gift_value":""}],"text":["谢谢参与 X 1"],"isExCode":false}} if ($de_raw['code'] == 0) { - $result = "活动->{$referer} 获得->{$de_raw['text'][0]}"; + $result = "活动->{$referer} 获得->{$de_raw['data']['text'][0]}"; Notice::push('capsule_lottery', $result); return true; } diff --git a/src/plugin/GiftRaffle.php b/src/plugin/GiftRaffle.php index ebd1a46..ade607d 100644 --- a/src/plugin/GiftRaffle.php +++ b/src/plugin/GiftRaffle.php @@ -98,7 +98,7 @@ class GiftRaffle extends BaseRaffle ]); } $results = Curl::async('app', $url, $tasks); - # print_r($results); + // print_r($results); return $results; } diff --git a/src/plugin/GuardRaffle.php b/src/plugin/GuardRaffle.php index a32ed9a..6ec629a 100644 --- a/src/plugin/GuardRaffle.php +++ b/src/plugin/GuardRaffle.php @@ -113,7 +113,7 @@ class GuardRaffle extends BaseRaffle ]); } $results = Curl::async('app', $url, $tasks); - # print_r($results); + // print_r($results); return $results; } diff --git a/src/plugin/Login.php b/src/plugin/Login.php index e5bfd8a..0fd04ab 100644 --- a/src/plugin/Login.php +++ b/src/plugin/Login.php @@ -211,7 +211,7 @@ class Login } else { Log::info('公钥载入完毕'); } - print_r($data); + // print_r($data); $public_key = $data['data']['key']; $hash = $data['data']['hash']; openssl_public_encrypt($hash . $plaintext, $crypt, $public_key); diff --git a/src/plugin/MasterSite.php b/src/plugin/MainSite.php similarity index 99% rename from src/plugin/MasterSite.php rename to src/plugin/MainSite.php index 83612ad..20e4e55 100644 --- a/src/plugin/MasterSite.php +++ b/src/plugin/MainSite.php @@ -14,13 +14,13 @@ use BiliHelper\Core\Log; use BiliHelper\Core\Curl; use BiliHelper\Util\TimeLock; -class MasterSite +class MainSite { use TimeLock; public static function run() { - if (self::getLock() > time() || getenv('USE_MASTER_SITE') == 'false') { + if (self::getLock() > time() || getenv('USE_MAIN_SITE') == 'false') { return; } if (self::watchAid() && self::shareAid() && self::coinAdd()) { diff --git a/src/plugin/PkRaffle.php b/src/plugin/PkRaffle.php index 55271d8..17d6fb7 100644 --- a/src/plugin/PkRaffle.php +++ b/src/plugin/PkRaffle.php @@ -96,7 +96,7 @@ class PkRaffle extends BaseRaffle ]); } $results = Curl::async('app', $url, $tasks); - # print_r($results); + // print_r($results); return $results; } diff --git a/src/plugin/Schedule.php b/src/plugin/Schedule.php index 680a420..ce75d22 100644 --- a/src/plugin/Schedule.php +++ b/src/plugin/Schedule.php @@ -23,7 +23,7 @@ class Schedule private static $unlock_timers = []; private static $sleep_section = []; // 日常类 - private static $fillable = ['Login', 'Schedule', 'Daily', 'Judge', 'MasterSite', 'GiftSend', 'DailyTask', 'Silver2Coin', 'ManGa', 'GameMatch', 'GroupSignIn', 'AwardRecord', 'Statistics']; + private static $fillable = ['Login', 'Schedule', 'Daily', 'Judge', 'MainSite', 'GiftSend', 'DailyTask', 'Silver2Coin', 'ManGa', 'GameMatch', 'GroupSignIn', 'AwardRecord', 'Statistics']; // 任务类 private static $guarded_first = ['Barrage', 'GiftHeart', 'Silver', 'MaterialObject']; // 监控类