diff --git a/xiaofang/Assets/Prefabs/PlayerPrefabs.meta b/xiaofang/Assets/Prefabs/PlayerPrefabs.meta
new file mode 100644
index 00000000..a0a2cd27
--- /dev/null
+++ b/xiaofang/Assets/Prefabs/PlayerPrefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 07faddb86540fa44a8f7f8b42e3cc53f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/xiaofang/Assets/Prefabs/PlayerPrefabs/newPlayer.fbx b/xiaofang/Assets/Prefabs/PlayerPrefabs/newPlayer.fbx
new file mode 100644
index 00000000..3385be78
Binary files /dev/null and b/xiaofang/Assets/Prefabs/PlayerPrefabs/newPlayer.fbx differ
diff --git a/xiaofang/Assets/Prefabs/PlayerPrefabs/newPlayer.fbx.meta b/xiaofang/Assets/Prefabs/PlayerPrefabs/newPlayer.fbx.meta
new file mode 100644
index 00000000..5b1055ef
--- /dev/null
+++ b/xiaofang/Assets/Prefabs/PlayerPrefabs/newPlayer.fbx.meta
@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 6def8c21980f20945bbf5eeab570702a
+ModelImporter:
+  serializedVersion: 21300
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 1
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 3
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 1
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 3
+  humanoidOversampling: 1
+  avatarSetup: 1
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/xiaofang/Assets/Scenes/Tmap.unity b/xiaofang/Assets/Scenes/Tmap.unity
index bf04bc36..48975c9e 100644
--- a/xiaofang/Assets/Scenes/Tmap.unity
+++ b/xiaofang/Assets/Scenes/Tmap.unity
@@ -467,7 +467,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 19
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &172478309
 PrefabInstance:
@@ -1760,7 +1760,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 25
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &479940076
 MonoBehaviour:
@@ -1803,7 +1803,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 14
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &542563896
 GameObject:
@@ -2050,7 +2050,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &596379530
 GameObject:
@@ -2251,13 +2251,17 @@ PrefabInstance:
       propertyPath: m_Name
       value: Player
       objectReference: {fileID: 0}
+    - target: {fileID: 3608877410834662313, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3}
       propertyPath: m_RootOrder
       value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -13.999404
+      value: -11.24
       objectReference: {fileID: 0}
     - target: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3}
       propertyPath: m_LocalPosition.y
@@ -2320,11 +2324,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 340618fb82d9f7246a985879a59c7b4d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!4 &608017475 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4133915569911699731, guid: 03b72bf544470e747a3e2c1f172d9e5c, type: 3}
-  m_PrefabInstance: {fileID: 608017461}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &669092464
 GameObject:
   m_ObjectHideFlags: 0
@@ -2354,7 +2353,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 22
+  m_RootOrder: 23
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!224 &689167531 stripped
 RectTransform:
@@ -2797,7 +2796,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 24
+  m_RootOrder: 25
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &810501282
 MonoBehaviour:
@@ -3019,7 +3018,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 16
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &996888830
 MonoBehaviour:
@@ -3541,7 +3540,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0bb2c0565bc902d478cc552b449b1445, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Character: {fileID: 608017475}
+  Character: {fileID: 1810834280}
   pivotOffset: {x: 0, y: 1.7, z: 0}
   camOffset: {x: 0.4, y: 0, z: -2}
   smooth: 10
@@ -4727,7 +4726,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 23
+  m_RootOrder: 24
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1481648095
 GameObject:
@@ -4758,7 +4757,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 21
+  m_RootOrder: 22
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1490008723
 GameObject:
@@ -5361,6 +5360,293 @@ RectTransform:
   m_AnchoredPosition: {x: 0.86829, y: 0}
   m_SizeDelta: {x: 165.4456, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1001 &1810834265
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_RootOrder
+      value: 14
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -13.999404
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.010001183
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 6.93
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_Name
+      value: newPlayer
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+      propertyPath: m_TagString
+      value: Player
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+--- !u!1 &1810834266 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+  m_PrefabInstance: {fileID: 1810834265}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &1810834267
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810834266}
+  m_Enabled: 1
+  m_Avatar: {fileID: 9000000, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+  m_Controller: {fileID: 9100000, guid: b6b0af1684cf4a3459f82fde7a3622e6, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!54 &1810834268
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810834266}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 112
+  m_CollisionDetection: 0
+--- !u!136 &1810834269
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810834266}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.3
+  m_Height: 2
+  m_Direction: 1
+  m_Center: {x: 0, y: 1, z: 0}
+--- !u!65 &1810834270
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810834266}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.5, y: 1.5, z: 0.5}
+  m_Center: {x: 0, y: 1, z: 0}
+--- !u!114 &1810834271
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810834266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eccdd1a2db5ba4848bcb2eea6ed8ddb8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cha: {fileID: 0}
+  xfs: {fileID: 0}
+--- !u!114 &1810834272
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810834266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b0e8bb916545c834b8981bdf116ec889, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  relativePosition: {x: 0, y: 0, z: 0}
+  relativeRotation: {x: 180, y: 225, z: -45}
+  pickUpRange: 2
+--- !u!114 &1810834273
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810834266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 776645053b40a604db295f0167ee1a67, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  vaultDistance: 2
+  vaultHeight: 2
+  vaultLayerMask:
+    serializedVersion: 2
+    m_Bits: 8
+  vaultForwardDistance: 2
+  vaultUpwardHeight: 2
+--- !u!114 &1810834274
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810834266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 177156116ddbf5a4c811e0da050f8c9d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  detectionRadius: 10
+  fireLayerMask:
+    serializedVersion: 2
+    m_Bits: 128
+--- !u!114 &1810834275
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810834266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f5ee0c437a82c154fbb3f7f2d268c19b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  currentItem: {fileID: 0}
+--- !u!114 &1810834276
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810834266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 340618fb82d9f7246a985879a59c7b4d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  moveSpeed: 3
+  mainCamera: {fileID: 1068997306}
+  JumpAbility: 1
+  JumpMoveSpeed: 100
+  normalFOV: 60
+  sprintFOV: 120
+  fovChangeSpeed: 2
+  walkTime: 1.8
+  runTime: 1.5
+--- !u!114 &1810834277
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810834266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ea9eb82687dfa674e883273cd7c73386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  characterState: 0
+--- !u!114 &1810834278
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810834266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a03ec7aa563e32d4ea7ce35cdd3e6f2b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Mp: 0
+  Def: 0
+--- !u!114 &1810834279
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1810834266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c377cd4742c7966498dda3a5e984db05, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  joystick: {fileID: 0}
+  cameraTransform: {fileID: 1068997307}
+  moveSpeed: 5
+  characterControl: {fileID: 1810834276}
+  mainCamera: {fileID: 1068997306}
+  normalFOV: 60
+  sprintFOV: 120
+  fovChangeSpeed: 2
+  walkTime: 0
+  runTime: 0
+  cameraControl: {fileID: 1068997308}
+--- !u!4 &1810834280 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6def8c21980f20945bbf5eeab570702a, type: 3}
+  m_PrefabInstance: {fileID: 1810834265}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1835582769
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5749,7 +6035,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 20
+  m_RootOrder: 21
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1973166534
 PrefabInstance:
@@ -6130,7 +6416,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 17
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &365379564727735658
 PrefabInstance:
@@ -6357,7 +6643,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3}
       propertyPath: m_RootOrder
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3}
       propertyPath: m_LocalPosition.x
diff --git a/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs b/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs
index e581c484..f8d53567 100644
--- a/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs
+++ b/xiaofang/Assets/Script/Character/Skills/Skill_Pick.cs
@@ -59,7 +59,7 @@ public class Skill_Pick : MonoBehaviour
                 itemCollider.enabled = false;
 
                 // 将物品设置为玩家手部的子对象，并调整其位置和旋转  
-                item.transform.SetParent(rightHand, false); // false表示保持物品的世界旋转和位置  
+                item.transform.SetParent(rightHand, true); // false表示保持物品的世界旋转和位置  
                 item.transform.localPosition = relativePosition; // 假设玩家手中有一个默认的持物位置  
                 item.transform.localRotation = Quaternion.Euler(relativeRotation); // 重置旋转  
 
diff --git a/xiaofang/Assets/Script/npc/RecuseNpc.cs b/xiaofang/Assets/Script/npc/RecuseNpc.cs
index 91b5b071..44fae622 100644
--- a/xiaofang/Assets/Script/npc/RecuseNpc.cs
+++ b/xiaofang/Assets/Script/npc/RecuseNpc.cs
@@ -21,12 +21,12 @@ public class RecuseNpc : MonoBehaviour
     public Npcstate nstate = Npcstate.dead;
 
     private bool movebool = false;
-    private Transform target;
+    public Transform target;
     private void Awake()
     {
         recusebtn = GameObject.Find("Canvas/Recuse").GetComponent<Button>();
         anim = this.GetComponent<Animator>();
-        target = GameObject.Find("mubiao").GetComponent<Transform>();
+        
     }
 
     private void OnTriggerEnter(Collider other)//通过触发器得到对应的救援组人员标签，是否显现出UI
