From 4dbb8de2e9d0dd74945137e850da3a995354feba Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Mon, 30 Mar 2026 20:20:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?gm=E5=91=BD=E4=BB=A4=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/gm_handler.go | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go index 752c68f3..6c69b8a9 100644 --- a/src/server/game/gm_handler.go +++ b/src/server/game/gm_handler.go @@ -610,6 +610,7 @@ func ReqGmCommand_(player *Player, Command string) error { player.ClearData() case "resetCode": BaseMod := player.PlayMod.getBaseMod() + BaseMod.Uid = player.GetPlayerBaseMod().Data.DwUin BaseMod.AddCode = fmt.Sprintf("MMM-%s-%s", BaseMod.CountryCode, GoUtil.UniqueStringFromInt(int(BaseMod.Uid))) player.BackUserInfo() case "debug": From a7b2b39fd2ae1a2bb540a6d59614233ef37d2c67 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Mon, 30 Mar 2026 20:39:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A0=B4=E4=BA=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=BA=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/message_handler.go | 4 +++- src/server/game/mod/playroom/playroom.go | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/server/game/message_handler.go b/src/server/game/message_handler.go index f95a92ea..d2079f41 100644 --- a/src/server/game/message_handler.go +++ b/src/server/game/message_handler.go @@ -343,7 +343,9 @@ func (p *Player) handle(m *msg.Msg) error { m.Item[0].Num = min(m.Item[0].Num, starNum) if m.Item[0].Num >= starNum && gameId == playroom.GAME_TYPE_FILP { bankruptcy = true - p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_BANKRUPTCY, fmt.Sprintf("%d", m.Item[0].Num), m.SendT) + if m.Item[0].Num > 0 { + p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_BANKRUPTCY, fmt.Sprintf("%d", m.Item[0].Num), m.SendT) + } } p.HandleLoseItem(m.Item, "HANDLE_TYPE_PLAYROOM_LOSE") } else { diff --git a/src/server/game/mod/playroom/playroom.go b/src/server/game/mod/playroom/playroom.go index 713f1016..7fd6ad9f 100644 --- a/src/server/game/mod/playroom/playroom.go +++ b/src/server/game/mod/playroom/playroom.go @@ -448,7 +448,7 @@ func (p *PlayroomMod) AddChip(uid int, time int64, emoji int) { func (p *PlayroomMod) SetTarget(target int) { p.Target = target - p.Status = 1 + p.Status = STATUS_VISIT p.HasVisit[target] = GoUtil.Now() } @@ -858,6 +858,9 @@ func (p *PlayroomMod) FlipCard(pos int) (int, error) { } func (p *PlayroomMod) GetFlipReward() ([]*item.Item, int, int, error) { + if p.Status != STATUS_VISIT { + return nil, 0, 0, fmt.Errorf("GetFlipReward Status is not STATUS_VISIT") + } check := make(map[int]int) var items []*item.Item target := p.Target From c07cfbcf4023104ba3b02c5ff918b25fa6f525c9 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Mon, 30 Mar 2026 20:45:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A0=B4=E4=BA=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=BA=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/message_handler.go | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/server/game/message_handler.go b/src/server/game/message_handler.go index d2079f41..891fc155 100644 --- a/src/server/game/message_handler.go +++ b/src/server/game/message_handler.go @@ -327,16 +327,6 @@ func (p *Player) handle(m *msg.Msg) error { return nil } var bankruptcy bool - if gameId == playroom.GAME_TYPE_HOOK || gameId == playroom.GAME_TYPE_HIDE { - PlayroomMod.AddChip(m.From, m.SendT, emoji) - p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_CAT_WIN, fmt.Sprintf("%d_%d_%d", m.Item[0].Id, m.Item[0].Num, emoji), m.SendT) - } else { - p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_VISIT, fmt.Sprintf("%d_%d_%d", m.Item[0].Id, m.Item[0].Num, emoji), m.SendT) - } - PlayroomMod.AddMood(playroom.MOOD_TYPE_FOOD, -50) - PlayroomMod.AddMood(playroom.MOOD_TYPE_CLEAN, -50) - PlayroomMod.AddVisitor(m.From, m.SendT) - if m.Item[0].Id == item.ITEM_STAR_ID { BaseMod := p.PlayMod.getBaseMod() starNum := BaseMod.GetStar() @@ -351,6 +341,15 @@ func (p *Player) handle(m *msg.Msg) error { } else { PlayroomMod.Lose(m.Item) } + if gameId == playroom.GAME_TYPE_HOOK || gameId == playroom.GAME_TYPE_HIDE { + PlayroomMod.AddChip(m.From, m.SendT, emoji) + p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_CAT_WIN, fmt.Sprintf("%d_%d_%d", m.Item[0].Id, m.Item[0].Num, emoji), m.SendT) + } else { + p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_VISIT, fmt.Sprintf("%d_%d_%d", m.Item[0].Id, m.Item[0].Num, emoji), m.SendT) + } + PlayroomMod.AddMood(playroom.MOOD_TYPE_FOOD, -50) + PlayroomMod.AddMood(playroom.MOOD_TYPE_CLEAN, -50) + PlayroomMod.AddVisitor(m.From, m.SendT) if bankruptcy { playerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) p.PushClientRes(&proto.NotifyPlayroomBroken{ From aa160e397a9350274a03cd7113f6cb262d836453 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Mon, 30 Mar 2026 20:57:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=A0=B4=E4=BA=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=BA=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/message_handler.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/game/message_handler.go b/src/server/game/message_handler.go index 891fc155..4d430c54 100644 --- a/src/server/game/message_handler.go +++ b/src/server/game/message_handler.go @@ -345,7 +345,9 @@ func (p *Player) handle(m *msg.Msg) error { PlayroomMod.AddChip(m.From, m.SendT, emoji) p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_CAT_WIN, fmt.Sprintf("%d_%d_%d", m.Item[0].Id, m.Item[0].Num, emoji), m.SendT) } else { - p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_VISIT, fmt.Sprintf("%d_%d_%d", m.Item[0].Id, m.Item[0].Num, emoji), m.SendT) + if !bankruptcy { + p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_VISIT, fmt.Sprintf("%d_%d_%d", m.Item[0].Id, m.Item[0].Num, emoji), m.SendT) + } } PlayroomMod.AddMood(playroom.MOOD_TYPE_FOOD, -50) PlayroomMod.AddMood(playroom.MOOD_TYPE_CLEAN, -50)