保持牌子亮着fix2

diff --git a/F/api.go b/F/api.go
index a3ff14562fa060db0d97f2f892d7cdfbb1024f7b..ab92e1ecf65c42ead8b375acbac816e8350b8297 100644 (file)
--- a/F/api.go
+++ b/F/api.go
@@ -937,7 +937,7 @@ type TGet_list_in_room struct{
        Target_id int `json:"target_id"`//牌子up主uid
        Target_name string `json:"target_name"`//牌子up主名
        Room_id int `json:"roomid"`//牌子直播间
-       Last_wear_time int `json:"last_wear_time"`//ä¸\8a次佩æ\88´æ\97¶é\97´
+       Last_wear_time int `json:"last_wear_time"`//佩æ\88´æ\9c\89æ\95\88æ\88ªæ­¢æ\97¶é\97´ï¼\88佩æ\88´æ\9c¬èº«ä¸\8dä¼\9aå\88·æ\96°ï¼\8cå\8f\91å¼¹å¹\95ï¼\8cé\80\81å°\8få¿\83å¿\83ï¼\8cé\80\81é\87\91ç\93\9cå­\90礼ç\89©æ\89\8dä¼\9aå\88·æ\96°ï¼\89
        Today_intimacy int `json:"today_intimacy"`//今日亲密(0:未发送弹幕 100:已发送弹幕)
        Is_lighted int `json:"is_lighted"`//牌子是否熄灭(0:熄灭 1:亮)
 }

diff --git a/Reply/F.go b/Reply/F.go
index 6d7a6066e4d9627b40c5553390a2af560f416e92..ea80f8829c3255e700954b16fff9b024338b1d94 100644 (file)
--- a/Reply/F.go
+++ b/Reply/F.go
@@ -758,7 +758,7 @@ func Entry_danmu(){
 
 //保持所有牌子点亮
 func Keep_medal_light() {
-       if v,_ := c.K_v.LoadV(`保持所有牌子亮着`).(bool);!v {
+       if v,_ := c.K_v.LoadV(`保持牌子亮着`).(bool);!v {
                return
        }
        flog := flog.Base_add(`保持亮牌`)
@@ -778,10 +778,9 @@ func Keep_medal_light() {
        flog.L(`T: `,`开始`)
 
        for _,v := range F.Get_list_in_room() {
-               if time.Now().Add(-time.Hour * time.Duration(24 * 5)).Unix() - int64(v.Last_wear_time) > 0 {continue}
-               if v.Is_lighted == 0 {continue}
+               if t := int64(v.Last_wear_time) - time.Now().Unix();t > 60*60*24*2 || t < 0{continue}//到期时间在2天以上或已过期
 
-               //5天前有佩戴记录，且仍然点亮的（7天内点亮的），将会进行保持
+               //两天内到期，发弹幕续期
                send.Danmu_s(sendStr,p.Map_2_Cookies_String(Cookie),v.Room_id)
                time.Sleep(time.Second)
        }

diff --git a/demo/config/config_K_v.json b/demo/config/config_K_v.json
index ca83c4a90dae8e09f88079c1a4e7a2a597282c1f..9e292252bfc026c1df513f0bf25f8afa82075202 100644 (file)
--- a/demo/config/config_K_v.json
+++ b/demo/config/config_K_v.json
@@ -32,7 +32,7 @@
 
     "其他":"",
     "发送还有几天过期的礼物":3,
-    "保持所有牌子亮着":true,
+    "保持牌子亮着":true,
     "扫码登录自动打开标签页":true,
     "日志显示":["T: ","I: ","W: ","E: "],
     "统计营收":true,