更新proto文件

xiaofang/Assets/Resources/Ain/Npc.controller

@@ -1,6 +1,34 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1101 &-5083329074022439226
+--- !u!1102 &-7494286096945644898
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: idle
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 3074207396828194077}
+  - {fileID: -3798024589101560023}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 471152417041a2940a4295d01794f152, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-7478834394725811032
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,11 +36,11 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Conditions:
-  - m_ConditionMode: 2
+  - m_ConditionMode: 6
-    m_ConditionEvent: Recuse
+    m_ConditionEvent: state
     m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -1085241712214742412}
+  m_DstState: {fileID: -963242654641360267}
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 0
@@ -25,6 +53,31 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &-3798024589101560023
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: state
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -963242654641360267}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9390244
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-2928487774769089836
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -33,9 +86,9 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Conditions:
-  - m_ConditionMode: 1
+  - m_ConditionMode: 6
-    m_ConditionEvent: Recuse
+    m_ConditionEvent: state
-    m_EventTreshold: 0
+    m_EventTreshold: 1
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 5494399718017335990}
   m_Solo: 0
@@ -66,8 +119,8 @@ AnimatorStateMachine:
     m_State: {fileID: 5494399718017335990}
     m_Position: {x: 310, y: 120, z: 0}
   - serializedVersion: 1
-    m_State: {fileID: -1085241712214742412}
+    m_State: {fileID: -7494286096945644898}
-    m_Position: {x: 310, y: 220, z: 0}
+    m_Position: {x: 300, y: 250, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -78,32 +131,31 @@ AnimatorStateMachine:
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: -963242654641360267}
---- !u!1102 &-1085241712214742412
+--- !u!1101 &-1024762781344007907
-AnimatorState:
+AnimatorStateTransition:
-  serializedVersion: 6
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: New State
+  m_Name: 
-  m_Speed: 1
+  m_Conditions:
-  m_CycleOffset: 0
+  - m_ConditionMode: 6
-  m_Transitions: []
+    m_ConditionEvent: state
-  m_StateMachineBehaviours: []
+    m_EventTreshold: 2
-  m_Position: {x: 50, y: 50, z: 0}
+  m_DstStateMachine: {fileID: 0}
-  m_IKOnFeet: 0
+  m_DstState: {fileID: -7494286096945644898}
-  m_WriteDefaultValues: 1
+  m_Solo: 0
-  m_Mirror: 0
+  m_Mute: 0
-  m_SpeedParameterActive: 0
+  m_IsExit: 0
-  m_MirrorParameterActive: 0
+  serializedVersion: 3
-  m_CycleOffsetParameterActive: 0
+  m_TransitionDuration: 0.25
-  m_TimeParameterActive: 0
+  m_TransitionOffset: 0
-  m_Motion: {fileID: -203655887218126122, guid: 4f5096cf35822b94cacebf7fb5d86d34, type: 3}
+  m_ExitTime: 0.57865167
-  m_Tag: 
+  m_HasExitTime: 1
-  m_SpeedParameter: 
+  m_HasFixedDuration: 1
-  m_MirrorParameter: 
+  m_InterruptionSource: 0
-  m_CycleOffsetParameter: 
+  m_OrderedInterruption: 1
-  m_TimeParameter: 
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-963242654641360267
 AnimatorState:
   serializedVersion: 6
@@ -116,6 +168,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: -2928487774769089836}
+  - {fileID: -931227757920040213}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -131,6 +184,31 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-931227757920040213
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: state
+    m_EventTreshold: 2
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -7494286096945644898}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9292453
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -146,6 +224,12 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
+  - m_Name: state
+    m_Type: 3
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -159,6 +243,31 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1101 &3074207396828194077
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 6
+    m_ConditionEvent: state
+    m_EventTreshold: 1
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 5494399718017335990}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9390244
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &5494399718017335990
 AnimatorState:
   serializedVersion: 6
