From c4df46eb570b0614dc02349deea46de26f50f616 Mon Sep 17 00:00:00 2001
From: ALEXTANG <574809918@qq.com>
Date: Sun, 23 Apr 2023 14:29:19 +0800
Subject: [PATCH] [-][+] Change .proto

[-][+] Change .proto
---
 Luban/Proto/Gen/ProtoBase.cs                  |  59 ++++++
 Luban/Proto/Log/ProtobufResolver.log          |   5 -
 Luban/Proto/ProtobufResolver.exe              | Bin 9728 -> 0 bytes
 Luban/Proto/gen_pb_code.bat                   |  37 ++--
 Luban/Proto/pb_message/DPLogin.proto          | 191 ------------------
 Luban/Proto/pb_message/GameBase.proto         |  45 -----
 Luban/Proto/pb_message/ProtoBase.proto        |  35 ----
 .../ExternalMessage.proto                     |   4 +-
 Luban/Proto/pb_schemas/GameProto.proto        |   8 +
 Luban/Proto/pb_schemas/ProtoBase.proto        |  36 ++++
 10 files changed, 126 insertions(+), 294 deletions(-)
 create mode 100644 Luban/Proto/Gen/ProtoBase.cs
 delete mode 100644 Luban/Proto/Log/ProtobufResolver.log
 delete mode 100644 Luban/Proto/ProtobufResolver.exe
 delete mode 100644 Luban/Proto/pb_message/DPLogin.proto
 delete mode 100644 Luban/Proto/pb_message/GameBase.proto
 delete mode 100644 Luban/Proto/pb_message/ProtoBase.proto
 rename Luban/Proto/{pb_message => pb_schemas}/ExternalMessage.proto (97%)
 create mode 100644 Luban/Proto/pb_schemas/GameProto.proto
 create mode 100644 Luban/Proto/pb_schemas/ProtoBase.proto

diff --git a/Luban/Proto/Gen/ProtoBase.cs b/Luban/Proto/Gen/ProtoBase.cs
new file mode 100644
index 00000000..8efbfa21
--- /dev/null
+++ b/Luban/Proto/Gen/ProtoBase.cs
@@ -0,0 +1,59 @@
+using System;
+using ProtoBuf;
+using TEngine;
+using System.Collections.Generic;
+namespace GameProto
+{
+	// 这个文件只放协议，和协议头
+	// 消息协议
+	[Serializable,global::ProtoBuf.ProtoContract(Name = @"CSPkg")]
+	public partial class CSPkg
+	{
+		[global::ProtoBuf.ProtoMember(1)]
+		public CSPkgHead Head { get; set; }
+
+		[global::ProtoBuf.ProtoMember(2)]
+		public CSPkgBody Body { get; set; }
+
+	}
+
+	// 消息协议头
+	[Serializable,global::ProtoBuf.ProtoContract(Name = @"CSPkgHead")]
+	public partial class CSPkgHead
+	{
+		[global::ProtoBuf.ProtoMember(1)]
+		public uint MsgId { get; set; }
+
+		[global::ProtoBuf.ProtoMember(2)]
+		public uint MsgLength { get; set; }
+
+		[global::ProtoBuf.ProtoMember(3)]
+		public uint MsgVersion { get; set; }
+
+		[global::ProtoBuf.ProtoMember(4)]
+		public uint Echo { get; set; }
+
+		[global::ProtoBuf.ProtoMember(5)]
+		public uint SvrTime { get; set; }
+
+	}
+
+	// 消息协议体
+	[Serializable,global::ProtoBuf.ProtoContract(Name = @"CSPkgBody")]
+	public partial class CSPkgBody
+	{
+	}
+
+	// 协议ID
+	[global::ProtoBuf.ProtoContract()]
+	public enum CSMsgID
+	{
+		CS_START		= 0,
+
+		CS_HeartBeat    = 10001,
+
+		CS_END          = 10000,
+
+	}
+
+}
diff --git a/Luban/Proto/Log/ProtobufResolver.log b/Luban/Proto/Log/ProtobufResolver.log
deleted file mode 100644
index 00a4418e..00000000
--- a/Luban/Proto/Log/ProtobufResolver.log
+++ /dev/null
@@ -1,5 +0,0 @@
-Info_2023/1/13 11:33:15: By AlanDu Time:2023/1/13 11:33:15
-Info_2023/1/13 11:33:15: Version 0.1
-Info_2023/1/13 11:33:15: Function Protobuf Resolver
-Info_2023/1/13 11:33:15: protoDirPath：G:\WorkSpace\DinGameFrame\Luban\Proto\pb_message
-Info_2023/1/13 11:33:15: ProtoOutputPath：../../Assets\GameMain\HotFix\Scripts\Proto\Definition\Constant
diff --git a/Luban/Proto/ProtobufResolver.exe b/Luban/Proto/ProtobufResolver.exe
deleted file mode 100644
index 0d97384da06b5e14fc44dc15e5e4d2a8aabcb9e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9728
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
BJk0<A

