From 39e84031ae8a588b025599ca49bc91ed23972f1f Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Tue, 16 Jul 2024 11:29:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E7=BA=A2=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worldsrv/action_shop.go | 2 +-
 worldsrv/player.go      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/worldsrv/action_shop.go b/worldsrv/action_shop.go
index e3b7530..c790bd9 100644
--- a/worldsrv/action_shop.go
+++ b/worldsrv/action_shop.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"mongo.games.com/game/srvdata"
 	"time"
 
 	"mongo.games.com/goserver/core/basic"
@@ -13,6 +12,7 @@ import (
 	"mongo.games.com/game/model"
 	"mongo.games.com/game/proto"
 	"mongo.games.com/game/protocol/shop"
+	"mongo.games.com/game/srvdata"
 )
 
 type CSShopInfoPacketFactory struct {
diff --git a/worldsrv/player.go b/worldsrv/player.go
index 4d71a77..09c34d2 100644
--- a/worldsrv/player.go
+++ b/worldsrv/player.go
@@ -787,6 +787,9 @@ func (this *Player) MessageShowRed() {
 		if msg.State == model.MSGSTATE_UNREAD ||
 			(msg.State == model.MSGSTATE_READED && msg.AttachState == model.MSGATTACHSTATE_DEFAULT &&
 				(msg.Coin > 0 || msg.Diamond > 0 || len(msg.Params) > 0)) {
+			if len(msg.Channel) > 0 && !common.InSliceString(msg.Channel, this.LastChannel) {
+				continue
+			}
 			if msg.ShowId == model.HallAll {
 				msgMap[model.HallMain] = 1
 				msgMap[model.HallTienlen] = 1