提交bug 艰难先这样

JNFrame2/Assets/JNGame/Network/Action/NActionEnum.cs

@@ -26,9 +26,12 @@
         
         NSyncStateDataUpdate = 121, //状态同步更新
         NSyncStateAllUpdate = 122,  //状态全量更新
-        NSyncStateAllBack = 123,    //状态同步全量回调
+        NSyncStateAllUpdateBack = 123,    //状态同步全量回调
         
-        NSyncTileInput = 131,       //状态Tile同步输入
+        NSyncTileInput = 131,               //区块Tile同步输入
+        NSyncTileAllUpdate = 132,           //区块全量更新
+        NSyncTileAllUpdateBack = 133,       //区块同步全量回调
+        NSyncTileGetTileInfo = 134,         //获取指定区块的全量信息
         
         NAddTileServer = 141,       //添加区块服务器
         

JNFrame2/Assets/JNGame/Network/JNClientBase.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Threading.Tasks;
 using AppGame;
+using Cysharp.Threading.Tasks;
 using DotRecast.Core.Collections;
 using Google.Protobuf;
 using Plugins.JNGame.Network.Entity;
@@ -26,6 +27,9 @@ namespace Plugins.JNGame.Network
         
         //计入字节大小
         protected Dictionary<int, int> _byteSize = new();
+        
+        //回调消息
+        protected Dictionary<int, UniTaskCompletionSource<byte[]>> _callback = new ();
 
         public void SetEvent(EventDispatcher dispatcher)
         {
@@ -46,8 +50,21 @@ namespace Plugins.JNGame.Network
         public virtual void Dispatch(JNetParam data)
         {
             _byteSize[data.HId] = data.Bytes.Length;
-            //发送消息
-            _event.Dispatch($"{data.HId}",data.Bytes);
+            
+            //判断是否是回调消息
+            if (data.HId <= 0)
+            {
+                //回调消息
+                _callback.TryGetValue(data.ID,out var task);
+                if (task is null) return;
+                task.TrySetResult(data.Bytes);
+            }
+            else
+            {
+                //通知消息
+                _event.Dispatch($"{data.HId}",data.Bytes);
+            }
+            
         }
 
         //向服务器发送消息
@@ -57,6 +74,17 @@ namespace Plugins.JNGame.Network
             _byteSize[hId] = bytes.Length;
             SendBytes(bytes);
         }
+        
+        //向服务器发送消息(有回调的消息)
+        public virtual async Task<byte[]> SendCallback(int hId,IMessage data = null,int timeout = 1000)
+        {
+            var id = this._id++;
+            _callback[id] = new UniTaskCompletionSource<byte[]>();
+            var bytes = NDataUtil.Encrypt(JNetParam.Build(id, hId).SetData(data));
+            SendBytes(bytes);
+            var message = await UniTask.WhenAny(_callback[id].Task, UniTask.Delay(timeout));
+            return message.result;
+        }
 
         public virtual void SendBytes(byte[] data){ }
         

JNFrame2/Assets/JNGame/Network/JNServerBase.cs

@@ -17,6 +17,8 @@ namespace Plugins.JNGame.Network
         
         public string Client;
 
+        public int MessageID;
+        
         public byte[] Message;
 
     }

JNFrame2/Assets/JNGame/Network/JNSocket.cs

@@ -9,6 +9,9 @@ using Google.Protobuf;
 using Plugins.JNGame.Network.Entity;
 using Plugins.JNGame.Network.Util;
 using Plugins.JNGame.Util;
+using TouchSocket.Core;
+using TouchSocket.Http.WebSockets;
+using TouchSocket.Sockets;
 using UnityEngine;
 
 namespace Plugins.JNGame.Network