@@ -170,7 +279,8 @@ AnimatorState:
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: -5083329074022439226}
+  - {fileID: -1024762781344007907}
+  - {fileID: -7478834394725811032}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0

xiaofang/Assets/Script/npc/RecuseNpc.cs

@@ -7,7 +7,7 @@ public enum Npcstate
 { 
   idle,
   dead,
-  healthy
+  run
 }
 
 public class RecuseNpc : MonoBehaviour
@@ -18,7 +18,7 @@ public class RecuseNpc : MonoBehaviour
 
     private Animator anim;
 
-    private Npcstate nstate = Npcstate.dead;
+    public Npcstate nstate = Npcstate.dead;
 
     private bool movebool = false;
     private Transform target;
@@ -44,8 +44,9 @@ public class RecuseNpc : MonoBehaviour
 
     public void Setnpcstate()//点击救援按钮执行完动作后对按钮进行隐藏
     {   
+
         movebool = true;
-        nstate = Npcstate.healthy;
+        nstate = Npcstate.run;
         recusebtn.gameObject.SetActive(false);
         Debug.Log("Setnpcstate调用");   
     }
@@ -63,19 +64,33 @@ public class RecuseNpc : MonoBehaviour
         switch (nstate)//通过枚举状态实现人物是否被救援，以及动作的改变
         {
             case Npcstate.idle:
-                anim.SetBool("Recuse", false);
+                SetAni(2);
                 break;
-            case Npcstate.healthy:
+            case Npcstate.run:
-                anim.SetBool("Recuse", true);
+                movebool = true;
-                transform.LookAt(target);  
+                Run();
-                transform.position = Vector3.Lerp(transform.position, target.position, 0.3f * Time.deltaTime);
                 break;
             case Npcstate.dead:
-
+                SetAni(0);
                 break;
         }
+    }
+
+    //Åܲ½Âß¼­
+    public void Run()
+    {
+        if (movebool)
+        {
+            SetAni(1);
+            transform.LookAt(target);
+            transform.position = Vector3.Lerp(transform.position, target.position, 0.3f * Time.deltaTime);
+        }
+    }
 
 
+    public void SetAni(int x)
+    {
+        anim.SetInteger("state", x);
     }
 
 

xiaofang/Assets/comm/Proto/Common.cs

