diff --git a/xiaofang/Assets/ProtoBuf/Proto/Join.cs b/xiaofang/Assets/ProtoBuf/Proto/Join.cs
index 3d9d6eb9..d6d929fe 100644
--- a/xiaofang/Assets/ProtoBuf/Proto/Join.cs
+++ b/xiaofang/Assets/ProtoBuf/Proto/Join.cs
@@ -23,7 +23,7 @@ public static partial class JoinReflection {
     byte[] descriptorData = global::System.Convert.FromBase64String(
         string.Concat(
           "Cgpqb2luLnByb3RvGgptb3ZlLnByb3RvGgpoYWxsLnByb3RvGgpwcm9wLnBy",
-          "b3RvIvUDChBVc2VySm9pblJlc3BvbnNlEg4KBnVzZXJJZBgBIAEoAxIQCghu",
+          "b3RvIokEChBVc2VySm9pblJlc3BvbnNlEg4KBnVzZXJJZBgBIAEoAxIQCghu",
           "aWNrTmFtZRgCIAEoCRIQCghyb2xlTmFtZRgDIAEoCRIOCgZyb29tSWQYBCAB",
           "KAkSDgoGb25saW5lGAUgASgIEhMKC21lc3NhZ2VUeXBlGAYgASgFEg8KB0lz",
           "UmVhZHkYECABKAgSCwoDY21kGAcgASgJEgwKBElzQWkYCCABKAgSJwoMdGFz",
@@ -34,30 +34,31 @@ public static partial class JoinReflection {
           "b25zZRgPIAEoCzITLlBsYXllckpvaW5SZXNwb25zZRInCgxmaXJlUmVzcG9u",
           "c2UYESADKAsyES5GaXJlSW5mb1Jlc3BvbnNlEgkKAXgYEiABKAISCQoBeRgT",
           "IAEoAhIJCgF6GBQgASgCEigKDHByb3BSZXNwb25zZRgVIAMoCzISLlByb3BN",
-          "b2RlbFJlc3BvbnNlIjwKFlZvaWNlVHJhbnNwb3J0UmVzcG9uc2USDQoFYXBw",
-          "SWQYASABKAkSEwoLY2hhbm5lbE5hbWUYAiABKAkiNwoQUm9vbVVzZXJSZXNw",
-          "b25zZRIjCgh1c2VyTGlzdBgBIAMoCzIRLlVzZXJKb2luUmVzcG9uc2UitgIK",
-          "EFRhc2tJbmZvUmVzcG9uc2USDgoGVGFza0lkGAEgASgJEg4KBlN0YXR1cxgC",
-          "IAEoCRIOCgZSb29tSWQYAyABKAkSCQoBWBgEIAEoAhIJCgFZGAUgASgCEgkK",
-          "AVoYBiABKAISDAoEVHlwZRgHIAEoCRIRCglUaW1lTGltaXQYCCABKAMSDAoE",
-          "RGVzYxgJIAEoCRIPCgdUcmlnZ2VyGAogASgJEhEKCU5leHRUYXNrcxgLIAEo",
-          "CRISCgpUYXJnZXRUeXBlGAwgASgJEg4KBlJld2FyZBgNIAEoCRIMCgROb3Rl",
-          "GA4gASgJEhIKCkNyZWF0ZVRpbWUYDyABKAkSEgoKVXBkYXRlVGltZRgQIAEo",
-          "CRIQCghUb1VzZXJJZBgRIAEoCRISCgpCYXNlVGFza0lkGBIgASgJIq8DChJP",
-          "YmplY3RJbmZvUmVzcG9uc2USDgoGUm9vbUlkGAEgASgJEgoKAklkGAIgASgJ",
-          "EhAKCE9iamVjdElkGAMgASgJEgwKBE5vdGUYBCABKAkSDAoEVHlwZRgFIAEo",
-          "CRIMCgROYW1lGAYgASgJEhYKDk5hbWVTaG93T2Zmc2V0GAcgASgDEhIKClNo",
-          "b3dSYWRpdXMYCCABKAMSDAoESWNvbhgJIAEoCRIMCgRSb2xlGAogASgJEhIK",
-          "Ckl0ZW1EZXBlbmQYCyABKAkSEAoIVGFrZVRpbWUYDCABKAMSEwoLTmVlZFBs",
-          "YXllcnMYDSABKAkSEgoKVGFza1N0YXR1cxgOIAEoCRISCgpTZWxlY3RMaXN0",
-          "GA8gASgJEg0KBU9uT2ZmGBAgASgDEg4KBlN0YXR1cxgRIAEoCRIRCglSZXND",
-          "aGFuZ2UYEiABKAkSFwoPUGFyYWxsZWxDb250cm9sGBMgASgDEhIKCkV4dHJh",
-          "VmFsdWUYFCABKAkSDwoHVXNlcklkcxgVIAEoCRISCgpDcmVhdGVUaW1lGBYg",
-          "ASgJEhIKClVwZGF0ZVRpbWUYFyABKAlCB1oFLi87cGJiBnByb3RvMw=="));
+          "b2RlbFJlc3BvbnNlEhIKCklzQWxsUmVhZHkYFiABKAgiPAoWVm9pY2VUcmFu",
+          "c3BvcnRSZXNwb25zZRINCgVhcHBJZBgBIAEoCRITCgtjaGFubmVsTmFtZRgC",
+          "IAEoCSI3ChBSb29tVXNlclJlc3BvbnNlEiMKCHVzZXJMaXN0GAEgAygLMhEu",
+          "VXNlckpvaW5SZXNwb25zZSK2AgoQVGFza0luZm9SZXNwb25zZRIOCgZUYXNr",
+          "SWQYASABKAkSDgoGU3RhdHVzGAIgASgJEg4KBlJvb21JZBgDIAEoCRIJCgFY",
+          "GAQgASgCEgkKAVkYBSABKAISCQoBWhgGIAEoAhIMCgRUeXBlGAcgASgJEhEK",
+          "CVRpbWVMaW1pdBgIIAEoAxIMCgREZXNjGAkgASgJEg8KB1RyaWdnZXIYCiAB",
+          "KAkSEQoJTmV4dFRhc2tzGAsgASgJEhIKClRhcmdldFR5cGUYDCABKAkSDgoG",
+          "UmV3YXJkGA0gASgJEgwKBE5vdGUYDiABKAkSEgoKQ3JlYXRlVGltZRgPIAEo",
+          "CRISCgpVcGRhdGVUaW1lGBAgASgJEhAKCFRvVXNlcklkGBEgASgJEhIKCkJh",
+          "c2VUYXNrSWQYEiABKAkirwMKEk9iamVjdEluZm9SZXNwb25zZRIOCgZSb29t",
+          "SWQYASABKAkSCgoCSWQYAiABKAkSEAoIT2JqZWN0SWQYAyABKAkSDAoETm90",
+          "ZRgEIAEoCRIMCgRUeXBlGAUgASgJEgwKBE5hbWUYBiABKAkSFgoOTmFtZVNo",
+          "b3dPZmZzZXQYByABKAMSEgoKU2hvd1JhZGl1cxgIIAEoAxIMCgRJY29uGAkg",
+          "ASgJEgwKBFJvbGUYCiABKAkSEgoKSXRlbURlcGVuZBgLIAEoCRIQCghUYWtl",
+          "VGltZRgMIAEoAxITCgtOZWVkUGxheWVycxgNIAEoCRISCgpUYXNrU3RhdHVz",
+          "GA4gASgJEhIKClNlbGVjdExpc3QYDyABKAkSDQoFT25PZmYYECABKAMSDgoG",
+          "U3RhdHVzGBEgASgJEhEKCVJlc0NoYW5nZRgSIAEoCRIXCg9QYXJhbGxlbENv",
+          "bnRyb2wYEyABKAMSEgoKRXh0cmFWYWx1ZRgUIAEoCRIPCgdVc2VySWRzGBUg",
+          "ASgJEhIKCkNyZWF0ZVRpbWUYFiABKAkSEgoKVXBkYXRlVGltZRgXIAEoCUIH",
+          "WgUuLztwYmIGcHJvdG8z"));
     descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
         new pbr::FileDescriptor[] { global::MoveReflection.Descriptor, global::HallReflection.Descriptor, global::PropReflection.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", "IsAi", "TaskResponse", "ObjectResponse", "NpcResponse", "VoiceResponse", "PlayerResponse", "FireResponse", "X", "Y", "Z", "PropResponse" }, 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", "PropResponse", "IsAllReady" }, 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),
