观看人数和人气一起显示

diff --git a/CV/Var.go b/CV/Var.go
index a103c82142630eede8f57b6c238483cb94782f8d..ca45d8009690159ba86dbefbf1ded96e07720e7b 100644 (file)
--- 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 e04c95b074531a521e29f693b78d0f67757c0e5d..a99e95fabab45b6a6539ac93f8be2f09d3f181eb 100644 (file)
--- 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-特殊礼物，当前仅观察到节奏风暴