mirrors2/hk4e
1
0
Fork 0
mirror of https://github.com/FlourishingWorld/hk4e.git synced 2026-03-01 00:35:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

给予已有角色重复问题修复

Browse Source
This commit is contained in:
UnKownOwO
2022-12-25 21:05:43 +08:00
parent c7ba154ab4
commit 0a2e13fad3
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gate/client_proto/client_proto_gen_test.go
View File

@@ -15,7 +15,8 @@ func TestClientProtoGen(t *testing.T) {
for _, entry := range dir { for _, entry := range dir {
split := strings.Split(entry.Name(), ".") split := strings.Split(entry.Name(), ".")
if len(split) != 2 { if len(split) != 2 {
panic("file name error") continue
//panic("file name error")
} }
nameList = append(nameList, split[0]) nameList = append(nameList, split[0])
} }
@@ -23,20 +24,18 @@ func TestClientProtoGen(t *testing.T) {
fileData := "package client_proto\n" fileData := "package client_proto\n"
fileData += "\n" fileData += "\n"
fileData += "import (\n" fileData += "import (\n"
fileData += "\"hk4e/gate/client_proto/proto\"\n" fileData += "\t\"hk4e/gate/client_proto/proto\"\n"
fileData += "pb \"google.golang.org/protobuf/proto\"\n"
fileData += ")\n" fileData += ")\n"
fileData += "\n" fileData += "\n"
fileData += "func (c *ClientCmdProtoMap) GetClientProtoObjByName(protoObjName string) any {\n" fileData += "func (c *ClientCmdProtoMap) GetClientProtoObjByName(protoObjName string) any {\n"
fileData += "switch protoObjName {\n" fileData += "\tswitch protoObjName {\n"
for _, protoObjName := range nameList { for _, protoObjName := range nameList {
fileData += "case \"" + protoObjName + "\":\nreturn new(proto." + protoObjName + ")\n" fileData += "\tcase \"" + protoObjName + "\":\n\t\treturn new(proto." + protoObjName + ")\n"
} }
fileData += "default:\n" fileData += "\tdefault:\n"
fileData += "return nil\n" fileData += "\t\treturn nil\n"
fileData += "\t}\n"
fileData += "}\n" fileData += "}\n"
fileData += "}\n"
fileData += "\n"
err = os.WriteFile("../client_proto_gen.go", []byte(fileData), 0644) err = os.WriteFile("../client_proto_gen.go", []byte(fileData), 0644)
if err != nil { if err != nil {

11
gs/game/user_avatar.go
View File

@@ -34,12 +34,13 @@ func (g *GameManager) AddUserAvatar(userId uint32, avatarId uint32) {
logger.Error("player is nil, uid: %v", userId) logger.Error("player is nil, uid: %v", userId)
return return
} }
player.AddAvatar(avatarId) // 判断玩家是否已有该角色
avatar := player.AvatarMap[avatarId] _, ok := player.AvatarMap[avatarId]
if avatar == nil { if ok {
logger.Error("avatar is nil, avatarId", avatarId) // TODO 如果已有转换命座材料
return return
} }
player.AddAvatar(avatarId)
// 添加初始武器 // 添加初始武器
avatarDataConfig, ok := gdc.CONF.AvatarDataMap[int32(avatarId)] avatarDataConfig, ok := gdc.CONF.AvatarDataMap[int32(avatarId)]
@@ -55,7 +56,7 @@ func (g *GameManager) AddUserAvatar(userId uint32, avatarId uint32) {
g.UpdateUserAvatarFightProp(player.PlayerID, avatarId) g.UpdateUserAvatarFightProp(player.PlayerID, avatarId)
avatarAddNotify := &proto.AvatarAddNotify{ avatarAddNotify := &proto.AvatarAddNotify{
Avatar: g.PacketAvatarInfo(avatar), Avatar: g.PacketAvatarInfo(player.AvatarMap[avatarId]),
IsInTeam: false, IsInTeam: false,
} }
g.SendMsg(cmd.AvatarAddNotify, userId, player.ClientSeq, avatarAddNotify) g.SendMsg(cmd.AvatarAddNotify, userId, player.ClientSeq, avatarAddNotify)