From: qydysky <qydysky@foxmail.com>
Date: Wed, 10 Mar 2021 09:35:08 +0000 (+0800)
Subject: 保持牌子亮着fix2
X-Git-Tag: v0.5.8~1^2~14
X-Git-Url: http://127.0.0.1:8081/?a=commitdiff_plain;h=2bd7a7798ea986de00c3000ae1cab40090636863;p=bili_danmu%2F.git

保持牌子亮着fix2
---

diff --git a/F/api.go b/F/api.go
index a3ff145..ab92e1e 100644
--- 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"`//上次佩戴时间
+	Last_wear_time int `json:"last_wear_time"`//佩戴有效截止时间（佩戴本身不会刷新，发弹幕，送小心心，送金瓜子礼物才会刷新）
 	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 6d7a606..ea80f88 100644
--- 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 ca83c4a..9e29225 100644
--- 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,