客户端服务端启动成功，暂未连接通过

Config/StartMachineConfigCategory.bytes

@@ -1,2 +1,2 @@
 
-

	127.0.0.1
+
	127.0.0.1	127.0.0.1

Config/StartProcessConfigCategory.bytes

@@ -1,3 +1,3 @@
 
-


-

+

�

+
�

Config/StartZoneConfigCategory.bytes

@@ -1,3 +1,3 @@
 
-
mongdb://127.0.0.1
-mongdb://127.0.0.1
+
mongdb://127.0.0.1ET1
+mongdb://127.0.0.1ET2

Server/Hotfix/AppStart_Init.cs

@@ -28,7 +28,8 @@ namespace ET
             Game.Scene.AddComponent<ActorMessageDispatcherComponent>();
             // 数值订阅组件
             Game.Scene.AddComponent<NumericWatcherComponent>();
-				
+
+            Game.Scene.AddComponent<NetThreadComponent>();
             Game.Scene.AddComponent<NetInnerComponent, IPEndPoint>(processConfig.InnerIPPort);
             
             var processScenes = StartSceneConfigCategory.Instance.GetByProcess(Game.Options.Process);

Server/Hotfix/Demo/Actor_TransferHandler.cs

@@ -5,7 +5,7 @@ using System.Net;
 namespace ET
 {
 	[ActorMessageHandler]
-	public class Actor_TransferHandler : AMActorRpcHandler<Unit, Actor_TransferRequest, Actor_TransferResponse>
+	public class Actor_TransferHandler : AMActorLocationRpcHandler<Unit, Actor_TransferRequest, Actor_TransferResponse>
 	{
 		protected override async ETTask Run(Unit unit, Actor_TransferRequest request, Actor_TransferResponse response, Action reply)
 		{

Server/Model/Generate/Config/StartProcessConfig.cs

@@ -75,7 +75,7 @@ namespace ET
 		[ProtoMember(2, IsRequired  = true)]
 		public int MachineId { get; set; }
 		[ProtoMember(3, IsRequired  = true)]
-		public string InnerPort { get; set; }
+		public int InnerPort { get; set; }
 
 
 		[ProtoAfterDeserialization]

Server/ThirdParty/Server.ThirdParty.csproj

@@ -28,605 +28,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\BclHelpers.cs.meta">
-        <Link>protobuf-net\BclHelpers.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\BufferExtension.cs.meta">
-        <Link>protobuf-net\BufferExtension.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\BufferPool.cs.meta">
-        <Link>protobuf-net\BufferPool.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\CallbackAttributes.cs.meta">
-        <Link>protobuf-net\CallbackAttributes.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Compiler.meta">
-        <Link>protobuf-net\Compiler.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Compiler\CompilerContext.cs.meta">
-        <Link>protobuf-net\Compiler\CompilerContext.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Compiler\CompilerDelegates.cs.meta">
-        <Link>protobuf-net\Compiler\CompilerDelegates.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Compiler\Local.cs.meta">
-        <Link>protobuf-net\Compiler\Local.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\DataFormat.cs.meta">
-        <Link>protobuf-net\DataFormat.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\DiscriminatedUnion.cs.meta">
-        <Link>protobuf-net\DiscriminatedUnion.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\DiscriminatedUnion.Serializable.cs.meta">
-        <Link>protobuf-net\DiscriminatedUnion.Serializable.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Extensible.cs.meta">
-        <Link>protobuf-net\Extensible.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ExtensibleUtil.cs.meta">
-        <Link>protobuf-net\ExtensibleUtil.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\GlobalSuppressions.cs.meta">
-        <Link>protobuf-net\GlobalSuppressions.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Helpers.cs.meta">
-        <Link>protobuf-net\Helpers.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\IExtensible.cs.meta">
-        <Link>protobuf-net\IExtensible.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\IExtension.cs.meta">
-        <Link>protobuf-net\IExtension.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ImplicitFields.cs.meta">
-        <Link>protobuf-net\ImplicitFields.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\IProtoInputT.cs.meta">
-        <Link>protobuf-net\IProtoInputT.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\IProtoOutputT.cs.meta">
-        <Link>protobuf-net\IProtoOutputT.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\KeyValuePairProxy.cs.meta">
-        <Link>protobuf-net\KeyValuePairProxy.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta.meta">
-        <Link>protobuf-net\Meta.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\AttributeMap.cs.meta">
-        <Link>protobuf-net\Meta\AttributeMap.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\BasicList.cs.meta">
-        <Link>protobuf-net\Meta\BasicList.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\CallbackSet.cs.meta">
-        <Link>protobuf-net\Meta\CallbackSet.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\MetaType.cs.meta">
-        <Link>protobuf-net\Meta\MetaType.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\ProtoSyntax.cs.meta">
-        <Link>protobuf-net\Meta\ProtoSyntax.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\RuntimeTypeModel.cs.meta">
-        <Link>protobuf-net\Meta\RuntimeTypeModel.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\SubType.cs.meta">
-        <Link>protobuf-net\Meta\SubType.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\TypeFormatEventArgs.cs.meta">
-        <Link>protobuf-net\Meta\TypeFormatEventArgs.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\TypeModel.cs.meta">
-        <Link>protobuf-net\Meta\TypeModel.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\TypeModel.InputOutput.cs.meta">
-        <Link>protobuf-net\Meta\TypeModel.InputOutput.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\ValueMember.cs.meta">
-        <Link>protobuf-net\Meta\ValueMember.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\NetObjectCache.cs.meta">
-        <Link>protobuf-net\NetObjectCache.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\PrefixStyle.cs.meta">
-        <Link>protobuf-net\PrefixStyle.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Properties.meta">
-        <Link>protobuf-net\Properties.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Properties\AssemblyInfo.cs.meta">
-        <Link>protobuf-net\Properties\AssemblyInfo.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\protobuf-net.csproj">
-        <Link>protobuf-net\protobuf-net.csproj</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\protobuf-net.csproj.meta">
-        <Link>protobuf-net\protobuf-net.csproj.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoContractAttribute.cs.meta">
-        <Link>protobuf-net\ProtoContractAttribute.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoConverterAttribute.cs.meta">
-        <Link>protobuf-net\ProtoConverterAttribute.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoEnumAttribute.cs.meta">
-        <Link>protobuf-net\ProtoEnumAttribute.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoException.cs.meta">
-        <Link>protobuf-net\ProtoException.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoIgnoreAttribute.cs.meta">
-        <Link>protobuf-net\ProtoIgnoreAttribute.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoIncludeAttribute.cs.meta">
-        <Link>protobuf-net\ProtoIncludeAttribute.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoMapAttribute.cs.meta">
-        <Link>protobuf-net\ProtoMapAttribute.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoMemberAttribute.cs.meta">
-        <Link>protobuf-net\ProtoMemberAttribute.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoReader.cs.meta">
-        <Link>protobuf-net\ProtoReader.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoWriter.cs.meta">
-        <Link>protobuf-net\ProtoWriter.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\SerializationContext.cs.meta">
-        <Link>protobuf-net\SerializationContext.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializer.cs.meta">
-        <Link>protobuf-net\Serializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers.meta">
-        <Link>protobuf-net\Serializers.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ArrayDecorator.cs.meta">
-        <Link>protobuf-net\Serializers\ArrayDecorator.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\BlobSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\BlobSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\BooleanSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\BooleanSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ByteSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\ByteSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\CharSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\CharSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\CompiledSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\CompiledSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\DateTimeSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\DateTimeSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\DecimalSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\DecimalSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\DefaultValueDecorator.cs.meta">
-        <Link>protobuf-net\Serializers\DefaultValueDecorator.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\DoubleSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\DoubleSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\EnumSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\EnumSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\FieldDecorator.cs.meta">
-        <Link>protobuf-net\Serializers\FieldDecorator.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\GuidSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\GuidSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ImmutableCollectionDecorator.cs.meta">
-        <Link>protobuf-net\Serializers\ImmutableCollectionDecorator.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\Int16Serializer.cs.meta">
-        <Link>protobuf-net\Serializers\Int16Serializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\Int32Serializer.cs.meta">
-        <Link>protobuf-net\Serializers\Int32Serializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\Int64Serializer.cs.meta">
-        <Link>protobuf-net\Serializers\Int64Serializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\IProtoSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\IProtoSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\IProtoTypeSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\IProtoTypeSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ISerializerProxy.cs.meta">
-        <Link>protobuf-net\Serializers\ISerializerProxy.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ListDecorator.cs.meta">
-        <Link>protobuf-net\Serializers\ListDecorator.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\MapDecorator.cs.meta">
-        <Link>protobuf-net\Serializers\MapDecorator.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\MemberSpecifiedDecorator.cs.meta">
-        <Link>protobuf-net\Serializers\MemberSpecifiedDecorator.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\NetObjectSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\NetObjectSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\NullDecorator.cs.meta">
-        <Link>protobuf-net\Serializers\NullDecorator.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ParseableSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\ParseableSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\PropertyDecorator.cs.meta">
-        <Link>protobuf-net\Serializers\PropertyDecorator.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ProtoDecoratorBase.cs.meta">
-        <Link>protobuf-net\Serializers\ProtoDecoratorBase.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ReflectedUriDecorator.cs.meta">
-        <Link>protobuf-net\Serializers\ReflectedUriDecorator.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\SByteSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\SByteSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\SingleSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\SingleSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\StringSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\StringSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\SubItemSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\SubItemSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\SurrogateSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\SurrogateSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\SystemTypeSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\SystemTypeSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\TagDecorator.cs.meta">
-        <Link>protobuf-net\Serializers\TagDecorator.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\TimeSpanSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\TimeSpanSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\TupleSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\TupleSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\TypeSerializer.cs.meta">
-        <Link>protobuf-net\Serializers\TypeSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\UInt16Serializer.cs.meta">
-        <Link>protobuf-net\Serializers\UInt16Serializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\UInt32Serializer.cs.meta">
-        <Link>protobuf-net\Serializers\UInt32Serializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\UInt64Serializer.cs.meta">
-        <Link>protobuf-net\Serializers\UInt64Serializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\UriDecorator.cs.meta">
-        <Link>protobuf-net\Serializers\UriDecorator.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ServiceModel.meta">
-        <Link>protobuf-net\ServiceModel.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ServiceModel\ProtoBehaviorAttribute.cs.meta">
-        <Link>protobuf-net\ServiceModel\ProtoBehaviorAttribute.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ServiceModel\ProtoBehaviorExtensionElement.cs.meta">
-        <Link>protobuf-net\ServiceModel\ProtoBehaviorExtensionElement.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ServiceModel\ProtoEndpointBehavior.cs.meta">
-        <Link>protobuf-net\ServiceModel\ProtoEndpointBehavior.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ServiceModel\ProtoOperationBehavior.cs.meta">
-        <Link>protobuf-net\ServiceModel\ProtoOperationBehavior.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ServiceModel\XmlProtoSerializer.cs.meta">
-        <Link>protobuf-net\ServiceModel\XmlProtoSerializer.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\SubItemToken.cs.meta">
-        <Link>protobuf-net\SubItemToken.cs.meta</Link>
-      </Content>
-      <Content Include="..\..\Unity\Assets\ThirdParty\protobuf-net\WireType.cs.meta">
-        <Link>protobuf-net\WireType.cs.meta</Link>
-      </Content>
-    </ItemGroup>
-
-    <ItemGroup>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\BclHelpers.cs">
-        <Link>protobuf-net\BclHelpers.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\BufferExtension.cs">
-        <Link>protobuf-net\BufferExtension.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\BufferPool.cs">
-        <Link>protobuf-net\BufferPool.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\CallbackAttributes.cs">
-        <Link>protobuf-net\CallbackAttributes.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Compiler\CompilerContext.cs">
-        <Link>protobuf-net\Compiler\CompilerContext.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Compiler\CompilerDelegates.cs">
-        <Link>protobuf-net\Compiler\CompilerDelegates.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Compiler\Local.cs">
-        <Link>protobuf-net\Compiler\Local.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\DataFormat.cs">
-        <Link>protobuf-net\DataFormat.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\DiscriminatedUnion.cs">
-        <Link>protobuf-net\DiscriminatedUnion.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\DiscriminatedUnion.Serializable.cs">
-        <Link>protobuf-net\DiscriminatedUnion.Serializable.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Extensible.cs">
-        <Link>protobuf-net\Extensible.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ExtensibleUtil.cs">
-        <Link>protobuf-net\ExtensibleUtil.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\GlobalSuppressions.cs">
-        <Link>protobuf-net\GlobalSuppressions.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Helpers.cs">
-        <Link>protobuf-net\Helpers.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\IExtensible.cs">
-        <Link>protobuf-net\IExtensible.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\IExtension.cs">
-        <Link>protobuf-net\IExtension.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ImplicitFields.cs">
-        <Link>protobuf-net\ImplicitFields.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\IProtoInputT.cs">
-        <Link>protobuf-net\IProtoInputT.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\IProtoOutputT.cs">
-        <Link>protobuf-net\IProtoOutputT.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\KeyValuePairProxy.cs">
-        <Link>protobuf-net\KeyValuePairProxy.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\AttributeMap.cs">
-        <Link>protobuf-net\Meta\AttributeMap.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\BasicList.cs">
-        <Link>protobuf-net\Meta\BasicList.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\CallbackSet.cs">
-        <Link>protobuf-net\Meta\CallbackSet.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\MetaType.cs">
-        <Link>protobuf-net\Meta\MetaType.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\ProtoSyntax.cs">
-        <Link>protobuf-net\Meta\ProtoSyntax.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\RuntimeTypeModel.cs">
-        <Link>protobuf-net\Meta\RuntimeTypeModel.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\SubType.cs">
-        <Link>protobuf-net\Meta\SubType.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\TypeFormatEventArgs.cs">
-        <Link>protobuf-net\Meta\TypeFormatEventArgs.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\TypeModel.cs">
-        <Link>protobuf-net\Meta\TypeModel.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\TypeModel.InputOutput.cs">
-        <Link>protobuf-net\Meta\TypeModel.InputOutput.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Meta\ValueMember.cs">
-        <Link>protobuf-net\Meta\ValueMember.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\NetObjectCache.cs">
-        <Link>protobuf-net\NetObjectCache.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\PrefixStyle.cs">
-        <Link>protobuf-net\PrefixStyle.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Properties\AssemblyInfo.cs">
-        <Link>protobuf-net\Properties\AssemblyInfo.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoContractAttribute.cs">
-        <Link>protobuf-net\ProtoContractAttribute.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoConverterAttribute.cs">
-        <Link>protobuf-net\ProtoConverterAttribute.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoEnumAttribute.cs">
-        <Link>protobuf-net\ProtoEnumAttribute.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoException.cs">
-        <Link>protobuf-net\ProtoException.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoIgnoreAttribute.cs">
-        <Link>protobuf-net\ProtoIgnoreAttribute.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoIncludeAttribute.cs">
-        <Link>protobuf-net\ProtoIncludeAttribute.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoMapAttribute.cs">
-        <Link>protobuf-net\ProtoMapAttribute.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoMemberAttribute.cs">
-        <Link>protobuf-net\ProtoMemberAttribute.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoReader.cs">
-        <Link>protobuf-net\ProtoReader.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ProtoWriter.cs">
-        <Link>protobuf-net\ProtoWriter.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\SerializationContext.cs">
-        <Link>protobuf-net\SerializationContext.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializer.cs">
-        <Link>protobuf-net\Serializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ArrayDecorator.cs">
-        <Link>protobuf-net\Serializers\ArrayDecorator.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\BlobSerializer.cs">
-        <Link>protobuf-net\Serializers\BlobSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\BooleanSerializer.cs">
-        <Link>protobuf-net\Serializers\BooleanSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ByteSerializer.cs">
-        <Link>protobuf-net\Serializers\ByteSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\CharSerializer.cs">
-        <Link>protobuf-net\Serializers\CharSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\CompiledSerializer.cs">
-        <Link>protobuf-net\Serializers\CompiledSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\DateTimeSerializer.cs">
-        <Link>protobuf-net\Serializers\DateTimeSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\DecimalSerializer.cs">
-        <Link>protobuf-net\Serializers\DecimalSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\DefaultValueDecorator.cs">
-        <Link>protobuf-net\Serializers\DefaultValueDecorator.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\DoubleSerializer.cs">
-        <Link>protobuf-net\Serializers\DoubleSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\EnumSerializer.cs">
-        <Link>protobuf-net\Serializers\EnumSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\FieldDecorator.cs">
-        <Link>protobuf-net\Serializers\FieldDecorator.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\GuidSerializer.cs">
-        <Link>protobuf-net\Serializers\GuidSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ImmutableCollectionDecorator.cs">
-        <Link>protobuf-net\Serializers\ImmutableCollectionDecorator.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\Int16Serializer.cs">
-        <Link>protobuf-net\Serializers\Int16Serializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\Int32Serializer.cs">
-        <Link>protobuf-net\Serializers\Int32Serializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\Int64Serializer.cs">
-        <Link>protobuf-net\Serializers\Int64Serializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\IProtoSerializer.cs">
-        <Link>protobuf-net\Serializers\IProtoSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\IProtoTypeSerializer.cs">
-        <Link>protobuf-net\Serializers\IProtoTypeSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ISerializerProxy.cs">
-        <Link>protobuf-net\Serializers\ISerializerProxy.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ListDecorator.cs">
-        <Link>protobuf-net\Serializers\ListDecorator.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\MapDecorator.cs">
-        <Link>protobuf-net\Serializers\MapDecorator.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\MemberSpecifiedDecorator.cs">
-        <Link>protobuf-net\Serializers\MemberSpecifiedDecorator.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\NetObjectSerializer.cs">
-        <Link>protobuf-net\Serializers\NetObjectSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\NullDecorator.cs">
-        <Link>protobuf-net\Serializers\NullDecorator.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ParseableSerializer.cs">
-        <Link>protobuf-net\Serializers\ParseableSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\PropertyDecorator.cs">
-        <Link>protobuf-net\Serializers\PropertyDecorator.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ProtoDecoratorBase.cs">
-        <Link>protobuf-net\Serializers\ProtoDecoratorBase.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\ReflectedUriDecorator.cs">
-        <Link>protobuf-net\Serializers\ReflectedUriDecorator.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\SByteSerializer.cs">
-        <Link>protobuf-net\Serializers\SByteSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\SingleSerializer.cs">
-        <Link>protobuf-net\Serializers\SingleSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\StringSerializer.cs">
-        <Link>protobuf-net\Serializers\StringSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\SubItemSerializer.cs">
-        <Link>protobuf-net\Serializers\SubItemSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\SurrogateSerializer.cs">
-        <Link>protobuf-net\Serializers\SurrogateSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\SystemTypeSerializer.cs">
-        <Link>protobuf-net\Serializers\SystemTypeSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\TagDecorator.cs">
-        <Link>protobuf-net\Serializers\TagDecorator.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\TimeSpanSerializer.cs">
-        <Link>protobuf-net\Serializers\TimeSpanSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\TupleSerializer.cs">
-        <Link>protobuf-net\Serializers\TupleSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\TypeSerializer.cs">
-        <Link>protobuf-net\Serializers\TypeSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\UInt16Serializer.cs">
-        <Link>protobuf-net\Serializers\UInt16Serializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\UInt32Serializer.cs">
-        <Link>protobuf-net\Serializers\UInt32Serializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\UInt64Serializer.cs">
-        <Link>protobuf-net\Serializers\UInt64Serializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\Serializers\UriDecorator.cs">
-        <Link>protobuf-net\Serializers\UriDecorator.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ServiceModel\ProtoBehaviorAttribute.cs">
-        <Link>protobuf-net\ServiceModel\ProtoBehaviorAttribute.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ServiceModel\ProtoBehaviorExtensionElement.cs">
-        <Link>protobuf-net\ServiceModel\ProtoBehaviorExtensionElement.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ServiceModel\ProtoEndpointBehavior.cs">
-        <Link>protobuf-net\ServiceModel\ProtoEndpointBehavior.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ServiceModel\ProtoOperationBehavior.cs">
-        <Link>protobuf-net\ServiceModel\ProtoOperationBehavior.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\ServiceModel\XmlProtoSerializer.cs">
-        <Link>protobuf-net\ServiceModel\XmlProtoSerializer.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\SubItemToken.cs">
-        <Link>protobuf-net\SubItemToken.cs</Link>
-      </Compile>
-      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\WireType.cs">
-        <Link>protobuf-net\WireType.cs</Link>
+      <Compile Include="..\..\Unity\Assets\ThirdParty\protobuf-net\**\*.cs">
+        <Link>protobuf-net\%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
     </ItemGroup>
 

Tools/ExcelExporter/Program.cs

@@ -211,7 +211,7 @@ namespace ET
             for (int row = 6; row <= worksheet.Dimension.End.Row; ++row)
             {
                 sb.Append("{");
-                for (int col = 3; col < worksheet.Dimension.End.Column; ++col)
+                for (int col = 3; col <= worksheet.Dimension.End.Column; ++col)
                 {
                     HeadInfo headInfo = headInfos[col];
                     if (headInfo.FieldAttribute == null)

Unity/Assets/Bundles/Config/StartMachineConfigCategory.bytes

@@ -1,2 +1,2 @@
 
-

	127.0.0.1
+
	127.0.0.1	127.0.0.1

Unity/Assets/Bundles/Config/StartProcessConfigCategory.bytes

@@ -1,3 +1,3 @@
 
-


-

+

�

+
�

Unity/Assets/Bundles/Config/StartZoneConfigCategory.bytes

@@ -1,3 +1,3 @@
 
-
mongdb://127.0.0.1
-mongdb://127.0.0.1
+
mongdb://127.0.0.1ET1
+mongdb://127.0.0.1ET2

Unity/Assets/Hotfix/Module/Message/NetKcpComponentSystem.cs

@@ -11,7 +11,7 @@ namespace ET
         {
             self.MessageDispatcher = new OuterMessageDispatcher();
             
-            self.Service = new KService(NetThreadComponent.Instance.ThreadSynchronizationContext, ServiceType.Outer);
+            self.Service = new TService(NetThreadComponent.Instance.ThreadSynchronizationContext, ServiceType.Outer);
             self.Service.ErrorCallback += self.OnError;
             self.Service.ReadCallback += self.OnRead;
 
@@ -26,7 +26,7 @@ namespace ET
         {
             self.MessageDispatcher = new OuterMessageDispatcher();
             
-            self.Service = new KService(NetThreadComponent.Instance.ThreadSynchronizationContext, address, ServiceType.Outer);
+            self.Service = new TService(NetThreadComponent.Instance.ThreadSynchronizationContext, address, ServiceType.Outer);
             self.Service.ErrorCallback += self.OnError;
             self.Service.ReadCallback += self.OnRead;
             self.Service.AcceptCallback += self.OnAccept;

Unity/Assets/HotfixView/AppStart_Init.cs

@@ -5,7 +5,7 @@ namespace ET
         public override async ETTask Run(EventType.AppStart args)
         {
             Game.Scene.AddComponent<TimerComponent>();
-
+            Game.Scene.AddComponent<CoroutineLockComponent>();
 
             // 下载ab包
             //await BundleHelper.DownloadBundle("1111");
@@ -15,14 +15,14 @@ namespace ET
             
             ResourcesComponent.Instance.LoadBundle("config.unity3d");
             Game.Scene.AddComponent<ConfigComponent>();
-            ResourcesComponent.Instance.UnloadBundle("config.unity3d");
-            
             ConfigComponent.GetAllConfigBytes = LoadConfigHelper.LoadAllConfigBytes;
             await ConfigComponent.Instance.LoadAsync();
+            ResourcesComponent.Instance.UnloadBundle("config.unity3d");
             
             Game.Scene.AddComponent<OpcodeTypeComponent>();
             Game.Scene.AddComponent<MessageDispatcherComponent>();
             Game.Scene.AddComponent<UIEventComponent>();
+            Game.Scene.AddComponent<NetThreadComponent>();
 
             ResourcesComponent.Instance.LoadBundle("unit.unity3d");
 

Unity/Assets/HotfixView/Scene/AfterCreateZoneScene_AddComponent.cs

@@ -7,6 +7,7 @@ namespace ET
             Scene zoneScene = args.ZoneScene;
             zoneScene.AddComponent<ResourcesComponent>();
             zoneScene.AddComponent<UIComponent>();
+            await ETTask.CompletedTask;
         }
     }
 }

Unity/Assets/HotfixView/UI/UIHelper.cs

@@ -10,6 +10,7 @@ namespace ET
         public static async ETTask Remove(Scene scene, string uiType)
         {
             scene.GetComponent<UIComponent>().Remove(uiType);
+            await ETTask.CompletedTask;
         }
     }
 }

Unity/Assets/HotfixView/UI/UILoading/UILoadingEvent.cs

@@ -10,6 +10,7 @@ namespace ET
         {
 	        try
 	        {
+		        await ETTask.CompletedTask;
 				GameObject bundleGameObject = ((GameObject)Resources.Load("KV")).Get<GameObject>(UIType.UILoading);
 				GameObject go = UnityEngine.Object.Instantiate(bundleGameObject);
 				go.layer = LayerMask.NameToLayer(LayerNames.UI);

Unity/Assets/HotfixView/UI/UILobby/UILobbyEvent.cs

@@ -8,6 +8,7 @@ namespace ET
     {
         public override async ETTask<UI> OnCreate(UIComponent uiComponent)
         {
+            await ETTask.CompletedTask;
             ResourcesComponent.Instance.LoadBundle(UIType.UILobby.StringToAB());
             GameObject bundleGameObject = (GameObject) ResourcesComponent.Instance.GetAsset(UIType.UILobby.StringToAB(), UIType.UILobby);
             GameObject gameObject = UnityEngine.Object.Instantiate(bundleGameObject);

Unity/Assets/HotfixView/Unit/AfterUnitCreate_CreateUnitView.cs

@@ -15,6 +15,7 @@ namespace ET
             GameObject.DontDestroyOnLoad(go);
             args.Unit.GameObject = go;
             args.Unit.AddComponent<AnimatorComponent>();
+            await ETTask.CompletedTask;
         }
     }
 }

Unity/Assets/Model/Core/Log/Log.cs

@@ -16,21 +16,16 @@ namespace ET
         public const int InfoLevel = 3;
         public const int WarningLevel = 4;
         
+        public static ILog ILog { get; }
+
+        static Log()
+        {
 #if SERVER
-		private static readonly ILog logger = new NLogger("Server");
-#elif ROBOT
-        private static readonly ILog logger = new NLogger("Robot");
-#elif UNITY_EDITOR
-        private static readonly ILog logger = new UnityLogger();
-#elif UNITY_STANDALONE_WIN
-        //这里都切换成为第三方插件的输出，会自动输出文件
-        //private static readonly ILog logger = new UnityLogger();
-        private static readonly ILog logger = new FileLogger("./Log.txt");
+            ILog = new NLogger("Server");
 #else
-        private static readonly ILog logger = new UnityLogger();
+            ILog = new UnityLogger();
 #endif
-
-        public static ILog Logger => logger;
+        }
 
         public static bool CheckLogLevel(int level)
         {
@@ -53,7 +48,7 @@ namespace ET
             }
             DebugCallback?.Invoke(msg, null);
             StackTrace st = new StackTrace(1, true);
-            logger.Trace($"{msg}\n{st}");
+            ILog.Trace($"{msg}\n{st}");
         }
 
         public static void Debug(string msg)
@@ -63,7 +58,7 @@ namespace ET
                 return;
             }
             DebugCallback?.Invoke(msg, null);
-            logger.Debug(msg);
+            ILog.Debug(msg);
         }
 
         public static void Info(string msg)
@@ -72,7 +67,7 @@ namespace ET
             {
                 return;
             }
-            logger.Info(msg);
+            ILog.Info(msg);
         }
 
         public static void TraceInfo(string msg)
