From: qydysky <qydysky@foxmail.com>
Date: Mon, 14 Jun 2021 20:07:45 +0000 (+0800)
Subject: panic fix & 入场tts参数补全
X-Git-Tag: v0.5.10~41^2~96
X-Git-Url: http://127.0.0.1:8081/?a=commitdiff_plain;h=27d0980755c28f2ba15c3878ddc8233eeb00d6c8;p=bili_danmu%2F.git

panic fix & 入场tts参数补全
---

diff --git a/Reply/Reply.go b/Reply/Reply.go
index e776203..f009291 100644
--- a/Reply/Reply.go
+++ b/Reply/Reply.go
@@ -256,7 +256,7 @@ func (replyF) user_toast_msg(s string){
 	}
 	if price != 0 {
 		sh_log = append(sh, "￥", price / 1000)//不在界面显示价格
-		c.Danmu_Main_mq.Push_tag(`c.Rev_add`,price / 1000)
+		c.Danmu_Main_mq.Push_tag(`c.Rev_add`,float64(price) / 1000)
 	}
 	{//语言tts
 		c.Danmu_Main_mq.Push_tag(`tts`,Danmu_mq_t{//传入消息队列
@@ -760,16 +760,27 @@ func (replyF) entry_effect(s string){
 	if e := json.Unmarshal([]byte(s), &res);e != nil {
 		msglog.L(`E: `, e)
 	}
+	
+	var username string
+	op := strings.Index(res.Data.Copy_writing, ` <%`)
+	ed := strings.Index(res.Data.Copy_writing, `%> `)
+	if op != -1 && ed != -1 {
+		username = res.Data.Copy_writing[op+3:ed]
+	}
 	//处理特殊字符
 	copy_writing := strings.ReplaceAll(res.Data.Copy_writing, `<%`, ``)
 	copy_writing = strings.ReplaceAll(copy_writing, `%>`, ``)
 
+	guard_name := ""
 	img := "0default"
 	if strings.Contains(copy_writing, `总督`) {
+		guard_name = `总督`
 		img = "0level1"
 	} else if strings.Contains(copy_writing, `提督`) {
+		guard_name = `提督`
 		img = "0level2"
 	} else if strings.Contains(copy_writing, `舰长`) {
+		guard_name = `舰长`
 		img = "0level3"
 	}
 
@@ -777,6 +788,8 @@ func (replyF) entry_effect(s string){
 		c.Danmu_Main_mq.Push_tag(`tts`,Danmu_mq_t{//传入消息队列
 			uid:img,
 			m:map[string]string{
+				`{guard_name}`:guard_name,
+				`{username}`:username,
 				`{msg}`:copy_writing,
 			},
 		})
diff --git a/demo/config/config_K_v.json b/demo/config/config_K_v.json
index 51a4cfd..3e91ec2 100644
--- a/demo/config/config_K_v.json
+++ b/demo/config/config_K_v.json
@@ -15,7 +15,7 @@
     "TTS_服务器_xfKey": "",
     "TTS_服务器_xfSecret": "",
     "TTS_服务器_xfVoice-help": "讯飞发音人 xiaoyan:小燕甜美女声 aisjiuxu:许久亲切男声 aisxping:小萍知性女声 aisjinger:小婧亲切女声 aisbabyxu:许小宝可爱童声 random:随机",
-    "TTS_服务器_xfVoice": "aisjinger",
+    "TTS_服务器_xfVoice": "random",
     "TTS_使用程序路径": "ffplay",
     "TTS_使用程序参数": "-autoexit -nodisp -volume 60",
     "弹幕-help": "弹幕相关",