AlphaaeGameStudio/TEngine
1
0
Fork 0
mirror of https://github.com/Alex-Rachel/TEngine.git synced 2025-08-14 16:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

完善AddressableManageComponent与ClientNetworkComponent

Browse Source 
完善AddressableManageComponent与ClientNetworkComponent
This commit is contained in:
ALEXTANG
2023-07-21 14:32:20 +08:00
parent 889fbdc8e1
commit 144ba9f222
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/GameScripts/DotNet/Core/Entitas/Scene/Scene.cs
View File

@@ -111,8 +111,20 @@ namespace TEngine
if (runEvent && sceneInfo.SceneType != null) if (runEvent && sceneInfo.SceneType != null)
{ {
// 没有SceneType目前只有代码创建的Scene才会这样、目前只有Server的Scene是这样 switch (sceneInfo.SceneType)
await EventSystem.Instance.PublishAsync(new OnCreateScene(sceneInfo, onSetNetworkComplete)); {
case "Addressable":
{
scene.AddComponent<AddressableManageComponent>();
break;
}
default:
{
// 没有SceneType目前只有代码创建的Scene才会这样、目前只有Server的Scene是这样
await EventSystem.Instance.PublishAsync(new OnCreateScene(sceneInfo, onSetNetworkComplete));
break;
}
}
} }
Scenes.Add(scene); Scenes.Add(scene);

3
Assets/GameScripts/DotNet/Core/Network/Entity/ClientNetworkComponent.cs
View File

@@ -9,7 +9,6 @@ namespace TEngine.Core.Network
{ {
private AClientNetwork Network { get; set; } private AClientNetwork Network { get; set; }
public Session Session { get; private set; } public Session Session { get; private set; }
private Action _onConnectDisconnect;
public void Initialize(NetworkProtocolType networkProtocolType, NetworkTarget networkTarget) public void Initialize(NetworkProtocolType networkProtocolType, NetworkTarget networkTarget)
{ {
@@ -39,7 +38,6 @@ namespace TEngine.Core.Network
throw new NotSupportedException("Network is null or isDisposed"); throw new NotSupportedException("Network is null or isDisposed");
} }
_onConnectDisconnect = onConnectDisconnect;
Network.Connect(remoteEndPoint, onConnectComplete, onConnectFail, onConnectDisconnect, connectTimeout); Network.Connect(remoteEndPoint, onConnectComplete, onConnectFail, onConnectDisconnect, connectTimeout);
Session = Session.Create(Network); Session = Session.Create(Network);
} }
@@ -53,7 +51,6 @@ namespace TEngine.Core.Network
} }
Session = null; Session = null;
_onConnectDisconnect?.Invoke();
base.Dispose(); base.Dispose();
} }
} }

1
Assets/GameScripts/DotNet/Core/Network/NetworkProtocol/TCP/Client/TCPClientNetwork.cs
View File

@@ -41,6 +41,7 @@ namespace TEngine.Core.Network
_isInit = true; _isInit = true;
OnConnectFail = onConnectFail; OnConnectFail = onConnectFail;
OnConnectComplete = onConnectComplete; OnConnectComplete = onConnectComplete;
OnConnectDisconnect = onConnectDisconnect;
ChannelId = 0xC0000000 | (uint) new Random().Next(); ChannelId = 0xC0000000 | (uint) new Random().Next();
_sendAction = (rpcId, routeTypeOpCode, routeId, memoryStream, message) => _sendAction = (rpcId, routeTypeOpCode, routeId, memoryStream, message) =>