diff --git a/xiaofang/Assets/ProtoBuf/Proto/Hall.cs b/xiaofang/Assets/ProtoBuf/Proto/Hall.cs
index c8e4d0ab..c11dd1ec 100644
--- a/xiaofang/Assets/ProtoBuf/Proto/Hall.cs
+++ b/xiaofang/Assets/ProtoBuf/Proto/Hall.cs
@@ -30,7 +30,7 @@ public static partial class HallReflection {
           "IiEKD0pvaW5Sb29tUmVxdWVzdBIOCgZyb29tSWQYASABKAkiNQoSUGxheWVy",
           "UmVhZHlSZXF1ZXN0Eg4KBnJvb21JZBgBIAEoCRIPCgdpc1JlYWR5GAIgASgI",
           "IlQKEEpvaW5Sb29tUmVzcG9uc2USDwoHbWVzc2FnZRgBIAEoCRIMCgRjb2Rl",
-          "GAIgASgFEiEKBGRhdGEYAyABKAsyEy5QbGF5ZXJKb2luUmVzcG9uc2UiyAMK",
+          "GAIgASgFEiEKBGRhdGEYAyABKAsyEy5QbGF5ZXJKb2luUmVzcG9uc2Ui7QMK",
           "ElBsYXllckpvaW5SZXNwb25zZRIQCghVc2VyTmFtZRgBIAEoCRIOCgZSb29t",
           "SWQYAiABKAkSDgoGU3RhdHVzGAMgASgFEhAKCFJvbGVOYW1lGAQgASgJEhQK",
           "DElzTGVhZGluZ05QQxgFIAEoBRIOCgZPbmxpbmUYBiABKAgSDgoGUm9sZUlk",
@@ -41,25 +41,29 @@ public static partial class HallReflection {
           "b25kGBEgASgFEhYKDk1vdmVTcGVlZFRoaXJkGBIgASgFEhAKCEJlYXJMb2Fk",
           "GBMgASgFEhIKClByb3RlY3Rpb24YFCABKAUSDgoGSGVhbHRoGBUgASgFEhIK",
           "ClJvbGVTdGF0dXMYFiABKAUSDgoGVXNlcklkGBcgASgDEg8KB2lzUmVhZHkY",
-          "GCABKAgiPQoYUGxheWVyU3RhdGlzdGljc1Jlc3BvbnNlEiEKBGRhdGEYASAD",
-          "KAsyEy5QbGF5ZXJKb2luUmVzcG9uc2UiKQoTUHJvcFRlbXBsYXRlUmVxdWVz",
-          "dBISCgp0ZW1wbGF0ZUlkGAEgASgDIksKFFByb3BUZW1wbGF0ZVJlc3BvbnNl",
-          "EhIKClRlbXBsYXRlSWQYASABKAMSCwoDTnVtGAIgASgDEhIKCk1hdGVyaWFs",
-          "SWQYAyABKAMiOwoPUHBjUHJvcFJlc3BvbnNlEigKCXJlc3BvbnNlcxgBIAMo",
-          "CzIVLlByb3BUZW1wbGF0ZVJlc3BvbnNlIloKE1JwY1Jvb21JbmZvUmVzcG9u",
-          "c2USCgoCSWQYASABKAMSEgoKVGVtcGxhdGVJZBgCIAEoAxIOCgZTdGF0dXMY",
-          "AyABKAMSEwoLUmVzZXJ2ZURhdGUYBCABKAkiOQoTVXNlclRlbXBsYXRlUmVx",
-          "dWVzdBISCgp0ZW1wbGF0ZUlkGAEgASgDEg4KBlJvb21JZBgCIAEoCSI4CgxV",
-          "c2VyVGVtcGxhdGUSKAoJcmVzcG9uc2VzGAEgAygLMhUuVXNlclRlbXBsYXRl",
-          "UmVzcG9uc2Ui/wEKFFVzZXJUZW1wbGF0ZVJlc3BvbnNlEg4KBlJvb21JZBgB",
-          "IAEoAxIOCgZVc2VySWQYAiABKAMSDgoGU3RhdHVzGAMgASgFEhIKClRlbXBs",
-          "YXRlSWQYBCABKAMSDgoGUm9sZUlkGAUgASgDEhMKC0JpcnRoQXJlYUlkGAYg",
-          "ASgDEhQKDENoYXJnZUFyZWFJZBgHIAEoAxIJCgFYGAggASgCEgkKAVkYCSAB",
-          "KAISCQoBWhgKIAEoAhIWCg5Nb3ZlU3BlZWRGaXJzdBgLIAEoAxIXCg9Nb3Zl",
-          "U3BlZWRTZWNvbmQYDCABKAMSFgoOTW92ZVNwZWVkVGhpcmQYDSABKAMiYgoP",
-          "VXNlckluZm9SZXF1ZXN0Eg4KBlVzZXJJZBgBIAEoAxIOCgZTdGF0dXMYAiAB",
-          "KAUSDgoGUm9vbUlkGAMgASgJEgkKAXgYBCABKAISCQoBeRgFIAEoAhIJCgF6",
-          "GAYgASgCIhIKEFVzZXJJbmZvUmVzcG9uc2VCB1oFLi87cGJiBnByb3RvMw=="));
+          "GCABKAgSIwoIZmlyZUluZm8YGSADKAsyES5GaXJlSW5mb1Jlc3BvbnNlImUK",
+          "EEZpcmVJbmZvUmVzcG9uc2USCQoBeBgBIAEoAhIJCgF5GAIgASgCEgkKAXoY",
+          "AyABKAISEQoJaGFsZldpZHRoGAQgASgCEhEKCWZpcmVQb3dlchgFIAEoCRIK",
+          "CgJJZBgGIAEoCSI9ChhQbGF5ZXJTdGF0aXN0aWNzUmVzcG9uc2USIQoEZGF0",
+          "YRgBIAMoCzITLlBsYXllckpvaW5SZXNwb25zZSIpChNQcm9wVGVtcGxhdGVS",
+          "ZXF1ZXN0EhIKCnRlbXBsYXRlSWQYASABKAMiSwoUUHJvcFRlbXBsYXRlUmVz",
+          "cG9uc2USEgoKVGVtcGxhdGVJZBgBIAEoAxILCgNOdW0YAiABKAMSEgoKTWF0",
+          "ZXJpYWxJZBgDIAEoAyI7Cg9QcGNQcm9wUmVzcG9uc2USKAoJcmVzcG9uc2Vz",
+          "GAEgAygLMhUuUHJvcFRlbXBsYXRlUmVzcG9uc2UiWgoTUnBjUm9vbUluZm9S",
+          "ZXNwb25zZRIKCgJJZBgBIAEoAxISCgpUZW1wbGF0ZUlkGAIgASgDEg4KBlN0",
+          "YXR1cxgDIAEoAxITCgtSZXNlcnZlRGF0ZRgEIAEoCSI5ChNVc2VyVGVtcGxh",
+          "dGVSZXF1ZXN0EhIKCnRlbXBsYXRlSWQYASABKAMSDgoGUm9vbUlkGAIgASgJ",
+          "IjgKDFVzZXJUZW1wbGF0ZRIoCglyZXNwb25zZXMYASADKAsyFS5Vc2VyVGVt",
+          "cGxhdGVSZXNwb25zZSL/AQoUVXNlclRlbXBsYXRlUmVzcG9uc2USDgoGUm9v",
+          "bUlkGAEgASgDEg4KBlVzZXJJZBgCIAEoAxIOCgZTdGF0dXMYAyABKAUSEgoK",
+          "VGVtcGxhdGVJZBgEIAEoAxIOCgZSb2xlSWQYBSABKAMSEwoLQmlydGhBcmVh",
+          "SWQYBiABKAMSFAoMQ2hhcmdlQXJlYUlkGAcgASgDEgkKAVgYCCABKAISCQoB",
+          "WRgJIAEoAhIJCgFaGAogASgCEhYKDk1vdmVTcGVlZEZpcnN0GAsgASgDEhcK",
+          "D01vdmVTcGVlZFNlY29uZBgMIAEoAxIWCg5Nb3ZlU3BlZWRUaGlyZBgNIAEo",
+          "AyJiCg9Vc2VySW5mb1JlcXVlc3QSDgoGVXNlcklkGAEgASgDEg4KBlN0YXR1",
+          "cxgCIAEoBRIOCgZSb29tSWQYAyABKAkSCQoBeBgEIAEoAhIJCgF5GAUgASgC",
+          "EgkKAXoYBiABKAIiEgoQVXNlckluZm9SZXNwb25zZUIHWgUuLztwYmIGcHJv",
+          "dG8z"));
     descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
         new pbr::FileDescriptor[] { },
         new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
@@ -70,7 +74,8 @@ public static partial class HallReflection {
           new pbr::GeneratedClrTypeInfo(typeof(global::JoinRoomRequest), global::JoinRoomRequest.Parser, new[]{ "RoomId" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::PlayerReadyRequest), global::PlayerReadyRequest.Parser, new[]{ "RoomId", "IsReady" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::JoinRoomResponse), global::JoinRoomResponse.Parser, new[]{ "Message", "Code", "Data" }, null, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::PlayerJoinResponse), global::PlayerJoinResponse.Parser, new[]{ "UserName", "RoomId", "Status", "RoleName", "IsLeadingNPC", "Online", "RoleId", "GroupLeader", "ActionMode", "Group", "X", "Y", "Z", "OverseeCond", "SendFrameCount", "MoveSpeedFirst", "MoveSpeedSecond", "MoveSpeedThird", "BearLoad", "Protection", "Health", "RoleStatus", "UserId", "IsReady" }, null, null, null, null),
+          new pbr::GeneratedClrTypeInfo(typeof(global::PlayerJoinResponse), global::PlayerJoinResponse.Parser, new[]{ "UserName", "RoomId", "Status", "RoleName", "IsLeadingNPC", "Online", "RoleId", "GroupLeader", "ActionMode", "Group", "X", "Y", "Z", "OverseeCond", "SendFrameCount", "MoveSpeedFirst", "MoveSpeedSecond", "MoveSpeedThird", "BearLoad", "Protection", "Health", "RoleStatus", "UserId", "IsReady", "FireInfo" }, null, null, null, null),
+          new pbr::GeneratedClrTypeInfo(typeof(global::FireInfoResponse), global::FireInfoResponse.Parser, new[]{ "X", "Y", "Z", "HalfWidth", "FirePower", "Id" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::PlayerStatisticsResponse), global::PlayerStatisticsResponse.Parser, new[]{ "Data" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::PropTemplateRequest), global::PropTemplateRequest.Parser, new[]{ "TemplateId" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::PropTemplateResponse), global::PropTemplateResponse.Parser, new[]{ "TemplateId", "Num", "MaterialId" }, null, null, null, null),
@@ -1821,6 +1826,7 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
     roleStatus_ = other.roleStatus_;
     userId_ = other.userId_;
     isReady_ = other.isReady_;
+    fireInfo_ = other.fireInfo_.Clone();
     _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
   }
 
@@ -2190,6 +2196,20 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
     }
   }
 
+  /// <summary>Field number for the "fireInfo" field.</summary>
+  public const int FireInfoFieldNumber = 25;
+  private static readonly pb::FieldCodec<global::FireInfoResponse> _repeated_fireInfo_codec
+      = pb::FieldCodec.ForMessage(202, global::FireInfoResponse.Parser);
+  private readonly pbc::RepeatedField<global::FireInfoResponse> fireInfo_ = new pbc::RepeatedField<global::FireInfoResponse>();
+  /// <summary>
+  /// 火焰信息
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public pbc::RepeatedField<global::FireInfoResponse> FireInfo {
+    get { return fireInfo_; }
+  }
+
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public override bool Equals(object other) {
@@ -2229,6 +2249,7 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
     if (RoleStatus != other.RoleStatus) return false;
     if (UserId != other.UserId) return false;
     if (IsReady != other.IsReady) return false;
+    if(!fireInfo_.Equals(other.fireInfo_)) return false;
     return Equals(_unknownFields, other._unknownFields);
   }
 
@@ -2260,6 +2281,7 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
     if (RoleStatus != 0) hash ^= RoleStatus.GetHashCode();
     if (UserId != 0L) hash ^= UserId.GetHashCode();
     if (IsReady != false) hash ^= IsReady.GetHashCode();
+    hash ^= fireInfo_.GetHashCode();
     if (_unknownFields != null) {
       hash ^= _unknownFields.GetHashCode();
     }
@@ -2374,6 +2396,7 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
       output.WriteRawTag(192, 1);
       output.WriteBool(IsReady);
     }
+    fireInfo_.WriteTo(output, _repeated_fireInfo_codec);
     if (_unknownFields != null) {
       _unknownFields.WriteTo(output);
     }
@@ -2480,6 +2503,7 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
       output.WriteRawTag(192, 1);
       output.WriteBool(IsReady);
     }
+    fireInfo_.WriteTo(ref output, _repeated_fireInfo_codec);
     if (_unknownFields != null) {
       _unknownFields.WriteTo(ref output);
     }
@@ -2562,6 +2586,7 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
     if (IsReady != false) {
       size += 2 + 1;
     }
+    size += fireInfo_.CalculateSize(_repeated_fireInfo_codec);
     if (_unknownFields != null) {
       size += _unknownFields.CalculateSize();
     }
@@ -2646,6 +2671,7 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
     if (other.IsReady != false) {
       IsReady = other.IsReady;
     }
+    fireInfo_.Add(other.fireInfo_);
     _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
   }
 
@@ -2761,6 +2787,10 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
           IsReady = input.ReadBool();
           break;
         }
+        case 202: {
+          fireInfo_.AddEntriesFrom(input, _repeated_fireInfo_codec);
+          break;
+        }
       }
     }
   #endif
@@ -2876,6 +2906,405 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
           IsReady = input.ReadBool();
           break;
         }