@@ -122,6 +123,7 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
     y_ = other.y_;
     z_ = other.z_;
     propResponse_ = other.propResponse_.Clone();
+    isAllReady_ = other.isAllReady_;
     _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
   }
 
@@ -414,6 +416,21 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
     get { return propResponse_; }
   }
 
+  /// <summary>Field number for the "IsAllReady" field.</summary>
+  public const int IsAllReadyFieldNumber = 22;
+  private bool isAllReady_;
+  /// <summary>
+  /// 是否所有玩家准备 true 所有玩家准备 false 还有玩家未准备
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public bool IsAllReady {
+    get { return isAllReady_; }
+    set {
+      isAllReady_ = value;
+    }
+  }
+
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public override bool Equals(object other) {
@@ -448,6 +465,7 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
     if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Y, other.Y)) return false;
     if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Z, other.Z)) return false;
     if(!propResponse_.Equals(other.propResponse_)) return false;
+    if (IsAllReady != other.IsAllReady) return false;
     return Equals(_unknownFields, other._unknownFields);
   }
 
@@ -474,6 +492,7 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
     if (Y != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Y);
     if (Z != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Z);
     hash ^= propResponse_.GetHashCode();
+    if (IsAllReady != false) hash ^= IsAllReady.GetHashCode();
     if (_unknownFields != null) {
       hash ^= _unknownFields.GetHashCode();
     }
