playroom修改

src/server/conf/server.json

@@ -13,7 +13,7 @@
 
 	"TELOGDIR" : "./teLog/",
 
-	"GameName": "Merge_Pet",
+	"GameName": "Merge_Pet_Local",
 	"GameID": 1,
 	"ServerType":"node",
 

src/server/game/PlayerBaseMod.go

@@ -180,23 +180,6 @@ func (p *PlayerBaseData) Reconnect(b bool) {
 	// GoUtil.RegisterEvent(MergeConst.Notify_Daily_Renew, p.Notify_Daily_Renew, p)
 }
 
-func (p *PlayerBaseData) SetChampshipID(ChampshipsGroupID int32, isNotify bool) {
-	p.Data.LastChampGroupID = p.Data.ChampshipsGroupID
-	p.Data.ChampshipsGroupID = ChampshipsGroupID
-
-	if isNotify {
-		notify := &msg.NotifyChampshipOpen{}
-		notify.CurChampshipsId = G_GameLogicPtr.M_SvrGlobal.CurChampshipsId
-		notify.LastChampshipsGroupID = p.Data.LastChampGroupID
-		notify.ChampshipsGroupID = p.Data.ChampshipsGroupID
-		agent := p.GetPlayer().GetAgentByPlayer()
-		data, _ := proto.Marshal(notify)
-		G_getGameLogic().PackResInfo(agent, "NotifyChampshipOpen", data)
-
-	}
-
-}
-
 func (p *PlayerBaseData) Notify_Daily_Renew(param []interface{}) {
 	p.Data.EnergyBuyCount = 0
 	p.DailyRenewTime = int32(G_GameLogicPtr.DailyTaskTimestamp)

src/server/game/RegisterNetworkFunc.go

@@ -2731,6 +2731,32 @@ func ReqPlayroomInfo(args []interface{}) error {
 	} else {
 		PlayroomMod.SetGameId(2)
 	}
+	if len(PlayroomMod.GameReward) == 0 {
+		Star := min(500, max(PlayerData.Star/10, 10))
+		ChessMod := player.PlayMod.getChessMod()
+		EmitList := ChessMod.GetOrderEmit()
+		ColorList := make([]string, 0)
+		for _, v := range EmitList {
+			Color := mergeDataCfg.GetEmitProduceChessType(v)
+			ColorList = append(ColorList, Color...)
+		}
+		RandList := make([]int, 0)
+		for _, v := range PlayerData.Chess {
+			Color := mergeDataCfg.GetColorById(v)
+			Lv := mergeDataCfg.GetLvById(v)
+			if GoUtil.InStringArray(Color, ColorList) && Lv <= 8 {
+				RandList = append(RandList, v)
+			}
+		}
+		if len(RandList) == 0 {
+			PlayroomMod.SetGameReward(0, 0, Star)
+		} else if len(RandList) == 1 {
+			PlayroomMod.SetGameReward(0, RandList[0], Star)
+		} else {
+			ChessList := GoUtil.RandSliceNum(RandList, 2)
+			PlayroomMod.SetGameReward(ChessList[0], ChessList[1], Star)
+		}
+	}
 	PlayroomVisit(player, Targer)
 	return nil
 }
@@ -2812,32 +2838,7 @@ func ReqPlayroomGame(args []interface{}) error {
 		Items = append(Items, item.NewItem(item.ITEM_STAR_ID, PlayerData.Level*3))
 		PlayroomMod.ResetGame()
 	}
-	if req.Type == playroom.GAME_RESULT_HIGH {
-		Star := min(500, max(PlayerData.Star/10, 10))
-		ChessMod := player.PlayMod.getChessMod()
-		EmitList := ChessMod.GetOrderEmit()
-		ColorList := make([]string, 0)
-		for _, v := range EmitList {
-			Color := mergeDataCfg.GetEmitProduceChessType(v)
-			ColorList = append(ColorList, Color...)
-		}
-		RandList := make([]int, 0)
-		for _, v := range PlayerData.Chess {
-			Color := mergeDataCfg.GetColorById(v)
-			Lv := mergeDataCfg.GetLvById(v)
-			if GoUtil.InStringArray(Color, ColorList) && Lv <= 8 {
-				RandList = append(RandList, v)
-			}
-		}
-		if len(RandList) == 0 {
-			PlayroomMod.SetGameReward(0, 0, Star)
-		} else if len(RandList) == 1 {
-			PlayroomMod.SetGameReward(0, RandList[0], Star)
-		} else {
-			ChessList := GoUtil.RandSliceNum(RandList, 2)
-			PlayroomMod.SetGameReward(ChessList[0], ChessList[1], Star)
-		}
-	}
+
 	err := player.HandleItem(Items, "playroomGame")
 	if err != nil {
 		player.SendErrClienRes(&msg.ResPlayroomGame{

src/server/middleware/kafka/kafka.go

@@ -11,12 +11,15 @@ var KafkaMod *kafka.Conn
 var topic string
 
 func init() {
-	conn, err := kafka.DialLeader(context.Background(), "tcp", "kafka-server:9092", conf.Server.GameName, 0)
+	topic = conf.Server.GameName
+	partition := 0
+
+	// 连接至Kafka集群的Leader节点
+	conn, err := kafka.DialLeader(context.Background(), "tcp", "kafka-server:9092", topic, partition)
 	if err != nil {
 		return
 	}
 	KafkaMod = conn
-	topic = conf.Server.GameName
 }
 
 func SendMsg(key, value []byte) error {

src/server/msg/msg.go

@@ -9,7 +9,6 @@ var Processor = protobuf.NewProcessor()
 func init() {
 	Processor.Register(&ClientReq{})
 
-	Processor.Register(&Hello{})
 	Processor.Register(&ClientRes{})
 
 }