Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
老鱼er
et
提交
fe94aadc
E
et
项目概览
老鱼er
/
et
与 Fork 源项目一致
从无法访问的项目Fork
通知
10
Star
1
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,发现更多精彩内容 >>
提交
fe94aadc
编写于
10月 19, 2016
作者:
T
tanghai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
整理了网络层代码,删除一些废代码
上级
a34d2825
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
14 addition
and
23 deletion
+14
-23
Unity/Assets/Plugins/Base/Network/AChannel.cs
Unity/Assets/Plugins/Base/Network/AChannel.cs
+2
-1
Unity/Assets/Plugins/Base/Network/AService.cs
Unity/Assets/Plugins/Base/Network/AService.cs
+0
-8
Unity/Assets/Plugins/Base/Network/TNet/TService.cs
Unity/Assets/Plugins/Base/Network/TNet/TService.cs
+0
-2
Unity/Assets/Plugins/Base/Network/UNet/UChannel.cs
Unity/Assets/Plugins/Base/Network/UNet/UChannel.cs
+5
-1
Unity/Assets/Plugins/Base/Network/UNet/UService.cs
Unity/Assets/Plugins/Base/Network/UNet/UService.cs
+0
-3
Unity/Assets/Plugins/Base/Network/UNet/USocket.cs
Unity/Assets/Plugins/Base/Network/UNet/USocket.cs
+2
-2
Unity/Assets/Scripts/Component/NetworkComponent.cs
Unity/Assets/Scripts/Component/NetworkComponent.cs
+5
-6
未找到文件。
Unity/Assets/Plugins/Base/Network/AChannel.cs
浏览文件 @
fe94aadc
...
...
@@ -17,6 +17,7 @@ namespace Base
public
abstract
class
AChannel
:
IDisposable
{
public
long
Id
{
get
;
private
set
;
}
protected
AService
service
;
public
string
RemoteAddress
{
get
;
protected
set
;
}
...
...
@@ -35,7 +36,7 @@ namespace Base
}
}
p
ublic
void
OnError
(
AChannel
channel
,
SocketError
e
)
p
rotected
void
OnError
(
AChannel
channel
,
SocketError
e
)
{
this
.
errorCallback
(
channel
,
e
);
}
...
...
Unity/Assets/Plugins/Base/Network/AService.cs
浏览文件 @
fe94aadc
...
...
@@ -30,14 +30,6 @@ namespace Base
public
abstract
void
Update
();
public
Action
<
AChannel
,
SocketError
>
OnError
;
protected
void
OnChannelError
(
AChannel
channel
,
SocketError
error
)
{
this
.
OnError
?.
Invoke
(
channel
,
error
);
this
.
Remove
(
channel
.
Id
);
}
public
abstract
void
Dispose
();
}
}
\ No newline at end of file
Unity/Assets/Plugins/Base/Network/TNet/TService.cs
浏览文件 @
fe94aadc
...
...
@@ -63,7 +63,6 @@ namespace Base
TSocket
socket
=
new
TSocket
(
this
.
poller
);
await
this
.
acceptor
.
AcceptAsync
(
socket
);
TChannel
channel
=
new
TChannel
(
socket
,
this
);
channel
.
ErrorCallback
+=
this
.
OnChannelError
;
this
.
idChannels
[
channel
.
Id
]
=
channel
;
return
channel
;
}
...
...
@@ -72,7 +71,6 @@ namespace Base
{
TSocket
newSocket
=
new
TSocket
(
this
.
poller
);
TChannel
channel
=
new
TChannel
(
newSocket
,
host
,
port
,
this
);
channel
.
ErrorCallback
+=
this
.
OnChannelError
;
this
.
idChannels
[
channel
.
Id
]
=
channel
;
return
channel
;
...
...
Unity/Assets/Plugins/Base/Network/UNet/UChannel.cs
浏览文件 @
fe94aadc
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Net.Sockets
;
using
System.Threading.Tasks
;
namespace
Base
...
...
@@ -21,6 +22,7 @@ namespace Base
this
.
RemoteAddress
=
host
+
":"
+
port
;
this
.
socket
.
ConnectAsync
(
host
,
(
ushort
)
port
);
this
.
socket
.
Received
+=
this
.
OnRecv
;
this
.
socket
.
Disconnect
+=
()
=>
{
this
.
OnError
(
this
,
SocketError
.
SocketError
);
};
}
/// <summary>
...
...
@@ -32,6 +34,7 @@ namespace Base
this
.
service
=
service
;
this
.
RemoteAddress
=
socket
.
RemoteAddress
;
this
.
socket
.
Received
+=
this
.
OnRecv
;
this
.
socket
.
Disconnect
+=
()
=>
{
this
.
OnError
(
this
,
SocketError
.
SocketError
);
};
}
public
override
void
Dispose
()
...
...
@@ -82,8 +85,9 @@ namespace Base
private
void
OnRecv
()
{
this
.
recvTcs
?.
SetResult
(
this
.
socket
.
RecvQueue
.
Dequeue
())
;
var
tcs
=
this
.
recvTcs
;
this
.
recvTcs
=
null
;
tcs
?.
SetResult
(
this
.
socket
.
RecvQueue
.
Dequeue
());
}
}
}
\ No newline at end of file
Unity/Assets/Plugins/Base/Network/UNet/UService.cs
浏览文件 @
fe94aadc
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Net.Sockets
;
using
System.Threading.Tasks
;
namespace
Base
...
...
@@ -53,7 +52,6 @@ namespace Base
{
USocket
socket
=
await
this
.
poller
.
AcceptAsync
();
UChannel
channel
=
new
UChannel
(
socket
,
this
);
socket
.
Disconnect
+=
()
=>
this
.
OnChannelError
(
channel
,
SocketError
.
SocketError
);
this
.
idChannels
[
channel
.
Id
]
=
channel
;
return
channel
;
}
...
...
@@ -62,7 +60,6 @@ namespace Base
{
USocket
newSocket
=
new
USocket
(
this
.
poller
);
UChannel
channel
=
new
UChannel
(
newSocket
,
host
,
port
,
this
);
newSocket
.
Disconnect
+=
()
=>
this
.
OnChannelError
(
channel
,
SocketError
.
SocketError
);
this
.
idChannels
[
channel
.
Id
]
=
channel
;
return
channel
;
}
...
...
Unity/Assets/Plugins/Base/Network/UNet/USocket.cs
浏览文件 @
fe94aadc
...
...
@@ -18,8 +18,8 @@ namespace Base
private
readonly
Queue
<
byte
[
]>
recvQueue
=
new
Queue
<
byte
[
]>
();
private
readonly
Queue
<
BufferInfo
>
sendQueue
=
new
Queue
<
BufferInfo
>();
private
bool
isConnected
;
p
ublic
Action
disconnect
;
p
ublic
Action
received
;
p
rivate
Action
disconnect
;
p
rivate
Action
received
;
public
event
Action
Received
{
...
...
Unity/Assets/Scripts/Component/NetworkComponent.cs
浏览文件 @
fe94aadc
...
...
@@ -26,10 +26,10 @@ namespace Model
public
class
NetworkComponent
:
Component
{
p
ublic
AService
Service
;
p
rivate
AService
Service
;
p
ublic
Dictionary
<
long
,
Entity
>
sessions
=
new
Dictionary
<
long
,
Entity
>();
p
ublic
Dictionary
<
string
,
Entity
>
adressSessions
=
new
Dictionary
<
string
,
Entity
>();
p
rivate
readonly
Dictionary
<
long
,
Entity
>
sessions
=
new
Dictionary
<
long
,
Entity
>();
p
rivate
readonly
Dictionary
<
string
,
Entity
>
adressSessions
=
new
Dictionary
<
string
,
Entity
>();
public
void
Awake
(
NetworkProtocol
protocol
)
{
...
...
@@ -81,13 +81,13 @@ namespace Model
}
}
p
ublic
void
Add
(
Entity
session
)
p
rivate
void
Add
(
Entity
session
)
{
this
.
sessions
.
Add
(
session
.
Id
,
session
);
this
.
adressSessions
.
Add
(
session
.
GetComponent
<
MessageComponent
>().
RemoteAddress
,
session
);
}
p
ublic
void
Remove
(
long
id
)
p
rivate
void
Remove
(
long
id
)
{
Entity
session
;
if
(!
this
.
sessions
.
TryGetValue
(
id
,
out
session
))
...
...
@@ -122,7 +122,6 @@ namespace Model
session
.
AddComponent
<
MessageComponent
,
AChannel
>(
channel
);
this
.
Add
(
session
);
return
session
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录