@@ -16,10 +19,7 @@ namespace Plugins.JNGame.Network
     public abstract class JNSocket : JNClientBase
     {
         
-        private WebSocket _socket;
-
-        private UniTaskCompletionSource _onOpen;
-        
+        private WebSocketClient client;
 
         public override async Task OnInit()
         {
@@ -29,61 +29,40 @@ namespace Plugins.JNGame.Network
         public async Task StartConnect()
         {
             
+            client = new WebSocketClient();
             
+            await client.SetupAsync(new TouchSocketConfig()
+                .SetRemoteIPHost(await this.GetUrl())
+                .ConfigurePlugins(a =>
+                {
+                    a.UseReconnection(-1, true, 1000);   //如需永远尝试连接，tryCount设置为-1即可。
+                })
+                .ConfigureContainer(a =>
+                {
+                    a.AddConsoleLogger();
+                }));
+            client.Received += OnReceived;
             
-
-            var url = $"{await this.GetUrl()}";
-            this._socket = new WebSocket(new Uri(url));
-
-            this._socket.OnOpen += OnOpen;
-            this._socket.OnMessage += OnMessageReceived;
-            this._socket.OnError += OnError;
-            this._socket.OnClosed += OnClosed;
-            this._socket.OnBinary += Onbinary;
-            
-            Debug.Log($"[JNSocket]初始化WebSocket成功，URL：{url}");
-            this._socket.Open();
-            
-            //等待连接成功
-            await (this._onOpen = new UniTaskCompletionSource()).Task;
+            client.Connect();
+            Debug.Log($"[JNSocket]连接WebSocket成功");
             
         }
 
-
-        private void OnOpen(WebSocket websocket)
+        private Task OnReceived(WebSocketClient webSocketClient, WSDataFrameEventArgs e)
         {
-            Debug.Log($"[JNSocket] OnOpen");
-            this._onOpen.TrySetResult();
+            if (e.DataFrame.Opcode == WSDataType.Binary && e.DataFrame.FIN)
+            {
+                Dispatch(NDataUtil.Parse(e.DataFrame.PayloadData));
+            }
+            return Task.CompletedTask;
         }
 
-        private void OnMessageReceived(WebSocket websocket, string message)
-        {
-            Debug.Log($"[JNSocket] OnMessageReceived");
-        }
 
-        private void OnError(WebSocket websocket, string reason)
-        {
-            Debug.Log($"[JNSocket] OnError");
-        }
-
-        private void OnClosed(WebSocket websocket, ushort code, string message)
-        {
-            Debug.Log($"[JNSocket] OnClosed");
-        }
-
-        private void Onbinary(WebSocket websocket, byte[] data)
-        {
-            
-            // NSystem.Log($"[JNSocket] Onbinary");
-            Dispatch(NDataUtil.Parse(data));
-            
-        }
-        
         protected abstract UniTask<string> GetUrl();
         
         public override void SendBytes(byte[] data)
         {
-            _socket.Send(data);
+            client.SendAsync(data);
         }
         
     }

JNFrame2/Assets/JNGame/Network/JNTCPClient.cs

@@ -36,7 +36,7 @@ namespace JNGame.Network
             tcpClient.Disconnected = OnDisconnected;//从服务器断开连接，当连接不成功时不会触发。
             tcpClient.Received = OnReceived;
 
-            tcpClient.Connect(await GetEndPoint());
+            await tcpClient.ConnectAsync(await GetEndPoint());
         }
 
         /// <summary>
@@ -108,8 +108,10 @@ namespace JNGame.Network
 
         public override void OnClose()
         {
-            base.OnClose();
             tcpClient.Close();
+            tcpClient.Dispose();
+            Debug.Log($"[JNTCPClient] 关闭对象");
+            base.OnClose();
         }
 
         protected virtual async UniTask<string> GetEndPoint()

JNFrame2/Assets/JNGame/Network/JNTCPServer.cs

@@ -103,6 +103,7 @@ namespace JNGame.Network
             Dispatch(param.HId,new JNServerParam()
             {
                 Client = client.Id,
+                MessageID = param.ID,
                 Message = param.Bytes,
             });
             await UniTask.NextFrame();
@@ -123,10 +124,19 @@ namespace JNGame.Network
         
         
         public void Send(SocketClient client,int hId,IMessage data = null)
+        {
+            Send(client.Id,hId,data);
+        }
+        public void Send(string client,int hId,IMessage data = null)
         {
             var bytes = NDataUtil.Encrypt(JNetParam.Build(this._id++, hId).SetData(data));
             _byteSize[hId] = bytes.Length;
-            service.SendAsync(client.Id, bytes);
+            service.SendAsync(client, bytes);
+        }
+        public void SendCallback(string client,int id,IMessage data = null)
+        {
+            var bytes = NDataUtil.Encrypt(JNetParam.Build(id, 0).SetData(data));
+            service.SendAsync(client, bytes);
         }
         
         public void AllSend(int hId,IMessage data = null)

JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.cs

@@ -31,20 +31,17 @@ public static partial class JNSyncMessageReflection {
           "CzINLkpORnJhbWVJbnB1dCIsCgxKTkZyYW1lSW5mb3MSHAoGZnJhbWVzGAEg",
           "AygLMgwuSk5GcmFtZUluZm8iKwoHSk5JbnB1dBIUCgdtZXNzYWdlGAEgASgJ",
           "SACIAQFCCgoIX21lc3NhZ2UiKQoLSk5TdGF0ZURhdGESEQoEZGF0YRgCIAEo",
-          "DEgAiAEBQgcKBV9kYXRhIo8BCg5KTlN0YXRlQWxsRGF0YRINCgVOZXRJRBgB",
-          "IAEoBRIvCghtZXNzYWdlcxgCIAMoCzIdLkpOU3RhdGVBbGxEYXRhLk1lc3Nh",
-          "Z2VzRW50cnkaPQoNTWVzc2FnZXNFbnRyeRILCgNrZXkYASABKAMSGwoFdmFs",
-          "dWUYAiABKAsyDC5KTlN0YXRlRGF0YToCOAEikQEKD0pOU3RhdGVJdGVtRGF0",
-          "YRINCgVOZXRJRBgBIAEoBRIwCghtZXNzYWdlcxgCIAMoCzIeLkpOU3RhdGVJ",
-          "dGVtRGF0YS5NZXNzYWdlc0VudHJ5Gj0KDU1lc3NhZ2VzRW50cnkSCwoDa2V5",
-          "GAEgASgDEhsKBXZhbHVlGAIgASgLMgwuSk5TdGF0ZURhdGE6AjgBIkEKEUpO",
-          "U3RhdGVUaWxlSW5wdXRzEgsKA3RJZBgBIAEoBRIfCgdtZXNzYWdlGAIgASgL",
-          "Mg4uSk5GcmFtZUlucHV0cyJCChNKTlN0YXRlVGlsZUl0ZW1EYXRhEgsKA3RJ",
-          "ZBgBIAEoBRIeCgRkYXRhGAIgASgLMhAuSk5TdGF0ZUl0ZW1EYXRhIkAKEkpO",
-          "U3RhdGVUaWxlQWxsRGF0YRILCgN0SWQYASABKAUSHQoEZGF0YRgCIAEoCzIP",
-          "LkpOU3RhdGVBbGxEYXRhIjkKD0pOQWRkVGlsZVNlcnZlchIMCgR0aWxlGAEg",
-          "ASgFEgoKAmlwGAIgASgJEgwKBHBvcnQYAyABKAVCFgoUY24uamlzb2wubmdh",
-          "bWUucHJvdG9iBnByb3RvMw=="));
+          "DEgAiAEBQgcKBV9kYXRhIpEBCg9KTlN0YXRlSXRlbURhdGESDQoFTmV0SUQY",
+          "ASABKAUSMAoIbWVzc2FnZXMYAiADKAsyHi5KTlN0YXRlSXRlbURhdGEuTWVz",
+          "c2FnZXNFbnRyeRo9Cg1NZXNzYWdlc0VudHJ5EgsKA2tleRgBIAEoAxIbCgV2",
+          "YWx1ZRgCIAEoCzIMLkpOU3RhdGVEYXRhOgI4ASIwCg5KTlN0YXRlQWxsRGF0",
+          "YRIeCgRkYXRhGAIgAygLMhAuSk5TdGF0ZUl0ZW1EYXRhIkEKEUpOU3RhdGVU",
+          "aWxlSW5wdXRzEgsKA3RJZBgBIAEoBRIfCgdtZXNzYWdlGAIgASgLMg4uSk5G",
+          "cmFtZUlucHV0cyJAChJKTlN0YXRlVGlsZUFsbERhdGESCwoDdElkGAEgASgF",
+          "Eh0KBGRhdGEYAiABKAsyDy5KTlN0YXRlQWxsRGF0YSIqChtOU3luY1RpbGVH",
+          "ZXRUaWxlSW5mb1JlcXVlc3QSCwoDdElkGAEgASgFIjkKD0pOQWRkVGlsZVNl",
+          "cnZlchIMCgR0aWxlGAEgASgFEgoKAmlwGAIgASgJEgwKBHBvcnQYAyABKAVC",
+          "FgoUY24uamlzb2wubmdhbWUucHJvdG9iBnByb3RvMw=="));
     descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
         new pbr::FileDescriptor[] { },
         new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
