From 3cadcaa6b482700cb7422b7c4d9a00f9d088b969 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 18 Dec 2023 10:50:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AE=9A=E6=8A=95=E9=99=8D=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0=20=20=E5=90=8E=E7=BB=AD=E8=B5=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/entertainment/api_getlist.go | 2 +-
 modules/entertainment/room.go        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/entertainment/api_getlist.go b/modules/entertainment/api_getlist.go
index febbae441..24e625e3b 100644
--- a/modules/entertainment/api_getlist.go
+++ b/modules/entertainment/api_getlist.go
@@ -34,7 +34,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.EntertainGetList
 		for _, v := range this.module.configure.GetGameConsumeIntegral() {
 			list.Playtype = append(list.Playtype, v.Key) // 配置读取一个玩法
 		}
-		list.Touxiang = 0
+		list.Touxiang = 3                  // 需求 默认3 后面可能走配置
 		update["touxiang"] = list.Touxiang // 每天投降次数清0
 		update["rtime"] = list.Rtime
 		update["playtype"] = list.Playtype
diff --git a/modules/entertainment/room.go b/modules/entertainment/room.go
index fd9dd6faa..277fe2114 100644
--- a/modules/entertainment/room.go
+++ b/modules/entertainment/room.go
@@ -507,13 +507,13 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
 			return
 		}
 		if list, err := this.module.model.getEntertainmList(session.GetUserId()); err == nil {
-			if list.Touxiang >= 3 {
+			if list.Touxiang > 0 {
 				errdata = &pb.ErrorData{
 					Code:  pb.ErrorCode_EntertainMaxTouxiangCount,
 					Title: pb.ErrorCode_EntertainMaxTouxiangCount.ToString(),
 				}
 			}
-			list.Touxiang += 1
+			list.Touxiang -= 1
 			this.module.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{
 				"touxiang": list.Touxiang,
 			})