diff --git a/Luban/Proto/gen_pb_code.bat b/Luban/Proto/gen_pb_code.bat
index 2c65d8ba..faa0cd9b 100644
--- a/Luban/Proto/gen_pb_code.bat
+++ b/Luban/Proto/gen_pb_code.bat
@@ -1,18 +1,21 @@
-@echo off & setlocal enabledelayedexpansion
-cd %~dp0
-echo =================start gen proto code=================
-set pb_path=pb_message
-set out_path=..\..\Assets\GameMain\HotFix\Scripts\Proto
-del /f /s /q %out_path%\*.*
-for /f "delims=" %%i in ('dir /b %pb_path%') do (
-echo ------------%%i start gen
-protoc -I=pb_message --csharp_out=../../Assets/GameMain/HotFix/Scripts/Proto pb_message\%%i
-echo ------------%%i gen success
-)
-echo =================end gen proto code=================
-set cur_path=%~dp0
-set outEventPath=../../Assets\GameMain\HotFix\Scripts\Proto\Definition\Constant
-call ProtobufResolver.exe %cur_path%pb_message %outEventPath%
-echo =================end gen proto event=================
-pause
+@REM @echo off & setlocal enabledelayedexpansion
+@REM cd %~dp0
+@REM echo =================start gen proto code=================
+@REM set pb_path=pb_message
+@REM set out_path=..\..\Assets\GameMain\HotFix\Scripts\Proto
+@REM del /f /s /q %out_path%\*.*
+@REM for /f "delims=" %%i in ('dir /b %pb_path%') do (
+@REM echo ------------%%i start gen
+@REM protoc -I=pb_message --csharp_out=../../Assets/GameMain/HotFix/Scripts/Proto pb_message\%%i
+@REM echo ------------%%i gen success
+@REM )
+@REM echo =================end gen proto code=================
+@REM set cur_path=%~dp0
+@REM set outEventPath=../../Assets\GameMain\HotFix\Scripts\Proto\Definition\Constant
+@REM call ProtobufResolver.exe %cur_path%pb_message %outEventPath%
+@REM echo =================end gen proto event=================
+@REM pause
 