@@ -82,7 +77,7 @@ namespace ET
                 return;
             }
             StackTrace st = new StackTrace(1, true);
-            logger.Trace($"{msg}\n{st}");
+            ILog.Trace($"{msg}\n{st}");
         }
 
         public static void Warning(string msg)
@@ -92,21 +87,21 @@ namespace ET
                 return;
             }
 
-            logger.Warning(msg);
+            ILog.Warning(msg);
         }
 
         public static void Error(string msg)
         {
             StackTrace st = new StackTrace(1, true);
             ErrorCallback?.Invoke($"{msg}\n{st}");
-            logger.Error($"{msg}\n{st}");
+            ILog.Error($"{msg}\n{st}");
         }
 
         public static void Error(Exception e)
         {
             string str = e.ToString();
             ErrorCallback?.Invoke(str);
-            logger.Error(str);
+            ILog.Error(str);
         }
 
         public static void Trace(string message, params object[] args)
@@ -117,7 +112,7 @@ namespace ET
             }
             DebugCallback?.Invoke(message, args);
             StackTrace st = new StackTrace(1, true);
-            logger.Trace($"{string.Format(message, args)}\n{st}");
+            ILog.Trace($"{string.Format(message, args)}\n{st}");
         }
 
         public static void Warning(string message, params object[] args)
