From 6d6e281ee303b9cdfb30cee8d283335bf7d6a8cd Mon Sep 17 00:00:00 2001 From: Muihd <1083092844@qq.com> Date: Sat, 28 Sep 2024 16:53:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8A=A0=E5=BC=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E7=82=B9=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BarrageGrab/LiveCompanHelper.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/BarrageGrab/LiveCompanHelper.cs b/BarrageGrab/LiveCompanHelper.cs index 7785ce0..e4d4f26 100644 --- a/BarrageGrab/LiveCompanHelper.cs +++ b/BarrageGrab/LiveCompanHelper.cs @@ -57,6 +57,7 @@ namespace BarrageGrab /// public static void SwitchSetup() { + if (!AppSetting.Current.LiveCompanHookSwitch) return; var exePath = GetExePath(); if (string.IsNullOrEmpty(exePath)) { @@ -121,11 +122,19 @@ namespace BarrageGrab SetSwitch("proxy-server", mineProxyHost, ref content); //移除文件损坏检测校验 - var checkReg = new Regex(@"if\(\(0,\w.integrityCheckReport\)\(\w\),!\w\.ok\)"); + var checkReg = new Regex(@"if\(\w{1,2}\(\w\),!\w\.ok\)"); if (checkReg.IsMatch(content)) { content = checkReg.Replace(content, "if(false)"); - Logger.LogInfo($"直播伴侣文件改动检测已拦截"); + Logger.LogInfo($"直播伴侣文件改动检测点1已拦截"); + } + + + checkReg = new Regex(@"if\(\(0,\w.integrityCheckReport\)\(\w\),!\w\.ok\)"); + if (checkReg.IsMatch(content)) + { + content = checkReg.Replace(content, "if(false)"); + Logger.LogInfo($"直播伴侣文件改动检测点2已拦截"); } return content; From 192e489fa5e3ad66191e30be1938c99bd16f34f4 Mon Sep 17 00:00:00 2001 From: Muihd <1083092844@qq.com> Date: Sat, 28 Sep 2024 16:53:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E4=BC=B4=E4=BE=A3=E5=8F=82=E6=95=B0=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BarrageGrab/App.config | 2 ++ BarrageGrab/AppSetting.cs | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/BarrageGrab/App.config b/BarrageGrab/App.config index 91a6d61..6a31fbf 100644 --- a/BarrageGrab/App.config +++ b/BarrageGrab/App.config @@ -48,6 +48,8 @@ + + diff --git a/BarrageGrab/AppSetting.cs b/BarrageGrab/AppSetting.cs index 188c0bf..2a4d2c4 100644 --- a/BarrageGrab/AppSetting.cs +++ b/BarrageGrab/AppSetting.cs @@ -41,6 +41,7 @@ namespace BarrageGrab DisableLivePageScriptCache = bool.Parse(AppSettings["disableLivePageScriptCache"].Trim()); WebRoomIds = AppSettings["webRoomIds"].Trim().Split(',').Where(w => !string.IsNullOrWhiteSpace(w)).ToArray(); LiveCompanPath = AppSettings["liveCompanPath"].Trim(); + LiveCompanHookSwitch = bool.Parse(AppSettings["liveCompanHookSwitch"].Trim()); ConfigComPort(); ConfigFilter(); @@ -249,5 +250,10 @@ namespace BarrageGrab /// 直播伴侣文件位置 /// public string LiveCompanPath { get; set; } = string.Empty; + + /// + /// hook直播伴侣代理开关 + /// + public bool LiveCompanHookSwitch { get; set; } = true; } } From 5cc51d31ebd531acdf047db1be638696fcb4da9d Mon Sep 17 00:00:00 2001 From: Muihd <1083092844@qq.com> Date: Sat, 28 Sep 2024 17:04:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 559d37e..fe4a3ed 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ ## ⛳近期更新 -2024-09-28 v2.7.6 +2024-09-28 v2.7.6(beta) -1. **[重要更新]** 支持免系统代理监听直播伴侣，需要在配置文件关闭`useproxy`选项，配置后监听web直播间可参考实践指南新部分 +1. **[重要更新]** 支持免系统代理监听直播伴侣，需要在配置文件关闭`useproxy`选项以及打开`liveCompanHookSwitch`选项，配置后监听web直播间可参考实践指南新部分 2. 修复了 挂机检测Js拦截逻辑 3. 默认关闭 禁用JS文件缓存 配置项，提高网页加载速度 4. 礼物计数相关代码有一小处调整 @@ -129,6 +129,8 @@ + + ``` @@ -180,9 +182,11 @@ + 这是因为本程序运行时会占用系统代理，不正确的关闭方式可能会导致系统代理未能正确关闭，请前往找到 系统设置-网络和Internet-代理-使用代理服务器 并关闭它即可，也可管理员运行[关闭代理.bat](./关闭代理.bat) + **未开系统代理，但是无法监听到直播伴侣弹幕** - + 之前可以突然不行，且刚刚升级直播伴侣，请重监听启程序和直播伴侣再次尝试 + 如果一次都没成功，则需要检查启动菜单是否有直播伴侣的快捷方式，换言之则必须确保 `C:\ProgramData\Microsoft\Windows\Start Menu\Programs\直播伴侣.lnk` 文件存在，否则请前往配置文件显式指定`直播伴侣.exe`文件存储路径，见配置项`liveCompanPath` ++ **直播伴侣打开显示文件损坏等字样** + + + 这可能是因为直播伴侣更新后脚本内容有所变更，从而导致程序检测拦截失效导致的，请前往 `(exe所在位置)\resources\app`将`index.js.bak` 文件内容还原到 `index.js` 中，并关闭配置文件中的`liveCompanHookSwitch` 选项，并上报问题后等待更新 From d0d3039c87bbfa1af2de40d6d0bd95078e9aef5d Mon Sep 17 00:00:00 2001 From: Muihd <1083092844@qq.com> Date: Sat, 28 Sep 2024 17:06:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E4=BC=B4=E4=BE=A3=E8=BF=9B=E7=A8=8B=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BarrageGrab/App.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BarrageGrab/App.config b/BarrageGrab/App.config index 6a31fbf..80da40c 100644 --- a/BarrageGrab/App.config +++ b/BarrageGrab/App.config @@ -48,8 +48,8 @@ - - + +