+        case 202: {
+          fireInfo_.AddEntriesFrom(ref input, _repeated_fireInfo_codec);
+          break;
+        }
+      }
+    }
+  }
+  #endif
+
+}
+
+/// <summary>
+///火势信息
+/// </summary>
+[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
+public sealed partial class FireInfoResponse : pb::IMessage<FireInfoResponse>
+#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    , pb::IBufferMessage
+#endif
+{
+  private static readonly pb::MessageParser<FireInfoResponse> _parser = new pb::MessageParser<FireInfoResponse>(() => new FireInfoResponse());
+  private pb::UnknownFieldSet _unknownFields;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pb::MessageParser<FireInfoResponse> Parser { get { return _parser; } }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pbr::MessageDescriptor Descriptor {
+    get { return global::HallReflection.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 FireInfoResponse() {
+    OnConstruction();
+  }
+
+  partial void OnConstruction();
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public FireInfoResponse(FireInfoResponse other) : this() {
+    x_ = other.x_;
+    y_ = other.y_;
+    z_ = other.z_;
+    halfWidth_ = other.halfWidth_;
+    firePower_ = other.firePower_;
+    id_ = other.id_;
+    _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public FireInfoResponse Clone() {
+    return new FireInfoResponse(this);
+  }
+
+  /// <summary>Field number for the "x" field.</summary>
+  public const int XFieldNumber = 1;
+  private float x_;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public float X {
+    get { return x_; }
+    set {
+      x_ = value;
+    }
+  }
+
+  /// <summary>Field number for the "y" field.</summary>
+  public const int YFieldNumber = 2;
+  private float y_;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public float Y {
+    get { return y_; }
+    set {
+      y_ = value;
+    }
+  }
+
+  /// <summary>Field number for the "z" field.</summary>
+  public const int ZFieldNumber = 3;
+  private float z_;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public float Z {
+    get { return z_; }
+    set {
+      z_ = value;
+    }
+  }
+
+  /// <summary>Field number for the "halfWidth" field.</summary>
+  public const int HalfWidthFieldNumber = 4;
+  private float halfWidth_;
+  /// <summary>
+  /// 火势半径
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public float HalfWidth {
+    get { return halfWidth_; }
+    set {
+      halfWidth_ = value;
+    }
+  }
+
+  /// <summary>Field number for the "firePower" field.</summary>
+  public const int FirePowerFieldNumber = 5;
+  private string firePower_ = "";
+  /// <summary>
+  /// 火势强度
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public string FirePower {
+    get { return firePower_; }
+    set {
+      firePower_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+    }
+  }
+
+  /// <summary>Field number for the "Id" field.</summary>
+  public const int IdFieldNumber = 6;
+  private string id_ = "";
+  /// <summary>
+  /// 火势id
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public string Id {
+    get { return id_; }
+    set {
+      id_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+    }
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public override bool Equals(object other) {
+    return Equals(other as FireInfoResponse);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public bool Equals(FireInfoResponse other) {
+    if (ReferenceEquals(other, null)) {
+      return false;
+    }
+    if (ReferenceEquals(other, this)) {
+      return true;
+    }
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(X, other.X)) return false;
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Y, other.Y)) return false;
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Z, other.Z)) return false;
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(HalfWidth, other.HalfWidth)) return false;
+    if (FirePower != other.FirePower) return false;
+    if (Id != other.Id) 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 (X != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(X);
+    if (Y != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Y);
+    if (Z != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Z);
+    if (HalfWidth != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(HalfWidth);
+    if (FirePower.Length != 0) hash ^= FirePower.GetHashCode();
+    if (Id.Length != 0) hash ^= Id.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 (X != 0F) {
+      output.WriteRawTag(13);
+      output.WriteFloat(X);
+    }
+    if (Y != 0F) {
+      output.WriteRawTag(21);
+      output.WriteFloat(Y);
+    }
+    if (Z != 0F) {
+      output.WriteRawTag(29);
+      output.WriteFloat(Z);
+    }
+    if (HalfWidth != 0F) {
+      output.WriteRawTag(37);
+      output.WriteFloat(HalfWidth);
+    }
+    if (FirePower.Length != 0) {
+      output.WriteRawTag(42);
+      output.WriteString(FirePower);
+    }
+    if (Id.Length != 0) {
+      output.WriteRawTag(50);
+      output.WriteString(Id);
+    }
+    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 (X != 0F) {
+      output.WriteRawTag(13);
+      output.WriteFloat(X);
+    }
+    if (Y != 0F) {
+      output.WriteRawTag(21);
+      output.WriteFloat(Y);
+    }
+    if (Z != 0F) {
+      output.WriteRawTag(29);
+      output.WriteFloat(Z);
+    }
+    if (HalfWidth != 0F) {
+      output.WriteRawTag(37);
+      output.WriteFloat(HalfWidth);
+    }
+    if (FirePower.Length != 0) {
+      output.WriteRawTag(42);
+      output.WriteString(FirePower);
+    }
+    if (Id.Length != 0) {
+      output.WriteRawTag(50);
+      output.WriteString(Id);
+    }
+    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 (X != 0F) {
+      size += 1 + 4;
+    }
+    if (Y != 0F) {
+      size += 1 + 4;
+    }
+    if (Z != 0F) {
+      size += 1 + 4;
+    }
+    if (HalfWidth != 0F) {
+      size += 1 + 4;
+    }
+    if (FirePower.Length != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeStringSize(FirePower);
+    }
+    if (Id.Length != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeStringSize(Id);
+    }
+    if (_unknownFields != null) {
+      size += _unknownFields.CalculateSize();
+    }
+    return size;
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public void MergeFrom(FireInfoResponse other) {
+    if (other == null) {
+      return;
+    }
+    if (other.X != 0F) {
+      X = other.X;
+    }
+    if (other.Y != 0F) {
+      Y = other.Y;
+    }
+    if (other.Z != 0F) {
+      Z = other.Z;
+    }
+    if (other.HalfWidth != 0F) {
+      HalfWidth = other.HalfWidth;
+    }
+    if (other.FirePower.Length != 0) {
+      FirePower = other.FirePower;
+    }
+    if (other.Id.Length != 0) {
+      Id = other.Id;
+    }
+    _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) {
+    if ((tag & 7) == 4) {
+      // Abort on any end group tag.
+      return;
+    }
+    switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+          break;
+        case 13: {
+          X = input.ReadFloat();
+          break;
+        }
+        case 21: {
+          Y = input.ReadFloat();
+          break;
+        }
+        case 29: {
+          Z = input.ReadFloat();
+          break;
+        }
+        case 37: {
+          HalfWidth = input.ReadFloat();
+          break;
+        }
+        case 42: {
+          FirePower = input.ReadString();
+          break;
+        }
+        case 50: {
+          Id = input.ReadString();
+          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) {
+    if ((tag & 7) == 4) {
+      // Abort on any end group tag.
+      return;
+    }
+    switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+          break;
+        case 13: {
+          X = input.ReadFloat();
+          break;
+        }
+        case 21: {
+          Y = input.ReadFloat();
+          break;
+        }
+        case 29: {
+          Z = input.ReadFloat();
+          break;
+        }
+        case 37: {
+          HalfWidth = input.ReadFloat();
+          break;
+        }
+        case 42: {
+          FirePower = input.ReadString();
+          break;
+        }
+        case 50: {
+          Id = input.ReadString();
+          break;
+        }
       }
     }
   }
@@ -2898,7 +3327,7 @@ public sealed partial class PlayerStatisticsResponse : pb::IMessage<PlayerStatis
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public static pbr::MessageDescriptor Descriptor {
-    get { return global::HallReflection.Descriptor.MessageTypes[8]; }
+    get { return global::HallReflection.Descriptor.MessageTypes[9]; }
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -3088,7 +3517,7 @@ public sealed partial class PropTemplateRequest : pb::IMessage<PropTemplateReque
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public static pbr::MessageDescriptor Descriptor {
-    get { return global::HallReflection.Descriptor.MessageTypes[9]; }
+    get { return global::HallReflection.Descriptor.MessageTypes[10]; }
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -3286,7 +3715,7 @@ public sealed partial class PropTemplateResponse : pb::IMessage<PropTemplateResp
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public static pbr::MessageDescriptor Descriptor {
-    get { return global::HallReflection.Descriptor.MessageTypes[10]; }
+    get { return global::HallReflection.Descriptor.MessageTypes[11]; }
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -3567,7 +3996,7 @@ public sealed partial class PpcPropResponse : pb::IMessage<PpcPropResponse>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public static pbr::MessageDescriptor Descriptor {
-    get { return global::HallReflection.Descriptor.MessageTypes[11]; }
+    get { return global::HallReflection.Descriptor.MessageTypes[12]; }
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -3754,7 +4183,7 @@ public sealed partial class RpcRoomInfoResponse : pb::IMessage<RpcRoomInfoRespon
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public static pbr::MessageDescriptor Descriptor {
-    get { return global::HallReflection.Descriptor.MessageTypes[12]; }
+    get { return global::HallReflection.Descriptor.MessageTypes[13]; }
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -4063,7 +4492,7 @@ public sealed partial class UserTemplateRequest : pb::IMessage<UserTemplateReque
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public static pbr::MessageDescriptor Descriptor {
-    get { return global::HallReflection.Descriptor.MessageTypes[13]; }
+    get { return global::HallReflection.Descriptor.MessageTypes[14]; }
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -4298,7 +4727,7 @@ public sealed partial class UserTemplate : pb::IMessage<UserTemplate>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public static pbr::MessageDescriptor Descriptor {
-    get { return global::HallReflection.Descriptor.MessageTypes[14]; }
+    get { return global::HallReflection.Descriptor.MessageTypes[15]; }
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -4485,7 +4914,7 @@ public sealed partial class UserTemplateResponse : pb::IMessage<UserTemplateResp
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public static pbr::MessageDescriptor Descriptor {
-    get { return global::HallReflection.Descriptor.MessageTypes[15]; }
+    get { return global::HallReflection.Descriptor.MessageTypes[16]; }
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -5127,7 +5556,7 @@ public sealed partial class UserInfoRequest : pb::IMessage<UserInfoRequest>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public static pbr::MessageDescriptor Descriptor {
-    get { return global::HallReflection.Descriptor.MessageTypes[16]; }
+    get { return global::HallReflection.Descriptor.MessageTypes[17]; }
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -5510,7 +5939,7 @@ public sealed partial class UserInfoResponse : pb::IMessage<UserInfoResponse>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public static pbr::MessageDescriptor Descriptor {
-    get { return global::HallReflection.Descriptor.MessageTypes[17]; }
+    get { return global::HallReflection.Descriptor.MessageTypes[18]; }
   }
 
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
diff --git a/xiaofang/Assets/ProtoBuf/Proto/Join.cs b/xiaofang/Assets/ProtoBuf/Proto/Join.cs
index 4454e2ff..e04d90be 100644
--- a/xiaofang/Assets/ProtoBuf/Proto/Join.cs
+++ b/xiaofang/Assets/ProtoBuf/Proto/Join.cs
@@ -22,41 +22,41 @@ public static partial class JoinReflection {
   static JoinReflection() {
     byte[] descriptorData = global::System.Convert.FromBase64String(
         string.Concat(
-          "Cgpqb2luLnByb3RvGgptb3ZlLnByb3RvGgpoYWxsLnByb3RvIrQDChBVc2Vy",
+          "Cgpqb2luLnByb3RvGgptb3ZlLnByb3RvGgpoYWxsLnByb3RvIssDChBVc2Vy",
           "Sm9pblJlc3BvbnNlEg4KBnVzZXJJZBgBIAEoAxIQCghuaWNrTmFtZRgCIAEo",
           "CRIQCghyb2xlTmFtZRgDIAEoCRIOCgZyb29tSWQYBCABKAkSDgoGb25saW5l",
           "GAUgASgIEhMKC21lc3NhZ2VUeXBlGAYgASgFEg8KB0lzUmVhZHkYECABKAgS",
-          "CwoDY21kGAcgASgJEhgKEGluY2lkZW50UG9zaXRpb24YCCABKAkSEgoKZmly",
-          "ZVJhZGl1cxgJIAEoAhIRCglmaXJlVmFsdWUYCiABKAUSJwoMdGFza1Jlc3Bv",
-          "bnNlGAsgASgLMhEuVGFza0luZm9SZXNwb25zZRIrCg5vYmplY3RSZXNwb25z",
-          "ZRgMIAEoCzITLk9iamVjdEluZm9SZXNwb25zZRIlCgtucGNSZXNwb25zZRgN",
-          "IAEoCzIQLk5wY0luZm9SZXNwb25zZRIuCg12b2ljZVJlc3BvbnNlGA4gASgL",
-          "MhcuVm9pY2VUcmFuc3BvcnRSZXNwb25zZRIrCg5wbGF5ZXJSZXNwb25zZRgP",
-          "IAEoCzITLlBsYXllckpvaW5SZXNwb25zZSI8ChZWb2ljZVRyYW5zcG9ydFJl",
-          "c3BvbnNlEg0KBWFwcElkGAEgASgJEhMKC2NoYW5uZWxOYW1lGAIgASgJIjcK",
-          "EFJvb21Vc2VyUmVzcG9uc2USIwoIdXNlckxpc3QYASADKAsyES5Vc2VySm9p",
-          "blJlc3BvbnNlIrYCChBUYXNrSW5mb1Jlc3BvbnNlEg4KBlRhc2tJZBgBIAEo",
-          "CRIOCgZTdGF0dXMYAiABKAkSDgoGUm9vbUlkGAMgASgJEgkKAVgYBCABKAIS",
-          "CQoBWRgFIAEoAhIJCgFaGAYgASgCEgwKBFR5cGUYByABKAkSEQoJVGltZUxp",
-          "bWl0GAggASgDEgwKBERlc2MYCSABKAkSDwoHVHJpZ2dlchgKIAEoCRIRCglO",
-          "ZXh0VGFza3MYCyABKAkSEgoKVGFyZ2V0VHlwZRgMIAEoCRIOCgZSZXdhcmQY",
-          "DSABKAkSDAoETm90ZRgOIAEoCRISCgpDcmVhdGVUaW1lGA8gASgJEhIKClVw",
-          "ZGF0ZVRpbWUYECABKAkSEAoIVG9Vc2VySWQYESABKAkSEgoKQmFzZVRhc2tJ",
-          "ZBgSIAEoCSKvAwoST2JqZWN0SW5mb1Jlc3BvbnNlEg4KBlJvb21JZBgBIAEo",
-          "CRIKCgJJZBgCIAEoCRIQCghPYmplY3RJZBgDIAEoCRIMCgROb3RlGAQgASgJ",
-          "EgwKBFR5cGUYBSABKAkSDAoETmFtZRgGIAEoCRIWCg5OYW1lU2hvd09mZnNl",
-          "dBgHIAEoAxISCgpTaG93UmFkaXVzGAggASgDEgwKBEljb24YCSABKAkSDAoE",
-          "Um9sZRgKIAEoCRISCgpJdGVtRGVwZW5kGAsgASgJEhAKCFRha2VUaW1lGAwg",
-          "ASgDEhMKC05lZWRQbGF5ZXJzGA0gASgJEhIKClRhc2tTdGF0dXMYDiABKAkS",
-          "EgoKU2VsZWN0TGlzdBgPIAEoCRINCgVPbk9mZhgQIAEoAxIOCgZTdGF0dXMY",
-          "ESABKAkSEQoJUmVzQ2hhbmdlGBIgASgJEhcKD1BhcmFsbGVsQ29udHJvbBgT",
-          "IAEoAxISCgpFeHRyYVZhbHVlGBQgASgJEg8KB1VzZXJJZHMYFSABKAkSEgoK",
-          "Q3JlYXRlVGltZRgWIAEoCRISCgpVcGRhdGVUaW1lGBcgASgJQgdaBS4vO3Bi",
-          "YgZwcm90bzM="));
+          "CwoDY21kGAcgASgJEgwKBElzQWkYCCABKAgSJwoMdGFza1Jlc3BvbnNlGAsg",
+          "ASgLMhEuVGFza0luZm9SZXNwb25zZRIrCg5vYmplY3RSZXNwb25zZRgMIAEo",
+          "CzITLk9iamVjdEluZm9SZXNwb25zZRIlCgtucGNSZXNwb25zZRgNIAEoCzIQ",
+          "Lk5wY0luZm9SZXNwb25zZRIuCg12b2ljZVJlc3BvbnNlGA4gASgLMhcuVm9p",
+          "Y2VUcmFuc3BvcnRSZXNwb25zZRIrCg5wbGF5ZXJSZXNwb25zZRgPIAEoCzIT",
+          "LlBsYXllckpvaW5SZXNwb25zZRInCgxmaXJlUmVzcG9uc2UYESADKAsyES5G",
+          "aXJlSW5mb1Jlc3BvbnNlEgkKAXgYEiABKAISCQoBeRgTIAEoAhIJCgF6GBQg",
+          "ASgCIjwKFlZvaWNlVHJhbnNwb3J0UmVzcG9uc2USDQoFYXBwSWQYASABKAkS",
+          "EwoLY2hhbm5lbE5hbWUYAiABKAkiNwoQUm9vbVVzZXJSZXNwb25zZRIjCgh1",
+          "c2VyTGlzdBgBIAMoCzIRLlVzZXJKb2luUmVzcG9uc2UitgIKEFRhc2tJbmZv",
+          "UmVzcG9uc2USDgoGVGFza0lkGAEgASgJEg4KBlN0YXR1cxgCIAEoCRIOCgZS",
+          "b29tSWQYAyABKAkSCQoBWBgEIAEoAhIJCgFZGAUgASgCEgkKAVoYBiABKAIS",
+          "DAoEVHlwZRgHIAEoCRIRCglUaW1lTGltaXQYCCABKAMSDAoERGVzYxgJIAEo",
+          "CRIPCgdUcmlnZ2VyGAogASgJEhEKCU5leHRUYXNrcxgLIAEoCRISCgpUYXJn",
+          "ZXRUeXBlGAwgASgJEg4KBlJld2FyZBgNIAEoCRIMCgROb3RlGA4gASgJEhIK",
+          "CkNyZWF0ZVRpbWUYDyABKAkSEgoKVXBkYXRlVGltZRgQIAEoCRIQCghUb1Vz",
+          "ZXJJZBgRIAEoCRISCgpCYXNlVGFza0lkGBIgASgJIq8DChJPYmplY3RJbmZv",
+          "UmVzcG9uc2USDgoGUm9vbUlkGAEgASgJEgoKAklkGAIgASgJEhAKCE9iamVj",
+          "dElkGAMgASgJEgwKBE5vdGUYBCABKAkSDAoEVHlwZRgFIAEoCRIMCgROYW1l",
+          "GAYgASgJEhYKDk5hbWVTaG93T2Zmc2V0GAcgASgDEhIKClNob3dSYWRpdXMY",
+          "CCABKAMSDAoESWNvbhgJIAEoCRIMCgRSb2xlGAogASgJEhIKCkl0ZW1EZXBl",
+          "bmQYCyABKAkSEAoIVGFrZVRpbWUYDCABKAMSEwoLTmVlZFBsYXllcnMYDSAB",
+          "KAkSEgoKVGFza1N0YXR1cxgOIAEoCRISCgpTZWxlY3RMaXN0GA8gASgJEg0K",
+          "BU9uT2ZmGBAgASgDEg4KBlN0YXR1cxgRIAEoCRIRCglSZXNDaGFuZ2UYEiAB",
+          "KAkSFwoPUGFyYWxsZWxDb250cm9sGBMgASgDEhIKCkV4dHJhVmFsdWUYFCAB",
+          "KAkSDwoHVXNlcklkcxgVIAEoCRISCgpDcmVhdGVUaW1lGBYgASgJEhIKClVw",
+          "ZGF0ZVRpbWUYFyABKAlCB1oFLi87cGJiBnByb3RvMw=="));
     descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
         new pbr::FileDescriptor[] { global::MoveReflection.Descriptor, global::HallReflection.Descriptor, },
         new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::UserJoinResponse), global::UserJoinResponse.Parser, new[]{ "UserId", "NickName", "RoleName", "RoomId", "Online", "MessageType", "IsReady", "Cmd", "IncidentPosition", "FireRadius", "FireValue", "TaskResponse", "ObjectResponse", "NpcResponse", "VoiceResponse", "PlayerResponse" }, null, null, null, null),
+          new pbr::GeneratedClrTypeInfo(typeof(global::UserJoinResponse), global::UserJoinResponse.Parser, new[]{ "UserId", "NickName", "RoleName", "RoomId", "Online", "MessageType", "IsReady", "Cmd", "IsAi", "TaskResponse", "ObjectResponse", "NpcResponse", "VoiceResponse", "PlayerResponse", "FireResponse", "X", "Y", "Z" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::VoiceTransportResponse), global::VoiceTransportResponse.Parser, new[]{ "AppId", "ChannelName" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::RoomUserResponse), global::RoomUserResponse.Parser, new[]{ "UserList" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::TaskInfoResponse), global::TaskInfoResponse.Parser, new[]{ "TaskId", "Status", "RoomId", "X", "Y", "Z", "Type", "TimeLimit", "Desc", "Trigger", "NextTasks", "TargetType", "Reward", "Note", "CreateTime", "UpdateTime", "ToUserId", "BaseTaskId" }, null, null, null, null),
@@ -110,14 +110,16 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
     messageType_ = other.messageType_;
     isReady_ = other.isReady_;
     cmd_ = other.cmd_;
-    incidentPosition_ = other.incidentPosition_;
-    fireRadius_ = other.fireRadius_;
-    fireValue_ = other.fireValue_;
+    isAi_ = other.isAi_;
     taskResponse_ = other.taskResponse_ != null ? other.taskResponse_.Clone() : null;
     objectResponse_ = other.objectResponse_ != null ? other.objectResponse_.Clone() : null;
     npcResponse_ = other.npcResponse_ != null ? other.npcResponse_.Clone() : null;
     voiceResponse_ = other.voiceResponse_ != null ? other.voiceResponse_.Clone() : null;
     playerResponse_ = other.playerResponse_ != null ? other.playerResponse_.Clone() : null;
+    fireResponse_ = other.fireResponse_.Clone();
+    x_ = other.x_;
+    y_ = other.y_;
+    z_ = other.z_;
     _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
   }
 
@@ -247,48 +249,18 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
     }
   }
 
-  /// <summary>Field number for the "incidentPosition" field.</summary>
-  public const int IncidentPositionFieldNumber = 8;
-  private string incidentPosition_ = "";
+  /// <summary>Field number for the "IsAi" field.</summary>
+  public const int IsAiFieldNumber = 8;
+  private bool isAi_;
   /// <summary>
-  ///事件发生位置
+  /// 是否Ai
   /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public string IncidentPosition {
-    get { return incidentPosition_; }
+  public bool IsAi {
+    get { return isAi_; }
     set {
-      incidentPosition_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-    }
-  }
-
-  /// <summary>Field number for the "fireRadius" field.</summary>
-  public const int FireRadiusFieldNumber = 9;
-  private float fireRadius_;
-  /// <summary>
-  ///火势半径
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public float FireRadius {
-    get { return fireRadius_; }
-    set {
-      fireRadius_ = value;
-    }
-  }
-
-  /// <summary>Field number for the "fireValue" field.</summary>
-  public const int FireValueFieldNumber = 10;
-  private int fireValue_;
-  /// <summary>
-  ///火势值
-  /// </summary>
-  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public int FireValue {
-    get { return fireValue_; }
-    set {
-      fireValue_ = value;
+      isAi_ = value;
     }
   }
 
@@ -367,6 +339,65 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
     }
   }
 
+  /// <summary>Field number for the "fireResponse" field.</summary>
+  public const int FireResponseFieldNumber = 17;
+  private static readonly pb::FieldCodec<global::FireInfoResponse> _repeated_fireResponse_codec
+      = pb::FieldCodec.ForMessage(138, global::FireInfoResponse.Parser);
+  private readonly pbc::RepeatedField<global::FireInfoResponse> fireResponse_ = new pbc::RepeatedField<global::FireInfoResponse>();
+  /// <summary>
+  ///火势信息
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public pbc::RepeatedField<global::FireInfoResponse> FireResponse {
+    get { return fireResponse_; }
+  }
+
+  /// <summary>Field number for the "x" field.</summary>
+  public const int XFieldNumber = 18;
+  private float x_;
+  /// <summary>
+  /// x坐标
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public float X {
+    get { return x_; }
+    set {
+      x_ = value;
+    }
+  }
+
+  /// <summary>Field number for the "y" field.</summary>
+  public const int YFieldNumber = 19;
+  private float y_;
+  /// <summary>
+  /// y坐标
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public float Y {
+    get { return y_; }
+    set {
+      y_ = value;
+    }
+  }
+
+  /// <summary>Field number for the "z" field.</summary>
+  public const int ZFieldNumber = 20;
+  private float z_;
+  /// <summary>
+  /// z坐标
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public float Z {
+    get { return z_; }
+    set {
+      z_ = value;
+    }
+  }
+
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public override bool Equals(object other) {
@@ -390,14 +421,16 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
     if (MessageType != other.MessageType) return false;
     if (IsReady != other.IsReady) return false;
     if (Cmd != other.Cmd) return false;
-    if (IncidentPosition != other.IncidentPosition) return false;
-    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(FireRadius, other.FireRadius)) return false;
-    if (FireValue != other.FireValue) return false;
+    if (IsAi != other.IsAi) return false;
     if (!object.Equals(TaskResponse, other.TaskResponse)) return false;
     if (!object.Equals(ObjectResponse, other.ObjectResponse)) return false;
     if (!object.Equals(NpcResponse, other.NpcResponse)) return false;
     if (!object.Equals(VoiceResponse, other.VoiceResponse)) return false;
     if (!object.Equals(PlayerResponse, other.PlayerResponse)) return false;
+    if(!fireResponse_.Equals(other.fireResponse_)) return false;
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(X, other.X)) return false;
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Y, other.Y)) return false;
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Z, other.Z)) return false;
     return Equals(_unknownFields, other._unknownFields);
   }
 