@@ -126,7 +121,7 @@ namespace ET
             {
                 return;
             }
-            logger.Warning(string.Format(message, args));
+            ILog.Warning(string.Format(message, args));
         }
 
         public static void Info(string message, params object[] args)
@@ -135,7 +130,7 @@ namespace ET
             {
                 return;
             }
-            logger.Info(string.Format(message, args));
+            ILog.Info(string.Format(message, args));
         }
 
         public static void Debug(string message, params object[] args)
@@ -145,7 +140,7 @@ namespace ET
                 return;
             }
             DebugCallback?.Invoke(message, args);
-            logger.Debug(string.Format(message, args));
+            ILog.Debug(string.Format(message, args));
 
         }
 
@@ -154,7 +149,7 @@ namespace ET
             StackTrace st = new StackTrace(1, true);
             string s = string.Format(message, args) + '\n' + st;
             ErrorCallback?.Invoke(s);
-            logger.Error(s);
+            ILog.Error(s);
         }
     }
 }

Unity/Assets/Model/Generate/Config/StartProcessConfig.cs

@@ -75,7 +75,7 @@ namespace ET
 		[ProtoMember(2, IsRequired  = true)]
 		public int MachineId { get; set; }
 		[ProtoMember(3, IsRequired  = true)]
-		public string InnerPort { get; set; }
+		public int InnerPort { get; set; }
 
 
 		[ProtoAfterDeserialization]

Unity/Assets/Model/Module/Message/OpcodeHelper.cs

@@ -36,7 +36,7 @@ namespace ET
                 return;
             }
             
-            Log.Logger.Debug("zone: {0} {1}", zone, message);
+            Log.ILog.Debug("zone: {0} {1}", zone, message);
         }
         
         public static void LogMsg(ushort opcode, long actorId, object message)
@@ -46,7 +46,7 @@ namespace ET
                 return;
             }
             
-            Log.Logger.Debug("actorId: {0} {1}", actorId, message);
+            Log.ILog.Debug("actorId: {0} {1}", actorId, message);
         }
     }
 }