From: qydysky <qydysky@foxmail.com>
Date: Sat, 7 May 2022 16:35:23 +0000 (+0800)
Subject: 观看人数和人气一起显示
X-Git-Tag: v0.5.10~41^2~70
X-Git-Url: http://127.0.0.1:8081/?a=commitdiff_plain;h=290704f7664140dc67519829aca14f8b2a58380d;p=bili_danmu%2F.git

观看人数和人气一起显示
---

diff --git a/CV/Var.go b/CV/Var.go
index a103c82..ca45d80 100644
--- a/CV/Var.go
+++ b/CV/Var.go
@@ -22,6 +22,7 @@ type Common struct {
 	UpUid             int                //主播uid
 	Rev               float64            //营收
 	Renqi             int                //人气
+	Watched           int                //观看人数
 	GuardNum          int                //舰长数
 	ParentAreaID      int                //父分区
 	AreaID            int                //子分区
diff --git a/Reply/Reply.go b/Reply/Reply.go
index e04c95b..a99e95f 100644
--- a/Reply/Reply.go
+++ b/Reply/Reply.go
@@ -357,7 +357,7 @@ func (replyF) heartbeat(s int) {
 	}
 
 	if renqi_old != s {
-		fmt.Printf("\t人气:%d %s\n", s, tmp)
+		fmt.Printf("\t人气:%d %s\t观看人数:%d\n", s, tmp, c.C.Watched)
 	}
 	reply_log.Base_add(`人气`).Log_show_control(false).L(`I: `, "当前人气", s)
 	renqi_old = s
@@ -371,20 +371,13 @@ func (replyF) win_activity(s string) {
 	msglog.Base_add("房").Log_show_control(false).L(`I: `, "活动", title, "已开启")
 }
 
-var (
-	watched int //观看人数
-)
-
 //Msg-观看人数
 func (replyF) watched_change(s string) {
 	var data ws_msg.WATCHED_CHANGE
 	json.Unmarshal([]byte(s), &data)
-	if float64(data.Data.Num) < float64(watched)*1.1 && data.Data.Num >= watched {
-		return
-	}
-	watched = data.Data.Num
-	fmt.Printf("\t观看人数:%d\n", watched)
-	msglog.Base_add("房").Log_show_control(false).L(`I: `, "观看人数", watched)
+	c.C.Watched = data.Data.Num
+	// fmt.Printf("\t观看人数:%d\n", watched)
+	msglog.Base_add("房").Log_show_control(false).L(`I: `, "观看人数", data.Data.Num)
 }
 
 //Msg-特殊礼物，当前仅观察到节奏风暴