@@ -413,14 +446,16 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
     if (MessageType != 0) hash ^= MessageType.GetHashCode();
     if (IsReady != false) hash ^= IsReady.GetHashCode();
     if (Cmd.Length != 0) hash ^= Cmd.GetHashCode();
-    if (IncidentPosition.Length != 0) hash ^= IncidentPosition.GetHashCode();
-    if (FireRadius != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(FireRadius);
-    if (FireValue != 0) hash ^= FireValue.GetHashCode();
+    if (IsAi != false) hash ^= IsAi.GetHashCode();
     if (taskResponse_ != null) hash ^= TaskResponse.GetHashCode();
     if (objectResponse_ != null) hash ^= ObjectResponse.GetHashCode();
     if (npcResponse_ != null) hash ^= NpcResponse.GetHashCode();
     if (voiceResponse_ != null) hash ^= VoiceResponse.GetHashCode();
     if (playerResponse_ != null) hash ^= PlayerResponse.GetHashCode();
+    hash ^= fireResponse_.GetHashCode();
+    if (X != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(X);
+    if (Y != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Y);
+    if (Z != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Z);
     if (_unknownFields != null) {
       hash ^= _unknownFields.GetHashCode();
     }
@@ -467,17 +502,9 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
       output.WriteRawTag(58);
       output.WriteString(Cmd);
     }
-    if (IncidentPosition.Length != 0) {
-      output.WriteRawTag(66);
-      output.WriteString(IncidentPosition);
-    }
-    if (FireRadius != 0F) {
-      output.WriteRawTag(77);
-      output.WriteFloat(FireRadius);
-    }
-    if (FireValue != 0) {
-      output.WriteRawTag(80);
-      output.WriteInt32(FireValue);
+    if (IsAi != false) {
+      output.WriteRawTag(64);
+      output.WriteBool(IsAi);
     }
     if (taskResponse_ != null) {
       output.WriteRawTag(90);
@@ -503,6 +530,19 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
       output.WriteRawTag(128, 1);
       output.WriteBool(IsReady);
     }
+    fireResponse_.WriteTo(output, _repeated_fireResponse_codec);
+    if (X != 0F) {
+      output.WriteRawTag(149, 1);
+      output.WriteFloat(X);
+    }
+    if (Y != 0F) {
+      output.WriteRawTag(157, 1);
+      output.WriteFloat(Y);
+    }
+    if (Z != 0F) {
+      output.WriteRawTag(165, 1);
+      output.WriteFloat(Z);
+    }
     if (_unknownFields != null) {
       _unknownFields.WriteTo(output);
     }
@@ -541,17 +581,9 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
       output.WriteRawTag(58);
       output.WriteString(Cmd);
     }
-    if (IncidentPosition.Length != 0) {
-      output.WriteRawTag(66);
-      output.WriteString(IncidentPosition);
-    }
-    if (FireRadius != 0F) {
-      output.WriteRawTag(77);
-      output.WriteFloat(FireRadius);
-    }
-    if (FireValue != 0) {
-      output.WriteRawTag(80);
-      output.WriteInt32(FireValue);
+    if (IsAi != false) {
+      output.WriteRawTag(64);
+      output.WriteBool(IsAi);
     }
     if (taskResponse_ != null) {
       output.WriteRawTag(90);
@@ -577,6 +609,19 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
       output.WriteRawTag(128, 1);
       output.WriteBool(IsReady);
     }
+    fireResponse_.WriteTo(ref output, _repeated_fireResponse_codec);
+    if (X != 0F) {
+      output.WriteRawTag(149, 1);
+      output.WriteFloat(X);
+    }
+    if (Y != 0F) {
+      output.WriteRawTag(157, 1);
+      output.WriteFloat(Y);
+    }
+    if (Z != 0F) {
+      output.WriteRawTag(165, 1);
+      output.WriteFloat(Z);
+    }
     if (_unknownFields != null) {
       _unknownFields.WriteTo(ref output);
     }
@@ -611,14 +656,8 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
     if (Cmd.Length != 0) {
       size += 1 + pb::CodedOutputStream.ComputeStringSize(Cmd);
     }
-    if (IncidentPosition.Length != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeStringSize(IncidentPosition);
-    }
-    if (FireRadius != 0F) {
-      size += 1 + 4;
-    }
-    if (FireValue != 0) {
-      size += 1 + pb::CodedOutputStream.ComputeInt32Size(FireValue);
+    if (IsAi != false) {
+      size += 1 + 1;
     }
     if (taskResponse_ != null) {
       size += 1 + pb::CodedOutputStream.ComputeMessageSize(TaskResponse);
@@ -635,6 +674,16 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
     if (playerResponse_ != null) {
       size += 1 + pb::CodedOutputStream.ComputeMessageSize(PlayerResponse);
     }
+    size += fireResponse_.CalculateSize(_repeated_fireResponse_codec);
+    if (X != 0F) {
+      size += 2 + 4;
+    }
+    if (Y != 0F) {
+      size += 2 + 4;
+    }
+    if (Z != 0F) {
+      size += 2 + 4;
+    }
     if (_unknownFields != null) {
       size += _unknownFields.CalculateSize();
     }
@@ -671,14 +720,8 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
     if (other.Cmd.Length != 0) {
       Cmd = other.Cmd;
     }
-    if (other.IncidentPosition.Length != 0) {
-      IncidentPosition = other.IncidentPosition;
-    }
-    if (other.FireRadius != 0F) {
-      FireRadius = other.FireRadius;
-    }
-    if (other.FireValue != 0) {
-      FireValue = other.FireValue;
+    if (other.IsAi != false) {
+      IsAi = other.IsAi;
     }
     if (other.taskResponse_ != null) {
       if (taskResponse_ == null) {
@@ -710,6 +753,16 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
       }
       PlayerResponse.MergeFrom(other.PlayerResponse);
     }
+    fireResponse_.Add(other.fireResponse_);
+    if (other.X != 0F) {
+      X = other.X;
+    }
+    if (other.Y != 0F) {
+      Y = other.Y;
+    }
+    if (other.Z != 0F) {
+      Z = other.Z;
+    }
     _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
   }
 
@@ -757,16 +810,8 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
           Cmd = input.ReadString();
           break;
         }
-        case 66: {
-          IncidentPosition = input.ReadString();
-          break;
-        }
-        case 77: {
-          FireRadius = input.ReadFloat();
-          break;
-        }
-        case 80: {
-          FireValue = input.ReadInt32();
+        case 64: {
+          IsAi = input.ReadBool();
           break;
         }
         case 90: {
@@ -808,6 +853,22 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
           IsReady = input.ReadBool();
           break;
         }
+        case 138: {
+          fireResponse_.AddEntriesFrom(input, _repeated_fireResponse_codec);
+          break;
+        }
+        case 149: {
+          X = input.ReadFloat();
+          break;
+        }
+        case 157: {
+          Y = input.ReadFloat();
+          break;
+        }
+        case 165: {
+          Z = input.ReadFloat();
+          break;
+        }
       }
     }
   #endif
@@ -855,16 +916,8 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
           Cmd = input.ReadString();
           break;
         }
-        case 66: {
-          IncidentPosition = input.ReadString();
-          break;
-        }
-        case 77: {
-          FireRadius = input.ReadFloat();
-          break;
-        }
-        case 80: {
-          FireValue = input.ReadInt32();
+        case 64: {
+          IsAi = input.ReadBool();
           break;
         }
         case 90: {
@@ -906,6 +959,22 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
           IsReady = input.ReadBool();
           break;
         }
+        case 138: {
+          fireResponse_.AddEntriesFrom(ref input, _repeated_fireResponse_codec);
+          break;
+        }
+        case 149: {
+          X = input.ReadFloat();
+          break;
+        }
+        case 157: {
+          Y = input.ReadFloat();
+          break;
+        }
+        case 165: {
+          Z = input.ReadFloat();
+          break;
+        }
       }
     }
   }