@@ -53,7 +53,7 @@ public class RecuseNpc : MonoBehaviour
 
     private void Update()
     {
-        if (Vector3.Distance(transform.position,target.position) < 1.3f && movebool)//判断人物被救援后移动到目标位置
+        if (Vector3.Distance(transform.position,target.position) < 1.3f && movebool && target.transform.position != null)//判断人物被救援后移动到目标位置
         {
             Debug.Log("到达目标点");
             nstate = Npcstate.idle;
diff --git a/xiaofang/Assets/comm/test.cs b/xiaofang/Assets/comm/test.cs
index 0f603748..39b9089c 100644
--- a/xiaofang/Assets/comm/test.cs
+++ b/xiaofang/Assets/comm/test.cs
@@ -271,14 +271,14 @@ public class test : MonoBehaviour
 
 
     // Start is called before the first frame update
-    void Start()
+    async void Start()
     {
         //loging();
         wEBScriptListener.ConcatWEBSocket();
         wEBScriptListener.OnCallback += callback;
         if (wEBScriptListener != null)
         {
-            lodingWebSocket();
+            //lodingWebSocket();
             //JoinRoom();
             //Heartbeat();
             //BroadcastMessage();
@@ -290,6 +290,65 @@ public class test : MonoBehaviour
             //Location();
 
         }
+        int index = 0;
+        while (true)
+        {
+            index++;
+            NpcData moveData = new NpcData();
+            moveData.X = index;
+            moveData.Y = 1;
+            moveData.Z = 1;
+
+            MoveResponse data = new MoveResponse();
+            data.MoveData.Add(moveData);
+
+
+            WSResponse ws = new WSResponse();
+            ws.MessageType = "move.Location";
+            ws.Data = ByteString.CopyFrom(data.ToByteArray());
+
+
+            callback(ProtoBufffer.Serialize(ws));
+
+
+
+            //PlayerJoinResponse pj = new PlayerJoinResponse();
+            //pj.UserName = "abc";
+            //pj.RoomId = "2";
+            //pj.Status = 0;
+            //pj.RoleName = "ABC";
+            //pj.IsLeadingNPC = 5;
+            //pj.Online = true;
+            //pj.RoleId = 7;
+            //pj.GroupLeader = 0;
+            //pj.ActionMode = 2;
+            //pj.Group = -1;
+            //pj.X = 11;
+            //pj.Y = 12;
+            //pj.Z = 13;
+            //pj.OverseeCond = "14";
+            //pj.SendFrameCount = 15;
+            //pj.MoveSpeedFirst = 16;
+            //pj.MoveSpeedSecond = 17;
+            //pj.MoveSpeedThird = 18;
+            //pj.BearLoad = 19;
+            //pj.Protection = 20;
+            //pj.Health = 21;
+            //pj.RoleStatus = 22;
+            //pj.UserId = 23;
+
+
+            //JoinRoomResponse data = new JoinRoomResponse();
+            //data.Data = pj;
+
+            //WSResponse ws = new WSResponse();
+            //ws.MessageType = "hall.JoinRoom";
+            //ws.Data = ByteString.CopyFrom(data.ToByteArray());
+
+            //callback(ProtoBufffer.Serialize(ws));
+
+            await Task.Delay(1000);
+        }
     }
 
     void callback(byte[] data)
@@ -321,6 +380,9 @@ public class test : MonoBehaviour
                 Debug.Log("玩家昵称：" + userJoinResponse.NickName + ",房间:" + userJoinResponse.RoomId.ToString() + "，用户角色"+ userJoinResponse.RoleName);
                 Debug.Log(userJoinResponse.IncidentPosition);
                 Debug.Log(userJoinResponse);
+
+
+
                 break;
 
             //
@@ -345,11 +407,19 @@ public class test : MonoBehaviour
 
                 Debug.Log("PropId:" + stopuseProp);
                 break;
+
             case "move.Location":
                 Debug.Log("move.Location接受到了");
                 MoveResponse moveResponse = ProtoBufffer.DeSerialize<MoveResponse>(bytes);
                 Debug.Log(moveResponse.MoveData);
-                
+                NpcData npcData = new NpcData();
+                npcData = moveResponse.MoveData[0];
+                RecuseNpc rn = GetComponent<RecuseNpc>();
+                float x = npcData.X;
+                float y = npcData.Y;
+                float z = npcData.Z;
+                rn.target.transform.position = new Vector3(x,y,z);
+
                 break;
 
                 //case "prop.CreateNpc":
@@ -368,7 +438,7 @@ public class test : MonoBehaviour
                 //    //Debug.Log("PropId:" + joinRoomRequest.RoomId);
                 //    break;
 
-            
+
         }
     }