feat: 添加前置弹幕消息处理器，修改zhgmang的c+数字指令为 数字

config-dev.yml

@@ -4,28 +4,28 @@ Server:
 UserCenterRpc:
   Etcd:
     Hosts:
-      - 127.0.0.1:2379
+      - noahlan.cn:2379
     Key: usercenter.rpc
   NonBlock: true
 Kafka:
   Danmaku:
-    Addr: [ "127.0.0.1:9093" ]
+    Addr: [ "noahlan.cn:9093" ]
     Topic: "danmaku"
     ConsumerGroup: "msgToPush"
   Gift:
-    Addr: [ "127.0.0.1:9093" ]
+    Addr: [ "noahlan.cn:9093" ]
     Topic: "gift"
     ConsumerGroup: "giftToPush"
   GuardBuy:
-    Addr: [ "127.0.0.1:9093" ]
+    Addr: [ "noahlan.cn:9093" ]
     Topic: "guardBuy"
     ConsumerGroup: "guardBuyConsumerG"
   RewardPool:
-    Addr: [ "127.0.0.1:9093" ]
+    Addr: [ "noahlan.cn:9093" ]
     Topic: "rewardPool"
     ConsumerGroup: "rewardPoolConsumerG"
   UserCoin:
-    Addr: [ "127.0.0.1:9093" ]
+    Addr: [ "noahlan.cn:9093" ]
     Topic: "notify-user-coin"
     ConsumerGroup: "notifyUserCoinConsumerG"
 Game:
@@ -137,16 +137,16 @@ Game:
     GiftEffect:
       # 辣条
       Free: [ 1 ]
-      # 清屏 心动盲盒
+      # 退! 快乐水
-      ClearScreen: [32124]
+      ClearScreen: [32057]
       # 随机加成 粉丝团灯牌
       RandomAddon: [31164,31738]
 Log:
   Console:
-    Level: debug
+    Level: info
     Format: console
   File:
-    Enabled: false
+    Enabled: true
     Level: info
     Format: json
     Path: ./logs

config.yml

@@ -4,28 +4,28 @@ Server:
 UserCenterRpc:
   Etcd:
     Hosts:
-      - 127.0.0.1:2379
+      - noahlan.cn:2379
     Key: usercenter.rpc
   NonBlock: true
 Kafka:
   Danmaku:
-    Addr: [ "127.0.0.1:9093" ]
+    Addr: [ "noahlan.cn:9093" ]
     Topic: "danmaku"
     ConsumerGroup: "msgToPush"
   Gift:
-    Addr: [ "127.0.0.1:9093" ]
+    Addr: [ "noahlan.cn:9093" ]
     Topic: "gift"
     ConsumerGroup: "giftToPush"
   GuardBuy:
-    Addr: [ "127.0.0.1:9093" ]
+    Addr: [ "noahlan.cn:9093" ]
     Topic: "guardBuy"
     ConsumerGroup: "guardBuyConsumerG"
   RewardPool:
-    Addr: [ "127.0.0.1:9093" ]
+    Addr: [ "noahlan.cn:9093" ]
     Topic: "rewardPool"
     ConsumerGroup: "rewardPoolConsumerG"
   UserCoin:
-    Addr: [ "127.0.0.1:9093" ]
+    Addr: [ "noahlan.cn:9093" ]
     Topic: "notify-user-coin"
     ConsumerGroup: "notifyUserCoinConsumerG"
 Game:
@@ -137,8 +137,8 @@ Game:
     GiftEffect:
       # 辣条
       Free: [ 1 ]
-      # 清屏 心动盲盒
+      # 退! 快乐水
-      ClearScreen: [32124]
+      ClearScreen: [32057]
       # 随机加成 粉丝团灯牌
       RandomAddon: [31164,31738]
 Log:

game/live_logic/logic.go

