From 20545b85584db41213f47a676e35a61d95c2a25d Mon Sep 17 00:00:00 2001
From: Muihd <1083092844@qq.com>
Date: Sun, 28 Apr 2024 19:17:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E7=A4=BC=E7=89=A9=E8=81=94?=
 =?UTF-8?q?=E6=9C=BA=E5=88=A4=E6=96=AD=EF=BC=8C=E6=94=BE=E5=BC=83Combo?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BarrageGrab/WsBarrageServer.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/BarrageGrab/WsBarrageServer.cs b/BarrageGrab/WsBarrageServer.cs
index f1e0825..7e723ab 100644
--- a/BarrageGrab/WsBarrageServer.cs
+++ b/BarrageGrab/WsBarrageServer.cs
@@ -105,6 +105,7 @@ namespace BarrageGrab
                 this.giftData = JsonConvert.DeserializeObject<WebCastGiftPack>(jsonData);
             }
 
+            return;
             //从服务器获取礼物数据
             DyServer.GetGifts().ContinueWith(t =>
             {
@@ -120,7 +121,7 @@ namespace BarrageGrab
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError(ex, "缓存礼物数据到本地失败");
+                    Logger.LogWarn("缓存礼物数据到本地失败，"+ex.Message);
                 }
             });
         }
@@ -346,8 +347,11 @@ namespace BarrageGrab
                 ogift.Name = findForData.name;
             }
 
+
+
             //Combo 为1时，表示为可连击礼物
-            if (msg.Gift.Combo)
+            //if (msg.Gift.Combo)  //一堆礼物Combo 和实际可连击情况不匹配，例如亲吻，闪耀星辰 Combo =false，实际上是可连击的，抖音那帮程序员怕是看女主播冲昏头了
+            if (true)
             {
                 //判断礼物重复
                 if (msg.repeatEnd == 1)