重构网关服务器

gs/config/drop_group_data.go

@@ -1,61 +0,0 @@
-package config
-
-import (
-	"os"
-	"strings"
-
-	"hk4e/pkg/logger"
-
-	"github.com/jszwec/csvutil"
-)
-
-type Drop struct {
-	DropId int32 `csv:"DropId"`
-	Weight int32 `csv:"Weight"`
-	Result int32 `csv:"Result"`
-	IsEnd  bool  `csv:"IsEnd"`
-}
-
-type DropGroupData struct {
-	DropId     int32
-	WeightAll  int32
-	DropConfig []*Drop
-}
-
-func (g *GameDataConfig) loadDropGroupData() {
-	g.DropGroupDataMap = make(map[int32]*DropGroupData)
-	fileNameList := []string{"DropGachaAvatarUp.csv", "DropGachaWeaponUp.csv", "DropGachaNormal.csv"}
-	for _, fileName := range fileNameList {
-		fileData, err := os.ReadFile(g.csvPrefix + fileName)
-		if err != nil {
-			logger.LOG.Error("open file error: %v", err)
-			return
-		}
-		// 去除第二三行的内容变成标准格式的csv
-		index1 := strings.Index(string(fileData), "\n")
-		index2 := strings.Index(string(fileData[(index1+1):]), "\n")
-		index3 := strings.Index(string(fileData[(index2+1)+(index1+1):]), "\n")
-		standardCsvData := make([]byte, 0)
-		standardCsvData = append(standardCsvData, fileData[:index1]...)
-		standardCsvData = append(standardCsvData, fileData[index3+(index2+1)+(index1+1):]...)
-		var dropList []*Drop
-		err = csvutil.Unmarshal(standardCsvData, &dropList)
-		if err != nil {
-			logger.LOG.Error("parse file error: %v", err)
-			return
-		}
-		for _, drop := range dropList {
-			dropGroupData, exist := g.DropGroupDataMap[drop.DropId]
-			if !exist {
-				dropGroupData = new(DropGroupData)
-				dropGroupData.DropId = drop.DropId
-				dropGroupData.WeightAll = 0
-				dropGroupData.DropConfig = make([]*Drop, 0)
-				g.DropGroupDataMap[drop.DropId] = dropGroupData
-			}
-			dropGroupData.WeightAll += drop.Weight
-			dropGroupData.DropConfig = append(dropGroupData.DropConfig, drop)
-		}
-	}
-	logger.LOG.Info("load %v DropGroupData", len(g.DropGroupDataMap))
-}

gs/config/game_data_config.go