@@ -0,0 +1,281 @@
+// <auto-generated>
+//     Generated by the protocol buffer compiler.  DO NOT EDIT!
+//     source: common.proto
+// </auto-generated>
+#pragma warning disable 1591, 0612, 3021, 8981
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+/// <summary>Holder for reflection information generated from common.proto</summary>
+public static partial class CommonReflection {
+
+  #region Descriptor
+  /// <summary>File descriptor for common.proto</summary>
+  public static pbr::FileDescriptor Descriptor {
+    get { return descriptor; }
+  }
+  private static pbr::FileDescriptor descriptor;
+
+  static CommonReflection() {
+    byte[] descriptorData = global::System.Convert.FromBase64String(
+        string.Concat(
+          "Cgxjb21tb24ucHJvdG8iLgoNUmVzdWx0TWVzc2FnZRIMCgRjb2RlGAEgASgF",
+          "Eg8KB21lc3NhZ2UYAiABKAlCB1oFLi87cGJiBnByb3RvMw=="));
+    descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+        new pbr::FileDescriptor[] { },
+        new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
+          new pbr::GeneratedClrTypeInfo(typeof(global::ResultMessage), global::ResultMessage.Parser, new[]{ "Code", "Message" }, null, null, null, null)
+        }));
+  }
+  #endregion
+
+}
+#region Messages
+[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
+public sealed partial class ResultMessage : pb::IMessage<ResultMessage>
+#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
+    , pb::IBufferMessage
+#endif
+{
+  private static readonly pb::MessageParser<ResultMessage> _parser = new pb::MessageParser<ResultMessage>(() => new ResultMessage());
+  private pb::UnknownFieldSet _unknownFields;
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pb::MessageParser<ResultMessage> Parser { get { return _parser; } }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public static pbr::MessageDescriptor Descriptor {
+    get { return global::CommonReflection.Descriptor.MessageTypes[0]; }
+  }
+
+  [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 ResultMessage() {
+    OnConstruction();
+  }
+
+  partial void OnConstruction();
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public ResultMessage(ResultMessage other) : this() {
+    code_ = other.code_;
+    message_ = other.message_;
+    _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public ResultMessage Clone() {
+    return new ResultMessage(this);
+  }
+
+  /// <summary>Field number for the "code" field.</summary>
+  public const int CodeFieldNumber = 1;
+  private int code_;
+  /// <summary>
+  /// 错误码
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public int Code {
+    get { return code_; }
+    set {
+      code_ = value;
+    }
+  }
+
+  /// <summary>Field number for the "message" field.</summary>
+  public const int MessageFieldNumber = 2;
+  private string message_ = "";
+  /// <summary>
+  /// 错误信息
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public string Message {
+    get { return message_; }
+    set {
+      message_ = 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 ResultMessage);
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public bool Equals(ResultMessage other) {
+    if (ReferenceEquals(other, null)) {
+      return false;
+    }
+    if (ReferenceEquals(other, this)) {
+      return true;
+    }
+    if (Code != other.Code) return false;
+    if (Message != other.Message) 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 (Code != 0) hash ^= Code.GetHashCode();
+    if (Message.Length != 0) hash ^= Message.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 (Code != 0) {
+      output.WriteRawTag(8);
+      output.WriteInt32(Code);
+    }
+    if (Message.Length != 0) {
+      output.WriteRawTag(18);
+      output.WriteString(Message);
+    }
+    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 (Code != 0) {
+      output.WriteRawTag(8);
+      output.WriteInt32(Code);
+    }
+    if (Message.Length != 0) {
+      output.WriteRawTag(18);
+      output.WriteString(Message);
+    }
+    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 (Code != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeInt32Size(Code);
+    }
+    if (Message.Length != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeStringSize(Message);
+    }
+    if (_unknownFields != null) {
+      size += _unknownFields.CalculateSize();
+    }
+    return size;
+  }
+
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public void MergeFrom(ResultMessage other) {
+    if (other == null) {
+      return;
+    }
+    if (other.Code != 0) {
+      Code = other.Code;
+    }
+    if (other.Message.Length != 0) {
+      Message = other.Message;
+    }
+    _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 8: {
+          Code = input.ReadInt32();
+          break;
+        }
+        case 18: {
+          Message = 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 8: {
+          Code = input.ReadInt32();
+          break;
+        }
+        case 18: {
+          Message = input.ReadString();
+          break;
+        }
+      }
+    }
+  }
+  #endif
+
+}
+
+#endregion
+
+
+#endregion Designer generated code

xiaofang/Assets/comm/Proto/Common.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 09a7d1a0777441d489f8b7ffae5077c9
+guid: 8f08a6ce1ce72944ab924e71bac47c6f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

xiaofang/Assets/comm/Proto/Fps.cs

@@ -27,7 +27,7 @@ public static partial class FpsReflection {
           "B2ZyYW1lSUQYASABKA1IAIgBARIZCgVpbnB1dBgCIAMoCzIKLklucHV0RGF0",
           "YUIKCghfZnJhbWVJRCJpCglJbnB1dERhdGESCgoCaWQYASABKAkSCwoDc0lk",
           "GAIgASgJEgkKAXgYAyABKAISCQoBeRgEIAEoAhISCgpyb29tU2VhdElkGAUg",
-          "ASgFEgkKAXoYBiABKAISDgoGcm9vbUlkGAcgASgJIg8KDUVtcHR5UmVzcG9u",
+          "ASgFEgkKAXoYBiABKAISDgoGcm9vbUlkGAggASgJIg8KDUVtcHR5UmVzcG9u",
           "c2VCB1oFLi87cGJiBnByb3RvMw=="));
     descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
         new pbr::FileDescriptor[] { },
@@ -630,7 +630,7 @@ public sealed partial class InputData : pb::IMessage<InputData>
   }
 
   /// <summary>Field number for the "roomId" field.</summary>
-  public const int RoomIdFieldNumber = 7;
+  public const int RoomIdFieldNumber = 8;
   private string roomId_ = "";
   /// <summary>
   ///房间id
@@ -723,7 +723,7 @@ public sealed partial class InputData : pb::IMessage<InputData>
       output.WriteFloat(Z);
     }
     if (RoomId.Length != 0) {
-      output.WriteRawTag(58);
+      output.WriteRawTag(66);
       output.WriteString(RoomId);
     }
     if (_unknownFields != null) {
@@ -761,7 +761,7 @@ public sealed partial class InputData : pb::IMessage<InputData>
       output.WriteFloat(Z);
     }
     if (RoomId.Length != 0) {
-      output.WriteRawTag(58);
+      output.WriteRawTag(66);
       output.WriteString(RoomId);
     }
     if (_unknownFields != null) {
@@ -871,7 +871,7 @@ public sealed partial class InputData : pb::IMessage<InputData>
           Z = input.ReadFloat();
           break;
         }
