From 3fb89c39479a3312c2eb2e72f6b9364ce40b7c82 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Wed, 11 Jun 2025 16:28:56 +0800
Subject: [PATCH] =?UTF-8?q?playroom=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/LimitedTimeTrigger.go    | 14 +++++---------
 src/server/game/RegisterNetworkFunc.go   |  4 ++--
 src/server/game/mod/playroom/playroom.go |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/server/game/LimitedTimeTrigger.go b/src/server/game/LimitedTimeTrigger.go
index 841810e7..5888b2bf 100644
--- a/src/server/game/LimitedTimeTrigger.go
+++ b/src/server/game/LimitedTimeTrigger.go
@@ -13,7 +13,6 @@ import (
 	MsgMod "server/game/mod/msg" // Ensure this package exists and is correctly referenced
 	"server/game/mod/playroom"
 	"server/msg"
-	"server/pkg/github.com/name5566/leaf/log"
 	"time"
 )
 
@@ -147,8 +146,8 @@ func LimitedTimePlayroomTrigger(p *Player) {
 			LimitedTimePlayroomTrigger_(p, k)
 		}
 	}
-	p.PushClientRes(PlayroomMod.NotifyMood())
 }
+
 func LimitedTimePlayroomTrigger_(p *Player, Id int) {
 	PlayroomMod := p.PlayMod.getPlayroomMod()
 	Physiology := PlayroomMod.GetPhysiology(Id)
@@ -165,7 +164,7 @@ func LimitedTimePlayroomTrigger_(p *Player, Id int) {
 	if Id == playroom.PHYSIOLOGY_TYPE_TOLIET && Num == 0 && CleanMood.Num > 50 {
 		CleanMood.Num = 50
 	}
-	log.Debug("PlayroomTrigger Id:%d, Time:%d, Num:%d, NewTime:%d, NextSecond:%d, MType:%d, MEffect:%d, Num :%d", Id, Physiology.Time, Physiology.Num, NewTime, NextSecond, MType, MEffect, Num)
+	// log.Debug("PlayroomTrigger Id:%d, Time:%d, Num:%d, NewTime:%d, NextSecond:%d, MType:%d, MEffect:%d, Num :%d", Id, Physiology.Time, Physiology.Num, NewTime, NextSecond, MType, MEffect, Num)
 	Physiology.Num = Num
 	if PlayroomMod.GetMoodInfo(MType).Num == 0 { // 心情值为0时，重置生理状态
 		PlayroomMod.ResetPhysiology(MType)
@@ -189,12 +188,9 @@ func PlayroomTrigger(Id int, Time int64, Num int) (int64, int64, int) {
 		return 0, 0, 0
 	}
 	Now := GoUtil.Now()
-	if Time > Now {
-		return Time, Time - Now, Num
-	}
-	if Time == Now {
-		NeedDuration := playroomCfg.GetPhysiologyDuration(Id, Num)
-		return Now, int64(NeedDuration), Num
+	NeedDuration := playroomCfg.GetPhysiologyDuration(Id, Num)
+	if Time+int64(NeedDuration) > Now {
+		return Time, int64(NeedDuration), Num
 	}
 	n := 0
 	for {
diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go
index 9f172f98..f610d2ad 100644
--- a/src/server/game/RegisterNetworkFunc.go
+++ b/src/server/game/RegisterNetworkFunc.go
@@ -3121,7 +3121,7 @@ func ReqPlayroomInteract(player *Player, buf []byte) error {
 	req := &msg.ReqPlayroomInteract{}
 	proto.Unmarshal(buf, req)
 	PlayroomMod := player.PlayMod.getPlayroomMod()
-	Items, _, err := PlayroomMod.Interact(int(req.Id), int(req.Type))
+	Items, PType, err := PlayroomMod.Interact(int(req.Id), int(req.Type))
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomInteract{
 			Code: msg.RES_CODE_FAIL,
@@ -3151,7 +3151,7 @@ func ReqPlayroomInteract(player *Player, buf []byte) error {
 	player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_INTERACT, A: []interface{}{int(req.Id)}})
 	player.PlayMod.save()
 	G_GameLogicPtr.SetUserData(int(player.M_DwUin), VAR_OP_KISS, 0)
-	LimitedTimePlayroomTrigger(player)
+	LimitedTimePlayroomTrigger_(player, PType)
 	player.NotifyPlayroomKiss()
 	player.PushClientRes(&msg.ResPlayroomInteract{
 		Code:        msg.RES_CODE_SUCCESS,
diff --git a/src/server/game/mod/playroom/playroom.go b/src/server/game/mod/playroom/playroom.go
index 1b990a92..fda78d04 100644
--- a/src/server/game/mod/playroom/playroom.go
+++ b/src/server/game/mod/playroom/playroom.go
@@ -380,7 +380,7 @@ func (p *PlayroomMod) Interact(Id, Type int) ([]*item.Item, int, error) {
 	p.AddPhysiology(PType, PEffect)
 	p.AddMood(MoodType, Effect)
 	p.AddInteractNum()
-	return ItemList, MoodType, nil
+	return ItemList, PType, nil
 }
 
 func (p *PlayroomMod) AddInteractNum() {