@@ -12,7 +12,6 @@ var CONF *GameDataConfig = nil
 type GameDataConfig struct {
 	binPrefix      string
 	excelBinPrefix string
-	csvPrefix      string
 	GameDepot      *GameDepot
 	// 配置表
 	// BinOutput
@@ -33,8 +32,6 @@ type GameDataConfig struct {
 	// 角色技能
 	AvatarSkillDataMap      map[int32]*AvatarSkillData
 	AvatarSkillDepotDataMap map[int32]*AvatarSkillDepotData
-	// 掉落组配置表
-	DropGroupDataMap map[int32]*DropGroupData
 	// GG
 	GadgetDataMap map[int32]*GadgetData
 	// 采集物
@@ -45,7 +42,6 @@ func InitGameDataConfig() {
 	CONF = new(GameDataConfig)
 	CONF.binPrefix = ""
 	CONF.excelBinPrefix = ""
-	CONF.csvPrefix = ""
 	CONF.loadAll()
 }
 
@@ -65,8 +61,6 @@ func (g *GameDataConfig) load() {
 	// 角色技能
 	g.loadAvatarSkillData()
 	g.loadAvatarSkillDepotData()
-	// 掉落组配置表
-	g.loadDropGroupData()
 	// GG
 	g.loadGadgetData()
 	// 采集物
@@ -87,7 +81,6 @@ func (g *GameDataConfig) loadAll() {
 	}
 	g.binPrefix = resourcePath + "/BinOutput"
 	g.excelBinPrefix = resourcePath + "/ExcelBinOutput"
-	g.csvPrefix = resourcePath + "/Csv"
 	dirInfo, err = os.Stat(g.binPrefix)
 	if err != nil || !dirInfo.IsDir() {
 		logger.LOG.Error("open game data bin output config dir error: %v", err)
@@ -98,14 +91,8 @@ func (g *GameDataConfig) loadAll() {
 		logger.LOG.Error("open game data excel bin output config dir error: %v", err)
 		return
 	}
-	dirInfo, err = os.Stat(g.csvPrefix)
-	if err != nil || !dirInfo.IsDir() {
-		logger.LOG.Error("open game data csv config dir error: %v", err)
-		return
-	}
 	g.binPrefix += "/"
 	g.excelBinPrefix += "/"
-	g.csvPrefix += "/"
 	g.load()
 }
 

gs/game/game_manager.go

@@ -2,8 +2,6 @@ package game
 
 import (
 	pb "google.golang.org/protobuf/proto"
-	"hk4e/gate/entity/gm"
-	"hk4e/gate/kcp"
 	"hk4e/gs/dao"
 	"hk4e/gs/model"
 	"hk4e/pkg/alg"
@@ -156,18 +154,3 @@ func (g *GameManager) ReconnectPlayer(userId uint32) {
 func (g *GameManager) DisconnectPlayer(userId uint32) {
 	g.SendMsg(cmd.ServerDisconnectClientNotify, userId, 0, new(proto.ServerDisconnectClientNotify))
 }
-
-// KickPlayer 踢出玩家
-func (g *GameManager) KickPlayer(userId uint32) {
-	info := new(gm.KickPlayerInfo)
-	info.UserId = userId
-	// 客户端提示信息为服务器断开连接
-	info.Reason = uint32(kcp.EnetServerKick)
-	var result bool
-	ok := false
-	//ok := r.hk4eGatewayConsumer.CallFunction("RpcManager", "KickPlayer", &info, &result)
-	if ok == true && result == true {
-		return
-	}
-	return
-}

gs/game/tick_manager.go

@@ -241,7 +241,7 @@ func (t *TickManager) onTickSecond(now int64) {
 
 func (t *TickManager) onTick200MilliSecond(now int64) {
 	// 耐力消耗
-	for _, player := range USER_MANAGER.playerMap {
+	for _, player := range USER_MANAGER.GetAllOnlineUserList() {
 		GAME_MANAGER.SustainStaminaHandler(player)
 		GAME_MANAGER.VehicleRestoreStaminaHandler(player)
 	}

gs/game/user_gacha.go

@@ -1,10 +1,10 @@
 package game
 
 import (
+	"hk4e/gdconf"
 	"time"
 
 	"hk4e/common/config"
-	gdc "hk4e/gs/config"
 	"hk4e/gs/model"
 	"hk4e/pkg/logger"
 	"hk4e/pkg/random"
@@ -385,7 +385,7 @@ func (g *GameManager) doGachaOnce(userId uint32, gachaType uint32, mustGetUpEnab
 	}
 
 	// 找到卡池对应的掉落组
-	dropGroupDataConfig := gdc.CONF.DropGroupDataMap[int32(gachaType)]
+	dropGroupDataConfig := gdconf.CONF.DropGroupDataMap[int32(gachaType)]
 	if dropGroupDataConfig == nil {
 		logger.LOG.Error("drop group not found, drop id: %v", gachaType)
 		return false, 0
@@ -419,7 +419,7 @@ func (g *GameManager) doGachaOnce(userId uint32, gachaType uint32, mustGetUpEnab
 		PurpleTimesFixValue = WeaponPurpleTimesFixValue
 	}
 	if gachaPoolInfo.OrangeTimes >= OrangeTimesFixThreshold || gachaPoolInfo.PurpleTimes >= PurpleTimesFixThreshold {
-		fixDropGroupDataConfig := new(gdc.DropGroupData)
+		fixDropGroupDataConfig := new(gdconf.DropGroupData)
 		fixDropGroupDataConfig.DropId = dropGroupDataConfig.DropId
 		fixDropGroupDataConfig.WeightAll = dropGroupDataConfig.WeightAll
 		// 计算4星和5星权重修正值
@@ -432,7 +432,7 @@ func (g *GameManager) doGachaOnce(userId uint32, gachaType uint32, mustGetUpEnab
 			addPurpleWeight = 0
 		}
 		for _, drop := range dropGroupDataConfig.DropConfig {
-			fixDrop := new(gdc.Drop)
+			fixDrop := new(gdconf.Drop)
 			fixDrop.Result = drop.Result
 			fixDrop.DropId = drop.DropId
 			fixDrop.IsEnd = drop.IsEnd
@@ -527,7 +527,7 @@ func (g *GameManager) doGachaOnce(userId uint32, gachaType uint32, mustGetUpEnab
 			// 替换本次结果为5星大保底
 			if gachaPoolInfo.MustGetUpOrange {
 				logger.LOG.Debug("trigger must get up orange, uid: %v", userId)
-				upOrangeDropGroupDataConfig := gdc.CONF.DropGroupDataMap[upOrangeDropId]
+				upOrangeDropGroupDataConfig := gdconf.CONF.DropGroupDataMap[upOrangeDropId]
 				if upOrangeDropGroupDataConfig == nil {
 					logger.LOG.Error("drop group not found, drop id: %v", upOrangeDropId)
 					return false, 0
@@ -554,7 +554,7 @@ func (g *GameManager) doGachaOnce(userId uint32, gachaType uint32, mustGetUpEnab
 			// 替换本次结果为4星大保底
 			if gachaPoolInfo.MustGetUpPurple {
 				logger.LOG.Debug("trigger must get up purple, uid: %v", userId)
-				upPurpleDropGroupDataConfig := gdc.CONF.DropGroupDataMap[upPurpleDropId]
+				upPurpleDropGroupDataConfig := gdconf.CONF.DropGroupDataMap[upPurpleDropId]
 				if upPurpleDropGroupDataConfig == nil {
 					logger.LOG.Error("drop group not found, drop id: %v", upPurpleDropId)
 					return false, 0
@@ -578,7 +578,7 @@ func (g *GameManager) doGachaOnce(userId uint32, gachaType uint32, mustGetUpEnab
 }
 
 // 走一次完整流程的掉落组
-func (g *GameManager) doFullRandDrop(dropGroupDataConfig *gdc.DropGroupData) (bool, *gdc.Drop) {
+func (g *GameManager) doFullRandDrop(dropGroupDataConfig *gdconf.DropGroupData) (bool, *gdconf.Drop) {
 	for {
 		drop := g.doRandDropOnce(dropGroupDataConfig)
 		if drop == nil {
@@ -590,7 +590,7 @@ func (g *GameManager) doFullRandDrop(dropGroupDataConfig *gdc.DropGroupData) (bo
 			return true, drop
 		}
 		// 进行下一步掉落流程
-		dropGroupDataConfig = gdc.CONF.DropGroupDataMap[drop.Result]
+		dropGroupDataConfig = gdconf.CONF.DropGroupDataMap[drop.Result]
 		if dropGroupDataConfig == nil {
 			logger.LOG.Error("drop config tab exist error, invalid drop id: %v", drop.Result)
 			return false, nil
@@ -599,7 +599,7 @@ func (g *GameManager) doFullRandDrop(dropGroupDataConfig *gdc.DropGroupData) (bo
 }
 
 // 进行单次随机掉落
-func (g *GameManager) doRandDropOnce(dropGroupDataConfig *gdc.DropGroupData) *gdc.Drop {
+func (g *GameManager) doRandDropOnce(dropGroupDataConfig *gdconf.DropGroupData) *gdconf.Drop {
 	randNum := random.GetRandomInt32(0, dropGroupDataConfig.WeightAll-1)
 	sumWeight := int32(0)
 	// 轮盘选择法