From 7e794dc2dcc12b9b8a5fd865fe4669fd146f3872 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Thu, 12 Dec 2024 19:03:45 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/server/game/GameLogic.go             | 10 +++++-----
 src/server/game/RegisterNetworkFunc.go   |  1 +
 src/server/game/mod/chess/Chess.go       |  1 +
 src/server/game/mod/playroom/playroom.go |  5 ++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/server/game/GameLogic.go b/src/server/game/GameLogic.go
index e3bda6b4..4b10bef4 100644
--- a/src/server/game/GameLogic.go
+++ b/src/server/game/GameLogic.go
@@ -657,7 +657,7 @@ func (ad *GameLogic) RegisterNetWorkFunc() {
 	RegisterMsgProcessFunc("UpdateBaseItemInfo", UpdateBaseItemInfofunction) // 保存引导
 	RegisterMsgProcessFunc("ReqKv", ReqKv)                                   // 保存客户端数据
 
-	// 棋盘
+	// #region 棋盘
 	RegisterMsgProcessFunc("ReqPlayerChessData", ReqPlayerChessDataFunc)
 	RegisterMsgProcessFunc("UpdatePlayerChessData", UpdatePlayerChessDataFunc) // 更新棋盘数据
 	RegisterMsgProcessFunc("ReqSetEnergyMul", RegSetEneryFunc)                 //设置能量倍数
@@ -722,7 +722,7 @@ func (ad *GameLogic) RegisterNetWorkFunc() {
 	RegisterMsgProcessFunc("ReqSelectLimitEvent", ReqSelectLimitEvent)   //领取限时事件进度奖励
 	RegisterMsgProcessFunc("ReqGetGoldCard", ReqGetGoldCard)             //请求金卡交换信息
 
-	// 好友
+	// #region 好友
 	RegisterMsgProcessFunc("ReqFriendList", ReqFriendList)           // 请求好友列表
 	RegisterMsgProcessFunc("ReqFriendApply", ReqFriendApply)         // 请求申请好友列表
 	RegisterMsgProcessFunc("ReqFriendCardMsg", ReqFriendCardMsg)     // 请求好友卡牌申请列表
@@ -773,7 +773,7 @@ func (ad *GameLogic) RegisterNetWorkFunc() {
 	RegisterMsgProcessFunc("ReqChampshipRank", ReqChampshipRank)             // 请求锦标赛排行榜
 	RegisterMsgProcessFunc("ReqChampshipPreRank", ReqChampshipPreRank)       // 请求锦标赛昨日排行榜
 
-	// 活动
+	// #region 活动
 	// 挖矿
 	RegisterMsgProcessFunc("ReqMining", ReqMining)             // 请求挖矿数据
 	RegisterMsgProcessFunc("ReqMiningReward", ReqMiningReward) // 领取挖矿奖励
@@ -782,12 +782,12 @@ func (ad *GameLogic) RegisterNetWorkFunc() {
 	RegisterMsgProcessFunc("ReqGuessColor", ReqGuessColor)             // 请求猜颜色数据
 	RegisterMsgProcessFunc("ReqGuessColorReward", ReqGuessColorReward) // 领取猜颜色奖励
 	RegisterMsgProcessFunc("ReqGuessColorTake", ReqGuessColorTake)     // 猜颜色
-	// 三段竞赛
+	//  三段竞赛
 	RegisterMsgProcessFunc("ReqRace", ReqRace)
 	RegisterMsgProcessFunc("ReqRaceReward", ReqRaceReward)
 	RegisterMsgProcessFunc("ReqRaceStart", ReqRaceStart)
 
-	// playroom
+	// #region playroom
 	RegisterMsgProcessFunc("ReqPlayroom", ReqPlayroom)                         // 请求playroom数据
 	RegisterMsgProcessFunc("ReqPlayroomInfo", ReqPlayroomInfo)                 // 请求playroom拜访信息
 	RegisterMsgProcessFunc("ReqPlayroomGame", ReqPlayroomGame)                 // 游戏结果
diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/RegisterNetworkFunc.go
index 591ced57..14f790f0 100644
--- a/src/server/game/RegisterNetworkFunc.go
+++ b/src/server/game/RegisterNetworkFunc.go
@@ -2991,6 +2991,7 @@ func ReqPlayroomDraw(args []interface{}) error {
 		})
 		return err
 	}
+	player.args["ResItemPopId"] = Id
 	player.PlayMod.save()
 	PlayroomBackData(player)
 	player.PushClientRes(&msg.ResPlayroomDraw{
diff --git a/src/server/game/mod/chess/Chess.go b/src/server/game/mod/chess/Chess.go
index f00140c7..ff698d56 100644
--- a/src/server/game/mod/chess/Chess.go
+++ b/src/server/game/mod/chess/Chess.go
@@ -406,6 +406,7 @@ func (cb *ChessBorad) PutChessInBag(Grid, ChessId, EmitId int) error {
 func (cb *ChessBorad) TakeChessOutBag(Grid int) error {
 	if Grid < 0 {
 		cb.RemoveHonor(-Grid)
+		cb.AddChess(Grid)
 		return nil
 	}
 	GridInfo, ok := cb.ChessBag.List[Grid]
diff --git a/src/server/game/mod/playroom/playroom.go b/src/server/game/mod/playroom/playroom.go
index 48e37047..4f872d20 100644
--- a/src/server/game/mod/playroom/playroom.go
+++ b/src/server/game/mod/playroom/playroom.go
@@ -218,7 +218,7 @@ func (p *PlayroomMod) Interact(Id, Type int) ([]*item.Item, int, error) {
 		return nil, 0, fmt.Errorf("Interact MoodType is 0")
 	}
 	if Effect > 0 {
-		p.AllMood += 10
+		p.AllMood = min(100, p.AllMood+10)
 	}
 	p.AddMood(MoodType, Effect)
 	return ItemList, MoodType, nil
@@ -233,6 +233,9 @@ func (p *PlayroomMod) AddMood(Id, Num int) {
 	if p.MoodInfo[Id].Num != 0 && p.MoodInfo[Id].Time == 0 {
 		p.MoodInfo[Id].Time = GoUtil.Now()
 	}
+	if p.MoodInfo[Id].Num == 0 {
+		p.MoodInfo[Id].Time = 0
+	}
 }
 
 func (p *PlayroomMod) AddVisitor(Id int, Time int64) {