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:
flswld
2023-06-05 12:33:31 +08:00
parent baea3b1334
commit 8d039dee06
8 changed files with 85 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gate/net/proto_endecode.go
View File

@@ -56,14 +56,11 @@ func ProtoDecode(kcpMsg *KcpMsg,
logger.Error("get server proto obj is nil, serverCmdId: %v", serverCmdId)
return protoMsgList
}
delList, err := object.CopyProtoBufSameField(serverProtoObj, clientProtoObj)
err = object.CopyProtoBufSameField(serverProtoObj, clientProtoObj)
if err != nil {
logger.Error("copy proto obj error: %v", err)
return protoMsgList
}
if len(delList) != 0 {
logger.Error("delete field name list: %v, cmdName: %v", delList, cmdName)
}
ConvClientPbDataToServer(serverProtoObj, clientCmdProtoMap)
serverProtoData, err := pb.Marshal(serverProtoObj)
if err != nil {
@@ -168,14 +165,11 @@ func ProtoDecodePayloadLoop(cmdId uint16, protoData []byte, protoMessageList *[]
logger.Error("get server proto obj is nil, serverCmdId: %v", serverCmdId)
continue
}
delList, err := object.CopyProtoBufSameField(serverProtoObj, clientProtoObj)
err = object.CopyProtoBufSameField(serverProtoObj, clientProtoObj)
if err != nil {
logger.Error("copy proto obj error: %v", err)
continue
}
if len(delList) != 0 {
logger.Error("delete field name list: %v, cmdName: %v", delList, cmdName)
}
ConvClientPbDataToServer(serverProtoObj, clientCmdProtoMap)
serverProtoData, err := pb.Marshal(serverProtoObj)
if err != nil {
@@ -251,14 +245,11 @@ func ProtoEncode(protoMsg *ProtoMsg,
logger.Error("get client proto obj is nil, cmdName: %v", cmdName)
return nil
}
delList, err := object.CopyProtoBufSameField(clientProtoObj, serverProtoObj)
err = object.CopyProtoBufSameField(clientProtoObj, serverProtoObj)
if err != nil {
logger.Error("copy proto obj error: %v", err)
return nil
}
if len(delList) != 0 {
logger.Error("delete field name list: %v, cmdName: %v", delList, cmdName)
}
ConvServerPbDataToClient(clientProtoObj, clientCmdProtoMap)
clientProtoData, err := pb.Marshal(clientProtoObj)
if err != nil {
@@ -327,7 +318,7 @@ func ConvClientPbDataToServerCore(protoObjName string, serverProtoObj pb.Message
if err != nil {
return
}
_, err = object.CopyProtoBufSameField(serverProtoObj, clientProtoObj)
err = object.CopyProtoBufSameField(serverProtoObj, clientProtoObj)
if err != nil {
return
}
@@ -347,7 +338,7 @@ func ConvServerPbDataToClientCore(protoObjName string, serverProtoObj pb.Message
if clientProtoObj == nil {
return
}
_, err = object.CopyProtoBufSameField(clientProtoObj, serverProtoObj)
err = object.CopyProtoBufSameField(clientProtoObj, serverProtoObj)
if err != nil {
return
}