diff --git a/xiaofang/Assets/ProtoBuf/Proto/Move.cs b/xiaofang/Assets/ProtoBuf/Proto/Move.cs
index b94572db..1f8934aa 100644
--- a/xiaofang/Assets/ProtoBuf/Proto/Move.cs
+++ b/xiaofang/Assets/ProtoBuf/Proto/Move.cs
@@ -36,7 +36,8 @@ public static partial class MoveReflection {
           "AhIPCgdzY2VuZUlkGAYgASgJEg0KBW5wY0lkGAcgASgJEg4KBmFjdGlvbhgI",
           "IAEoBSIVChNNb3ZlUm9vbUFvaVJlc3BvbnNlIj8KD05wY0luZm9SZXNwb25z",
           "ZRINCgVucGNJZBgBIAEoCRIPCgdpbmp1cmVkGAIgASgIEgwKBHN0b3AYAyAB",
-          "KAhCB1oFLi87cGJiBnByb3RvMw=="));
+          "KAgiNAoQTnBjQWlNb3ZlUmVxdWVzdBIQCghvcHRpb25JZBgBIAEoCRIOCgZy",
+          "b29tSWQYAyABKAlCB1oFLi87cGJiBnByb3RvMw=="));
     descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
         new pbr::FileDescriptor[] { },
         new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
@@ -47,7 +48,8 @@ public static partial class MoveReflection {
           new pbr::GeneratedClrTypeInfo(typeof(global::NpcData), global::NpcData.Parser, new[]{ "X", "Y", "Z", "UserId", "NickName", "Type", "Formation", "Event" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::MoveRoomAoiRequest), global::MoveRoomAoiRequest.Parser, new[]{ "RoomId", "UserId", "X", "Y", "Z", "SceneId", "NpcId", "Action" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::MoveRoomAoiResponse), global::MoveRoomAoiResponse.Parser, null, null, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::NpcInfoResponse), global::NpcInfoResponse.Parser, new[]{ "NpcId", "Injured", "Stop" }, null, null, null, null)
+          new pbr::GeneratedClrTypeInfo(typeof(global::NpcInfoResponse), global::NpcInfoResponse.Parser, new[]{ "NpcId", "Injured", "Stop" }, null, null, null, null),
+          new pbr::GeneratedClrTypeInfo(typeof(global::NpcAiMoveRequest), global::NpcAiMoveRequest.Parser, new[]{ "OptionId", "RoomId" }, null, null, null, null)
         }));
   }
   #endregion
@@ -2522,6 +2524,247 @@ public sealed partial class NpcInfoResponse : pb::IMessage<NpcInfoResponse>
 
 }
 
+[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
+public sealed partial class NpcAiMoveRequest : pb::IMessage<NpcAiMoveRequest>
+#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    , pb::IBufferMessage
+#endif
+{
+  private static readonly pb::MessageParser<NpcAiMoveRequest> _parser = new pb::MessageParser<NpcAiMoveRequest>(() => new NpcAiMoveRequest());
+  private pb::UnknownFieldSet _unknownFields;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pb::MessageParser<NpcAiMoveRequest> Parser { get { return _parser; } }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pbr::MessageDescriptor Descriptor {
+    get { return global::MoveReflection.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 NpcAiMoveRequest() {
+    OnConstruction();
+  }
+
+  partial void OnConstruction();
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public NpcAiMoveRequest(NpcAiMoveRequest other) : this() {
+    optionId_ = other.optionId_;
+    roomId_ = other.roomId_;
+    _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public NpcAiMoveRequest Clone() {
+    return new NpcAiMoveRequest(this);
+  }
+
+  /// <summary>Field number for the "optionId" field.</summary>
+  public const int OptionIdFieldNumber = 1;
+  private string optionId_ = "";
+  /// <summary>
+  /// 选项Id
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public string OptionId {
+    get { return optionId_; }
+    set {
+      optionId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+    }
+  }
+
+  /// <summary>Field number for the "roomId" field.</summary>
+  public const int RoomIdFieldNumber = 3;
+  private string roomId_ = "";
+  /// <summary>
+  /// 房间Id
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public string RoomId {
+    get { return roomId_; }
+    set {
+      roomId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+    }
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public override bool Equals(object other) {
+    return Equals(other as NpcAiMoveRequest);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public bool Equals(NpcAiMoveRequest other) {
+    if (ReferenceEquals(other, null)) {
+      return false;
+    }
+    if (ReferenceEquals(other, this)) {
+      return true;
+    }
+    if (OptionId != other.OptionId) return false;
+    if (RoomId != other.RoomId) 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 (OptionId.Length != 0) hash ^= OptionId.GetHashCode();
+    if (RoomId.Length != 0) hash ^= RoomId.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 (OptionId.Length != 0) {
+      output.WriteRawTag(10);
+      output.WriteString(OptionId);
+    }
+    if (RoomId.Length != 0) {
+      output.WriteRawTag(26);
+      output.WriteString(RoomId);
+    }
+    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 (OptionId.Length != 0) {
+      output.WriteRawTag(10);
+      output.WriteString(OptionId);
+    }
+    if (RoomId.Length != 0) {
+      output.WriteRawTag(26);
+      output.WriteString(RoomId);
+    }
+    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 (OptionId.Length != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeStringSize(OptionId);
+    }
+    if (RoomId.Length != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeStringSize(RoomId);
+    }
+    if (_unknownFields != null) {
+      size += _unknownFields.CalculateSize();
+    }
+    return size;
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public void MergeFrom(NpcAiMoveRequest other) {
+    if (other == null) {
+      return;
+    }
+    if (other.OptionId.Length != 0) {
+      OptionId = other.OptionId;
+    }
+    if (other.RoomId.Length != 0) {
+      RoomId = other.RoomId;
+    }
+    _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) {
+    if ((tag & 7) == 4) {
+      // Abort on any end group tag.
+      return;
+    }
+    switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+          break;
+        case 10: {
+          OptionId = input.ReadString();
+          break;
+        }
+        case 26: {
+          RoomId = input.ReadString();
+          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) {
+    if ((tag & 7) == 4) {
+      // Abort on any end group tag.
+      return;
+    }
+    switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+          break;
+        case 10: {
+          OptionId = input.ReadString();
+          break;
+        }
+        case 26: {
+          RoomId = input.ReadString();
+          break;
+        }
+      }
+    }
+  }
+  #endif
+
+}
+
 #endregion
 
 
diff --git a/xiaofang/Assets/ProtoBuf/Proto/Object.cs b/xiaofang/Assets/ProtoBuf/Proto/Object.cs
index 5afb187f..34686fb6 100644
--- a/xiaofang/Assets/ProtoBuf/Proto/Object.cs
+++ b/xiaofang/Assets/ProtoBuf/Proto/Object.cs
@@ -22,23 +22,24 @@ public static partial class ObjectReflection {
   static ObjectReflection() {
     byte[] descriptorData = global::System.Convert.FromBase64String(
         string.Concat(
-          "CgxvYmplY3QucHJvdG8iXgoNUmVxdWVzdE9iamVjdBIKCgJJZBgBIAEoCRIQ",
+          "CgxvYmplY3QucHJvdG8ifwoNUmVxdWVzdE9iamVjdBIKCgJJZBgBIAEoCRIQ",
           "CghPYmplY3RJZBgCIAEoCRIOCgZTdGF0dXMYAyABKAkSDwoHVXNlcklkcxgE",
-          "IAEoCRIOCgZSb29tSWQYBSABKAkiqwMKDlJlc3BvbnNlT2JqZWN0EgoKAklk",
-          "GAEgASgJEhAKCE9iamVjdElkGAIgASgJEgwKBE5vdGUYAyABKAkSDAoEVHlw",
-          "ZRgEIAEoCRIMCgROYW1lGAUgASgJEhYKDk5hbWVTaG93T2Zmc2V0GAYgASgD",
-          "EhIKClNob3dSYWRpdXMYByABKAMSDAoESWNvbhgIIAEoCRIMCgRSb2xlGAkg",
-          "ASgJEhIKCkl0ZW1EZXBlbmQYCiABKAkSEAoIVGFrZVRpbWUYCyABKAMSEwoL",
-          "TmVlZFBsYXllcnMYDCABKAkSEgoKVGFza1N0YXR1cxgNIAEoCRISCgpTZWxl",
-          "Y3RMaXN0GA4gASgJEg0KBU9uT2ZmGA8gASgDEg4KBlN0YXR1cxgQIAEoCRIR",
-          "CglSZXNDaGFuZ2UYESABKAkSFwoPUGFyYWxsZWxDb250cm9sGBIgASgDEhIK",
-          "CkV4dHJhVmFsdWUYEyABKAkSDwoHVXNlcklkcxgUIAEoCRISCgpDcmVhdGVU",
-          "aW1lGBUgASgJEhIKClVwZGF0ZVRpbWUYFiABKAkSDgoGUm9vbUlkGBcgASgJ",
-          "QgdaBS4vO3BiYgZwcm90bzM="));
+          "IAEoCRIOCgZSb29tSWQYBSABKAkSCQoBWBgGIAEoAhIJCgFZGAcgASgCEgkK",
+          "AVoYCCABKAIiqwMKDlJlc3BvbnNlT2JqZWN0EgoKAklkGAEgASgJEhAKCE9i",
+          "amVjdElkGAIgASgJEgwKBE5vdGUYAyABKAkSDAoEVHlwZRgEIAEoCRIMCgRO",
+          "YW1lGAUgASgJEhYKDk5hbWVTaG93T2Zmc2V0GAYgASgDEhIKClNob3dSYWRp",
+          "dXMYByABKAMSDAoESWNvbhgIIAEoCRIMCgRSb2xlGAkgASgJEhIKCkl0ZW1E",
+          "ZXBlbmQYCiABKAkSEAoIVGFrZVRpbWUYCyABKAMSEwoLTmVlZFBsYXllcnMY",
+          "DCABKAkSEgoKVGFza1N0YXR1cxgNIAEoCRISCgpTZWxlY3RMaXN0GA4gASgJ",
+          "Eg0KBU9uT2ZmGA8gASgDEg4KBlN0YXR1cxgQIAEoCRIRCglSZXNDaGFuZ2UY",
+          "ESABKAkSFwoPUGFyYWxsZWxDb250cm9sGBIgASgDEhIKCkV4dHJhVmFsdWUY",
+          "EyABKAkSDwoHVXNlcklkcxgUIAEoCRISCgpDcmVhdGVUaW1lGBUgASgJEhIK",
+          "ClVwZGF0ZVRpbWUYFiABKAkSDgoGUm9vbUlkGBcgASgJQgdaBS4vO3BiYgZw",
+          "cm90bzM="));
     descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
         new pbr::FileDescriptor[] { },
         new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::RequestObject), global::RequestObject.Parser, new[]{ "Id", "ObjectId", "Status", "UserIds", "RoomId" }, null, null, null, null),
+          new pbr::GeneratedClrTypeInfo(typeof(global::RequestObject), global::RequestObject.Parser, new[]{ "Id", "ObjectId", "Status", "UserIds", "RoomId", "X", "Y", "Z" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::ResponseObject), global::ResponseObject.Parser, new[]{ "Id", "ObjectId", "Note", "Type", "Name", "NameShowOffset", "ShowRadius", "Icon", "Role", "ItemDepend", "TakeTime", "NeedPlayers", "TaskStatus", "SelectList", "OnOff", "Status", "ResChange", "ParallelControl", "ExtraValue", "UserIds", "CreateTime", "UpdateTime", "RoomId" }, null, null, null, null)
         }));
   }
