Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
guo450212436
et
提交
22c71a76
E
et
项目概览
guo450212436
/
et
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
et
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
22c71a76
编写于
10月 28, 2020
作者:
T
tanghai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
去掉IMessagePacker,根据opcode来选择序列化方式
上级
193ca829
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
44 addition
and
212 deletion
+44
-212
Server/Hotfix/Module/Message/NetInnerComponentSystem.cs
Server/Hotfix/Module/Message/NetInnerComponentSystem.cs
+0
-3
Server/Model/Module/Message/MongoPacker.cs
Server/Model/Module/Message/MongoPacker.cs
+0
-38
Server/Model/Server.Model.csproj
Server/Model/Server.Model.csproj
+2
-5
Unity/Assets/Hotfix/Module/Message/NetOuterComponentSystem.cs
...y/Assets/Hotfix/Module/Message/NetOuterComponentSystem.cs
+0
-3
Unity/Assets/Model/Base/Helper/Dumper.cs.meta
Unity/Assets/Model/Base/Helper/Dumper.cs.meta
+0
-11
Unity/Assets/Model/Base/Helper/MongoHelper.cs
Unity/Assets/Model/Base/Helper/MongoHelper.cs
+0
-13
Unity/Assets/Model/Module/Message/IMessagePacker.cs
Unity/Assets/Model/Module/Message/IMessagePacker.cs
+0
-12
Unity/Assets/Model/Module/Message/IMessagePacker.cs.meta
Unity/Assets/Model/Module/Message/IMessagePacker.cs.meta
+0
-12
Unity/Assets/Model/Module/Message/MessagePackHelper.cs
Unity/Assets/Model/Module/Message/MessagePackHelper.cs
+38
-0
Unity/Assets/Model/Module/Message/MessagePackHelper.cs.meta
Unity/Assets/Model/Module/Message/MessagePackHelper.cs.meta
+1
-1
Unity/Assets/Model/Module/Message/MessagePool.cs
Unity/Assets/Model/Module/Message/MessagePool.cs
+0
-64
Unity/Assets/Model/Module/Message/NetworkComponent.cs
Unity/Assets/Model/Module/Message/NetworkComponent.cs
+0
-2
Unity/Assets/Model/Module/Message/ProtobufPacker.cs
Unity/Assets/Model/Module/Message/ProtobufPacker.cs
+0
-23
Unity/Assets/Model/Module/Message/ProtobufPacker.cs.meta
Unity/Assets/Model/Module/Message/ProtobufPacker.cs.meta
+0
-12
Unity/Assets/Model/Module/Message/Session.cs
Unity/Assets/Model/Module/Message/Session.cs
+2
-2
Unity/Assets/ThirdParty/Google.Protobuf.meta
Unity/Assets/ThirdParty/Google.Protobuf.meta
+0
-8
Unity/Unity.Model.csproj
Unity/Unity.Model.csproj
+1
-3
未找到文件。
Server/Hotfix/Module/Message/NetInnerComponentSystem.cs
浏览文件 @
22c71a76
...
...
@@ -8,7 +8,6 @@ namespace ET
{
NetInnerComponent
.
Instance
=
self
;
self
.
Awake
(
NetworkProtocol
.
TCP
);
self
.
MessagePacker
=
new
MongoPacker
();
self
.
MessageDispatcher
=
new
InnerMessageDispatcher
();
}
}
...
...
@@ -19,7 +18,6 @@ namespace ET
{
NetInnerComponent
.
Instance
=
self
;
self
.
Awake
(
NetworkProtocol
.
TCP
,
a
);
self
.
MessagePacker
=
new
MongoPacker
();
self
.
MessageDispatcher
=
new
InnerMessageDispatcher
();
}
}
...
...
@@ -28,7 +26,6 @@ namespace ET
{
public
override
void
Load
(
NetInnerComponent
self
)
{
self
.
MessagePacker
=
new
MongoPacker
();
self
.
MessageDispatcher
=
new
InnerMessageDispatcher
();
}
}
...
...
Server/Model/Module/Message/MongoPacker.cs
已删除
100644 → 0
浏览文件 @
193ca829
using
System
;
using
System.IO
;
namespace
ET
{
public
class
MongoPacker
:
IMessagePacker
{
public
byte
[]
SerializeTo
(
object
obj
)
{
return
MongoHelper
.
ToBson
(
obj
);
}
public
void
SerializeTo
(
object
obj
,
MemoryStream
stream
)
{
MongoHelper
.
ToBson
(
obj
,
stream
);
}
public
object
DeserializeFrom
(
Type
type
,
byte
[]
bytes
,
int
index
,
int
count
)
{
return
MongoHelper
.
FromBson
(
type
,
bytes
,
index
,
count
);
}
public
object
DeserializeFrom
(
object
instance
,
byte
[]
bytes
,
int
index
,
int
count
)
{
return
MongoHelper
.
FromBson
(
instance
,
bytes
,
index
,
count
);
}
public
object
DeserializeFrom
(
Type
type
,
MemoryStream
stream
)
{
return
MongoHelper
.
FromStream
(
type
,
stream
);
}
public
object
DeserializeFrom
(
object
instance
,
MemoryStream
stream
)
{
return
MongoHelper
.
FromBson
(
instance
,
stream
);
}
}
}
Server/Model/Server.Model.csproj
浏览文件 @
22c71a76
...
...
@@ -173,8 +173,8 @@
<Compile Include="..\..\Unity\Assets\Model\Module\CoroutineLock\CoroutineLockType.cs">
<Link>Module\CoroutineLock\CoroutineLockType.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Model\Module\Message\MessageP
ool
.cs">
<Link>Module\Message\MessageP
ool\ETModel\MessagePool
.cs</Link>
<Compile Include="..\..\Unity\Assets\Model\Module\Message\MessageP
ackHelper
.cs">
<Link>Module\Message\MessageP
ackHelper
.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Model\Module\Message\NetOuterComponent.cs">
<Link>Module\Message\NetOuterComponent.cs</Link>
...
...
@@ -225,7 +225,6 @@
<Compile Include="..\..\Unity\Assets\Model\Module\Message\ErrorCode.cs" Link="Module\Message\ErrorCode.cs" />
<Compile Include="..\..\Unity\Assets\Model\Module\Message\IMessage.cs" Link="Module\Message\IMessage.cs" />
<Compile Include="..\..\Unity\Assets\Model\Module\Message\IMessageDispatcher.cs" Link="Module\Message\IMessageDispatcher.cs" />
<Compile Include="..\..\Unity\Assets\Model\Module\Message\IMessagePacker.cs" Link="Module\Message\IMessagePacker.cs" />
<Compile Include="..\..\Unity\Assets\Model\Module\Message\IMHandler.cs" Link="Module\Message\IMHandler.cs" />
<Compile Include="..\..\Unity\Assets\Model\Module\Message\MessageAttribute.cs" Link="Module\Message\MessageAttribute.cs" />
<Compile Include="..\..\Unity\Assets\Model\Module\Message\MessageHandlerAttribute.cs" Link="Module\Message\MessageHandlerAttribute.cs" />
...
...
@@ -246,7 +245,6 @@
<Compile Include="..\..\Unity\Assets\Model\Module\Message\OuterMessage.cs" Link="Module\Message\OuterMessage.cs" />
<Compile Include="..\..\Unity\Assets\Model\Module\Message\OuterOpcode.cs" Link="Module\Message\OuterOpcode.cs" />
<Compile Include="..\..\Unity\Assets\Model\Module\Message\ProtobufHelper.cs" Link="Module\Message\ProtobufHelper.cs" />
<Compile Include="..\..\Unity\Assets\Model\Module\Message\ProtobufPacker.cs" Link="Module\Message\ProtobufPacker.cs" />
<Compile Include="..\..\Unity\Assets\Model\Module\Message\RpcException.cs" Link="Module\Message\RpcException.cs" />
<Compile Include="..\..\Unity\Assets\Model\Module\Message\Session.cs" Link="Module\Message\Session.cs" />
<Compile Include="..\..\Unity\Assets\Model\Module\Message\SessionIdleCheckComponent.cs">
...
...
@@ -281,7 +279,6 @@
<Folder Include="Base\RecyclableMemoryStream\" />
<Folder Include="Module\Message\Network\KCP\" />
<Folder Include="Module\Message\Network\TCP\" />
<Folder Include="Module\Message\MessagePool\" />
</ItemGroup>
<ItemGroup>
<Reference Include="Pathfinding.Ionic.Zip.Reduced, Version=1.9.1.9000, Culture=neutral, PublicKeyToken=null">
...
...
Unity/Assets/Hotfix/Module/Message/NetOuterComponentSystem.cs
浏览文件 @
22c71a76
...
...
@@ -7,7 +7,6 @@ namespace ET
public
override
void
Awake
(
NetOuterComponent
self
)
{
self
.
Awake
(
self
.
Protocol
);
self
.
MessagePacker
=
new
ProtobufPacker
();
self
.
MessageDispatcher
=
new
OuterMessageDispatcher
();
}
}
...
...
@@ -17,7 +16,6 @@ namespace ET
public
override
void
Awake
(
NetOuterComponent
self
,
string
address
)
{
self
.
Awake
(
self
.
Protocol
,
address
);
self
.
MessagePacker
=
new
ProtobufPacker
();
self
.
MessageDispatcher
=
new
OuterMessageDispatcher
();
}
}
...
...
@@ -26,7 +24,6 @@ namespace ET
{
public
override
void
Load
(
NetOuterComponent
self
)
{
self
.
MessagePacker
=
new
ProtobufPacker
();
self
.
MessageDispatcher
=
new
OuterMessageDispatcher
();
}
}
...
...
Unity/Assets/Model/Base/Helper/Dumper.cs.meta
已删除
100644 → 0
浏览文件 @
193ca829
fileFormatVersion: 2
guid: 6a2cb7433d50e2a4b9c8d8f1d6c871fd
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Unity/Assets/Model/Base/Helper/MongoHelper.cs
浏览文件 @
22c71a76
...
...
@@ -107,19 +107,6 @@ namespace ET
}
}
public
static
object
FromBson
(
object
instance
,
byte
[]
bytes
,
int
index
,
int
count
)
{
using
(
MemoryStream
memoryStream
=
new
MemoryStream
(
bytes
,
index
,
count
))
{
return
BsonSerializer
.
Deserialize
(
memoryStream
,
instance
.
GetType
());
}
}
public
static
object
FromBson
(
object
instance
,
Stream
stream
)
{
return
BsonSerializer
.
Deserialize
(
stream
,
instance
.
GetType
());
}
public
static
object
FromStream
(
Type
type
,
Stream
stream
)
{
return
BsonSerializer
.
Deserialize
(
stream
,
type
);
...
...
Unity/Assets/Model/Module/Message/IMessagePacker.cs
已删除
100644 → 0
浏览文件 @
193ca829
using
System
;
using
System.IO
;
namespace
ET
{
public
interface
IMessagePacker
{
void
SerializeTo
(
object
obj
,
MemoryStream
stream
);
object
DeserializeFrom
(
Type
type
,
byte
[]
bytes
,
int
index
,
int
count
);
object
DeserializeFrom
(
Type
type
,
MemoryStream
stream
);
}
}
Unity/Assets/Model/Module/Message/IMessagePacker.cs.meta
已删除
100644 → 0
浏览文件 @
193ca829
fileFormatVersion: 2
guid: 09fe3a4882b1b50498860b3f672d1d47
timeCreated: 1501467234
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Unity/Assets/Model/Module/Message/MessagePackHelper.cs
0 → 100644
浏览文件 @
22c71a76
using
System
;
using
System.IO
;
namespace
ET
{
public
static
class
MessagePackHelper
{
public
static
void
SerializeTo
(
ushort
opcode
,
object
obj
,
MemoryStream
stream
)
{
if
(
opcode
>=
20000
)
{
ProtobufHelper
.
ToStream
(
obj
,
stream
);
return
;
}
MongoHelper
.
ToBson
(
obj
,
stream
);
}
public
static
object
DeserializeFrom
(
ushort
opcode
,
Type
type
,
byte
[]
bytes
,
int
index
,
int
count
)
{
if
(
opcode
>=
20000
)
{
return
ProtobufHelper
.
FromBytes
(
type
,
bytes
,
index
,
count
);
}
return
MongoHelper
.
FromBson
(
type
,
bytes
,
index
,
count
);
}
public
static
object
DeserializeFrom
(
ushort
opcode
,
Type
type
,
MemoryStream
stream
)
{
if
(
opcode
>=
20000
)
{
return
ProtobufHelper
.
FromStream
(
type
,
stream
);
}
return
MongoHelper
.
FromStream
(
type
,
stream
);
}
}
}
\ No newline at end of file
Unity/Assets/Model/Module/Message/MessageP
ool
.cs.meta
→
Unity/Assets/Model/Module/Message/MessageP
ackHelper
.cs.meta
浏览文件 @
22c71a76
fileFormatVersion: 2
guid:
1d413cb22ac106a439af32933382ce66
guid:
f6c5c5505ab984795a67f5da89e16761
MonoImporter:
externalObjects: {}
serializedVersion: 2
...
...
Unity/Assets/Model/Module/Message/MessagePool.cs
已删除
100644 → 0
浏览文件 @
193ca829
using
System
;
#if !SERVER
using
System.Collections.Generic
;
#endif
namespace
ET
{
// 客户端为了0GC需要消息池,服务端消息需要跨协程不需要消息池
public
class
MessagePool
{
public
static
MessagePool
Instance
{
get
;
}
=
new
MessagePool
();
#if !SERVER
private
readonly
Dictionary
<
Type
,
Queue
<
object
>>
dictionary
=
new
Dictionary
<
Type
,
Queue
<
object
>>();
#endif
public
object
Fetch
(
Type
type
)
{
#if !SERVER
Queue
<
object
>
queue
;
if
(!
this
.
dictionary
.
TryGetValue
(
type
,
out
queue
))
{
queue
=
new
Queue
<
object
>();
this
.
dictionary
.
Add
(
type
,
queue
);
}
object
obj
;
if
(
queue
.
Count
>
0
)
{
obj
=
queue
.
Dequeue
();
}
else
{
obj
=
Activator
.
CreateInstance
(
type
);
}
return
obj
;
#else
return
Activator
.
CreateInstance
(
type
);
#endif
}
public
T
Fetch
<
T
>()
where
T
:
class
{
T
t
=
(
T
)
this
.
Fetch
(
typeof
(
T
));
return
t
;
}
public
void
Recycle
(
object
obj
)
{
#if !SERVER
Type
type
=
obj
.
GetType
();
Queue
<
object
>
queue
;
if
(!
this
.
dictionary
.
TryGetValue
(
type
,
out
queue
))
{
queue
=
new
Queue
<
object
>();
this
.
dictionary
.
Add
(
type
,
queue
);
}
queue
.
Enqueue
(
obj
);
#endif
}
}
}
\ No newline at end of file
Unity/Assets/Model/Module/Message/NetworkComponent.cs
浏览文件 @
22c71a76
...
...
@@ -10,8 +10,6 @@ namespace ET
public
readonly
Dictionary
<
long
,
Session
>
Sessions
=
new
Dictionary
<
long
,
Session
>();
public
IMessagePacker
MessagePacker
{
get
;
set
;
}
public
IMessageDispatcher
MessageDispatcher
{
get
;
set
;
}
public
void
Awake
(
NetworkProtocol
protocol
)
...
...
Unity/Assets/Model/Module/Message/ProtobufPacker.cs
已删除
100644 → 0
浏览文件 @
193ca829
using
System
;
using
System.IO
;
namespace
ET
{
public
class
ProtobufPacker
:
IMessagePacker
{
public
void
SerializeTo
(
object
obj
,
MemoryStream
stream
)
{
ProtobufHelper
.
ToStream
(
obj
,
stream
);
}
public
object
DeserializeFrom
(
Type
type
,
byte
[]
bytes
,
int
index
,
int
count
)
{
return
ProtobufHelper
.
FromBytes
(
type
,
bytes
,
index
,
count
);
}
public
object
DeserializeFrom
(
Type
type
,
MemoryStream
stream
)
{
return
ProtobufHelper
.
FromStream
(
type
,
stream
);
}
}
}
Unity/Assets/Model/Module/Message/ProtobufPacker.cs.meta
已删除
100644 → 0
浏览文件 @
193ca829
fileFormatVersion: 2
guid: ea1ea7cb44e1e18448edde8ab653d905
timeCreated: 1519350935
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Unity/Assets/Model/Module/Message/Session.cs
浏览文件 @
22c71a76
...
...
@@ -133,7 +133,7 @@ namespace ET
try
{
Type
type
=
OpcodeTypeComponent
.
Instance
.
GetType
(
opcode
);
message
=
this
.
Network
.
MessagePacker
.
DeserializeFrom
(
type
,
memoryStream
);
message
=
MessagePackHelper
.
DeserializeFrom
(
opcode
,
type
,
memoryStream
);
if
(
OpcodeHelper
.
IsNeedDebugLogMessage
(
opcode
))
{
...
...
@@ -260,7 +260,7 @@ namespace ET
stream
.
Seek
(
Packet
.
MessageIndex
,
SeekOrigin
.
Begin
);
stream
.
SetLength
(
Packet
.
MessageIndex
);
this
.
Network
.
MessagePacker
.
SerializeTo
(
message
,
stream
);
MessagePackHelper
.
SerializeTo
(
opcode
,
message
,
stream
);
stream
.
Seek
(
0
,
SeekOrigin
.
Begin
);
opcodeBytes
.
WriteTo
(
0
,
opcode
);
...
...
Unity/Assets/ThirdParty/Google.Protobuf.meta
已删除
100644 → 0
浏览文件 @
193ca829
fileFormatVersion: 2
guid: 0c65cefeb5a4691489086c452ed06a7d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Unity/Unity.Model.csproj
浏览文件 @
22c71a76
...
...
@@ -156,12 +156,11 @@
<Compile
Include=
"Assets\Model\Module\Message\IMHandler.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\IMessage.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\IMessageDispatcher.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\IMessagePacker.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\MessageAttribute.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\MessageDispatcherComponent.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\MessageHandlerAttribute.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\MessageInfo.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\MessageP
ool
.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\MessageP
ackHelper
.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\MessageProxy.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\NetOuterComponent.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\Network\AChannel.cs"
/>
...
...
@@ -184,7 +183,6 @@
<Compile
Include=
"Assets\Model\Module\Message\OuterMessageDispatcher.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\OuterOpcode.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\ProtobufHelper.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\ProtobufPacker.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\RpcException.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\Session.cs"
/>
<Compile
Include=
"Assets\Model\Module\Message\SessionCallbackComponent.cs"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录