@@ -56,11 +53,11 @@ public static partial class JNSyncMessageReflection {
           new pbr::GeneratedClrTypeInfo(typeof(global::JNFrameInfos), global::JNFrameInfos.Parser, new[]{ "Frames" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::JNInput), global::JNInput.Parser, new[]{ "Message" }, new[]{ "Message" }, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::JNStateData), global::JNStateData.Parser, new[]{ "Data" }, new[]{ "Data" }, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::JNStateAllData), global::JNStateAllData.Parser, new[]{ "NetID", "Messages" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, }),
           new pbr::GeneratedClrTypeInfo(typeof(global::JNStateItemData), global::JNStateItemData.Parser, new[]{ "NetID", "Messages" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, }),
+          new pbr::GeneratedClrTypeInfo(typeof(global::JNStateAllData), global::JNStateAllData.Parser, new[]{ "Data" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::JNStateTileInputs), global::JNStateTileInputs.Parser, new[]{ "TId", "Message" }, null, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::JNStateTileItemData), global::JNStateTileItemData.Parser, new[]{ "TId", "Data" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::JNStateTileAllData), global::JNStateTileAllData.Parser, new[]{ "TId", "Data" }, null, null, null, null),
+          new pbr::GeneratedClrTypeInfo(typeof(global::NSyncTileGetTileInfoRequest), global::NSyncTileGetTileInfoRequest.Parser, new[]{ "TId" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::JNAddTileServer), global::JNAddTileServer.Parser, new[]{ "Tile", "Ip", "Port" }, null, null, null, null)
         }));
   }
@@ -1751,230 +1748,6 @@ public sealed partial class JNStateData : pb::IMessage<JNStateData>
 
 }
 