@@ -89,6 +90,9 @@ public sealed partial class RequestObject : pb::IMessage<RequestObject>
     status_ = other.status_;
     userIds_ = other.userIds_;
     roomId_ = other.roomId_;
+    x_ = other.x_;
+    y_ = other.y_;
+    z_ = other.z_;
     _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
   }
 
@@ -173,6 +177,51 @@ public sealed partial class RequestObject : pb::IMessage<RequestObject>
     }
   }
 
+  /// <summary>Field number for the "X" field.</summary>
+  public const int XFieldNumber = 6;
+  private float x_;
+  /// <summary>
+  /// 坐标X 操作对象的坐标
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public float X {
+    get { return x_; }
+    set {
+      x_ = value;
+    }
+  }
+
+  /// <summary>Field number for the "Y" field.</summary>
+  public const int YFieldNumber = 7;
+  private float y_;
+  /// <summary>
+  /// 坐标Y
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public float Y {
+    get { return y_; }
+    set {
+      y_ = value;
+    }
+  }
+
+  /// <summary>Field number for the "Z" field.</summary>
+  public const int ZFieldNumber = 8;
+  private float z_;
+  /// <summary>
+  /// 坐标Z
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public float Z {
+    get { return z_; }
+    set {
+      z_ = value;
+    }
+  }
+
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public override bool Equals(object other) {
@@ -193,6 +242,9 @@ public sealed partial class RequestObject : pb::IMessage<RequestObject>
     if (Status != other.Status) return false;
     if (UserIds != other.UserIds) return false;
     if (RoomId != other.RoomId) return false;
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(X, other.X)) return false;
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Y, other.Y)) return false;
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Z, other.Z)) return false;
     return Equals(_unknownFields, other._unknownFields);
   }
 
@@ -205,6 +257,9 @@ public sealed partial class RequestObject : pb::IMessage<RequestObject>
     if (Status.Length != 0) hash ^= Status.GetHashCode();
     if (UserIds.Length != 0) hash ^= UserIds.GetHashCode();
     if (RoomId.Length != 0) hash ^= RoomId.GetHashCode();
+    if (X != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(X);
+    if (Y != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Y);
+    if (Z != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Z);
     if (_unknownFields != null) {
       hash ^= _unknownFields.GetHashCode();
     }
@@ -243,6 +298,18 @@ public sealed partial class RequestObject : pb::IMessage<RequestObject>
       output.WriteRawTag(42);
       output.WriteString(RoomId);
     }
+    if (X != 0F) {
+      output.WriteRawTag(53);
+      output.WriteFloat(X);
+    }
+    if (Y != 0F) {
+      output.WriteRawTag(61);
+      output.WriteFloat(Y);
+    }
+    if (Z != 0F) {
+      output.WriteRawTag(69);
+      output.WriteFloat(Z);
+    }
     if (_unknownFields != null) {
       _unknownFields.WriteTo(output);
     }
@@ -273,6 +340,18 @@ public sealed partial class RequestObject : pb::IMessage<RequestObject>
       output.WriteRawTag(42);
       output.WriteString(RoomId);
     }
+    if (X != 0F) {
+      output.WriteRawTag(53);
+      output.WriteFloat(X);
+    }
+    if (Y != 0F) {
+      output.WriteRawTag(61);
+      output.WriteFloat(Y);
+    }
+    if (Z != 0F) {
+      output.WriteRawTag(69);
+      output.WriteFloat(Z);
+    }
     if (_unknownFields != null) {
       _unknownFields.WriteTo(ref output);
     }
@@ -298,6 +377,15 @@ public sealed partial class RequestObject : pb::IMessage<RequestObject>
     if (RoomId.Length != 0) {
       size += 1 + pb::CodedOutputStream.ComputeStringSize(RoomId);
     }
+    if (X != 0F) {
+      size += 1 + 4;
+    }
+    if (Y != 0F) {
+      size += 1 + 4;
+    }
+    if (Z != 0F) {
+      size += 1 + 4;
+    }
     if (_unknownFields != null) {
       size += _unknownFields.CalculateSize();
     }
@@ -325,6 +413,15 @@ public sealed partial class RequestObject : pb::IMessage<RequestObject>
     if (other.RoomId.Length != 0) {
       RoomId = other.RoomId;
     }
+    if (other.X != 0F) {
+      X = other.X;
+    }
+    if (other.Y != 0F) {
+      Y = other.Y;
+    }
+    if (other.Z != 0F) {
+      Z = other.Z;
+    }
     _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
   }
 
@@ -364,6 +461,18 @@ public sealed partial class RequestObject : pb::IMessage<RequestObject>
           RoomId = input.ReadString();
           break;
         }
+        case 53: {
+          X = input.ReadFloat();
+          break;
+        }
+        case 61: {
+          Y = input.ReadFloat();
+          break;
+        }
+        case 69: {
+          Z = input.ReadFloat();
+          break;
+        }
       }
     }
   #endif
@@ -403,6 +512,18 @@ public sealed partial class RequestObject : pb::IMessage<RequestObject>
           RoomId = input.ReadString();
           break;
         }
+        case 53: {
+          X = input.ReadFloat();
+          break;
+        }
+        case 61: {
+          Y = input.ReadFloat();
+          break;
+        }
+        case 69: {
+          Z = input.ReadFloat();
+          break;
+        }
       }
     }
   }
diff --git a/xiaofang/Assets/ProtoBuf/Proto/Prop.cs b/xiaofang/Assets/ProtoBuf/Proto/Prop.cs
index e4bb19f8..e29cd556 100644
--- a/xiaofang/Assets/ProtoBuf/Proto/Prop.cs
+++ b/xiaofang/Assets/ProtoBuf/Proto/Prop.cs
@@ -36,14 +36,19 @@ public static partial class PropReflection {
           "EwoLQ2FsY3VsYXRpb24YDSABKAgSEAoITG9zc1RpbWUYDiABKAUSFAoMUHJv",
           "cFNlcnZlcklkGA8gASgJEgwKBFVzZWQYECABKAgSDgoGVXNlcklkGBEgASgJ",
           "Eg4KBlJvb21JZBgSIAEoCRIQCghUb3RhbE51bRgTIAEoBRIPCgdSZXN0TnVt",
-          "GBQgASgFEhEKCUF0dHJpYnV0ZRgVIAEoCUIHWgUuLztwYmIGcHJvdG8z"));
+          "GBQgASgFEhEKCUF0dHJpYnV0ZRgVIAEoCSI8Cg5QdXRGaXJlUmVxdWVzdBIa",
+          "CgRkYXRhGAEgAygLMgwuUHV0RmlyZURhdGESDgoGcm9vbUlkGAIgASgJIi4K",
+          "C1B1dEZpcmVEYXRhEg4KBnByb3BJZBgBIAEoCRIPCgd1c2VkTnVtGAIgASgF",
+          "QgdaBS4vO3BiYgZwcm90bzM="));
     descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
         new pbr::FileDescriptor[] { },
         new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
           new pbr::GeneratedClrTypeInfo(typeof(global::PropRequest), global::PropRequest.Parser, new[]{ "PropId", "Action", "PropServerId", "RoomId", "UserId", "X", "Y", "Z" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::PropResponse), global::PropResponse.Parser, new[]{ "PropId", "PropServerId", "Name", "Code", "Message" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::PropModelRequest), global::PropModelRequest.Parser, new[]{ "Id" }, null, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::PropModelResponse), global::PropModelResponse.Parser, new[]{ "Id", "Category", "Note", "Name", "Weight", "Scene", "Icon", "ResPath", "ConsumableType", "Durations", "IsPickup", "Num", "Calculation", "LossTime", "PropServerId", "Used", "UserId", "RoomId", "TotalNum", "RestNum", "Attribute" }, null, null, null, null)
+          new pbr::GeneratedClrTypeInfo(typeof(global::PropModelResponse), global::PropModelResponse.Parser, new[]{ "Id", "Category", "Note", "Name", "Weight", "Scene", "Icon", "ResPath", "ConsumableType", "Durations", "IsPickup", "Num", "Calculation", "LossTime", "PropServerId", "Used", "UserId", "RoomId", "TotalNum", "RestNum", "Attribute" }, null, null, null, null),
+          new pbr::GeneratedClrTypeInfo(typeof(global::PutFireRequest), global::PutFireRequest.Parser, new[]{ "Data", "RoomId" }, null, null, null, null),
+          new pbr::GeneratedClrTypeInfo(typeof(global::PutFireData), global::PutFireData.Parser, new[]{ "PropId", "UsedNum" }, null, null, null, null)
         }));
   }
   #endregion
@@ -2091,6 +2096,477 @@ public sealed partial class PropModelResponse : pb::IMessage<PropModelResponse>
 
 }
 