-        case 58: {
+        case 66: {
           RoomId = input.ReadString();
           break;
         }
@@ -918,7 +918,7 @@ public sealed partial class InputData : pb::IMessage<InputData>
           Z = input.ReadFloat();
           break;
         }
-        case 58: {
+        case 66: {
           RoomId = input.ReadString();
           break;
         }

xiaofang/Assets/comm/Proto/Hall.cs

@@ -1217,6 +1217,9 @@ public sealed partial class JoinRoomResponse : pb::IMessage<JoinRoomResponse>
   /// <summary>Field number for the "data" field.</summary>
   public const int DataFieldNumber = 3;
   private global::PlayerJoinResponse data_;
+  /// <summary>
+  /// 玩家加入房间返回数据
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public global::PlayerJoinResponse Data {
@@ -1494,6 +1497,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "UserName" field.</summary>
   public const int UserNameFieldNumber = 1;
   private string userName_ = "";
+  /// <summary>
+  /// 用户名
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public string UserName {
@@ -1506,6 +1512,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <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 {
@@ -1518,6 +1527,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "Status" field.</summary>
   public const int StatusFieldNumber = 3;
   private int status_;
+  /// <summary>
+  /// 状态 0 待加入 1进行中 2已结束
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int Status {
@@ -1530,6 +1542,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "RoleName" field.</summary>
   public const int RoleNameFieldNumber = 4;
   private string roleName_ = "";
+  /// <summary>
+  /// 角色名
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public string RoleName {
@@ -1542,6 +1557,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "IsLeadingNPC" field.</summary>
   public const int IsLeadingNPCFieldNumber = 5;
   private int isLeadingNPC_;
+  /// <summary>
+  /// 1=此职业有分管NPC的功能
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int IsLeadingNPC {
@@ -1554,6 +1572,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "Online" field.</summary>
   public const int OnlineFieldNumber = 6;
   private bool online_;
+  /// <summary>
+  /// 判断是否在线 true 在线 false 离线
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public bool Online {
@@ -1566,6 +1587,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "RoleId" field.</summary>
   public const int RoleIdFieldNumber = 7;
   private int roleId_;
+  /// <summary>
+  /// 角色id
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int RoleId {
@@ -1578,6 +1602,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "GroupLeader" field.</summary>
   public const int GroupLeaderFieldNumber = 8;
   private int groupLeader_;
+  /// <summary>
+  /// 是否是组长 0 组员 1 组长 2 总指挥 3 主持人
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int GroupLeader {
@@ -1590,6 +1617,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "ActionMode" field.</summary>
   public const int ActionModeFieldNumber = 9;
   private int actionMode_;
+  /// <summary>
+  /// 0=主持人 1=指令式行动 2=自由行动
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int ActionMode {
@@ -1602,6 +1632,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "Group" field.</summary>
   public const int GroupFieldNumber = 10;
   private int group_;
+  /// <summary>
+  /// 小组归属 -1 无归属 有值有归属
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int Group {
@@ -1614,6 +1647,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "X" field.</summary>
   public const int XFieldNumber = 11;
   private float x_;
+  /// <summary>
+  /// 坐标x
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public float X {
@@ -1626,6 +1662,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "Y" field.</summary>
   public const int YFieldNumber = 12;
   private float y_;
+  /// <summary>
+  /// 坐标y
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public float Y {
@@ -1638,6 +1677,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "Z" field.</summary>
   public const int ZFieldNumber = 13;
   private float z_;
+  /// <summary>
+  /// 坐标z
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public float Z {
@@ -1650,6 +1692,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "OverseeCond" field.</summary>
   public const int OverseeCondFieldNumber = 14;
   private string overseeCond_ = "";
+  /// <summary>
+  /// 分管区域Id
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public string OverseeCond {
@@ -1662,6 +1707,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "SendFrameCount" field.</summary>
   public const int SendFrameCountFieldNumber = 15;
   private int sendFrameCount_;
+  /// <summary>
+  /// 玩家发送的帧数
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int SendFrameCount {
@@ -1674,6 +1722,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "MoveSpeedFirst" field.</summary>
   public const int MoveSpeedFirstFieldNumber = 16;
   private int moveSpeedFirst_;
+  /// <summary>
+  /// 移动速度1
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int MoveSpeedFirst {
@@ -1686,6 +1737,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "MoveSpeedSecond" field.</summary>
   public const int MoveSpeedSecondFieldNumber = 17;
   private int moveSpeedSecond_;
+  /// <summary>
+  /// 移动速度2
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int MoveSpeedSecond {
@@ -1698,6 +1752,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "MoveSpeedThird" field.</summary>
   public const int MoveSpeedThirdFieldNumber = 18;
   private int moveSpeedThird_;
+  /// <summary>
+  /// 移动速度3
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int MoveSpeedThird {
@@ -1710,6 +1767,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "BearLoad" field.</summary>
   public const int BearLoadFieldNumber = 19;
   private int bearLoad_;
+  /// <summary>
+  /// 负重
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int BearLoad {
@@ -1722,6 +1782,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "Protection" field.</summary>
   public const int ProtectionFieldNumber = 20;
   private int protection_;
+  /// <summary>
+  /// 防护值
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int Protection {
@@ -1734,6 +1797,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "Health" field.</summary>
   public const int HealthFieldNumber = 21;
   private int health_;
+  /// <summary>
+  /// 健康值 100
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int Health {
@@ -1746,6 +1812,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "RoleStatus" field.</summary>
   public const int RoleStatusFieldNumber = 22;
   private int roleStatus_;
+  /// <summary>
+  /// 角色状态 0正常 1行动受限 2负伤 3昏迷 4手受伤
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int RoleStatus {
@@ -1758,6 +1827,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
   /// <summary>Field number for the "UserId" field.</summary>
   public const int UserIdFieldNumber = 23;
   private long userId_;
+  /// <summary>
+  /// 用户id
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public long UserId {

xiaofang/Assets/comm/Proto/Move.cs

@@ -22,20 +22,21 @@ public static partial class MoveReflection {
   static MoveReflection() {
     byte[] descriptorData = global::System.Convert.FromBase64String(
         string.Concat(
-          "Cgptb3ZlLnByb3RvIiIKEE5wY0NyZWF0ZVJlcXVlc3QSDgoGcm9vbUlkGAEg",
+          "Cgptb3ZlLnByb3RvIkcKEE5wY0NyZWF0ZVJlcXVlc3QSDgoGcm9vbUlkGAEg",
-          "ASgJIhMKEU5wY0NyZWF0ZVJlc3BvbnNlIi8KC01vdmVSZXF1ZXN0Eg4KBnJv",
+          "ASgJEhIKCnRlbXBsYXRlSWQYAiABKAMSDwoHc2NlbmVJZBgDIAEoCSITChFO",
-          "b21JZBgBIAEoCRIQCghtb3ZlVHlwZRgCIAEoBSJKCgxNb3ZlUmVzcG9uc2US",
+          "cGNDcmVhdGVSZXNwb25zZSIvCgtNb3ZlUmVxdWVzdBIOCgZyb29tSWQYASAB",
-          "DgoGdXNlcklkGAIgASgJEg4KBnJvb21JZBgDIAEoCRIaCghtb3ZlRGF0YRgB",
+          "KAkSEAoIbW92ZVR5cGUYAiABKAUiSgoMTW92ZVJlc3BvbnNlEg4KBnVzZXJJ",
-          "IAMoCzIILk5wY0RhdGEifAoHTnBjRGF0YRIJCgF4GAEgASgCEgkKAXkYAiAB",
+          "ZBgCIAEoCRIOCgZyb29tSWQYAyABKAkSGgoIbW92ZURhdGEYASADKAsyCC5O",
-          "KAISCQoBehgDIAEoAhIOCgZ1c2VySWQYBCABKAkSEAoIbmlja05hbWUYCCAB",
+          "cGNEYXRhInwKB05wY0RhdGESCQoBeBgBIAEoAhIJCgF5GAIgASgCEgkKAXoY",
-          "KAkSDAoEdHlwZRgFIAEoBRIRCglmb3JtYXRpb24YBiABKAUSDQoFZXZlbnQY",
+          "AyABKAISDgoGdXNlcklkGAQgASgJEhAKCG5pY2tOYW1lGAggASgJEgwKBHR5",
-          "ByABKAUiVQoSTW92ZVJvb21Bb2lSZXF1ZXN0Eg4KBnJvb21JZBgBIAEoCRIO",
+          "cGUYBSABKAUSEQoJZm9ybWF0aW9uGAYgASgFEg0KBWV2ZW50GAcgASgFIlUK",
-          "CgZ1c2VySWQYAiABKAMSCQoBeBgDIAEoAhIJCgF5GAQgASgCEgkKAXoYBSAB",
+          "Ek1vdmVSb29tQW9pUmVxdWVzdBIOCgZyb29tSWQYASABKAkSDgoGdXNlcklk",
-          "KAIiFQoTTW92ZVJvb21Bb2lSZXNwb25zZUIHWgUuLztwYmIGcHJvdG8z"));
+          "GAIgASgDEgkKAXgYAyABKAISCQoBeRgEIAEoAhIJCgF6GAUgASgCIhUKE01v",
+          "dmVSb29tQW9pUmVzcG9uc2VCB1oFLi87cGJiBnByb3RvMw=="));
     descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
         new pbr::FileDescriptor[] { },
         new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-          new pbr::GeneratedClrTypeInfo(typeof(global::NpcCreateRequest), global::NpcCreateRequest.Parser, new[]{ "RoomId" }, null, null, null, null),
+          new pbr::GeneratedClrTypeInfo(typeof(global::NpcCreateRequest), global::NpcCreateRequest.Parser, new[]{ "RoomId", "TemplateId", "SceneId" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::NpcCreateResponse), global::NpcCreateResponse.Parser, null, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::MoveRequest), global::MoveRequest.Parser, new[]{ "RoomId", "MoveType" }, null, null, null, null),
           new pbr::GeneratedClrTypeInfo(typeof(global::MoveResponse), global::MoveResponse.Parser, new[]{ "UserId", "RoomId", "MoveData" }, null, null, null, null),
@@ -84,6 +85,8 @@ public sealed partial class NpcCreateRequest : pb::IMessage<NpcCreateRequest>
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public NpcCreateRequest(NpcCreateRequest other) : this() {
     roomId_ = other.roomId_;
+    templateId_ = other.templateId_;
+    sceneId_ = other.sceneId_;
     _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
   }
 
@@ -108,6 +111,36 @@ public sealed partial class NpcCreateRequest : pb::IMessage<NpcCreateRequest>
     }
   }
 
+  /// <summary>Field number for the "templateId" field.</summary>
+  public const int TemplateIdFieldNumber = 2;
+  private long templateId_;
+  /// <summary>
+  /// 演练模板id
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public long TemplateId {
+    get { return templateId_; }
+    set {
+      templateId_ = value;
+    }
+  }
+
+  /// <summary>Field number for the "sceneId" field.</summary>
+  public const int SceneIdFieldNumber = 3;
+  private string sceneId_ = "";
+  /// <summary>
+  /// 场景Id
+  /// </summary>
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+  [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
+  public string SceneId {
+    get { return sceneId_; }
+    set {
+      sceneId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+    }
+  }
+
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public override bool Equals(object other) {
@@ -124,6 +157,8 @@ public sealed partial class NpcCreateRequest : pb::IMessage<NpcCreateRequest>
       return true;
     }
     if (RoomId != other.RoomId) return false;
+    if (TemplateId != other.TemplateId) return false;
+    if (SceneId != other.SceneId) return false;
     return Equals(_unknownFields, other._unknownFields);
   }
 
@@ -132,6 +167,8 @@ public sealed partial class NpcCreateRequest : pb::IMessage<NpcCreateRequest>
   public override int GetHashCode() {
     int hash = 1;
     if (RoomId.Length != 0) hash ^= RoomId.GetHashCode();
+    if (TemplateId != 0L) hash ^= TemplateId.GetHashCode();
+    if (SceneId.Length != 0) hash ^= SceneId.GetHashCode();
     if (_unknownFields != null) {
       hash ^= _unknownFields.GetHashCode();
     }
@@ -154,6 +191,14 @@ public sealed partial class NpcCreateRequest : pb::IMessage<NpcCreateRequest>
       output.WriteRawTag(10);
       output.WriteString(RoomId);
     }
+    if (TemplateId != 0L) {
+      output.WriteRawTag(16);
+      output.WriteInt64(TemplateId);
+    }
+    if (SceneId.Length != 0) {
+      output.WriteRawTag(26);
+      output.WriteString(SceneId);
+    }
     if (_unknownFields != null) {
       _unknownFields.WriteTo(output);
     }
@@ -168,6 +213,14 @@ public sealed partial class NpcCreateRequest : pb::IMessage<NpcCreateRequest>
       output.WriteRawTag(10);
       output.WriteString(RoomId);
     }
+    if (TemplateId != 0L) {
+      output.WriteRawTag(16);
+      output.WriteInt64(TemplateId);
+    }
+    if (SceneId.Length != 0) {
+      output.WriteRawTag(26);
+      output.WriteString(SceneId);
+    }
     if (_unknownFields != null) {
       _unknownFields.WriteTo(ref output);
     }
@@ -181,6 +234,12 @@ public sealed partial class NpcCreateRequest : pb::IMessage<NpcCreateRequest>
     if (RoomId.Length != 0) {
       size += 1 + pb::CodedOutputStream.ComputeStringSize(RoomId);
     }
+    if (TemplateId != 0L) {
+      size += 1 + pb::CodedOutputStream.ComputeInt64Size(TemplateId);
+    }
+    if (SceneId.Length != 0) {
+      size += 1 + pb::CodedOutputStream.ComputeStringSize(SceneId);
+    }
     if (_unknownFields != null) {
       size += _unknownFields.CalculateSize();
     }
@@ -196,6 +255,12 @@ public sealed partial class NpcCreateRequest : pb::IMessage<NpcCreateRequest>
     if (other.RoomId.Length != 0) {
       RoomId = other.RoomId;
     }
+    if (other.TemplateId != 0L) {
+      TemplateId = other.TemplateId;
+    }
+    if (other.SceneId.Length != 0) {
+      SceneId = other.SceneId;
+    }
     _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
   }
 
@@ -219,6 +284,14 @@ public sealed partial class NpcCreateRequest : pb::IMessage<NpcCreateRequest>
           RoomId = input.ReadString();
           break;
         }
+        case 16: {
+          TemplateId = input.ReadInt64();
+          break;
+        }
+        case 26: {
+          SceneId = input.ReadString();
+          break;
+        }
       }
     }
   #endif
@@ -242,6 +315,14 @@ public sealed partial class NpcCreateRequest : pb::IMessage<NpcCreateRequest>
           RoomId = input.ReadString();
           break;
         }
+        case 16: {
+          TemplateId = input.ReadInt64();
+          break;
+        }
+        case 26: {
+          SceneId = input.ReadString();
+          break;
+        }
       }
     }
   }

xiaofang/Assets/comm/Proto/Object.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7a2dfd72791480141a3dca377b5196d1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/comm/Proto/Prop.cs

@@ -419,6 +419,9 @@ public sealed partial class PropResponse : pb::IMessage<PropResponse>
   /// <summary>Field number for the "propId" field.</summary>
   public const int PropIdFieldNumber = 1;
   private int propId_;
+  /// <summary>
+  /// 道具ID
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int PropId {
@@ -431,6 +434,9 @@ public sealed partial class PropResponse : pb::IMessage<PropResponse>
   /// <summary>Field number for the "propServerId" field.</summary>
   public const int PropServerIdFieldNumber = 5;
   private string propServerId_ = "";
+  /// <summary>
+  /// 服务端ID
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public string PropServerId {
@@ -443,6 +449,9 @@ public sealed partial class PropResponse : pb::IMessage<PropResponse>
   /// <summary>Field number for the "name" field.</summary>
   public const int NameFieldNumber = 2;
   private string name_ = "";
+  /// <summary>
+  /// 道具名称
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public string Name {
@@ -455,6 +464,9 @@ public sealed partial class PropResponse : pb::IMessage<PropResponse>
   /// <summary>Field number for the "code" field.</summary>
   public const int CodeFieldNumber = 3;
   private int code_;
+  /// <summary>
+  /// 道具编码
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public int Code {
@@ -467,6 +479,9 @@ public sealed partial class PropResponse : pb::IMessage<PropResponse>
   /// <summary>Field number for the "message" field.</summary>
   public const int MessageFieldNumber = 4;
   private string message_ = "";
+  /// <summary>
+  /// 道具提示信息
+  /// </summary>
   [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
   [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
   public string Message {

xiaofang/Assets/comm/Proto/ProtoBufffer.cs

@@ -1,28 +0,0 @@
-using Google.Protobuf;
-using System;
-public class ProtoBufffer
-{
-    public static byte[] Serialize(IMessage message)
-    {
-        return message.ToByteArray();
-    }
-
-    public static T DeSerialize<T>(byte[] packet) where T : IMessage, new()
-    {
-        IMessage message = new T();
-        try
-        {
-            return (T)message.Descriptor.Parser.ParseFrom(packet);
-        }
-        catch (System.Exception e)
-        {
-            throw;
-        }
-    }
-
-    internal static T DeSerialize<T>(ByteString data)
-    {
-        throw new NotImplementedException();
-    }
-}
-

xiaofang/Assets/comm/test.cs

@@ -300,6 +300,7 @@ public class test : MonoBehaviour
             case "hall.BroadcastMessage":
                 UserJoinResponse userJoinResponse = ProtoBufffer.DeSerialize<UserJoinResponse>(bytes);
                 Debug.Log("玩家昵称：" + userJoinResponse.NickName + ",房间:" + userJoinResponse.RoomId.ToString() + "，用户角色"+ userJoinResponse.RoleName);
+                userJoinResponse.
                 break;
 
             //