-/// <summary>
-/// 全量状态
-/// </summary>
-public sealed partial class JNStateAllData : pb::IMessage<JNStateAllData>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    , pb::IBufferMessage
-#endif
-{
-  private static readonly pb::MessageParser<JNStateAllData> _parser = new pb::MessageParser<JNStateAllData>(() => new JNStateAllData());
-  private pb::UnknownFieldSet _unknownFields;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public static pb::MessageParser<JNStateAllData> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[8]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public JNStateAllData() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public JNStateAllData(JNStateAllData other) : this() {
-    netID_ = other.netID_;
-    messages_ = other.messages_.Clone();
-    _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public JNStateAllData Clone() {
-    return new JNStateAllData(this);
-  }
-
-  /// <summary>Field number for the "NetID" field.</summary>
-  public const int NetIDFieldNumber = 1;
-  private int netID_;
-  /// <summary>
-  ///同步Id
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public int NetID {
-    get { return netID_; }
-    set {
-      netID_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "messages" field.</summary>
-  public const int MessagesFieldNumber = 2;
-  private static readonly pbc::MapField<long, global::JNStateData>.Codec _map_messages_codec
-      = new pbc::MapField<long, global::JNStateData>.Codec(pb::FieldCodec.ForInt64(8, 0L), pb::FieldCodec.ForMessage(18, global::JNStateData.Parser), 18);
-  private readonly pbc::MapField<long, global::JNStateData> messages_ = new pbc::MapField<long, global::JNStateData>();
-  /// <summary>
-  ///状态bytes
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public pbc::MapField<long, global::JNStateData> Messages {
-    get { return messages_; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public override bool Equals(object other) {
-    return Equals(other as JNStateAllData);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public bool Equals(JNStateAllData other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (NetID != other.NetID) return false;
-    if (!Messages.Equals(other.Messages)) return false;
-    return Equals(_unknownFields, other._unknownFields);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (NetID != 0) hash ^= NetID.GetHashCode();
-    hash ^= Messages.GetHashCode();
-    if (_unknownFields != null) {
-      hash ^= _unknownFields.GetHashCode();
-    }
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public void WriteTo(pb::CodedOutputStream output) {
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    output.WriteRawMessage(this);
-  #else
-    if (NetID != 0) {
-      output.WriteRawTag(8);
-      output.WriteInt32(NetID);
-    }
-    messages_.WriteTo(output, _map_messages_codec);
-    if (_unknownFields != null) {
-      _unknownFields.WriteTo(output);
-    }
-  #endif
-  }
-
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-    if (NetID != 0) {
-      output.WriteRawTag(8);
-      output.WriteInt32(NetID);
-    }
-    messages_.WriteTo(ref output, _map_messages_codec);
-    if (_unknownFields != null) {
-      _unknownFields.WriteTo(ref output);
-    }
-  }
-  #endif
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public int CalculateSize() {
-    int size = 0;
-    if (NetID != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeInt32Size(NetID);
-    }
-    size += messages_.CalculateSize(_map_messages_codec);
-    if (_unknownFields != null) {
-      size += _unknownFields.CalculateSize();
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public void MergeFrom(JNStateAllData other) {
-    if (other == null) {
-      return;
-    }
-    if (other.NetID != 0) {
-      NetID = other.NetID;
-    }
-    messages_.Add(other.messages_);
-    _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public void MergeFrom(pb::CodedInputStream input) {
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    input.ReadRawMessage(this);
-  #else
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-          break;
-        case 8: {
-          NetID = input.ReadInt32();
-          break;
-        }
-        case 18: {
-          messages_.AddEntriesFrom(input, _map_messages_codec);
-          break;
-        }
-      }
-    }
-  #endif
-  }
-
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-          break;
-        case 8: {
-          NetID = input.ReadInt32();
-          break;
-        }
-        case 18: {
-          messages_.AddEntriesFrom(ref input, _map_messages_codec);
-          break;
-        }
-      }
-    }
-  }
-  #endif
-
-}
-
 /// <summary>
 /// 更新状态
 /// </summary>
@@ -1992,7 +1765,7 @@ public sealed partial class JNStateItemData : pb::IMessage<JNStateItemData>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public static pbr::MessageDescriptor Descriptor {
-    get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[9]; }
+    get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[8]; }
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -2199,6 +1972,190 @@ public sealed partial class JNStateItemData : pb::IMessage<JNStateItemData>
 
 }
 
+/// <summary>
+/// 全量状态
+/// </summary>
+public sealed partial class JNStateAllData : pb::IMessage<JNStateAllData>
+#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    , pb::IBufferMessage
+#endif
+{
+  private static readonly pb::MessageParser<JNStateAllData> _parser = new pb::MessageParser<JNStateAllData>(() => new JNStateAllData());
+  private pb::UnknownFieldSet _unknownFields;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pb::MessageParser<JNStateAllData> Parser { get { return _parser; } }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pbr::MessageDescriptor Descriptor {
+    get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[9]; }
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  pbr::MessageDescriptor pb::IMessage.Descriptor {
+    get { return Descriptor; }
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public JNStateAllData() {
+    OnConstruction();
+  }
+
+  partial void OnConstruction();
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public JNStateAllData(JNStateAllData other) : this() {
+    data_ = other.data_.Clone();
+    _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public JNStateAllData Clone() {
+    return new JNStateAllData(this);
+  }
+
+  /// <summary>Field number for the "data" field.</summary>
+  public const int DataFieldNumber = 2;
+  private static readonly pb::FieldCodec<global::JNStateItemData> _repeated_data_codec
+      = pb::FieldCodec.ForMessage(18, global::JNStateItemData.Parser);
+  private readonly pbc::RepeatedField<global::JNStateItemData> data_ = new pbc::RepeatedField<global::JNStateItemData>();
+  /// <summary>
+  ///数据
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public pbc::RepeatedField<global::JNStateItemData> Data {
+    get { return data_; }
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public override bool Equals(object other) {
+    return Equals(other as JNStateAllData);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public bool Equals(JNStateAllData other) {
+    if (ReferenceEquals(other, null)) {
+      return false;
+    }
+    if (ReferenceEquals(other, this)) {
+      return true;
+    }
+    if(!data_.Equals(other.data_)) return false;
+    return Equals(_unknownFields, other._unknownFields);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public override int GetHashCode() {
+    int hash = 1;
+    hash ^= data_.GetHashCode();
+    if (_unknownFields != null) {
+      hash ^= _unknownFields.GetHashCode();
+    }
+    return hash;
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public override string ToString() {
+    return pb::JsonFormatter.ToDiagnosticString(this);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public void WriteTo(pb::CodedOutputStream output) {
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    output.WriteRawMessage(this);
+  #else
+    data_.WriteTo(output, _repeated_data_codec);
+    if (_unknownFields != null) {
+      _unknownFields.WriteTo(output);
+    }
+  #endif
+  }
+
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+    data_.WriteTo(ref output, _repeated_data_codec);
+    if (_unknownFields != null) {
+      _unknownFields.WriteTo(ref output);
+    }
+  }
+  #endif
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public int CalculateSize() {
+    int size = 0;
+    size += data_.CalculateSize(_repeated_data_codec);
+    if (_unknownFields != null) {
+      size += _unknownFields.CalculateSize();
+    }
+    return size;
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public void MergeFrom(JNStateAllData other) {
+    if (other == null) {
+      return;
+    }
+    data_.Add(other.data_);
+    _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public void MergeFrom(pb::CodedInputStream input) {
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    input.ReadRawMessage(this);
+  #else
+    uint tag;
+    while ((tag = input.ReadTag()) != 0) {
+      switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+          break;
+        case 18: {
+          data_.AddEntriesFrom(input, _repeated_data_codec);
+          break;
+        }
+      }
+    }
+  #endif
+  }
+
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
+    uint tag;
+    while ((tag = input.ReadTag()) != 0) {
+      switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+          break;
+        case 18: {
+          data_.AddEntriesFrom(ref input, _repeated_data_codec);
+          break;
+        }
+      }
+    }
+  }
+  #endif
+
+}
+
 /// <summary>
 /// --------------------- 状态Tile同步 -----------------------
 /// 状态Tile输入
@@ -2444,247 +2401,6 @@ public sealed partial class JNStateTileInputs : pb::IMessage<JNStateTileInputs>
 
 }
 
-/// <summary>
-/// Tile更新状态
-/// </summary>
-public sealed partial class JNStateTileItemData : pb::IMessage<JNStateTileItemData>
-#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    , pb::IBufferMessage
-#endif
-{
-  private static readonly pb::MessageParser<JNStateTileItemData> _parser = new pb::MessageParser<JNStateTileItemData>(() => new JNStateTileItemData());
-  private pb::UnknownFieldSet _unknownFields;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public static pb::MessageParser<JNStateTileItemData> Parser { get { return _parser; } }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public static pbr::MessageDescriptor Descriptor {
-    get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[11]; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  pbr::MessageDescriptor pb::IMessage.Descriptor {
-    get { return Descriptor; }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public JNStateTileItemData() {
-    OnConstruction();
-  }
-
-  partial void OnConstruction();
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public JNStateTileItemData(JNStateTileItemData other) : this() {
-    tId_ = other.tId_;
-    data_ = other.data_ != null ? other.data_.Clone() : null;
-    _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public JNStateTileItemData Clone() {
-    return new JNStateTileItemData(this);
-  }
-
-  /// <summary>Field number for the "tId" field.</summary>
-  public const int TIdFieldNumber = 1;
-  private int tId_;
-  /// <summary>
-  ///区块Id
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public int TId {
-    get { return tId_; }
-    set {
-      tId_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "data" field.</summary>
-  public const int DataFieldNumber = 2;
-  private global::JNStateItemData data_;
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public global::JNStateItemData Data {
-    get { return data_; }
-    set {
-      data_ = value;
-    }
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public override bool Equals(object other) {
-    return Equals(other as JNStateTileItemData);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public bool Equals(JNStateTileItemData other) {
-    if (ReferenceEquals(other, null)) {
-      return false;
-    }
-    if (ReferenceEquals(other, this)) {
-      return true;
-    }
-    if (TId != other.TId) return false;
-    if (!object.Equals(Data, other.Data)) return false;
-    return Equals(_unknownFields, other._unknownFields);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public override int GetHashCode() {
-    int hash = 1;
-    if (TId != 0) hash ^= TId.GetHashCode();
-    if (data_ != null) hash ^= Data.GetHashCode();
-    if (_unknownFields != null) {
-      hash ^= _unknownFields.GetHashCode();
-    }
-    return hash;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public override string ToString() {
-    return pb::JsonFormatter.ToDiagnosticString(this);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public void WriteTo(pb::CodedOutputStream output) {
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    output.WriteRawMessage(this);
-  #else
-    if (TId != 0) {
-      output.WriteRawTag(8);
-      output.WriteInt32(TId);
-    }
-    if (data_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Data);
-    }
-    if (_unknownFields != null) {
-      _unknownFields.WriteTo(output);
-    }
-  #endif
-  }
-
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-    if (TId != 0) {
-      output.WriteRawTag(8);
-      output.WriteInt32(TId);
-    }
-    if (data_ != null) {
-      output.WriteRawTag(18);
-      output.WriteMessage(Data);
-    }
-    if (_unknownFields != null) {
-      _unknownFields.WriteTo(ref output);
-    }
-  }
-  #endif
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public int CalculateSize() {
-    int size = 0;
-    if (TId != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeInt32Size(TId);
-    }
-    if (data_ != null) {
-      size += 1 + pb::CodedOutputStream.ComputeMessageSize(Data);
-    }
-    if (_unknownFields != null) {
-      size += _unknownFields.CalculateSize();
-    }
-    return size;
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public void MergeFrom(JNStateTileItemData other) {
-    if (other == null) {
-      return;
-    }
-    if (other.TId != 0) {
-      TId = other.TId;
-    }
-    if (other.data_ != null) {
-      if (data_ == null) {
-        Data = new global::JNStateItemData();
-      }
-      Data.MergeFrom(other.Data);
-    }
-    _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-  }
-
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public void MergeFrom(pb::CodedInputStream input) {
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    input.ReadRawMessage(this);
-  #else
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-          break;
-        case 8: {
-          TId = input.ReadInt32();
-          break;
-        }
-        case 18: {
-          if (data_ == null) {
-            Data = new global::JNStateItemData();
-          }
-          input.ReadMessage(Data);
-          break;
-        }
-      }
-    }
-  #endif
-  }
-
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-    uint tag;
-    while ((tag = input.ReadTag()) != 0) {
-      switch(tag) {
-        default:
-          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-          break;
-        case 8: {
-          TId = input.ReadInt32();
-          break;
-        }
-        case 18: {
-          if (data_ == null) {
-            Data = new global::JNStateItemData();
-          }
-          input.ReadMessage(Data);
-          break;
-        }
-      }
-    }
-  }
-  #endif
-
-}
-
 /// <summary>
 /// Tile更新全量状态
 /// </summary>
@@ -2702,7 +2418,7 @@ public sealed partial class JNStateTileAllData : pb::IMessage<JNStateTileAllData
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public static pbr::MessageDescriptor Descriptor {
-    get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[12]; }
+    get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[11]; }
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -2926,6 +2642,201 @@ public sealed partial class JNStateTileAllData : pb::IMessage<JNStateTileAllData
 
 }
 
+/// <summary>
+/// 获取指定区块的全量数据
+/// </summary>
+public sealed partial class NSyncTileGetTileInfoRequest : pb::IMessage<NSyncTileGetTileInfoRequest>
+#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    , pb::IBufferMessage
+#endif
+{
+  private static readonly pb::MessageParser<NSyncTileGetTileInfoRequest> _parser = new pb::MessageParser<NSyncTileGetTileInfoRequest>(() => new NSyncTileGetTileInfoRequest());
+  private pb::UnknownFieldSet _unknownFields;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pb::MessageParser<NSyncTileGetTileInfoRequest> Parser { get { return _parser; } }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pbr::MessageDescriptor Descriptor {
+    get { return global::JNSyncMessageReflection.Descriptor.MessageTypes[12]; }
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  pbr::MessageDescriptor pb::IMessage.Descriptor {
+    get { return Descriptor; }
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public NSyncTileGetTileInfoRequest() {
+    OnConstruction();
+  }
+
+  partial void OnConstruction();
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public NSyncTileGetTileInfoRequest(NSyncTileGetTileInfoRequest other) : this() {
+    tId_ = other.tId_;
+    _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public NSyncTileGetTileInfoRequest Clone() {
+    return new NSyncTileGetTileInfoRequest(this);
+  }
+
+  /// <summary>Field number for the "tId" field.</summary>
+  public const int TIdFieldNumber = 1;
+  private int tId_;
+  /// <summary>
+  ///区块Id
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public int TId {
+    get { return tId_; }
+    set {
+      tId_ = value;
+    }
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public override bool Equals(object other) {
+    return Equals(other as NSyncTileGetTileInfoRequest);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public bool Equals(NSyncTileGetTileInfoRequest other) {
+    if (ReferenceEquals(other, null)) {
+      return false;
+    }
+    if (ReferenceEquals(other, this)) {
+      return true;
+    }
+    if (TId != other.TId) return false;
+    return Equals(_unknownFields, other._unknownFields);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public override int GetHashCode() {
+    int hash = 1;
+    if (TId != 0) hash ^= TId.GetHashCode();
+    if (_unknownFields != null) {
+      hash ^= _unknownFields.GetHashCode();
+    }
+    return hash;
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public override string ToString() {
+    return pb::JsonFormatter.ToDiagnosticString(this);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public void WriteTo(pb::CodedOutputStream output) {
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    output.WriteRawMessage(this);
+  #else
+    if (TId != 0) {
+      output.WriteRawTag(8);
+      output.WriteInt32(TId);
+    }
+    if (_unknownFields != null) {
+      _unknownFields.WriteTo(output);
+    }
+  #endif
+  }
+
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
+    if (TId != 0) {
+      output.WriteRawTag(8);
+      output.WriteInt32(TId);
+    }
+    if (_unknownFields != null) {
+      _unknownFields.WriteTo(ref output);
+    }
+  }
+  #endif
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public int CalculateSize() {
+    int size = 0;
+    if (TId != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeInt32Size(TId);
+    }
+    if (_unknownFields != null) {
+      size += _unknownFields.CalculateSize();
+    }
+    return size;
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public void MergeFrom(NSyncTileGetTileInfoRequest other) {
+    if (other == null) {
+      return;
+    }
+    if (other.TId != 0) {
+      TId = other.TId;
+    }
+    _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public void MergeFrom(pb::CodedInputStream input) {
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    input.ReadRawMessage(this);
+  #else
+    uint tag;
+    while ((tag = input.ReadTag()) != 0) {
+      switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+          break;
+        case 8: {
+          TId = input.ReadInt32();
+          break;
+        }
+      }
+    }
+  #endif
+  }
+
+  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
+    uint tag;
+    while ((tag = input.ReadTag()) != 0) {
+      switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+          break;
+        case 8: {
+          TId = input.ReadInt32();
+          break;
+        }
+      }
+    }
+  }
+  #endif
+
+}
+
 /// <summary>
 ///Tile服务器区块信息
 /// </summary>

JNFrame2/Assets/JNGame/Network/Proto/JNSyncMessage.proto

@@ -46,18 +46,17 @@ message JNStateData{
   optional bytes data = 2; //数据
 }
 
-// 全量状态
-message JNStateAllData{
-  int32 NetID = 1; //同步Id
-  map<int64 ,JNStateData> messages = 2; //状态bytes
-}
-
 // 更新状态
 message JNStateItemData{
   int32 NetID = 1; //同步Id
   map<int64 ,JNStateData> messages = 2; //状态bytes
 }
 
+// 全量状态
+message JNStateAllData{
+  repeated JNStateItemData data = 2; //数据
+}
+
 // --------------------- 状态Tile同步 -----------------------
 // 状态Tile输入
 message JNStateTileInputs{
@@ -65,18 +64,17 @@ message JNStateTileInputs{
   JNFrameInputs message = 2; //inputs
 }
 
-// Tile更新状态
-message JNStateTileItemData{
-  int32 tId = 1; //区块Id
-  JNStateItemData data = 2;
-}
-
 // Tile更新全量状态
 message JNStateTileAllData{
   int32 tId = 1; //区块Id
   JNStateAllData data = 2;
 }
 
+// 获取指定区块的全量数据
+message NSyncTileGetTileInfoRequest{
+  int32 tId = 1; //区块Id
+}
+
 //Tile服务器区块信息
 message JNAddTileServer{
   int32 tile = 1;   //TileId