+[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
+public sealed partial class PutFireRequest : pb::IMessage<PutFireRequest>
+#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    , pb::IBufferMessage
+#endif
+{
+  private static readonly pb::MessageParser<PutFireRequest> _parser = new pb::MessageParser<PutFireRequest>(() => new PutFireRequest());
+  private pb::UnknownFieldSet _unknownFields;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pb::MessageParser<PutFireRequest> Parser { get { return _parser; } }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pbr::MessageDescriptor Descriptor {
+    get { return global::PropReflection.Descriptor.MessageTypes[4]; }
+  }
+
+  [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 PutFireRequest() {
+    OnConstruction();
+  }
+
+  partial void OnConstruction();
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public PutFireRequest(PutFireRequest other) : this() {
+    data_ = other.data_.Clone();
+    roomId_ = other.roomId_;
+    _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public PutFireRequest Clone() {
+    return new PutFireRequest(this);
+  }
+
+  /// <summary>Field number for the "data" field.</summary>
+  public const int DataFieldNumber = 1;
+  private static readonly pb::FieldCodec<global::PutFireData> _repeated_data_codec
+      = pb::FieldCodec.ForMessage(10, global::PutFireData.Parser);
+  private readonly pbc::RepeatedField<global::PutFireData> data_ = new pbc::RepeatedField<global::PutFireData>();
+  /// <summary>
+  /// 道具ID和使用人数
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public pbc::RepeatedField<global::PutFireData> Data {
+    get { return data_; }
+  }
+
+  /// <summary>Field number for the "roomId" field.</summary>
+  public const int RoomIdFieldNumber = 2;
+  private string roomId_ = "";
+  /// <summary>
+  /// 房间ID
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public string RoomId {
+    get { return roomId_; }
+    set {
+      roomId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+    }
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public override bool Equals(object other) {
+    return Equals(other as PutFireRequest);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public bool Equals(PutFireRequest other) {
+    if (ReferenceEquals(other, null)) {
+      return false;
+    }
+    if (ReferenceEquals(other, this)) {
+      return true;
+    }
+    if(!data_.Equals(other.data_)) return false;
+    if (RoomId != other.RoomId) 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 (RoomId.Length != 0) hash ^= RoomId.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 (RoomId.Length != 0) {
+      output.WriteRawTag(18);
+      output.WriteString(RoomId);
+    }
+    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 (RoomId.Length != 0) {
+      output.WriteRawTag(18);
+      output.WriteString(RoomId);
+    }
+    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 (RoomId.Length != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeStringSize(RoomId);
+    }
+    if (_unknownFields != null) {
+      size += _unknownFields.CalculateSize();
+    }
+    return size;
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public void MergeFrom(PutFireRequest other) {
+    if (other == null) {
+      return;
+    }
+    data_.Add(other.data_);
+    if (other.RoomId.Length != 0) {
+      RoomId = other.RoomId;
+    }
+    _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) {
+    if ((tag & 7) == 4) {
+      // Abort on any end group tag.
+      return;
+    }
+    switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+          break;
+        case 10: {
+          data_.AddEntriesFrom(input, _repeated_data_codec);
+          break;
+        }
+        case 18: {
+          RoomId = input.ReadString();
+          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) {
+    if ((tag & 7) == 4) {
+      // Abort on any end group tag.
+      return;
+    }
+    switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+          break;
+        case 10: {
+          data_.AddEntriesFrom(ref input, _repeated_data_codec);
+          break;
+        }
+        case 18: {
+          RoomId = input.ReadString();
+          break;
+        }
+      }
+    }
+  }
+  #endif
+
+}
+
+[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
+public sealed partial class PutFireData : pb::IMessage<PutFireData>
+#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    , pb::IBufferMessage
+#endif
+{
+  private static readonly pb::MessageParser<PutFireData> _parser = new pb::MessageParser<PutFireData>(() => new PutFireData());
+  private pb::UnknownFieldSet _unknownFields;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pb::MessageParser<PutFireData> Parser { get { return _parser; } }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pbr::MessageDescriptor Descriptor {
+    get { return global::PropReflection.Descriptor.MessageTypes[5]; }
+  }
+
+  [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 PutFireData() {
+    OnConstruction();
+  }
+
+  partial void OnConstruction();
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public PutFireData(PutFireData other) : this() {
+    propId_ = other.propId_;
+    usedNum_ = other.usedNum_;
+    _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public PutFireData Clone() {
+    return new PutFireData(this);
+  }
+
+  /// <summary>Field number for the "propId" field.</summary>
+  public const int PropIdFieldNumber = 1;
+  private string propId_ = "";
+  /// <summary>
+  /// 道具ID
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public string PropId {
+    get { return propId_; }
+    set {
+      propId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+    }
+  }
+
+  /// <summary>Field number for the "usedNum" field.</summary>
+  public const int UsedNumFieldNumber = 2;
+  private int usedNum_;
+  /// <summary>
+  /// 使用人数
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public int UsedNum {
+    get { return usedNum_; }
+    set {
+      usedNum_ = value;
+    }
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public override bool Equals(object other) {
+    return Equals(other as PutFireData);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public bool Equals(PutFireData other) {
+    if (ReferenceEquals(other, null)) {
+      return false;
+    }
+    if (ReferenceEquals(other, this)) {
+      return true;
+    }
+    if (PropId != other.PropId) return false;
+    if (UsedNum != other.UsedNum) 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 (PropId.Length != 0) hash ^= PropId.GetHashCode();
+    if (UsedNum != 0) hash ^= UsedNum.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 (PropId.Length != 0) {
+      output.WriteRawTag(10);
+      output.WriteString(PropId);
+    }
+    if (UsedNum != 0) {
+      output.WriteRawTag(16);
+      output.WriteInt32(UsedNum);
+    }
+    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 (PropId.Length != 0) {
+      output.WriteRawTag(10);
+      output.WriteString(PropId);
+    }
+    if (UsedNum != 0) {
+      output.WriteRawTag(16);
+      output.WriteInt32(UsedNum);
+    }
+    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 (PropId.Length != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeStringSize(PropId);
+    }
+    if (UsedNum != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeInt32Size(UsedNum);
+    }
+    if (_unknownFields != null) {
+      size += _unknownFields.CalculateSize();
+    }
+    return size;
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public void MergeFrom(PutFireData other) {
+    if (other == null) {
+      return;
+    }
+    if (other.PropId.Length != 0) {
+      PropId = other.PropId;
+    }
+    if (other.UsedNum != 0) {
+      UsedNum = other.UsedNum;
+    }
+    _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) {
+    if ((tag & 7) == 4) {
+      // Abort on any end group tag.
+      return;
+    }
+    switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+          break;
+        case 10: {
+          PropId = input.ReadString();
+          break;
+        }
+        case 16: {
+          UsedNum = 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) {
+    if ((tag & 7) == 4) {
+      // Abort on any end group tag.
+      return;
+    }
+    switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+          break;
+        case 10: {
+          PropId = input.ReadString();
+          break;
+        }
+        case 16: {
+          UsedNum = input.ReadInt32();
+          break;
+        }
+      }
+    }
+  }
+  #endif
+
+}
+
 #endregion
 
 
diff --git a/xiaofang/Assets/ProtoBuf/Proto/Room.cs b/xiaofang/Assets/ProtoBuf/Proto/Room.cs
index 25ba0064..77409708 100644
--- a/xiaofang/Assets/ProtoBuf/Proto/Room.cs
+++ b/xiaofang/Assets/ProtoBuf/Proto/Room.cs
@@ -32,7 +32,7 @@ public static partial class RoomReflection {
           "C3Rhc2tPcm1EYXRhGBAgAygLMgwuVGFza09ybURhdGESJQoNc2VsZWN0T3Jt",
           "RGF0YRgRIAMoCzIOLlNlbGVjdE9ybURhdGESJQoNb2JqZWN0T3JtRGF0YRgS",
           "IAMoCzIOLk9iamVjdE9ybURhdGESFAoMR2FtZVBvc2l0aW9uGBYgASgJEhYK",
-          "DkluaXRGaXJlUmFkaXVzGBcgASgFEhQKDEluaXRGaXJlVGltZRgYIAEoBRIV",
+          "DkluaXRGaXJlUmFkaXVzGBcgASgCEhQKDEluaXRGaXJlVGltZRgYIAEoBRIV",
           "Cg1BZGRGaXJlUmFkaXVzGBkgASgCEhQKDEFkZEZpcmVWYWx1ZRgaIAEoAhIT",
           "CgtNYXhGaXJld2FsbBgbIAEoBSLVAwoLVGFza09ybURhdGESCgoCSWQYASAB",
           "KAMSEAoIVGFza05hbWUYAiABKAkSEAoIR2FtZU5hbWUYAyABKAkSEAoIR2Ft",
@@ -63,15 +63,17 @@ public static partial class RoomReflection {
           "DQoFT25PZmYYDyABKAMSDgoGU3RhdHVzGBAgASgJEhEKCVJlc0NoYW5nZRgR",
           "IAEoCRIXCg9QYXJhbGxlbENvbnRyb2wYEiABKAMSEgoKRXh0cmFWYWx1ZRgT",
           "IAEoCRIPCgdVc2VySWRzGBQgASgJEhIKCkNyZWF0ZVRpbWUYFSABKAkSEgoK",
-          "VXBkYXRlVGltZRgWIAEoCRIOCgZSb29tSWQYFyABKAlCB1oFLi87cGJiBnBy",
-          "b3RvMw=="));
+          "VXBkYXRlVGltZRgWIAEoCRIOCgZSb29tSWQYFyABKAkiQwoQRmlyZVBvaW50",
+          "UmVxdWVzdBIJCgFYGAEgASgCEgkKAVkYAiABKAISCQoBWhgDIAEoAhIOCgZS",
+          "b29tSWQYBCABKAlCB1oFLi87cGJiBnByb3RvMw=="));
     descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
         new pbr::FileDescriptor[] { },
         new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
           new pbr::GeneratedClrTypeInfo(typeof(global::RoomTemplateResponse), global::RoomTemplateResponse.Parser, new[]{ "Id", "TemplateName", "CompanyId", "SceneId", "SubjectId", "Status", "IsTemplate", "CreateBy", "CreateTime", "UpdateBy", "UpdateTime", "Remark", "Mode", "DisasterLocation", "Firewall", "TaskOrmData", "SelectOrmData", "ObjectOrmData", "GamePosition", "InitFireRadius", "InitFireTime", "AddFireRadius", "AddFireValue", "MaxFirewall" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::TaskOrmData), global::TaskOrmData.Parser, new[]{ "Id", "TaskName", "GameName", "GameType", "GameDesc", "GamePlayScript", "GameTrigger", "GameTriggerLogic", "GameOverseeCond", "GameTimeLimit", "GameRole", "GameSelects", "GameTargetType", "GameTargetsFirst", "GameTargetsSecond", "GameTargetsSecondLogic", "GameExtraValue", "GameSort", "GameIsShow", "GameExclusive", "GameReward" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::SelectOrmData), global::SelectOrmData.Parser, new[]{ "Id", "Note", "Group", "ShowText", "Icon", "Preconditions", "Exclusive", "TaskTime", "TimeLimit", "NextSelect", "TaskLink", "TaskLinkDetails", "CallMode", "CallRecipient", "CorrectOption", "Reward", "Result", "Route", "TimingChange", "AppliedUI", "UIDetails", "Seq" }, null, null, null, null),
-          new pbr::GeneratedClrTypeInfo(typeof(global::ObjectOrmData), global::ObjectOrmData.Parser, new[]{ "Id", "ObjectId", "Note", "Type", "Name", "NameShowOffset", "ShowRadius", "Icon", "Role", "ItemDepend", "TakeTime", "NeedPlayers", "TaskStatus", "SelectList", "OnOff", "Status", "ResChange", "ParallelControl", "ExtraValue", "UserIds", "CreateTime", "UpdateTime", "RoomId" }, null, null, null, null)
+          new pbr::GeneratedClrTypeInfo(typeof(global::ObjectOrmData), global::ObjectOrmData.Parser, new[]{ "Id", "ObjectId", "Note", "Type", "Name", "NameShowOffset", "ShowRadius", "Icon", "Role", "ItemDepend", "TakeTime", "NeedPlayers", "TaskStatus", "SelectList", "OnOff", "Status", "ResChange", "ParallelControl", "ExtraValue", "UserIds", "CreateTime", "UpdateTime", "RoomId" }, null, null, null, null),
+          new pbr::GeneratedClrTypeInfo(typeof(global::FirePointRequest), global::FirePointRequest.Parser, new[]{ "X", "Y", "Z", "RoomId" }, null, null, null, null)
         }));
   }
   #endregion
@@ -373,10 +375,10 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
 
   /// <summary>Field number for the "InitFireRadius" field.</summary>
   public const int InitFireRadiusFieldNumber = 23;
-  private int initFireRadius_;
+  private float initFireRadius_;
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-  public int InitFireRadius {
+  public float InitFireRadius {
     get { return initFireRadius_; }
     set {
       initFireRadius_ = value;
@@ -465,7 +467,7 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
     if(!selectOrmData_.Equals(other.selectOrmData_)) return false;
     if(!objectOrmData_.Equals(other.objectOrmData_)) return false;
     if (GamePosition != other.GamePosition) return false;
-    if (InitFireRadius != other.InitFireRadius) return false;
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(InitFireRadius, other.InitFireRadius)) return false;
     if (InitFireTime != other.InitFireTime) return false;
     if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(AddFireRadius, other.AddFireRadius)) return false;
     if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(AddFireValue, other.AddFireValue)) return false;
@@ -496,7 +498,7 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
     hash ^= selectOrmData_.GetHashCode();
     hash ^= objectOrmData_.GetHashCode();
     if (GamePosition.Length != 0) hash ^= GamePosition.GetHashCode();
-    if (InitFireRadius != 0) hash ^= InitFireRadius.GetHashCode();
+    if (InitFireRadius != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(InitFireRadius);
     if (InitFireTime != 0) hash ^= InitFireTime.GetHashCode();
     if (AddFireRadius != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(AddFireRadius);
     if (AddFireValue != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(AddFireValue);
@@ -586,9 +588,9 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
       output.WriteRawTag(178, 1);
       output.WriteString(GamePosition);
     }
-    if (InitFireRadius != 0) {
-      output.WriteRawTag(184, 1);
-      output.WriteInt32(InitFireRadius);
+    if (InitFireRadius != 0F) {
+      output.WriteRawTag(189, 1);
+      output.WriteFloat(InitFireRadius);
     }
     if (InitFireTime != 0) {
       output.WriteRawTag(192, 1);
@@ -683,9 +685,9 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
       output.WriteRawTag(178, 1);
       output.WriteString(GamePosition);
     }
-    if (InitFireRadius != 0) {
-      output.WriteRawTag(184, 1);
-      output.WriteInt32(InitFireRadius);
+    if (InitFireRadius != 0F) {
+      output.WriteRawTag(189, 1);
+      output.WriteFloat(InitFireRadius);
     }
     if (InitFireTime != 0) {
       output.WriteRawTag(192, 1);
@@ -764,8 +766,8 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
     if (GamePosition.Length != 0) {
       size += 2 + pb::CodedOutputStream.ComputeStringSize(GamePosition);
     }
-    if (InitFireRadius != 0) {
-      size += 2 + pb::CodedOutputStream.ComputeInt32Size(InitFireRadius);
+    if (InitFireRadius != 0F) {
+      size += 2 + 4;
     }
     if (InitFireTime != 0) {
       size += 2 + pb::CodedOutputStream.ComputeInt32Size(InitFireTime);
@@ -842,7 +844,7 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
     if (other.GamePosition.Length != 0) {
       GamePosition = other.GamePosition;
     }
-    if (other.InitFireRadius != 0) {
+    if (other.InitFireRadius != 0F) {
       InitFireRadius = other.InitFireRadius;
     }
     if (other.InitFireTime != 0) {
@@ -952,8 +954,8 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
           GamePosition = input.ReadString();
           break;
         }
-        case 184: {
-          InitFireRadius = input.ReadInt32();
+        case 189: {
+          InitFireRadius = input.ReadFloat();
           break;
         }
         case 192: {
@@ -1067,8 +1069,8 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
           GamePosition = input.ReadString();
           break;
         }
-        case 184: {
-          InitFireRadius = input.ReadInt32();
+        case 189: {
+          InitFireRadius = input.ReadFloat();
           break;
         }
         case 192: {
@@ -4088,6 +4090,315 @@ public sealed partial class ObjectOrmData : pb::IMessage<ObjectOrmData>
 
 }
 
+[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
+public sealed partial class FirePointRequest : pb::IMessage<FirePointRequest>
+#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    , pb::IBufferMessage
+#endif
+{
+  private static readonly pb::MessageParser<FirePointRequest> _parser = new pb::MessageParser<FirePointRequest>(() => new FirePointRequest());
+  private pb::UnknownFieldSet _unknownFields;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pb::MessageParser<FirePointRequest> Parser { get { return _parser; } }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pbr::MessageDescriptor Descriptor {
+    get { return global::RoomReflection.Descriptor.MessageTypes[4]; }
+  }
+
+  [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 FirePointRequest() {
+    OnConstruction();
+  }
+
+  partial void OnConstruction();
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public FirePointRequest(FirePointRequest other) : this() {
+    x_ = other.x_;
+    y_ = other.y_;
+    z_ = other.z_;
+    roomId_ = other.roomId_;
+    _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public FirePointRequest Clone() {
+    return new FirePointRequest(this);
+  }
+
+  /// <summary>Field number for the "X" field.</summary>
+  public const int XFieldNumber = 1;
+  private float x_;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public float X {
+    get { return x_; }
+    set {
+      x_ = value;
+    }
+  }
+
+  /// <summary>Field number for the "Y" field.</summary>
+  public const int YFieldNumber = 2;
+  private float y_;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public float Y {
+    get { return y_; }
+    set {
+      y_ = value;
+    }
+  }
+
+  /// <summary>Field number for the "Z" field.</summary>
+  public const int ZFieldNumber = 3;
+  private float z_;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public float Z {
+    get { return z_; }
+    set {
+      z_ = value;
+    }
+  }
+
+  /// <summary>Field number for the "RoomId" field.</summary>
+  public const int RoomIdFieldNumber = 4;
+  private string roomId_ = "";
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public string RoomId {
+    get { return roomId_; }
+    set {
+      roomId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+    }
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public override bool Equals(object other) {
+    return Equals(other as FirePointRequest);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public bool Equals(FirePointRequest other) {
+    if (ReferenceEquals(other, null)) {
+      return false;
+    }
+    if (ReferenceEquals(other, this)) {
+      return true;
+    }
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(X, other.X)) return false;
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Y, other.Y)) return false;
+    if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Z, other.Z)) return false;
+    if (RoomId != other.RoomId) 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 (X != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(X);
+    if (Y != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Y);
+    if (Z != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Z);
+    if (RoomId.Length != 0) hash ^= RoomId.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 (X != 0F) {
+      output.WriteRawTag(13);
+      output.WriteFloat(X);
+    }
+    if (Y != 0F) {
+      output.WriteRawTag(21);
+      output.WriteFloat(Y);
+    }
+    if (Z != 0F) {
+      output.WriteRawTag(29);
+      output.WriteFloat(Z);
+    }
+    if (RoomId.Length != 0) {
+      output.WriteRawTag(34);
+      output.WriteString(RoomId);
+    }
+    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 (X != 0F) {
+      output.WriteRawTag(13);
+      output.WriteFloat(X);
+    }
+    if (Y != 0F) {
+      output.WriteRawTag(21);
+      output.WriteFloat(Y);
+    }
+    if (Z != 0F) {
+      output.WriteRawTag(29);
+      output.WriteFloat(Z);
+    }
+    if (RoomId.Length != 0) {
+      output.WriteRawTag(34);
+      output.WriteString(RoomId);
+    }
+    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 (X != 0F) {
+      size += 1 + 4;
+    }
+    if (Y != 0F) {
+      size += 1 + 4;
+    }
+    if (Z != 0F) {
+      size += 1 + 4;
+    }
+    if (RoomId.Length != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeStringSize(RoomId);
+    }
+    if (_unknownFields != null) {
+      size += _unknownFields.CalculateSize();
+    }
+    return size;
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public void MergeFrom(FirePointRequest other) {
+    if (other == null) {
+      return;
+    }
+    if (other.X != 0F) {
+      X = other.X;
+    }
+    if (other.Y != 0F) {
+      Y = other.Y;
+    }
+    if (other.Z != 0F) {
+      Z = other.Z;
+    }
+    if (other.RoomId.Length != 0) {
+      RoomId = other.RoomId;
+    }
+    _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) {
+    if ((tag & 7) == 4) {
+      // Abort on any end group tag.
+      return;
+    }
+    switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
+          break;
+        case 13: {
+          X = input.ReadFloat();
+          break;
+        }
+        case 21: {
+          Y = input.ReadFloat();
+          break;
+        }
+        case 29: {
+          Z = input.ReadFloat();
+          break;
+        }
+        case 34: {
+          RoomId = input.ReadString();
+          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) {
+    if ((tag & 7) == 4) {
+      // Abort on any end group tag.
+      return;
+    }
+    switch(tag) {
+        default:
+          _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
+          break;
+        case 13: {
+          X = input.ReadFloat();
+          break;
+        }
+        case 21: {
+          Y = input.ReadFloat();
+          break;
+        }
+        case 29: {
+          Z = input.ReadFloat();
+          break;
+        }
+        case 34: {
+          RoomId = input.ReadString();
+          break;
+        }
+      }
+    }
+  }
+  #endif
+
+}
+
 #endregion
 
 
diff --git a/xiaofang/Assets/ProtoBuf/test.cs b/xiaofang/Assets/ProtoBuf/test.cs
index d5352568..cb35978d 100644
--- a/xiaofang/Assets/ProtoBuf/test.cs
+++ b/xiaofang/Assets/ProtoBuf/test.cs
@@ -9,6 +9,7 @@ using Google.Protobuf;
 using System.Net.WebSockets;
 using System;
 using System.Threading.Tasks;
+using UnityEngine.Networking.Types;
 
 public class test : MonoBehaviour
 {
@@ -112,17 +113,18 @@ public class test : MonoBehaviour
             await Task.Delay(2000);
         }
     }
+
     //֡�洢��������
-    void UpFps()
+    public void UpFps(string id,string sid,float x,float y,int roomseatid,float z,string roomid)
     {
         InputData data = new InputData();
-        data.RoomId = "168888";
-        data.Id = "778899";
-        data.SId = "7";
-        data.X = 7f;
-        data.Y = 5f;
-        data.Z = 4f;
-        data.RoomSeatId = 5;
+        data.Id = id;
+        data.SId = sid;
+        data.X = x;
+        data.Y = y;
+        data.RoomSeatId = roomseatid;
+        data.Z = z;
+        data.RoomId = roomid;
         WSMessage msg = new WSMessage();
         msg.Module = "fps";
         msg.ServiceName = "UpFps";
@@ -137,11 +139,13 @@ public class test : MonoBehaviour
     }
 
     //ʰȡ����
-    void PickUpProp()
+    void PickUpProp(int propid,int action,string propserverid,string roomid)
     {
         PropRequest data = new PropRequest();
-        data.PropId = 1001;
-        data.RoomId = "168888";
+        data.PropId = propid;
+        data.Action = action;
+        data.PropServerId = propserverid;
+        data.RoomId = roomid;
         WSMessage msg = new WSMessage();
         msg.Module = "prop";
         msg.ServiceName = "PickUpProp";
@@ -156,13 +160,13 @@ public class test : MonoBehaviour
     }
 
     //ʹ�õ���
-    void StartUseProp()
+    void StartUseProp(int propid, int action, string propserverid, string roomid)
     {
         PropRequest data = new PropRequest();
-        data.RoomId = "168888";
-        data.PropId = 1001;
-        data.Action = 1;
-        data.PropServerId = "MTg1OTc5MDMwOTIyODc4OTc2MA==";
+        data.PropId = propid;
+        data.Action = action;
+        data.PropServerId = propserverid;
+        data.RoomId = roomid;
         WSMessage msg = new WSMessage();
         msg.Module = "prop";
         msg.ServiceName = "StartUseProp";
@@ -175,13 +179,15 @@ public class test : MonoBehaviour
 
         wEBScriptListener.SendMessageByte(sendData);
     }
+
     //ֹͣʹ�õ���
-    void StopUseProp()
+    void StopUseProp(int propid, int action, string propserverid, string roomid)
     {
         PropRequest data = new PropRequest();
-        data.RoomId = "168888";
-        data.PropId = 1001;
-        data.PropServerId = "MTg1OTc5MDMwOTIyODc4OTc2MA==";
+        data.RoomId = roomid;
+        data.PropId = propid;
+        data.PropServerId = propserverid;
+        data.Action = action;
         WSMessage msg = new WSMessage();
         msg.Module = "prop";
         msg.ServiceName = "StopUseProp";
@@ -232,23 +238,7 @@ public class test : MonoBehaviour
     //}
 
 
-    //11����ʼ��ʱ
-    void RoomStartTime(string rooid) 
-    {
-        JoinRoomRequest data = new JoinRoomRequest();
-        data.RoomId = rooid;
-        WSMessage msg = new WSMessage();
-        msg.Module = "hall";
-        msg.ServiceName = "RoomStartTime";
-        msg.Data = ByteString.CopyFrom(ProtoBufffer.Serialize(data));
-        byte[] sendData = ProtoBufffer.Serialize(msg);
-        WSMessage deinfo = ProtoBufffer.DeSerialize<WSMessage>(sendData);
-        JoinRoomRequest login = ProtoBufffer.DeSerialize<JoinRoomRequest>(deinfo.Data.ToByteArray());
-        Debug.Log("����npc����ҵ���Ϣ");
-        //BroadcastFrameMsg.FramesFieldNumber
-
-        wEBScriptListener.SendMessageByte(sendData);
-    }
+    
 
     //����npc����ҵ���Ϣ
     void Location(string userId = "2", string roomId = "3")
@@ -273,13 +263,36 @@ public class test : MonoBehaviour
     }
 
 
-    void TaskTrigger()
+    //(1)	��ʼ��������Ҫִ�е�����(������������ɺ����)
+    public void InitStart(string roomid)
     {
         TaskTrigger data = new TaskTrigger();
-        data.RoomId = "168888";
-        data.TriggerId = "10006";
-        data.UserId = "1845037177556934659";
-        data.TypeStr = "selector";
+        data.RoomId = roomid;
+        
+        WSMessage msg = new WSMessage();
+        msg.Module = "task";
+        msg.ServiceName = "InitStart";
+        msg.Data = ByteString.CopyFrom(ProtoBufffer.Serialize(data));
+        byte[] sendData = ProtoBufffer.Serialize(msg);
+        WSMessage deinfo = ProtoBufffer.DeSerialize<WSMessage>(sendData);
+        TaskTrigger login = ProtoBufffer.DeSerialize<TaskTrigger>(deinfo.Data.ToByteArray());
+        Debug.Log("==========���񴥷�");
+        //BroadcastFrameMsg.FramesFieldNumber
+
+        wEBScriptListener.SendMessageByte(sendData);
+    }
+
+    //(2)	���񴥷�
+    public void TaskTrigger(string userid,string roomid,string triggerid,string typestr,string targetid,string taskid,string roleid)
+    {
+        TaskTrigger data = new TaskTrigger();
+        data.RoomId = roomid;
+        data.TriggerId = triggerid;
+        data.UserId = userid;
+        data.TypeStr = typestr;
+        data.TargetId = targetid;
+        data.TaskId = taskid;
+        data.RoleId = roleid;
         WSMessage msg = new WSMessage();
         msg.Module = "task";
         msg.ServiceName = "TaskTrigger";
@@ -293,13 +306,28 @@ public class test : MonoBehaviour
         wEBScriptListener.SendMessageByte(sendData);
     }
 
-    void TaskUpdateRequest()
+
+
+    //(3)	��������״̬
+    void TaskUpdateRequest(TaskUpdateRequest taskUpdateRequest)
     {
+        //TaskUpdateRequest������������ע��
+        /*
+         message TaskUpdateRequesti
+        string RoomId =1;//����id
+        tring TaskId =2; // ����id
+string UserId =3;// �û�id
+string SelectId =4;// ѡ��ID ���水ť
+string ToUserId =5;// Ŀ���û�id
+string UserName =6;//�û���
+string PropId =7;//����id
+string PropName =8;//��������
+int32 InputNum =9;//��������
+string status =10;// ����״̬
+string HandleButtoncallId=11;//������ť����idstring TargetType =12;// �����������
+         */
         TaskUpdateRequest data = new TaskUpdateRequest();
-        data.RoomId = "168888";
-        data.TaskId = "d9608224-18b4-4d68-af45-82b3c843e3c3";
-        data.UserId = "1845037177556934659";
-        data.PropId = "3005";
+        data = taskUpdateRequest;
         WSMessage msg = new WSMessage();
         msg.Module = "task";
         msg.ServiceName = "UpdateTask";
@@ -313,8 +341,8 @@ public class test : MonoBehaviour
         wEBScriptListener.SendMessageByte(sendData);
     }
 
-    //NPC·��ѡ��
-    public void NpcMove(string roomId = "1", int moveType = 2, int selectId = 3)
+    //NPC·��ѡ��   
+    public void NpcMove(string roomId, int moveType, int selectId)
     {
         MoveRequest data = new MoveRequest();
         data.RoomId = roomId;
@@ -334,14 +362,32 @@ public class test : MonoBehaviour
         wEBScriptListener.SendMessageByte(sendData);
     }
 
+    //11����ʼ��ʱ
+    void RoomStartTime(string rooid)
+    {
+        JoinRoomRequest data = new JoinRoomRequest();
+        data.RoomId = rooid;
+        WSMessage msg = new WSMessage();
+        msg.Module = "hall";
+        msg.ServiceName = "RoomStartTime";
+        msg.Data = ByteString.CopyFrom(ProtoBufffer.Serialize(data));
+        byte[] sendData = ProtoBufffer.Serialize(msg);
+        WSMessage deinfo = ProtoBufffer.DeSerialize<WSMessage>(sendData);
+        JoinRoomRequest login = ProtoBufffer.DeSerialize<JoinRoomRequest>(deinfo.Data.ToByteArray());
+        Debug.Log("����npc����ҵ���Ϣ");
+        //BroadcastFrameMsg.FramesFieldNumber
+
+        wEBScriptListener.SendMessageByte(sendData);
+    }
+
     //12����Ϣת��
-    public void MessageToUser()
+    public void MessageToUser(string roomid, int type, string roleid, string cmd)
     {
         MessageBroadcastRequest data = new MessageBroadcastRequest();
-        data.RoomId = "168888";
-        data.Type = 1;
-        data.RoleId = "8002";
-        data.Cmd = "55";
+        data.RoomId = roomid;
+        data.Type = type;
+        data.RoleId = roleid;
+        data.Cmd = cmd;
         WSMessage msg = new WSMessage();
         msg.Module = "hall";
         msg.ServiceName = "MessageToUser";
@@ -355,6 +401,25 @@ public class test : MonoBehaviour
         wEBScriptListener.SendMessageByte(sendData);
     }
 
+    //14.���󴥷�����
+    public void HandleObject(RequestObject requestObject)
+    {
+        RequestObject data = new RequestObject();
+        
+        WSMessage msg = new WSMessage();
+        msg.Module = "object";
+        msg.ServiceName = "HandleObject";
+        msg.Data = ByteString.CopyFrom(ProtoBufffer.Serialize(data));
+        byte[] sendData = ProtoBufffer.Serialize(msg);
+        WSMessage deinfo = ProtoBufffer.DeSerialize<WSMessage>(sendData);
+        MessageBroadcastRequest login = ProtoBufffer.DeSerialize<MessageBroadcastRequest>(deinfo.Data.ToByteArray());
+        Debug.Log("==========��Ϣת����������");
+        //BroadcastFrameMsg.FramesFieldNumber
+
+        wEBScriptListener.SendMessageByte(sendData);
+    }
+
+
     public void CreateNpcHandler()
     {
         NpcCreateRequest data = new NpcCreateRequest();
@@ -374,15 +439,19 @@ public class test : MonoBehaviour
         wEBScriptListener.SendMessageByte(sendData);
     }
 
-    //��������Ƶ��
-    public void RtcTokenHandler()
+    //17.��������Ƶ��
+    public void RtcTokenHandler(VoiceRequest voiceRequest)
     {
+        /*
+            VoiceRequest
+            uint32 uid =1;// �û�id
+            string channelName=2;//Ƶ������
+            Channelrype=5;//Ƶ������string
+            string roomId=8://��Ϸ����id
+            string role=6;//��Ҫ֪ͨ�Ľ�ɫ ����:1,2,3,4 You��Moments
+         */
         VoiceRequest data = new VoiceRequest();
-        data.Uid = 1;
-        data.RoomId = "8";
-        data.ChannelName = "2";
-        data.ChannelType = "5";
-        data.Role = "6";
+        data = voiceRequest;
 
         WSMessage msg = new WSMessage();
         msg.Module = "voice";
@@ -397,12 +466,13 @@ public class test : MonoBehaviour
         wEBScriptListener.SendMessageByte(sendData);
     }
 
-    //NPC�Ƿ������������
-    public void EnterFogArea()
+    //18.NPC�Ƿ������������
+    public void EnterFogArea(string[] npclist,string roomid,int action)
     {
         npcRequest data = new npcRequest();
-        data.RoomId = "8";
-        data.Action = 3;
+        data.RoomId = roomid;
+        data.Action = action;
+        
 
         WSMessage msg = new WSMessage();
         msg.Module = "voice";
@@ -410,7 +480,7 @@ public class test : MonoBehaviour
         msg.Data = ByteString.CopyFrom(ProtoBufffer.Serialize(data));
         byte[] sendData = ProtoBufffer.Serialize(msg);
         WSMessage deinfo = ProtoBufffer.DeSerialize<WSMessage>(sendData);
-        VoiceRequest login = ProtoBufffer.DeSerialize<VoiceRequest>(deinfo.Data.ToByteArray());
+        npcRequest login = ProtoBufffer.DeSerialize<npcRequest>(deinfo.Data.ToByteArray());
         Debug.Log("==========��Ϣת����������");
         //BroadcastFrameMsg.FramesFieldNumber
 
@@ -418,20 +488,16 @@ public class test : MonoBehaviour
     }
 
 
-    //����ѡ�����
-    public void SelectTrigger()
+    //19.����ѡ�����
+    public void SelectTrigger(SelectRequest selectRequest)
     {
         SelectRequest data = new SelectRequest();
-        data.SelectId = "1";
-        data.UserId = "2";
-        data.RoomId = "3";
-        data.TaskId = "4";
-        data.RoleId = "5";
+        data = selectRequest;
 
 
         WSMessage msg = new WSMessage();
-        msg.Module = "voice";
-        msg.ServiceName = "RtcTokenHandler";
+        msg.Module = "select";
+        msg.ServiceName = "SelectTrigger";
         msg.Data = ByteString.CopyFrom(ProtoBufffer.Serialize(data));
         byte[] sendData = ProtoBufffer.Serialize(msg);
         WSMessage deinfo = ProtoBufffer.DeSerialize<WSMessage>(sendData);
@@ -443,13 +509,13 @@ public class test : MonoBehaviour
     }
 
 
-    //
-    public void GetSelectHistoryList()
+    //20.ѡ�������¼
+    public void GetSelectHistoryList(string selectid,string userid,string roomid)
     {
         SelectHistoryRequest data = new SelectHistoryRequest();
-        data.SelectId = "1";
-        data.UserId = "2";
-        data.RoomId = "3";
+        data.SelectId = selectid;
+        data.UserId = userid;
+        data.RoomId = roomid;
 
 
 
@@ -466,12 +532,11 @@ public class test : MonoBehaviour
         wEBScriptListener.SendMessageByte(sendData);
     }
 
-    //
-    public void GetTaskList(string userID, string roomID)
+    //16.��ȡ�����б�
+    public void GetTaskList(TaskTrigger taskTrigger)
     {
         TaskTrigger data = new TaskTrigger();
-        data.UserId = "2";
-        data.RoomId = "3";
+        data = taskTrigger;
 
 
 
@@ -488,7 +553,7 @@ public class test : MonoBehaviour
         wEBScriptListener.SendMessageByte(sendData);
     }
 
-    //���������Ϣ
+    //15.���������Ϣ
     public void ThatUser(PlayerJoinResponse player)
     {
         PlayerJoinResponse data = new PlayerJoinResponse();
@@ -507,6 +572,8 @@ public class test : MonoBehaviour
 
         wEBScriptListener.SendMessageByte(sendData);
     }
+
+
     public void TriggerNpcArrive()
     {
         MoveRoomAoiRequest data = new MoveRoomAoiRequest();
@@ -532,8 +599,8 @@ public class test : MonoBehaviour
 
         wEBScriptListener.SendMessageByte(sendData);
     }
-    
-    
+
+    //21.���׼��
     public void PlayerReady(string roomId,bool isready)
     {
         PlayerReadyRequest data = new PlayerReadyRequest();
@@ -554,6 +621,7 @@ public class test : MonoBehaviour
         wEBScriptListener.SendMessageByte(sendData);
     }
 
+    //22.��ʼ����
     public void StartGameDrill(string roomId)
     {
         JoinRoomRequest data = new JoinRoomRequest();
@@ -573,6 +641,27 @@ public class test : MonoBehaviour
 
         wEBScriptListener.SendMessageByte(sendData);
     }
+
+    //24.�ύ�Ż�� 2024.12.30
+    public void PlayerSituation(FirePointRequest firePointRequest)
+    {
+        FirePointRequest data = new FirePointRequest();
+        data = firePointRequest;
+
+
+        Debug.Log("==========------------------��");
+        WSMessage msg = new WSMessage();
+        msg.Module = "hall";
+        msg.ServiceName = "SubmitFirePoint";
+        msg.Data = ByteString.CopyFrom(ProtoBufffer.Serialize(data));
+        byte[] sendData = ProtoBufffer.Serialize(msg);
+        WSMessage deinfo = ProtoBufffer.DeSerialize<WSMessage>(sendData);
+        FirePointRequest login = ProtoBufffer.DeSerialize<FirePointRequest>(deinfo.Data.ToByteArray());
+        Debug.Log("==========��Ϣת����������");
+        //BroadcastFrameMsg.FramesFieldNumber
+
+        wEBScriptListener.SendMessageByte(sendData);
+    }//23.��ҵ�λ��� 2024.12.30
     public void PlayerSituation(string roomId)
     {
         JoinRoomRequest data = new JoinRoomRequest();
@@ -581,7 +670,7 @@ public class test : MonoBehaviour
 
         Debug.Log("==========------------------��");
         WSMessage msg = new WSMessage();
-        msg.Module = "move";
+        msg.Module = "hall";
         msg.ServiceName = "PlayerSituation";
         msg.Data = ByteString.CopyFrom(ProtoBufffer.Serialize(data));
         byte[] sendData = ProtoBufffer.Serialize(msg);
@@ -593,7 +682,7 @@ public class test : MonoBehaviour
         wEBScriptListener.SendMessageByte(sendData);
     }
 
-
+    
 
     // Start is called before the first frame update
     async void Start()
@@ -825,31 +914,37 @@ public class test : MonoBehaviour
 
                 break;
 
-            //
+            //֡����
             case "fps.UpFps":
                 InputData inputData = ProtoBufffer.DeSerialize<InputData>(bytes);
                 Debug.Log("Id��" + inputData.Id + ",sId :" + inputData.SId + "��X:" + inputData.X.ToString() + "��Y:" + inputData.Y.ToString() + "��roomSeatId :" + inputData.RoomSeatId + "��z:" + inputData.Z.ToString() + "��roomId:" + inputData.RoomId);
                 break;
 
+            //ʰȡ���߼�������
             case "prop.PickUpProp":
-                PropRequest propRequest = ProtoBufffer.DeSerialize<PropRequest>(bytes);
-                Debug.Log("PropId:" + propRequest.PropId);
+                PropResponse PropResponse = ProtoBufffer.DeSerialize<PropResponse>(bytes);
+                //����id propId �����ID propServerId  ��������name ���߱���code ������ʾ��Ϣmessage
+                Debug.Log("PropId:" + PropResponse.PropId);
+
                 break;
 
+            //��ʼʹ�õ��߼�������
             case "prop.StartUseProp":
                 PropResponse useProp = ProtoBufffer.DeSerialize<PropResponse>(bytes);
-
+                //����id propId �����ID propServerId  ��������name ���߱���code ������ʾ��Ϣmessage
                 Debug.Log("PropId:" + useProp);
                 break;
 
             case "prop.StopUseProp":
                 PropResponse stopuseProp = ProtoBufffer.DeSerialize<PropResponse>(bytes);
-
+                //����id propId �����ID propServerId  ��������name ���߱���code ������ʾ��Ϣmessage
                 Debug.Log("PropId:" + stopuseProp);
                 break;
 
             case "move.Location":
                 //Debug.Log("move.Location���ܵ���");
+                MoveResponse playermove = ProtoBufffer.DeSerialize<MoveResponse>(bytes);
+
                 NpcData npcData = ProtoBufffer.DeSerialize<NpcData>(bytes);
                 //Debug.Log(npcData);
                 if (npcData.Type == 1)//npc����
@@ -937,13 +1032,7 @@ public class test : MonoBehaviour
 
                 break;
 
-            //17.����Ƶ��v
-            case "voice.RtcTokenHandler":
-                Debug.Log("-----------move.MoveNpc");
-                VoiceResponse voiceResponse = ProtoBufffer.DeSerialize<VoiceResponse>(bytes);
-                Debug.Log(voiceResponse);
-
-                break;
+            
 
             //15.���󴥷�����
             case "hall.ThatUser":
@@ -955,6 +1044,30 @@ public class test : MonoBehaviour
 
             //16.��ȡ�����б�
             case "hall.GetTaskList":
+                /*
+                 TaskListResponsetmessage
+                 repeated TaskResponse tasks =1;//�����б�
+
+                message TaskResponsef
+                string TaskId =1;//����id
+                string status =2;//״̬
+                string RoomId =3;//����id
+                float X=4;//x����
+                float Y=5;// y����
+                float z=6;// z����
+                string Type = 7;//����
+                int64 TimeLimit =8;//ʱ������
+                string Desc=9;//����
+                string Trigger =10;//��������
+                string NextTasks =11;//��һ������
+                string TargetType =12;//�ձ�����
+                string Reward =13;//����
+                string Note =14;//��ע
+                string CreateTime =15;//����ʱ��
+                string UpdateTime =16;//����ʱ��
+                string ToUserId =17;//�ձ��û�id
+                string BaseTaskId =18;//��������id
+                 */
                 Debug.Log("-----------move.MoveNpc");
                 TaskListResponse TaskListResponse = ProtoBufffer.DeSerialize<TaskListResponse>(bytes);
                 foreach (var task in TaskListResponse.Tasks)
@@ -963,8 +1076,58 @@ public class test : MonoBehaviour
                 }
 
                 break;
+
+            //17.����Ƶ��v
+            case "voice.RtcTokenHandler":
+                /*
+                    uint32 uid =1;// �û�id
+                    ChannelName=2;//Ƶ������string
+                    ChannelId=3;//Ƶ��idstring
+                    string Token =4://����token
+                    Channelrype=5;//Ƶ������string
+                    string appId =7;// ��Ҫ֪ͨ�Ľ�ɫ
+                 */
+                Debug.Log("-----------move.MoveNpc");
+                VoiceResponse voiceResponse = ProtoBufffer.DeSerialize<VoiceResponse>(bytes);
+                Debug.Log(voiceResponse);
+
+                break;
+
             //19.	����ѡ�����
             case "select.SelectTrigger":
+
+                /*
+                 tring Id =1;// ѡ���ID
+string BaseId =2;//ѡ�������ID
+string Note =3;// ѡ��˵��
+string Group =4;// ѡ�����
+string UnDisplay =5;// �Ƿ����� 1 ֻ��ʾһ�� 2 ���ظ���ʾ
+string ShowText =6;//��ʾ�ı�
+string Icon =7;// ͼ��
+string Preconditions=8;//ǰ������
+string Exclusive =9;//�Ƿ��ռ
+string TaskTime =10;// ����ʱ��
+int64 TimeLimit = 11;// ʱ������
+string NextSelect =12;//��һ��ѡ��
+string TaskLink = 13;// ��������
+string TaskLinkDetails = 14;// ������������
+string callMode = 15;// ���з�ʽ
+string callRecipient =16;//�������
+string Correctoption=17;//��ȷѡ��
+string Reward =18;//����
+string Result=19;//���
+string Route =20;//·��
+string TimingChange = 21;//�Ƿ�������ʱ�޸�
+string ApplieduI = 22;// �Ƿ���Ӧ��UI
+string UIDetails = 23;// UI����
+string Seq = 24;// ִ��ʱ������֡
+string PlayScript = 25;// JSON��ʽ�IJ��Žű�
+string RoomId=26;//����ID
+string CreateTime =27;//����ʱ��
+string UpdateTime =28;//����ʱ��
+string UserId =29;//������ID
+string RoleId =30;//��ɫID
+                 */
                 Debug.Log("select.SelectTrigger");
                 SelectResponse selectRequest = ProtoBufffer.DeSerialize<SelectResponse>(bytes);
                 Debug.Log(selectRequest);
@@ -973,6 +1136,47 @@ public class test : MonoBehaviour
 
             //20.	ѡ�������¼
             case "select.GetSelectHistoryList":
+                /*
+                 message SelectHistoryResponse
+meated selectResponse selects= 1;// ѡ����ʷ�б�
+                 
+                message SelectResponse 
+string Id =1;// ѡ���ID
+string BaseId =2;//ѡ�������ID
+string Note =3;//ѡ��˵��
+string Group =4;//ѡ�����
+string UnDisplay =5;// �Ƿ����� 1 ֻ��ʾһ�� 2 ���ظ���ʾ
+string ShowText =6;// ��ʾ�ı�
+string Icon =7;// ͼ��
+string Preconditions=8;//ǰ������
+string Exclusive =9;// �Ƿ��ռ
+string TaskTime =10;// ����ʱ��
+int64 TimeLimit = 11;// ʱ������
+string NextSelect=12;//��һ��ѡ��
+string TaskLink=13;//��������
+string TaskLinkDetails=14;//������������
+string callMode =15;//���з�ʽ
+string callRecipient =16;//�������
+string Correctoption=17;//��ȷѡ��
+string Reward =18;// ����
+string Result = 19;// ���
+string Route =20;//·��
+string Timingchange =21;//�Ƿ�������ʱ�޸�
+string ApplieduI=22;//�Ƿ���Ӧ��UI
+string UIDetails=23;//UI����
+string Seq=24;// ִ��ʱ������֡
+string PlayScript=25;//JSON��ʽ�IJ��Žű�
+string RoomId=26;//����ID
+string CreateTime=27;//����ʱ��
+string UpdateTime =28;// ����ʱ��
+string UserId =29;//������ID
+string RoleId =30://��ɫID
+repeated UserList SelectUserList =31;//ѡ����û�ID
+repeated string SelectRoleList=32;//ѡ��Ľ�ɫID
+message UserList{
+string UserId =1://�û�ID
+string RoleId=2;//��ɫID
+                 */
                 Debug.Log("select.GetSelectHistoryList");
                 SelectHistoryResponse selectHistoryResponse = ProtoBufffer.DeSerialize<SelectHistoryResponse>(bytes);
                 foreach (var selectRes in selectHistoryResponse.Selects)
@@ -982,14 +1186,24 @@ public class test : MonoBehaviour
                 break;
 
             //21.NPC�Ƿ񱻿���
-            case "move.TriggerNpcArrive":
-                SelectResponse selectResponse = ProtoBufffer.DeSerialize<SelectResponse>(bytes);
+            case "hall.PlayerReady":
+                //SelectResponse selectResponse = ProtoBufffer.DeSerialize<SelectResponse>(bytes);
 
 
                 break;
 
+            //23.��ҵ�λ��� 2024.12.30
+            //case "hall.PlayerSituation":
+            //    //SelectResponse selectResponse = ProtoBufffer.DeSerialize<SelectResponse>(bytes);
+            //    PlayerStatisticsResponse playerStatisticsResponse1 = ProtoBufffer.DeSerialize<PlayerStatisticsResponse>(bytes);
+            //    foreach(var item in playerStatisticsResponse1.Data)
+            //    {
+            //        Debug.Log(item.UserId);
+            //    }
+            //    break;
 
-            case "move.PlayerSituation":
+            //23.��ҵ�λ��� 2024.12.30  ֮ǰ����øĵ�
+            case "hall.PlayerSituation":
                 Debug.LogError("���״̬11111111111111111");
                 PlayerStatisticsResponse playerStatisticsResponse = ProtoBufffer.DeSerialize<PlayerStatisticsResponse>(bytes);
                 foreach(var item in playerStatisticsResponse.Data)
@@ -1001,11 +1215,14 @@ public class test : MonoBehaviour
                 Personnelpreparation.instance.UpdateSubObjectList();
                 break;
 
+            //25.�����û��Ƿ��¼
+            case "user.UnOnlineByUser":
+                
 
-                //case "prop.CreateNpc":
-                //    MoveResponse moveResponse = ProtoBufffer.DeSerialize<MoveResponse>(bytes);
-                //    Debug.Log("UserId:" + moveResponse.UserId + "��RoomId:" + moveResponse.RoomId + "��x:" + moveResponse.MoveData);
-                //    break;
+
+                break;
+               
+