diff --git a/Assets/GameScripts/DotNet/Core/CoreErrorCode.cs b/Assets/GameScripts/DotNet/Core/CoreErrorCode.cs index 76f6ff45..6df44d9c 100644 --- a/Assets/GameScripts/DotNet/Core/CoreErrorCode.cs +++ b/Assets/GameScripts/DotNet/Core/CoreErrorCode.cs @@ -2,9 +2,9 @@ namespace TEngine.Core { public class CoreErrorCode { - public const int ErrRpcFail = 100000002; // Rpc消息发送失败 - public const int ErrNotFoundRoute = 100000003; // 没有找到Route消息 - public const int ErrRouteTimeout = 100000004; // 发送Route消息超时 - public const int Error_NotFindEntity = 100000008; // 没有找到Entity + public const uint ErrRpcFail = 100000002; // Rpc消息发送失败 + public const uint ErrNotFoundRoute = 100000003; // 没有找到Route消息 + public const uint ErrRouteTimeout = 100000004; // 发送Route消息超时 + public const uint Error_NotFindEntity = 100000008; // 没有找到Entity } } \ No newline at end of file diff --git a/Assets/GameScripts/DotNet/Core/Entitas/Entity.cs b/Assets/GameScripts/DotNet/Core/Entitas/Entity.cs index fcd2bf9c..22f22bd9 100644 --- a/Assets/GameScripts/DotNet/Core/Entitas/Entity.cs +++ b/Assets/GameScripts/DotNet/Core/Entitas/Entity.cs @@ -399,12 +399,6 @@ namespace TEngine public void Deserialize(Scene scene, bool resetId = false) { - if (IsDisposed) - { - Log.Error($"component is Disposed {this.GetType().FullName}"); - return; - } - if (RuntimeId != 0) { return; diff --git a/Assets/GameScripts/DotNet/Core/Entitas/Scene/Scene.cs b/Assets/GameScripts/DotNet/Core/Entitas/Scene/Scene.cs index 18e579db..00632a2c 100644 --- a/Assets/GameScripts/DotNet/Core/Entitas/Scene/Scene.cs +++ b/Assets/GameScripts/DotNet/Core/Entitas/Scene/Scene.cs @@ -70,7 +70,7 @@ namespace TEngine public void CreateSession(string remoteAddress, NetworkProtocolType networkProtocolType, Action onConnectComplete, Action onConnectFail, int connectTimeout = 5000) { var address = NetworkHelper.ToIPEndPoint(remoteAddress); - var clientNetworkComponent = AddComponent(); + var clientNetworkComponent = GetComponent() ?? AddComponent(); clientNetworkComponent.Initialize(networkProtocolType, NetworkTarget.Outer); clientNetworkComponent.Connect(address, onConnectComplete, onConnectFail, connectTimeout); Session = clientNetworkComponent.Session; diff --git a/Assets/GameScripts/DotNet/Core/Exporter/ProtoBuf/ProtoBufExporter.cs b/Assets/GameScripts/DotNet/Core/Exporter/ProtoBuf/ProtoBufExporter.cs index 60ce17f4..f863ed0c 100644 --- a/Assets/GameScripts/DotNet/Core/Exporter/ProtoBuf/ProtoBufExporter.cs +++ b/Assets/GameScripts/DotNet/Core/Exporter/ProtoBuf/ProtoBufExporter.cs @@ -246,7 +246,7 @@ public sealed class ProtoBufExporter { opcodeInfo.Code += ++_aResponse; file.AppendLine("\t\t[ProtoMember(91, IsRequired = true)]"); - file.AppendLine("\t\tpublic int ErrorCode { get; set; }"); + file.AppendLine("\t\tpublic uint ErrorCode { get; set; }"); break; } default: @@ -263,7 +263,7 @@ public sealed class ProtoBufExporter { opcodeInfo.Code += ++_aRouteResponse; file.AppendLine("\t\t[ProtoMember(91, IsRequired = true)]"); - file.AppendLine("\t\tpublic int ErrorCode { get; set; }"); + file.AppendLine("\t\tpublic uint ErrorCode { get; set; }"); } break; diff --git a/Assets/GameScripts/DotNet/Core/Network/Entity/Session/Session.cs b/Assets/GameScripts/DotNet/Core/Network/Entity/Session/Session.cs index f7fde407..18438ba6 100644 --- a/Assets/GameScripts/DotNet/Core/Network/Entity/Session/Session.cs +++ b/Assets/GameScripts/DotNet/Core/Network/Entity/Session/Session.cs @@ -112,7 +112,7 @@ namespace TEngine.Core.Network if (networkId != 0 && channelId != 0) { - NetworkThread.Instance.SynchronizationContext.Post(() => + NetworkThread.Instance?.SynchronizationContext.Post(() => { NetworkThread.Instance?.RemoveChannel(networkId, channelId); }); diff --git a/Assets/GameScripts/DotNet/Core/Network/Message/Dispatcher/MessageDispatcherSystem.cs b/Assets/GameScripts/DotNet/Core/Network/Message/Dispatcher/MessageDispatcherSystem.cs index 4f8eff04..db2cabf6 100644 --- a/Assets/GameScripts/DotNet/Core/Network/Message/Dispatcher/MessageDispatcherSystem.cs +++ b/Assets/GameScripts/DotNet/Core/Network/Message/Dispatcher/MessageDispatcherSystem.cs @@ -212,7 +212,7 @@ namespace TEngine.Core.Network } } #endif - public void FailResponse(Session session, IRouteRequest iRouteRequest, int error, uint rpcId) + public void FailResponse(Session session, IRouteRequest iRouteRequest, uint error, uint rpcId) { var response = CreateResponse(iRouteRequest, error); session.Send(response, rpcId); @@ -223,7 +223,7 @@ namespace TEngine.Core.Network return new RouteResponse(); } - public IResponse CreateResponse(Type requestType, int error) + public IResponse CreateResponse(Type requestType, uint error) { IResponse response; @@ -240,7 +240,7 @@ namespace TEngine.Core.Network return response; } - public IResponse CreateResponse(IRequest iRequest, int error) + public IResponse CreateResponse(IRequest iRequest, uint error) { IResponse response; @@ -257,7 +257,7 @@ namespace TEngine.Core.Network return response; } - public IRouteResponse CreateResponse(IRouteRequest iRouteRequest, int error) + public IRouteResponse CreateResponse(IRouteRequest iRouteRequest, uint error) { IRouteResponse response; diff --git a/Assets/GameScripts/DotNet/Core/Network/Message/Interface/Protocol/IMessage.cs b/Assets/GameScripts/DotNet/Core/Network/Message/Interface/Protocol/IMessage.cs index 89da78b9..ccfb55ab 100644 --- a/Assets/GameScripts/DotNet/Core/Network/Message/Interface/Protocol/IMessage.cs +++ b/Assets/GameScripts/DotNet/Core/Network/Message/Interface/Protocol/IMessage.cs @@ -12,6 +12,6 @@ namespace TEngine.Core.Network public interface IResponse : IMessage { - int ErrorCode { get; set; } + uint ErrorCode { get; set; } } } \ No newline at end of file diff --git a/Assets/GameScripts/DotNet/Core/Network/Message/Protocols/CoreMessageProtocols.cs b/Assets/GameScripts/DotNet/Core/Network/Message/Protocols/CoreMessageProtocols.cs index a95dea82..b6ff44ba 100644 --- a/Assets/GameScripts/DotNet/Core/Network/Message/Protocols/CoreMessageProtocols.cs +++ b/Assets/GameScripts/DotNet/Core/Network/Message/Protocols/CoreMessageProtocols.cs @@ -12,7 +12,7 @@ namespace TEngine } [ProtoMember(90)] public long RpcId { get; set; } - [ProtoMember(91, IsRequired = true)] public int ErrorCode { get; set; } + [ProtoMember(91, IsRequired = true)] public uint ErrorCode { get; set; } } [ProtoContract] @@ -24,7 +24,7 @@ namespace TEngine } [ProtoMember(90)] public long RpcId { get; set; } - [ProtoMember(91, IsRequired = true)] public int ErrorCode { get; set; } + [ProtoMember(91, IsRequired = true)] public uint ErrorCode { get; set; } } [ProtoContract] public class PingRequest : AProto, IRequest @@ -46,7 +46,7 @@ namespace TEngine } [ProtoMember(90)] public long RpcId { get; set; } - [ProtoMember(91, IsRequired = true)] public int ErrorCode { get; set; } + [ProtoMember(91, IsRequired = true)] public uint ErrorCode { get; set; } [ProtoMember(1)] public long Now; } /// @@ -69,7 +69,7 @@ namespace TEngine { public uint OpCode() { return Opcode.AddressableAddResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } } /// /// 查询一个可寻址 @@ -89,7 +89,7 @@ namespace TEngine { public uint OpCode() { return Opcode.AddressableGetResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } [ProtoMember(1)] public long RouteId { get; set; } } @@ -111,7 +111,7 @@ namespace TEngine { public uint OpCode() { return Opcode.AddressableRemoveResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } } /// /// 锁定一个可寻址 @@ -131,7 +131,7 @@ namespace TEngine { public uint OpCode() { return Opcode.AddressableLockResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } } /// /// 解锁一个可寻址 @@ -155,6 +155,6 @@ namespace TEngine { public uint OpCode() { return Opcode.AddressableUnLockResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } } } \ No newline at end of file diff --git a/Assets/GameScripts/HotFix/GameLogic/DataCenter/NetworkUtils.cs b/Assets/GameScripts/HotFix/GameLogic/DataCenter/NetworkUtils.cs index affaf98c..32837e75 100644 --- a/Assets/GameScripts/HotFix/GameLogic/DataCenter/NetworkUtils.cs +++ b/Assets/GameScripts/HotFix/GameLogic/DataCenter/NetworkUtils.cs @@ -34,7 +34,7 @@ namespace GameLogic } //Remark 这里图方便注册错误码文本,正常应该走文本配置表。 - public static Dictionary ErrCodeTextMap = new Dictionary + public static Dictionary ErrCodeTextMap = new Dictionary { { ErrorCode.ERR_AccountAlreadyRegisted, "账户已经被注册了" diff --git a/Assets/GameScripts/HotFix/GameProto/GameProtocol/OuterMessage.cs b/Assets/GameScripts/HotFix/GameProto/GameProtocol/OuterMessage.cs index 7ff55bd3..a41f96fb 100644 --- a/Assets/GameScripts/HotFix/GameProto/GameProtocol/OuterMessage.cs +++ b/Assets/GameScripts/HotFix/GameProto/GameProtocol/OuterMessage.cs @@ -33,7 +33,7 @@ namespace TEngine { public uint OpCode() { return OuterOpcode.H_G2C_MessageResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } [ProtoMember(1)] public string Message { get; set; } } @@ -74,7 +74,7 @@ namespace TEngine { public uint OpCode() { return OuterOpcode.H_G2C_LoginAddressResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } } /// /// 发送一个Address消息给Map @@ -105,7 +105,7 @@ namespace TEngine { public uint OpCode() { return OuterOpcode.H_M2C_MessageResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } [ProtoMember(1)] public string Message { get; set; } } @@ -150,7 +150,7 @@ namespace TEngine { public uint OpCode() { return OuterOpcode.H_G2C_LoginResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } [ProtoMember(1)] public uint UID { get; set; } [ProtoMember(2)] @@ -177,7 +177,7 @@ namespace TEngine { public uint OpCode() { return OuterOpcode.H_G2C_RegisterResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } [ProtoMember(1)] public uint UID { get; set; } } diff --git a/DotNet/Logic/src/Generate/NetworkProtocol/InnerMessage.cs b/DotNet/Logic/src/Generate/NetworkProtocol/InnerMessage.cs index 0f446035..e20dfa07 100644 --- a/DotNet/Logic/src/Generate/NetworkProtocol/InnerMessage.cs +++ b/DotNet/Logic/src/Generate/NetworkProtocol/InnerMessage.cs @@ -26,6 +26,6 @@ namespace TEngine { public uint OpCode() { return InnerOpcode.I_M2G_LoginAddressResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } } } diff --git a/DotNet/Logic/src/Generate/NetworkProtocol/OuterMessage.cs b/DotNet/Logic/src/Generate/NetworkProtocol/OuterMessage.cs index 9c39e3b7..287c2fc8 100644 --- a/DotNet/Logic/src/Generate/NetworkProtocol/OuterMessage.cs +++ b/DotNet/Logic/src/Generate/NetworkProtocol/OuterMessage.cs @@ -33,7 +33,7 @@ namespace TEngine { public uint OpCode() { return OuterOpcode.H_G2C_MessageResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } [ProtoMember(1)] public string Message { get; set; } } @@ -74,7 +74,7 @@ namespace TEngine { public uint OpCode() { return OuterOpcode.H_G2C_LoginAddressResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } } /// /// 发送一个Address消息给Map @@ -105,7 +105,7 @@ namespace TEngine { public uint OpCode() { return OuterOpcode.H_M2C_MessageResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } [ProtoMember(1)] public string Message { get; set; } } @@ -150,7 +150,7 @@ namespace TEngine { public uint OpCode() { return OuterOpcode.H_G2C_LoginResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } [ProtoMember(1)] public uint UID { get; set; } [ProtoMember(2)] @@ -177,7 +177,7 @@ namespace TEngine { public uint OpCode() { return OuterOpcode.H_G2C_RegisterResponse; } [ProtoMember(91, IsRequired = true)] - public int ErrorCode { get; set; } + public uint ErrorCode { get; set; } [ProtoMember(1)] public uint UID { get; set; } }