@@ -562,6 +581,10 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
       output.WriteFloat(Z);
     }
     propResponse_.WriteTo(output, _repeated_propResponse_codec);
+    if (IsAllReady != false) {
+      output.WriteRawTag(176, 1);
+      output.WriteBool(IsAllReady);
+    }
     if (_unknownFields != null) {
       _unknownFields.WriteTo(output);
     }
@@ -642,6 +665,10 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
       output.WriteFloat(Z);
     }
     propResponse_.WriteTo(ref output, _repeated_propResponse_codec);
+    if (IsAllReady != false) {
+      output.WriteRawTag(176, 1);
+      output.WriteBool(IsAllReady);
+    }
     if (_unknownFields != null) {
       _unknownFields.WriteTo(ref output);
     }
@@ -705,6 +732,9 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
       size += 2 + 4;
     }
     size += propResponse_.CalculateSize(_repeated_propResponse_codec);
+    if (IsAllReady != false) {
+      size += 2 + 1;
+    }
     if (_unknownFields != null) {
       size += _unknownFields.CalculateSize();
     }
@@ -785,6 +815,9 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
       Z = other.Z;
     }
     propResponse_.Add(other.propResponse_);
+    if (other.IsAllReady != false) {
+      IsAllReady = other.IsAllReady;
+    }
     _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
   }
 
@@ -895,6 +928,10 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
           propResponse_.AddEntriesFrom(input, _repeated_propResponse_codec);
           break;
         }
+        case 176: {
+          IsAllReady = input.ReadBool();
+          break;
+        }
       }
     }
   #endif
@@ -1005,6 +1042,10 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
           propResponse_.AddEntriesFrom(ref input, _repeated_propResponse_codec);
           break;
         }
+        case 176: {
+          IsAllReady = input.ReadBool();
+          break;
+        }
       }
     }
   }