From 899472a5dbc2ad19fa2434c7cfd6b03e7b2768f9 Mon Sep 17 00:00:00 2001
From: ALEXTANG <574809918@qq.com>
Date: Wed, 17 May 2023 23:06:29 +0800
Subject: [PATCH] [+] Network
[+] Network
---
.../HotFix/GameLogic/Network/ProtoUtil.cs | 30 ++++++
.../GameLogic/Network/ProtoUtil.cs.meta | 3 +
.../HotFix/GameProto/GameProtocol/NetMsgId.cs | 4 +
.../HotFix/GameProto/GameProtocol/proto_cs.cs | 97 +++++++++----------
.../GameProto/GameProtocol/proto_cs_common.cs | 44 +++++++++
.../GameProtocol/proto_cs_common.cs.meta | 11 +++
.../GameProto/GameProtocol/proto_cs_player.cs | 2 +-
7 files changed, 140 insertions(+), 51 deletions(-)
create mode 100644 Assets/GameScripts/HotFix/GameLogic/Network/ProtoUtil.cs
create mode 100644 Assets/GameScripts/HotFix/GameLogic/Network/ProtoUtil.cs.meta
create mode 100644 Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs_common.cs
create mode 100644 Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs_common.cs.meta
diff --git a/Assets/GameScripts/HotFix/GameLogic/Network/ProtoUtil.cs b/Assets/GameScripts/HotFix/GameLogic/Network/ProtoUtil.cs
new file mode 100644
index 00000000..6f66eda1
--- /dev/null
+++ b/Assets/GameScripts/HotFix/GameLogic/Network/ProtoUtil.cs
@@ -0,0 +1,30 @@
+using System;
+using GameProto;
+
+namespace GameLogic
+{
+ public class ProtoUtil
+ {
+ public static UInt32 MsgEcho = 0;
+
+ ///
+ /// 根据msgId来生成一个数据包
+ ///
+ ///
+ ///
+ public static CSPkg BuildCsMsg(int msgId)
+ {
+ CSPkg tmp = new CSPkg();
+ tmp.Head = new CSPkgHead();
+ tmp.Head.MsgId = (UInt16)msgId;
+ tmp.Head.Echo = GetNextEcho();
+ // tmp.Body.create(msgId);
+ return tmp;
+ }
+
+ private static UInt32 GetNextEcho()
+ {
+ return ++MsgEcho;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/GameScripts/HotFix/GameLogic/Network/ProtoUtil.cs.meta b/Assets/GameScripts/HotFix/GameLogic/Network/ProtoUtil.cs.meta
new file mode 100644
index 00000000..77f8a672
--- /dev/null
+++ b/Assets/GameScripts/HotFix/GameLogic/Network/ProtoUtil.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4d4427af9be14c56b01e4674853c09a8
+timeCreated: 1684334469
\ No newline at end of file
diff --git a/Assets/GameScripts/HotFix/GameProto/GameProtocol/NetMsgId.cs b/Assets/GameScripts/HotFix/GameProto/GameProtocol/NetMsgId.cs
index 92d447f6..ec489697 100644
--- a/Assets/GameScripts/HotFix/GameProto/GameProtocol/NetMsgId.cs
+++ b/Assets/GameScripts/HotFix/GameProto/GameProtocol/NetMsgId.cs
@@ -15,6 +15,10 @@ namespace GameProto
{
public partial class NetMsgId
{
+ //心跳请求
+ public const int CS_CMD_HEATBEAT_REQ = 1001;
+ //心跳回包
+ public const int CS_CMD_HEATBEAT_RES = 1002;
//帐号登录请求
public const int CS_CMD_ACT_LOGIN_REQ = 2001;
//帐号登录回包
diff --git a/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs.cs b/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs.cs
index 0fe8ca93..42aa38c3 100644
--- a/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs.cs
+++ b/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs.cs
@@ -13,71 +13,68 @@ 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; }
+ // 这个文件只放协议，和协议头
+ // 消息协议
+ [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; }
+ [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; }
+ // 消息协议头
+ [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(2)]
+ public uint MsgLength { get; set; }
- [global::ProtoBuf.ProtoMember(3)]
- public uint MsgVersion { get; set; }
+ [global::ProtoBuf.ProtoMember(3)]
+ public uint MsgVersion { get; set; }
- [global::ProtoBuf.ProtoMember(4)]
- public uint Echo { get; set; }
+ [global::ProtoBuf.ProtoMember(4)]
+ public uint Echo { get; set; }
- [global::ProtoBuf.ProtoMember(5)]
- public uint SvrTime { get; set; }
+ [global::ProtoBuf.ProtoMember(5)]
+ public uint SvrTime { get; set; }
- }
+ }
- // 消息协议体
- [Serializable,global::ProtoBuf.ProtoContract(Name = @"CSPkgBody")]
- public partial class CSPkgBody
- {
- [global::ProtoBuf.ProtoMember(1)]
- public CSActLoginReq ActLoginReq { get; set; }
+ // 消息协议体
+ [Serializable,global::ProtoBuf.ProtoContract(Name = @"CSPkgBody")]
+ public partial class CSPkgBody
+ {
+ [global::ProtoBuf.ProtoMember(1)]
+ public CSHeatBeatReq HeatBeatReq { get; set; }
- [global::ProtoBuf.ProtoMember(2)]
- public CSActLoginRes ActLoginRes { get; set; }
+ [global::ProtoBuf.ProtoMember(2)]
+ public CSHeatBeatRes HeatBeatRes { get; set; }
- }
+ [global::ProtoBuf.ProtoMember(3)]
+ public CSActLoginReq ActLoginReq { get; set; }
- // 消息结果
- [Serializable,global::ProtoBuf.ProtoContract(Name = @"ProtoResult")]
- public partial class ProtoResult
- {
- [global::ProtoBuf.ProtoMember(3)]
- public List Params = new List();
+ [global::ProtoBuf.ProtoMember(4)]
+ public CSActLoginRes ActLoginRes { get; set; }
- }
+ }
- // 协议ID
- [global::ProtoBuf.ProtoContract()]
- public enum CSMsgID
- {
- CS_START = 0,
+ // 协议ID
+ [global::ProtoBuf.ProtoContract()]
+ public enum CSMsgID
+ {
+ CS_START = 0,
- CS_HeartBeat = 10001,
+ CS_HeartBeat = 10001,
- CS_END = 10000,
+ CS_END = 10000,
- }
+ }
-}
+}
\ No newline at end of file
diff --git a/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs_common.cs b/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs_common.cs
new file mode 100644
index 00000000..9d610c1c
--- /dev/null
+++ b/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs_common.cs
@@ -0,0 +1,44 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+using System;
+using ProtoBuf;
+using TEngine;
+using System.Collections.Generic;
+
+namespace GameProto
+{
+ // 常用协议
+ // 消息结果
+ [Serializable,global::ProtoBuf.ProtoContract(Name = @"ProtoResult")]
+ public partial class ProtoResult
+ {
+ [global::ProtoBuf.ProtoMember(3)]
+ public List Params = new List();
+
+ }
+
+ // 心跳请求
+ [Serializable,global::ProtoBuf.ProtoContract(Name = @"CSHeatBeatReq")]
+ public partial class CSHeatBeatReq
+ {
+ [global::ProtoBuf.ProtoMember(1)]
+ public float HeatEchoTime { get; set; }
+
+ }
+
+ // 角色登录结果返回
+ [Serializable,global::ProtoBuf.ProtoContract(Name = @"CSHeatBeatRes")]
+ public partial class CSHeatBeatRes
+ {
+ [global::ProtoBuf.ProtoMember(1)]
+ public float HeatEchoTime { get; set; }
+
+ }
+
+}
diff --git a/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs_common.cs.meta b/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs_common.cs.meta
new file mode 100644
index 00000000..6fc4ef74
--- /dev/null
+++ b/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs_common.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 12409798b7e6e134ea804286b9670089
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs_player.cs b/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs_player.cs
index 64f3f5db..f114c627 100644
--- a/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs_player.cs
+++ b/Assets/GameScripts/HotFix/GameProto/GameProtocol/proto_cs_player.cs
@@ -13,7 +13,7 @@ using System.Collections.Generic;
namespace GameProto
{
- // 这个文件只放协议，和协议头
+ // 玩家协议
// 角色登录结果请求
[Serializable,global::ProtoBuf.ProtoContract(Name = @"CSActLoginReq")]
public partial class CSActLoginReq