From 9100d2d431771882e41aa1a89815cd3679b5dacb Mon Sep 17 00:00:00 2001
From: Fang_Zhijian <klxf@vip.qq.com>
Date: Mon, 27 May 2024 17:20:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=AC=A1=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E7=A4=BC=E7=89=A9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 强度增减数值与赠送礼物数量相同
* 波形时长改为 `5*礼物数量`
---
 src/socket/coyote.ts | 26 ++++++++++++++++----------
 src/socket/index.ts  | 18 ++++++++----------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/socket/coyote.ts b/src/socket/coyote.ts
index 5d65043..845dd4c 100644
--- a/src/socket/coyote.ts
+++ b/src/socket/coyote.ts
@@ -146,31 +146,37 @@ function sendWsMsg(messageObj) {
     messageObj.targetId = targetWSId;
     if (!messageObj.hasOwnProperty('type'))
         messageObj.type = "msg";
-    wsConn.send(JSON.stringify((messageObj)));
+    wsConn.send(JSON.stringify((messageObj)))
 }
 
 function addOrIncrease(type, channelIndex, strength) {
-    // 1 减少一  2 增加一  3 设置到
+    // 1 减少  2 增加  3 设置到
     // channel:1-A    2-B
-    // 获取当前频道元素和当前值
+    // 获取当前通道的当前值
     let channelStrength = channelIndex === 1 ? channelAStrength.value : channelBStrength.value;
 
     // 如果是设置操作
     if (type === 3) {
-        channelStrength = strength; //固定为0
+        channelStrength = strength
     }
-    // 减少一
+    // 减少
     else if (type === 1) {
-        channelStrength = Math.max(channelStrength - strength, 0);
+        channelStrength = Math.max(channelStrength - strength, 0)
     }
-    // 增加一
+    // 增加
     else if (type === 2) {
-        channelStrength = Math.min(channelStrength + strength, 200);
+        channelStrength = Math.min(channelStrength + strength, 200)
     }
 
     // 构造消息对象并发送
-    const data = { type, strength: channelStrength, message: "set channel", channel: channelIndex };
-    console.log(data)
+    let data = {}
+    if (type === 3) {
+        data = { type, strength: channelStrength, message: "set channel", channel: channelIndex }
+    } else {
+        // 这里用 type 4 可以自定义增加减小是数值，type 2/3 固定是 1
+        data = { type: 4, message: "strength-" + channelIndex + "+" + (type - 1) + "+" + strength }
+    }
+
     sendWsMsg(data);
 }
 
diff --git a/src/socket/index.ts b/src/socket/index.ts
index 16180da..d335066 100644
--- a/src/socket/index.ts
+++ b/src/socket/index.ts
@@ -93,11 +93,9 @@ function createSocket(authBody: string, wssLinks: string[]) {
                 if (settings && res.data.gift_id.toString() === settings.value.strengthData[0]) {
                     // 加强度1
                     try {
-                        console.log("开始操作")
-                        addOrIncrease(2, 1, 1)
-                        addOrIncrease(2, 2, 1)
-                        console.log("结束操作")
-                        notyf.success("收到" + res.data.gift_name + "，强度+1")
+                        addOrIncrease(2, 1, res.data.gift_num)
+                        addOrIncrease(2, 2, res.data.gift_num)
+                        notyf.success("收到" + res.data.gift_name + "，强度+" + res.data.gift_num)
                     }
                     catch (e) {
                         console.log(e)
@@ -106,9 +104,9 @@ function createSocket(authBody: string, wssLinks: string[]) {
                 } else if (settings && res.data.gift_id.toString() === settings.value.strengthData[1]) {
                     // 减强度1
                     try {
-                        addOrIncrease(1, 1, 1)
-                        addOrIncrease(1, 2, 1)
-                        notyf.success("收到" + res.data.gift_name + "，强度-1")
+                        addOrIncrease(1, 1, res.data.gift_num)
+                        addOrIncrease(1, 2, res.data.gift_num)
+                        notyf.success("收到" + res.data.gift_name + "，强度-" + res.data.gift_num)
                     }
                     catch (e) {
                         console.log(e)
@@ -117,8 +115,8 @@ function createSocket(authBody: string, wssLinks: string[]) {
                 } else if(settings && settings.value.waveData[res.data.gift_id]) {
                     // 其他礼物，发送波形数据
                     try {
-                        sendWaveData(5, 5, settings.value.waveData[res.data.gift_id], settings.value.waveData[res.data.gift_id])
-                        notyf.success("收到礼物" + res.data.gift_name)
+                        sendWaveData(5 * res.data.gift_num, 5 * res.data.gift_num, settings.value.waveData[res.data.gift_id], settings.value.waveData[res.data.gift_id])
+                        notyf.success("收到礼物" + res.data.gift_name + "*"+res.data.gift_num)
                     }
                     catch (e) {
                         console.log(e)