@@ -14,6 +14,7 @@ type (
 	// 处理礼物
 	liveLogic struct {
 		gameType          string                    // 游戏类型
+		preDanmakuHandler PreDanmakuHandlerFunc     // 弹幕前置处理
 		cmdParser         *cmd.Parser               // 命令解析
 		cmdHandlerMapper  map[string]CMDHandlerFunc // 具体命令处理(同类型)
 		giftHandlers      []GiftHandler             // 礼物处理
@@ -24,6 +25,7 @@ type (
 func NewLiveGameLogic(opts ...LogicOption) LiveLogic {
 	resp := &liveLogic{
 		cmdHandlerMapper:  make(map[string]CMDHandlerFunc),
+		preDanmakuHandler: DefaultPreDanmakuHandlerFunc,
 		giftHandlers:      make([]GiftHandler, 0),
 	}
 
@@ -38,6 +40,10 @@ func (l *liveLogic) SetGameType(gameType string) {
 	l.gameType = gameType
 }
 
+func (l *liveLogic) SetPreDanmakuHandler(h PreDanmakuHandlerFunc) {
+	l.preDanmakuHandler = h
+}
+
 func (l *liveLogic) SetCmdParser(parser *cmd.Parser) {
 	l.cmdParser = parser
 }
@@ -71,16 +77,24 @@ func (l *liveLogic) RegisterNobilityHandler(h NobilityHandlerFunc) {
 // HandleDanmaku 弹幕数据处理
 // pushCommonMsg 非弹幕数据是否转发
 func (l *liveLogic) HandleDanmaku(liveRoom *LiveRoom, user *pbCommon.PbUser, dm *pbMq.MqDanmaku) {
+	preResp := PreDanmakuHandlerResp{
+		PushDanmaku: true,
+		Parsing:     true,
+	}
+	if l.preDanmakuHandler != nil {
+		preResp = l.preDanmakuHandler(liveRoom, user, dm)
+	}
+
 	if l.cmdParser != nil {
 		cmdStruct := l.cmdParser.Parse(dm.Msg)
-		if cmdStruct.IsCMD {
+		if cmdStruct.IsCMD && preResp.Parsing {
 			for _, m := range cmdStruct.Matches {
 				l.handleCMD(liveRoom, m.Prefix, m.Content, user)
 			}
-		} else {
+		} else if preResp.PushDanmaku {
 			l.pushDanmaku(liveRoom, user, dm.Msg)
 		}
-	} else {
+	} else if preResp.PushDanmaku {
 		l.pushDanmaku(liveRoom, user, dm.Msg)
 	}
 }

game/live_logic/manager.go

@@ -72,6 +72,7 @@ func InitLiveManager(svcCtx *svc.ServiceContext) {
 	opts = append(opts, WithGiftHandler(commonLogic.GiftHandler()))
 	opts = append(opts,
 		zhgmang.WithGameType(),
+		zhgmang.WithPreDanmakuHandler(),
 		zhgmang.WithCmdHandlers(),
 		zhgmang.WithCmdParserLogic(commonLogic.CmdParserPatterns()),
 		zhgmang.WithGiftHandler(),

game/live_logic/option.go

@@ -12,6 +12,12 @@ func WithGameType(gameType string) LogicOption {
 	}
 }
 
+func WithPreDanmakuHandler(handler PreDanmakuHandlerFunc) LogicOption {
+	return func(logic LiveLogic) {
+		logic.SetPreDanmakuHandler(handler)
+	}
+}
+
 func WithCmdParser(parser *cmd.Parser) LogicOption {
 	return func(logic LiveLogic) {
 		logic.SetCmdParser(parser)

game/live_logic/types.go

@@ -12,6 +12,7 @@ type (
 		GameType() string
 
 		SetCmdParser(parser *cmd.Parser)
+		SetPreDanmakuHandler(h PreDanmakuHandlerFunc)
 		RegisterCMDHandler(h CMDHandlerFunc, cmd string, alias ...string)
 		RegisterGiftHandler(h GiftHandler)
 		RegisterNobilityHandler(h NobilityHandlerFunc)
@@ -26,6 +27,12 @@ type (
 		Platform string
 	}
 
+	PreDanmakuHandlerResp struct {
+		PushDanmaku bool // 之后的处理逻辑是否继续push普通danmaku
+		Parsing     bool // 之后是否继续处理命令解析
+	}
+
+	PreDanmakuHandlerFunc func(liveRoom *LiveRoom, user *pbCommon.PbUser, dm *pbMq.MqDanmaku) PreDanmakuHandlerResp
 	CMDHandlerFunc        func(liveRoom *LiveRoom, prefix string, content []rune, user *pbCommon.PbUser)
 	GiftHandlerFunc       func(liveRoom *LiveRoom, user *pbCommon.PbUser, gift *pbMq.MqGift)
 	GiftHandler           func(next GiftHandlerFunc) GiftHandlerFunc
@@ -40,3 +47,9 @@ type (
 )
 
 var EmptyGiftHandlerFunc GiftHandlerFunc = func(liveRoom *LiveRoom, user *pbCommon.PbUser, gift *pbMq.MqGift) {}
+var DefaultPreDanmakuHandlerFunc PreDanmakuHandlerFunc = func(liveRoom *LiveRoom, user *pbCommon.PbUser, dm *pbMq.MqDanmaku) PreDanmakuHandlerResp {
+	return PreDanmakuHandlerResp{
+		PushDanmaku: true,
+		Parsing:     true,
+	}
+}

game/live_logic/zhgmang_handler.go

@@ -12,6 +12,7 @@ import (
 	"dcg/game/svc"
 	"dcg/pkg/cmd"
 	"git.noahlan.cn/northlan/ntools-go/logger"
+	"regexp"
 	"strconv"
 	"strings"
 )
@@ -30,16 +31,18 @@ func (h *ZhgmangGameLogic) WithGameType() LogicOption {
 	return WithGameType(pbRoom.GameType_name[int32(pbRoom.GameType_ZHGMang)])
 }
 
+func (h *ZhgmangGameLogic) WithPreDanmakuHandler() LogicOption {
+	return func(logic LiveLogic) {
+		logic.SetPreDanmakuHandler(h.preDanmakuHandler)
+	}
+}
+
 func (h *ZhgmangGameLogic) WithCmdParserLogic(p []cmd.Pattern) LogicOption {
 	pattern := []cmd.Pattern{
 		{
 			Prefix:        "j",
 			Alias:         []string{"加入", "加入游戏"},
 			ContentMaxLen: 1,
-		}, {
-			Prefix:        "c",
-			Alias:         []string{"抽卡"},
-			ContentMaxLen: 1,
 		}, {
 			Prefix:        "w",
 			Alias:         []string{"我在哪"},
@@ -67,7 +70,6 @@ func (h *ZhgmangGameLogic) WithCmdParserLogic(p []cmd.Pattern) LogicOption {
 func (h *ZhgmangGameLogic) WithCmdHandlers() LogicOption {
 	return func(logic LiveLogic) {
 		logic.RegisterCMDHandler(h.handleJoinGame, "j")
-		logic.RegisterCMDHandler(h.handleAddUnit, "c")
 		logic.RegisterCMDHandler(h.handleWai, "w")
 		logic.RegisterCMDHandler(h.handleMockGift, "n")
 	}
@@ -82,6 +84,29 @@ func (h *ZhgmangGameLogic) WithGiftHandler() LogicOption {
 	})
 }
 
+func (h *ZhgmangGameLogic) preDanmakuHandler(liveRoom *LiveRoom, user *pbCommon.PbUser, dm *pbMq.MqDanmaku) PreDanmakuHandlerResp {
+	matching, err := regexp.MatchString("^[1-5]*$", dm.Msg)
+	if err != nil {
+		return PreDanmakuHandlerResp{
+			PushDanmaku: true,
+			Parsing:     true,
+		}
+	}
+	if !matching {
+		return PreDanmakuHandlerResp{
+			PushDanmaku: true,
+			Parsing:     true,
+		}
+	}
+	// add unit
+	h.handleAddUnit(liveRoom, dm.Msg, []rune(dm.Msg), user)
+
+	return PreDanmakuHandlerResp{
+		PushDanmaku: false,
+		Parsing:     false,
+	}
+}
+
 func (h *ZhgmangGameLogic) handleJoinGame(liveRoom *LiveRoom, _ string, _ []rune, user *pbCommon.PbUser) {
 	room, err := manager.GameManager.RoomByLiveRoom(liveRoom.RoomId, liveRoom.Platform)
 	if err != nil {
@@ -114,23 +139,19 @@ func (h *ZhgmangGameLogic) handleAddUnit(liveRoom *LiveRoom, _ string, content [
 		return
 	}
 
+	for _, r := range content {
 		var card int32
-	if len(content) > 0 {
+		t, err := strconv.ParseInt(string(r), 10, 32)
-		t, err := strconv.ParseInt(string(content[0]), 10, 32)
 		if err == nil {
 			card = int32(t)
 		}
-	}
-	if card > 5 {
-		return
-	}
-
 		logger.SLog.Debugf("用户 [%s] 抽卡 [%d]", user.Username, card)
 		room.Broadcast(pb.PushZhgmangAddUnit, &pbGameZhgMang.AddUnit{
 			User: user,
 			Card: card,
 		})
 	}
+}
 
 func (h *ZhgmangGameLogic) handleWai(liveRoom *LiveRoom, _ string, _ []rune, user *pbCommon.PbUser) {
 	room, err := manager.GameManager.RoomByLiveRoom(liveRoom.RoomId, liveRoom.Platform)

logs/dcg.log

@@ -11,3 +11,4 @@
 2022-10-03 13:57:43.134+08	error	E:/Projects/dm-game/dcg/game/live_logic/manager.go:104	获取游戏逻辑失败, err:未找到当前直播间支持的游戏逻辑
 2022-10-03 13:58:02.000+08	error	E:/Projects/dm-game/dcg/game/live_logic/manager.go:104	获取游戏逻辑失败, err:未找到当前直播间支持的游戏逻辑
 2022-10-03 13:59:32.995+08	error	E:/Projects/dm-game/dcg/game/live_logic/manager.go:104	获取游戏逻辑失败, err:弹幕对应直播间未加入游戏房间
+2022-10-13 21:35:21.211+08	error	E:/Projects/dm-game/dcg/game/manager/room.go:39	推送消息到 房间[5:ZHGMang] 失败, err:session send buffer exceed