+protoc -I=pb_schemas --csharp_out=Gen pb_schemas\ProtoBase.proto
+
+pause
\ No newline at end of file
diff --git a/Luban/Proto/pb_message/DPLogin.proto b/Luban/Proto/pb_message/DPLogin.proto
deleted file mode 100644
index c6186b02..00000000
--- a/Luban/Proto/pb_message/DPLogin.proto
+++ /dev/null
@@ -1,191 +0,0 @@
-syntax = "proto3";
-
-import "GameBase.proto";
-
-option java_package ="com.game.juhe.server.protobuf.proto";
-
-package DPLogin;
-
-// 客户端向服务端发送登录协议，发送账号和密码
-// PTC_C2G_LOGININFO
-message DPUserLoginInfoReq
-{
-    string szAccount       = 1; // 账号    
-    string szPassword      = 2; // 密码       
-    string szMacAdress     = 3; // mac地址
-    int32 nClientVersion   = 4; // 客户端版本号
-    string szUserName      = 5; // 用户名字
-    string extensionJson   = 6; // 透传字段
-}
-
-// 登陆角色服返回验证结果
-enum AccountLoginVerifyResult
-{
-    ACC_VERIFY_RET_SUCCESS                      = 0;    // 允许进入角色服务器
-    ACC_VERIFY_RET_FAILED                       = 1;    // 未知错误    
-    ACC_VERIFY_RET_ACCOUNT_OR_PASSWORD_ERROR    = 2;    // 账号或者密码错误    
-    ACC_VERIFY_RET_MAINTENANCE                  = 3;    // 服务器维护中
-    ACC_VERIFY_RET_IS_FULL                      = 4;    // 服务器人数已满
-    ACC_VERIFY_RET_TIMEOUT                      = 5;   // 验证超时
-    ACC_VERIFY_RET_PAYSYSHTTPERROR              = 6;   // http验证系统异常请联系客服
-    ACC_VERIFY_RET_FULLACCOUNT_INLIST           = 7;   // 因为人数过多在排队队列
-    ACC_VERIFY_RET_FULLACCOUNT_OUTLIST          = 8;   // 因为人数过多连排队队列都排不上
-    ACC_VERIFY_RET_FULLVERIFYACOUNT             = 9;   // 验证账号人数过多请耐心等待
-    ACC_VERIFY_RET_CLIENTVERSIONERROR           = 10;   // 客户端版本不对
-}
-
-// 玩家登陆，身份验证的结果
-// PTC_G2C_ACC_VERIFY_RESULT
-message DPAccountVerifyResultResp
-{
-    string  szAccount                      = 1;   // 账号     
-    AccountLoginVerifyResult nResult       = 2;   // 结果                
-    string szLoginGuid                     = 3;   // 登陆guid    
-    string szServerIP                      = 4;   // 服务器ip
-    int32  nPort                           = 5;   // 端口
-    int32  nServerID                       = 6;   // 服务器ID
-    int32  nWaitNum                        = 7;   // 排队人数
-    int32  nMaxWaitNum                     = 8;   // 最大排队人数
-    string szGatewayName                   = 9;   // 服务器名
-}
-
-
-// 客户端发起登陆协议
-// PTC_C2S_LOGICLOGIN
-message DPGSLogicLoginReq
-{
-    string szLoginGuid     = 1; // 登陆guid        
-    string szAccount       = 2; // 账号   
-    int32  nServerId       = 3; // serverID 
-    string szMacAdress     = 4; // mac地址    
-}
-
-// 登陆逻辑服失败
-enum BEGSLogicLoginRet
-{
-    GS_LOGIN_RET_FAILED                     = 0;        // 未知错误
-    GS_LOGIN_RET_SUCCESS                    = 1;        // 成功        
-    GS_LOGIN_RET_FAILED_NEED_AUTH           = 2;        // 需要重新账号密码验证
-    GS_LOGIN_RET_FAILED_DIRECTLOGIN         = 3;        // 断线重连失败
-    GS_LOGIN_RET_FAILED_ACCOUNTLOGINPROXY   = 4;        // 登录代理服务器失败
-    GS_LOGIN_RET_FAILED_GSDIRECTLOGIN       = 5;        // 登录gs失败
-    GS_LOGIN_RET_FAILED_ACCOUNTLOGINBEGIN   = 6;        // account登录失败
-    GS_LOGIN_RET_FAILED_ASKGCROLEINFO       = 7;        // 登陆失败
-    GS_LOGIN_RET_FAILED_ROLELIST            = 8;        // 获取角色列表
-    GS_LOGIN_RET_FAILED_ASKGSPERMISSION     = 9;        // 询问gs登录失败
-    GS_LOGIN_RET_FAILED_ASKGSPERMISSIONRET  = 10;       // 询问gs登录失败
-    GS_LOGIN_RET_FAILED_SELECTROLEFAILED    = 11;       // 选择角色登录失败
-}
-
-// 客户端登陆逻辑服失败返回错误码
-// PTC_S2C_LOGICLOIN_RET
-message DPGSLogicLoginRetResp
-{
-    string szAccount       = 1;    // 账号   
-    BEGSLogicLoginRet eRet = 2;    // 返回登陆结果
-}
-
-// 角色列表中的角色信息
-message DPGSRoleItemInfo
-{
-    GameBase.DPRoleBaseInfo stBaseInfo = 1;
-    int64 nCreateTime          = 2; // 创建角色时间
-    int32 nPlatformId          = 3; // 平台类型
-    int32 nCreateServerId      = 4; // 创建角色的服务器ID
-}
-
-// 网关服务端把角色列表发回到客户端，里面有账号，角色数和角色列表
-// PTC_G2C_ROLELIST_RESPONE
-message DPRoleListResponeResp
-{   
-    string  szAccount       = 1;    // 账号    
-    int32   nRoleCount      = 2;    // 角色数
-    repeated DPGSRoleItemInfo arrayRoleList = 3; // 角色列表
-}
-
-// 玩家确定选取角色登录游戏
-// PTC_C2G_GAMELOGIN_REQUEST
-message DPGameLoginRequestReq
-{   
-    string  szAccount       = 1;   // 账号        
-    uint64   nRoleGuid       = 2;   // 玩家唯一标识id guid    
-    string  szRoleName      = 3;   // 玩家名
-}
-
-// 创建角色发送创建的角色名到网关服务器
-// PTC_C2G_CREATE_ROLE
-message DPCreateRoleReq
-{   
-    string szAccount       = 1;    // 账号    
-    string szRoleName      = 2;    // 角色名
-    int32  nProfessionId   = 3;    // 角色ID
-    int32  nPortrait       = 4;    // 头像
-    int32  nClothId        = 5;    // 选择的时装        
-    int32  nPlatformId     = 6;    // 平台ID
-}
-
-// 创建角色失败原因
-enum RoleCreateFailedResult
-{
-    ROLECREATE_FAIL_REASON_NONE            = 0;    // 角色创建成功
-    ROLECREATE_FAIL_REASON_UNKNOWN         = 1;    // 未知错误
-    ROLECREATE_FAIL_REASON_NAME_FILTER     = 2;    // 角色名非法
-    ROLECREATE_FAIL_REASON_NAME_EXIST      = 3;    // 角色名已存在
-    ROLECREATE_FAIL_REASON_OVER_MAX_ROLE_PER_GATEWAY = 4;  // 创建角色超过本服上限
-    ROLECREATE_FAIL_REASON_OVER_MAX_ROLE_PER_ZONE  = 5;    // 创建角色超过整个大区上限
-    ROLECREATE_FAIL_MAX_NAME_LEN           = 6;    // 角色名长度超过上限
-    ROLECREATE_FAIL_MIN_NAME_LEN           = 7;    // 角色名长度低于下限
-}
-
-// 创建角色返回结果给客户端
-// PTC_G2C_CREATEROLE_RESULT
-message DPCreateRoleResultResp
-{   
-    string szAccount       = 1;   // 账号    
-    string szRoleName      = 2;   // 角色名
-    uint64  nRoleGuid      = 3;   // 玩家唯一标识id guid
-    bool   bSuccessed      = 4;   // 是否成功
-    RoleCreateFailedResult nFailedReason = 5;    // 如果失败，返回原因
-}
-
-// 踢掉玩家的原因
-enum KickOutClientResult
-{
-    KICKOUT_REASON_NULL                       = 0;        //默认踢掉角色
-    KICKOUT_REASON_SAMEACCOUNTLOGIN           = 1;        //账号重复登录
-    KICKOUT_REASON_KICKHANGUP                 = 2;        //踢掉挂机的玩家
-    KICKOUT_REASON_LOGINFAILED                = 3;        //客户端登录失败
-    KICKOUT_REASON_CLIENTDISCONNECT           = 4;        //客户端断开连接
-    KICKOUT_REASON_CLIENTREQUESTEXIT          = 5;        //客户端请求退出
-    KICKOUT_REASON_SERVERKICK                 = 6;        //服务器因错误挫人
-    KICKOUT_REASON_UNLEGALCLIENT              = 7;        //非法的客户端
-    KICKOUT_REASON_BACKENDKICK                = 8;        //后台踢人
-    KICKOUT_REASON_ONLINEGMKICK               = 9;        //GM在线踢人
-    KICKOUT_REASON_GSCRASH                    = 10;        //GS宕机踢人
-    KICKOUT_REASON_GCCRASH                    = 11;       //GC宕机踢人
-    KICKOUT_REASON_SCENECHANGE                = 12;       //场景切换失败
-    KICKOUT_REASON_BANPLAYER                  = 13;       //封号        
-    KICKOUT_REASON_SWITCHSERVER               = 14;       //切换gs的踢人
-    KICKOUT_REASON_EXITROLE                   = 15;       //切换角色
-    KICKOUT_REASON_DIRECTLOGIN                = 16;       //断线重连失败
-    KICKOUT_REASON_BISHOPKICKOUT              = 17;       //bishop踢人    
-}
-
-// 踢掉客户端
-// PTC_G2C_KICKOUTCLIENT
-message DPKickOutClientResp
-{
-    KickOutClientResult eKickOut = 1;  // 踢掉原因
-}
-
-// 退出账号，到账号登录界面
-// PTC_C2S_EXITACCOUNT
-message DPGSExitAccountReq
-{    
-}
-
-// 退出角色，到选择角色界面
-// PTC_C2S_EXITROLE
-message DPGSExitRoleReq
-{    
-}
diff --git a/Luban/Proto/pb_message/GameBase.proto b/Luban/Proto/pb_message/GameBase.proto
deleted file mode 100644
index 0ea992c4..00000000
--- a/Luban/Proto/pb_message/GameBase.proto
+++ /dev/null
@@ -1,45 +0,0 @@
-syntax = "proto3";
-
-option java_package ="com.game.juhe.server.protobuf.proto";
-
-package GameBase;
-// 游戏全局基础数据，和协议无关，就放结构
-
-enum PacketType
-{
-	Undefined = 0;
-	ClientToServer = 1;
-	ServerToClient = 2;
-}
-
-message PacketHeader
-{
-	PacketType packetType = 1;
-	int64 id = 2;
-	int64 packetLength = 3;
-	bool isValid = 4;
-}
-
-// PTC_C2S_HeartBeat
-message CSHeartBeat
-{
-    int64 dwTime = 1;
-}
-
-// PTC_S2C_HeartBeat
-message SCHeartBeat
-{
-    int64 dwTime = 1;
-}
-
-// 玩家角色基础数据数据
-message DPRoleBaseInfo
-{
-    uint64 ullRoleGuid         = 1; // guid
-    string szRoleName          = 2; // 角色名    
-    int32  nLevel              = 3; // 角色等级
-    int32  nProfessionId       = 4; // 角色ID
-    int32  nPortraitId         = 5; // 头像
-    int32  nFightPower         = 6; // 战斗力
-    int32  nClothId            = 7; // 时装ID       
-}
\ No newline at end of file
diff --git a/Luban/Proto/pb_message/ProtoBase.proto b/Luban/Proto/pb_message/ProtoBase.proto
deleted file mode 100644
index 57862d54..00000000
--- a/Luban/Proto/pb_message/ProtoBase.proto
+++ /dev/null
@@ -1,35 +0,0 @@
-syntax = "proto3";
-
-option java_package ="com.game.juhe.server.protobuf.proto";
-
-package ProtoBase;
-// 这个文件只放协议，和协议头
-
-// 协议头
-message BGProtocolHeader
-{
-    int32 uProtocolId  = 1;    // 协议号
-    int32 uKeyLen      = 2;    // 验证码长度
-    bytes szSessionKey = 3;    //[MAX_SESSIONKEY_LEN=64]
-}
-
-// 协议ID
-enum ProtocolID
-{
-	PTC_START							= 0;
-	
-	PTC_C2S_HeartBeat                        = 10001;   // 客户端向网关服务器的协议id
-	PTC_S2C_HeartBeat                        = 10002;   // 网关服务器向客户端的协议id
-	PTC_C2G_LOGININFO						= 10003;
-  	PTC_G2C_ACC_VERIFY_RESULT						= 1004;
-	PTC_C2S_LOGICLOGIN	= 10005;
-	PTC_S2C_LOGICLOIN_RET	= 10006;
-	PTC_G2C_ROLELIST_RESPONE	= 10007;
-	PTC_C2G_GAMELOGIN_REQUEST	= 10008;
-	PTC_C2G_CREATE_ROLE	= 1009;
-	PTC_G2C_CREATEROLE_RESULT	= 10010;
-	PTC_G2C_KICKOUTCLIENT	= 10011;
-	PTC_C2S_EXITACCOUNT	= 10012;
-	PTC_C2S_EXITROLE	= 10013;
-	PTC_END                             = 10000;
-}
diff --git a/Luban/Proto/pb_message/ExternalMessage.proto b/Luban/Proto/pb_schemas/ExternalMessage.proto
similarity index 97%
rename from Luban/Proto/pb_message/ExternalMessage.proto
rename to Luban/Proto/pb_schemas/ExternalMessage.proto
index adc90070..350bc930 100644
--- a/Luban/Proto/pb_message/ExternalMessage.proto
+++ b/Luban/Proto/pb_schemas/ExternalMessage.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
-package pb.message;
+
+package GameProto;
+
 // 对外服数据协议
 message ExternalMessage {
   // 请求命令类型: 0 心跳，1 业务
diff --git a/Luban/Proto/pb_schemas/GameProto.proto b/Luban/Proto/pb_schemas/GameProto.proto
new file mode 100644
index 00000000..6f476e76
--- /dev/null
+++ b/Luban/Proto/pb_schemas/GameProto.proto
@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+package GameProto;
+// 游戏全局基础数据，和协议无关，就放结构
+
+// 导入定义
+import "ProtoBase";
+
diff --git a/Luban/Proto/pb_schemas/ProtoBase.proto b/Luban/Proto/pb_schemas/ProtoBase.proto
new file mode 100644
index 00000000..55a40694
--- /dev/null
+++ b/Luban/Proto/pb_schemas/ProtoBase.proto
@@ -0,0 +1,36 @@
+syntax = "proto3";
+
+package GameProto;
+// 这个文件只放协议，和协议头
+
+// 消息协议
+message CSPkg
+{
+	CSPkgHead Head		= 1;		//消息协议头
+	CSPkgBody Body		= 2;		//消息协议体
+}
+
+// 消息协议头
+message CSPkgHead
+{
+	uint32 MsgId 		= 1;		//协议号
+	uint32 MsgLength 	= 2;		//协议长度
+	uint32 MsgVersion 	= 3;		//协议版本
+	uint32 Echo 		= 4;		//回带字段
+	uint32 SvrTime 		= 5;		//服务器时间
+}
+
+// 消息协议体
+message CSPkgBody
+{
+
+}
+
+
+// 协议ID
+enum CSMsgID
+{
+	CS_START		= 0;
+	CS_HeartBeat    = 10001;
+	CS_END          = 10000;
+}