进房先尝试切换牌子

diff --git a/Reply/F.go b/Reply/F.go
index 8eda2350a2f2daf26634fc05c33c09e8fe1141d3..e1fc4b58c5d0e63c12e03beb67f44b75dc8dae43 100644 (file)
--- a/Reply/F.go
+++ b/Reply/F.go
@@ -769,12 +769,19 @@ func Save_to_json(Loc int,Context []interface{}) {
 
 //进入房间发送弹幕
 func Entry_danmu(){
+       flog := flog.Base_add(`进房弹幕`)
+
+       //检查与切换粉丝牌，只在cookie存在时启用
+       F.Get(`CheckSwitch_FansMedal`)
+       
        if v,_ := c.K_v.LoadV(`进房弹幕_有粉丝牌时才发`).(bool);v && c.Wearing_FansMedal == 0{
+               flog.L(`T: `,`无粉丝牌`)
                return
        }
        if v,_ := c.K_v.LoadV(`进房弹幕_仅发首日弹幕`).(bool);v {
                res := F.Get_weared_medal()
                if res.Today_intimacy > 0 {
+                       flog.L(`T: `,`今日已发弹幕`)
                        return
                }
        }

diff --git a/bili_danmu.go b/bili_danmu.go
index 8d9a8e179c5990719d8e97b6a69a14e6b1ec7eea..ce65378acd13072a6b9596f5c6dea77110ab51cb 100644 (file)
--- a/bili_danmu.go
+++ b/bili_danmu.go
@@ -75,6 +75,7 @@ func Demo(roomid ...int) {
                                c.Note = ``//分区排行
                                c.Uname = ``//主播id
                                c.Title = ``
+                               c.Wearing_FansMedal = 0
                                reply.Saveflv_wait()//停止保存直播流
                                for len(change_room_chan) != 0 {<-change_room_chan}
                                change_room_chan <- struct{}{}
@@ -187,6 +188,9 @@ func Demo(roomid ...int) {
                        })
 
                        F.Get(`Liveing`)
+                       //检查与切换粉丝牌，只在cookie存在时启用
+                       F.Get(`CheckSwitch_FansMedal`)
+
                        //直播状态
                        if c.Liveing {
                                danmulog.L(`I: `,"直播中")
@@ -287,8 +291,6 @@ func Demo(roomid ...int) {
                                                        go reply.Entry_danmu()
                                                        go reply.Saveflvf()
                                                        go reply.ShowRevf()
-                                                       //检查与切换粉丝牌，只在cookie存在时启用
-                                                       F.Get(`CheckSwitch_FansMedal`)
                                                        //小心心
                                                        go F.F_x25Kn()
                                                }