From 2ea166846340d33b61e6efae51d50bb2a614e1d0 Mon Sep 17 00:00:00 2001 From: zqj <582132116@qq.com> Date: Wed, 11 May 2022 18:12:21 +0800 Subject: [PATCH] fix: update --- cmd/gameserver/action/RoleAction.go | 1 + cmd/gameserver/service/agent.go | 1 - cmd/test/action/TestAction.go | 40 +++++++++++++++++++++++++++++++--------- cmd/test/action/protocode.go | 24 ++++++++++++++++-------- cmd/test/service/TestClient.go | 1 + tools/generator.py | 18 ++++++++++++++++++ 6 files changed, 67 insertions(+), 18 deletions(-) diff --git a/cmd/gameserver/action/RoleAction.go b/cmd/gameserver/action/RoleAction.go index ff69dad..c07d854 100644 --- a/cmd/gameserver/action/RoleAction.go +++ b/cmd/gameserver/action/RoleAction.go @@ -235,6 +235,7 @@ func RoleEndBattleRpc(role *models.RoleModel, msg components.IMessage) (int32, i amount = carbonInfo.CarbonFailExp } level, exp := role.UpLevel(amount) + role.UpdateProperties(map[string]interface{}{"level": level, "exp": exp}, true) rsp := &pb.RoleEndBattleRsp{ RoleLevel: level, diff --git a/cmd/gameserver/service/agent.go b/cmd/gameserver/service/agent.go index 6dcbf2c..16b100d 100644 --- a/cmd/gameserver/service/agent.go +++ b/cmd/gameserver/service/agent.go @@ -75,7 +75,6 @@ func (c *Agent) OnLoginQuery(msg components.IMessage) (int32, proto.Message) { // 判断是否已经登录 ，挤掉，断开连接 conn := c.Server.GetConnManage().GetConnByUID(uid) - logger.Debug(conn) if conn != nil { logger.Debug("挤掉。。。。。。。。") conn.SendSuccess(uint32(pb.ProtoCode_DisConnectRsp), nil) diff --git a/cmd/test/action/TestAction.go b/cmd/test/action/TestAction.go index 6810a25..a9c3613 100644 --- a/cmd/test/action/TestAction.go +++ b/cmd/test/action/TestAction.go @@ -8,26 +8,48 @@ import ( "pro2d/pb" ) -func HeartReq(role *models.RoleTestModel, msg components.IMessage) { +func HeartRsp(role *models.RoleTestModel, msg components.IMessage) { } -func CreateReq(role *models.RoleTestModel, msg components.IMessage) { +func LoginRsp(role *models.RoleTestModel, msg components.IMessage) { } -func ChangeTeamReq(role *models.RoleTestModel, msg components.IMessage) { + +func CreateRsp(role *models.RoleTestModel, msg components.IMessage) { } -func HeroEquipReferReq(role *models.RoleTestModel, msg components.IMessage) { + +func DisConnectRsp(role *models.RoleTestModel, msg components.IMessage) { } -func RoleClearItemsReq(role *models.RoleTestModel, msg components.IMessage) { + +func ChangeTeamRsp(role *models.RoleTestModel, msg components.IMessage) { } -func RoleStartBattleReq(role *models.RoleTestModel, msg components.IMessage) { +func HeroEquipReferRsp(role *models.RoleTestModel, msg components.IMessage) { +} + +func RoleRsp(role *models.RoleTestModel, msg components.IMessage) { +} + +func RoleUpdatePropertyRsp(role *models.RoleTestModel, msg components.IMessage) { +} + +func RoleUpdateItemsRsp(role *models.RoleTestModel, msg components.IMessage) { } -func RoleEndBattleReq(role *models.RoleTestModel, msg components.IMessage) { + +func RoleClearItemsRsp(role *models.RoleTestModel, msg components.IMessage) { +} + +func RoleStartBattleRsp(role *models.RoleTestModel, msg components.IMessage) { +} + +func RoleEndBattleRsp(role *models.RoleTestModel, msg components.IMessage) { rsp := pb.RoleEndBattleRsp{} if err := proto.Unmarshal(msg.GetData(), &rsp); err != nil { logger.Error("rsp err: %v", err) return } - logger.Debug(rsp) } -func EquipmentDelReq(role *models.RoleTestModel, msg components.IMessage) { + +func EquipmentDelRsp(role *models.RoleTestModel, msg components.IMessage) { +} + +func EquipmentAddRsp(role *models.RoleTestModel, msg components.IMessage) { } diff --git a/cmd/test/action/protocode.go b/cmd/test/action/protocode.go index 2bad651..53b9a37 100644 --- a/cmd/test/action/protocode.go +++ b/cmd/test/action/protocode.go @@ -6,14 +6,22 @@ import ( func GetTestActionMap() map[interface{}]interface{} { am := make(map[interface{}]interface{}) - am[uint32(pb.ProtoCode_HeartReq)] = HeartReq - am[uint32(pb.ProtoCode_CreateReq)] = CreateReq - am[uint32(pb.ProtoCode_ChangeTeamReq)] = ChangeTeamReq - am[uint32(pb.ProtoCode_HeroEquipReferReq)] = HeroEquipReferReq - am[uint32(pb.ProtoCode_RoleClearItemsReq)] = RoleClearItemsReq - am[uint32(pb.ProtoCode_RoleStartBattleReq)] = RoleStartBattleReq - am[uint32(pb.ProtoCode_RoleEndBattleReq)] = RoleEndBattleReq - am[uint32(pb.ProtoCode_EquipmentDelReq)] = EquipmentDelReq + am[uint32(pb.ProtoCode_LoginRsp)] = LoginRsp + am[uint32(pb.ProtoCode_HeartReq)] = HeartRsp + am[uint32(pb.ProtoCode_HeartRsp)] = HeartRsp + am[uint32(pb.ProtoCode_CreateReq)] = CreateRsp + am[uint32(pb.ProtoCode_DisConnectRsp)] = DisConnectRsp + am[uint32(pb.ProtoCode_ChangeTeamReq)] = ChangeTeamRsp + am[uint32(pb.ProtoCode_HeroEquipReferReq)] = HeroEquipReferRsp + am[uint32(pb.ProtoCode_RoleRsp)] = RoleRsp + am[uint32(pb.ProtoCode_RoleUpdatePropertyRsp)] = RoleUpdatePropertyRsp + am[uint32(pb.ProtoCode_RoleUpdateItemsRsp)] = RoleUpdateItemsRsp + am[uint32(pb.ProtoCode_RoleClearItemsReq)] = RoleClearItemsRsp + am[uint32(pb.ProtoCode_RoleStartBattleReq)] = RoleStartBattleRsp + am[uint32(pb.ProtoCode_RoleEndBattleReq)] = RoleEndBattleRsp + am[uint32(pb.ProtoCode_RoleEndBattleRsp)] = RoleEndBattleRsp + am[uint32(pb.ProtoCode_EquipmentDelReq)] = EquipmentDelRsp + am[uint32(pb.ProtoCode_EquipmentAddRsp)] = EquipmentAddRsp return am } diff --git a/cmd/test/service/TestClient.go b/cmd/test/service/TestClient.go index 41b31de..939383b 100644 --- a/cmd/test/service/TestClient.go +++ b/cmd/test/service/TestClient.go @@ -98,6 +98,7 @@ func (t *TestClient) OnMessage(msg components.IMessage) { } func (t *TestClient) OnClose(conn components.IConnection) { + conn.Stop() } func (t *TestClient) OnTimer(conn components.IConnection) { } diff --git a/tools/generator.py b/tools/generator.py index fde617d..fe6977d 100644 --- a/tools/generator.py +++ b/tools/generator.py @@ -1,6 +1,7 @@ import os ProtoCodeGO = './cmd/gameserver/action/protocode.go' +ProtoCodeGOTest = './cmd/test/action/protocode.go' ProtoCodeFile = './protos/protocode.proto' ProtoFileDir = "./protos" @@ -14,12 +15,18 @@ GoProtoCodeStr = "package action\n\nimport (\n\t\"pro2d/common/logger\"\n\t\"pro "}}]interface{{}})\n{}\n\treturn am\n}}" GoProtoCodeLine = "\tam[uint32(pb.ProtoCode_{}Req)] = {}Rpc\n" +GoProtoCodeTestStr = "package action\n\nimport (\n\t\"pro2d/pb\"\n)\n\nfunc GetTestActionMap() " \ + "map[interface{{}}]interface{{}} {{\n\tam := make(map[interface{{" \ + "}}]interface{{}})\n{}\n\treturn am\n}}" +GoProtoCodeTestReqLine = "\tam[uint32(pb.ProtoCode_{}Req)] = {}Rsp\n" +GoProtoCodeTestRspLine = "\tam[uint32(pb.ProtoCode_{}Rsp)] = {}Rsp\n" def generatorProto(path): files = os.listdir(path) code = 0 ProtoCodeData = "" GoCodeData = "" + GoCodeTestData = "" for file in files: if os.path.isdir(file): continue @@ -53,16 +60,27 @@ def generatorProto(path): continue GoCodeData += GoProtoCodeLine.format(messageStr[:n1], messageStr[:n1]) + GoCodeTestData += GoProtoCodeTestReqLine.format(messageStr[:n1], messageStr[:n1]) elif n2 != -1: code += 1 ProtoCodeData += ProtoCodeLineRsp.format(messageStr[:n2], code) + if loginReq != -1: + continue + GoCodeTestData += GoProtoCodeTestRspLine.format(messageStr[:n2], messageStr[:n2]) + # protocode.go gostr = GoProtoCodeStr.format(GoCodeData) fo = open(ProtoCodeGO, "w") fo.write(gostr) fo.close() + # protocode.go + gostr = GoProtoCodeTestStr.format(GoCodeTestData) + fo = open(ProtoCodeGOTest, "w") + fo.write(gostr) + fo.close() + #protocode.proto protostr = ProtoCodeStr.format(ProtoCodeData) fo = open(ProtoCodeFile, "w") -- libgit2 0.21.2