diff --git a/SSLR/Assets/NpcModels/Prefabs/female1.prefab b/SSLR/Assets/NpcModels/Prefabs/female1.prefab index e2f51c8..5b93f05 100644 --- a/SSLR/Assets/NpcModels/Prefabs/female1.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/female1.prefab @@ -674,7 +674,7 @@ Transform: m_GameObject: {fileID: 3556498266740698296} serializedVersion: 2 m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} - m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.474} + m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.358} m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} m_ConstrainProportionsScale: 0 m_Children: [] @@ -699,8 +699,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1, z: 0.51218075} + m_Center: {x: -1.1612629e-15, y: 0, z: -0.047450446} --- !u!54 &1204833351552570936 Rigidbody: m_ObjectHideFlags: 0 diff --git a/SSLR/Assets/NpcModels/Prefabs/female2.prefab b/SSLR/Assets/NpcModels/Prefabs/female2.prefab index 2649ca5..6a7ff28 100644 --- a/SSLR/Assets/NpcModels/Prefabs/female2.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/female2.prefab @@ -239,7 +239,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &1785374020187378694 +--- !u!1 &1913304662308635010 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -247,11 +247,11 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6530529283060009076} - - component: {fileID: 5700711725433149469} - - component: {fileID: 244853163959655191} - - component: {fileID: 7727887146848177440} - - component: {fileID: 5791029736690179426} + - component: {fileID: 6480171934249429200} + - component: {fileID: 106824583410403480} + - component: {fileID: 3108262879989979906} + - component: {fileID: 2544595398727898354} + - component: {fileID: 4322952686222931750} m_Layer: 0 m_Name: Paper Socket_NPC m_TagString: Untagged @@ -259,28 +259,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6530529283060009076 +--- !u!4 &6480171934249429200 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1785374020187378694} + m_GameObject: {fileID: 1913304662308635010} serializedVersion: 2 m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} - m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.474} + m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.358} m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1104961981622706960} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &5700711725433149469 +--- !u!65 &106824583410403480 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1785374020187378694} + m_GameObject: {fileID: 1913304662308635010} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -293,15 +293,15 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &244853163959655191 + m_Size: {x: 1, y: 1, z: 0.51218075} + m_Center: {x: -1.1612629e-15, y: 0, z: -0.047450446} +--- !u!54 &3108262879989979906 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1785374020187378694} + m_GameObject: {fileID: 1913304662308635010} serializedVersion: 4 m_Mass: 1 m_Drag: 0 @@ -322,13 +322,13 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!114 &7727887146848177440 +--- !u!114 &2544595398727898354 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1785374020187378694} + m_GameObject: {fileID: 1913304662308635010} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} @@ -368,13 +368,13 @@ MonoBehaviour: m_SocketScaleMode: 0 m_FixedScale: {x: 1, y: 1, z: 1} m_TargetBoundsSize: {x: 1, y: 1, z: 1} ---- !u!114 &5791029736690179426 +--- !u!114 &4322952686222931750 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1785374020187378694} + m_GameObject: {fileID: 1913304662308635010} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} @@ -1299,7 +1299,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5322a15b17a89d54387e0ed089c3f36c, type: 3} insertIndex: 0 - addedObject: {fileID: 6530529283060009076} + addedObject: {fileID: 6480171934249429200} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5322a15b17a89d54387e0ed089c3f36c, type: 3} insertIndex: 1 addedObject: {fileID: 7742407613049353203} @@ -1368,7 +1368,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0 + m_BaseOffset: 0.2 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &6550354841523958635 diff --git a/SSLR/Assets/NpcModels/Prefabs/female3.prefab b/SSLR/Assets/NpcModels/Prefabs/female3.prefab index 2ce55c5..8a6b120 100644 --- a/SSLR/Assets/NpcModels/Prefabs/female3.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/female3.prefab @@ -849,6 +849,148 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &6178777237381190032 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3045071268070528650} + - component: {fileID: 9218709713811610968} + - component: {fileID: 7778921818894250012} + - component: {fileID: 156760809446503904} + - component: {fileID: 6935118802997975813} + m_Layer: 0 + m_Name: Paper Socket_NPC + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3045071268070528650 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6178777237381190032} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} + m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.358} + m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6707846670718131335} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &9218709713811610968 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6178777237381190032} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 0.51218075} + m_Center: {x: -1.1612629e-15, y: 0, z: -0.047450446} +--- !u!54 &7778921818894250012 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6178777237381190032} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &156760809446503904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6178777237381190032} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 2 + m_Handedness: 0 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_ShowInteractableHoverMeshes: 1 + m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} + m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} + m_SocketActive: 1 + m_InteractableHoverScale: 1 + m_RecycleDelayTime: 1 + m_HoverSocketSnapping: 0 + m_SocketSnappingRadius: 0.1 + m_SocketScaleMode: 0 + m_FixedScale: {x: 1, y: 1, z: 1} + m_TargetBoundsSize: {x: 1, y: 1, z: 1} +--- !u!114 &6935118802997975813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6178777237381190032} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1 &7283726428374373647 GameObject: m_ObjectHideFlags: 0 @@ -1088,148 +1230,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7694716630882756943 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4415371291487920874} - - component: {fileID: 7490219902283022896} - - component: {fileID: 8939056523318217426} - - component: {fileID: 603032554747908176} - - component: {fileID: 5648695755777913368} - m_Layer: 0 - m_Name: Paper Socket_NPC - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4415371291487920874 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694716630882756943} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} - m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.474} - m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6707846670718131335} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &7490219902283022896 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694716630882756943} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &8939056523318217426 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694716630882756943} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &603032554747908176 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694716630882756943} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_InteractionLayers: - m_Bits: 2 - m_Handedness: 0 - m_AttachTransform: {fileID: 0} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_ShowInteractableHoverMeshes: 1 - m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} - m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} - m_SocketActive: 1 - m_InteractableHoverScale: 1 - m_RecycleDelayTime: 1 - m_HoverSocketSnapping: 0 - m_SocketSnappingRadius: 0.1 - m_SocketScaleMode: 0 - m_FixedScale: {x: 1, y: 1, z: 1} - m_TargetBoundsSize: {x: 1, y: 1, z: 1} ---- !u!114 &5648695755777913368 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7694716630882756943} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} - m_Name: - m_EditorClassIdentifier: - socketName: Paper Socket_NPC --- !u!1001 &6529575681155513196 PrefabInstance: m_ObjectHideFlags: 0 @@ -1300,7 +1300,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 55e2055054d94ee4aa07586779090ee5, type: 3} insertIndex: 0 - addedObject: {fileID: 4415371291487920874} + addedObject: {fileID: 3045071268070528650} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 55e2055054d94ee4aa07586779090ee5, type: 3} insertIndex: 1 addedObject: {fileID: 5469791572987278424} @@ -1369,7 +1369,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0 + m_BaseOffset: 0.2 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &3235455458723478503 diff --git a/SSLR/Assets/NpcModels/Prefabs/male1.prefab b/SSLR/Assets/NpcModels/Prefabs/male1.prefab index c6d8c41..947c337 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male1.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male1.prefab @@ -373,7 +373,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &6305475373166175447 +--- !u!1 &6280747184112191635 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -381,11 +381,11 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8250500181484719322} - - component: {fileID: 7172191011401203843} - - component: {fileID: 1797092900221605408} - - component: {fileID: 889130723273379647} - - component: {fileID: 794692896336327532} + - component: {fileID: 2280984794637822111} + - component: {fileID: 8995155076247729339} + - component: {fileID: 699726177547340921} + - component: {fileID: 1868741122290621516} + - component: {fileID: 8445696845888888275} m_Layer: 0 m_Name: Paper Socket_NPC m_TagString: Untagged @@ -393,28 +393,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8250500181484719322 +--- !u!4 &2280984794637822111 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6305475373166175447} + m_GameObject: {fileID: 6280747184112191635} serializedVersion: 2 m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} - m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.474} + m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.358} m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4853797667259607755} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &7172191011401203843 +--- !u!65 &8995155076247729339 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6305475373166175447} + m_GameObject: {fileID: 6280747184112191635} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -427,15 +427,15 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &1797092900221605408 + m_Size: {x: 1, y: 1, z: 0.51218075} + m_Center: {x: -1.1612629e-15, y: 0, z: -0.047450446} +--- !u!54 &699726177547340921 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6305475373166175447} + m_GameObject: {fileID: 6280747184112191635} serializedVersion: 4 m_Mass: 1 m_Drag: 0 @@ -456,13 +456,13 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!114 &889130723273379647 +--- !u!114 &1868741122290621516 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6305475373166175447} + m_GameObject: {fileID: 6280747184112191635} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} @@ -502,13 +502,13 @@ MonoBehaviour: m_SocketScaleMode: 0 m_FixedScale: {x: 1, y: 1, z: 1} m_TargetBoundsSize: {x: 1, y: 1, z: 1} ---- !u!114 &794692896336327532 +--- !u!114 &8445696845888888275 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6305475373166175447} + m_GameObject: {fileID: 6280747184112191635} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} @@ -1300,7 +1300,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 208f8e7ee2310474aa57f8901d61d5f6, type: 3} insertIndex: 0 - addedObject: {fileID: 8250500181484719322} + addedObject: {fileID: 2280984794637822111} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 208f8e7ee2310474aa57f8901d61d5f6, type: 3} insertIndex: 1 addedObject: {fileID: 7624190420235664298} @@ -1374,7 +1374,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0 + m_BaseOffset: 0.2 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &1404532670578165301 diff --git a/SSLR/Assets/NpcModels/Prefabs/male2.prefab b/SSLR/Assets/NpcModels/Prefabs/male2.prefab index c4d005e..232f369 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male2.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male2.prefab @@ -954,148 +954,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4476012752627612937 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8504821295744702193} - - component: {fileID: 2497606220704784950} - - component: {fileID: 4228252306727084392} - - component: {fileID: 8344193944377356275} - - component: {fileID: 234791113522605735} - m_Layer: 0 - m_Name: Paper Socket_NPC - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8504821295744702193 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4476012752627612937} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} - m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.474} - m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8467587010930758281} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &2497606220704784950 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4476012752627612937} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &4228252306727084392 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4476012752627612937} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &8344193944377356275 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4476012752627612937} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_InteractionLayers: - m_Bits: 2 - m_Handedness: 0 - m_AttachTransform: {fileID: 0} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_ShowInteractableHoverMeshes: 1 - m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} - m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} - m_SocketActive: 1 - m_InteractableHoverScale: 1 - m_RecycleDelayTime: 1 - m_HoverSocketSnapping: 0 - m_SocketSnappingRadius: 0.1 - m_SocketScaleMode: 0 - m_FixedScale: {x: 1, y: 1, z: 1} - m_TargetBoundsSize: {x: 1, y: 1, z: 1} ---- !u!114 &234791113522605735 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4476012752627612937} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} - m_Name: - m_EditorClassIdentifier: - socketName: Paper Socket_NPC --- !u!1 &6055890241833183148 GameObject: m_ObjectHideFlags: 0 @@ -1230,6 +1088,148 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7615605175898020466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2759216358178088516} + - component: {fileID: 5691325477273002361} + - component: {fileID: 7989660180904457924} + - component: {fileID: 7871771051388302823} + - component: {fileID: 9148748947819276606} + m_Layer: 0 + m_Name: Paper Socket_NPC + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2759216358178088516 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7615605175898020466} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} + m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.358} + m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8467587010930758281} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &5691325477273002361 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7615605175898020466} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 0.51218075} + m_Center: {x: -1.1612629e-15, y: 0, z: -0.047450446} +--- !u!54 &7989660180904457924 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7615605175898020466} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &7871771051388302823 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7615605175898020466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 2 + m_Handedness: 0 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_ShowInteractableHoverMeshes: 1 + m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} + m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} + m_SocketActive: 1 + m_InteractableHoverScale: 1 + m_RecycleDelayTime: 1 + m_HoverSocketSnapping: 0 + m_SocketSnappingRadius: 0.1 + m_SocketScaleMode: 0 + m_FixedScale: {x: 1, y: 1, z: 1} + m_TargetBoundsSize: {x: 1, y: 1, z: 1} +--- !u!114 &9148748947819276606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7615605175898020466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1001 &8216906548593571170 PrefabInstance: m_ObjectHideFlags: 0 @@ -1300,7 +1300,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 8c08f173abfeb6740b1d9707f1bf5a3c, type: 3} insertIndex: 0 - addedObject: {fileID: 8504821295744702193} + addedObject: {fileID: 2759216358178088516} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 8c08f173abfeb6740b1d9707f1bf5a3c, type: 3} insertIndex: 1 addedObject: {fileID: 4566066686622745497} @@ -1374,7 +1374,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0 + m_BaseOffset: 0.2 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &7289129299178912299 diff --git a/SSLR/Assets/NpcModels/Prefabs/male3.prefab b/SSLR/Assets/NpcModels/Prefabs/male3.prefab index 0af0aff..5748e80 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male3.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male3.prefab @@ -609,6 +609,148 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &4316045321179167294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1415954078842339315} + - component: {fileID: 1817296046735999795} + - component: {fileID: 7329637561325615076} + - component: {fileID: 9000082615928066432} + - component: {fileID: 4811766159480266559} + m_Layer: 0 + m_Name: Paper Socket_NPC + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1415954078842339315 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4316045321179167294} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} + m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.358} + m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 546028504628827354} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1817296046735999795 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4316045321179167294} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 0.51218075} + m_Center: {x: -1.1612629e-15, y: 0, z: -0.047450446} +--- !u!54 &7329637561325615076 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4316045321179167294} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &9000082615928066432 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4316045321179167294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 2 + m_Handedness: 0 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_ShowInteractableHoverMeshes: 1 + m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} + m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} + m_SocketActive: 1 + m_InteractableHoverScale: 1 + m_RecycleDelayTime: 1 + m_HoverSocketSnapping: 0 + m_SocketSnappingRadius: 0.1 + m_SocketScaleMode: 0 + m_FixedScale: {x: 1, y: 1, z: 1} + m_TargetBoundsSize: {x: 1, y: 1, z: 1} +--- !u!114 &4811766159480266559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4316045321179167294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1 &4547055204330898016 GameObject: m_ObjectHideFlags: 0 @@ -1088,148 +1230,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &9182391001311392250 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4534289443344988739} - - component: {fileID: 1710284870846194539} - - component: {fileID: 1871604507135984828} - - component: {fileID: 8768190027082506874} - - component: {fileID: 9005417642477873445} - m_Layer: 0 - m_Name: Paper Socket_NPC - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4534289443344988739 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9182391001311392250} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} - m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.474} - m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 546028504628827354} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1710284870846194539 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9182391001311392250} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &1871604507135984828 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9182391001311392250} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &8768190027082506874 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9182391001311392250} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_InteractionLayers: - m_Bits: 2 - m_Handedness: 0 - m_AttachTransform: {fileID: 0} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_ShowInteractableHoverMeshes: 1 - m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} - m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} - m_SocketActive: 1 - m_InteractableHoverScale: 1 - m_RecycleDelayTime: 1 - m_HoverSocketSnapping: 0 - m_SocketSnappingRadius: 0.1 - m_SocketScaleMode: 0 - m_FixedScale: {x: 1, y: 1, z: 1} - m_TargetBoundsSize: {x: 1, y: 1, z: 1} ---- !u!114 &9005417642477873445 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9182391001311392250} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} - m_Name: - m_EditorClassIdentifier: - socketName: Paper Socket_NPC --- !u!1001 &7137433848050481 PrefabInstance: m_ObjectHideFlags: 0 @@ -1296,7 +1296,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e815cd9e50092a54a972db0a7c381b5e, type: 3} insertIndex: 0 - addedObject: {fileID: 4534289443344988739} + addedObject: {fileID: 1415954078842339315} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e815cd9e50092a54a972db0a7c381b5e, type: 3} insertIndex: 1 addedObject: {fileID: 5389246775543483731} @@ -1370,7 +1370,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0 + m_BaseOffset: 0.2 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &7310366438356425248 diff --git a/SSLR/Assets/NpcModels/Prefabs/male4.prefab b/SSLR/Assets/NpcModels/Prefabs/male4.prefab index 310a5d4..7bdb265 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male4.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male4.prefab @@ -1,147 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1101133743960231593 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3788829144626472458} - - component: {fileID: 4577496929676255019} - - component: {fileID: 7263784456140940319} - - component: {fileID: 4759191189512595014} - - component: {fileID: 8674262097833971812} - m_Layer: 0 - m_Name: Paper Socket_NPC - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3788829144626472458 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1101133743960231593} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} - m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.474} - m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3732948466575516741} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &4577496929676255019 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1101133743960231593} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &7263784456140940319 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1101133743960231593} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &4759191189512595014 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1101133743960231593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_InteractionLayers: - m_Bits: 2 - m_Handedness: 0 - m_AttachTransform: {fileID: 0} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_ShowInteractableHoverMeshes: 1 - m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} - m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} - m_SocketActive: 1 - m_InteractableHoverScale: 1 - m_RecycleDelayTime: 1 - m_HoverSocketSnapping: 0 - m_SocketSnappingRadius: 0.1 - m_SocketScaleMode: 0 - m_FixedScale: {x: 1, y: 1, z: 1} - m_TargetBoundsSize: {x: 1, y: 1, z: 1} ---- !u!114 &8674262097833971812 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1101133743960231593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} - m_Name: - m_EditorClassIdentifier: - socketName: Paper Socket_NPC --- !u!1 &2472564892493175482 GameObject: m_ObjectHideFlags: 0 @@ -410,6 +268,148 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3421695620289022411 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5827847534764219374} + - component: {fileID: 8034639137699156371} + - component: {fileID: 2365727132839469332} + - component: {fileID: 7287598442288487378} + - component: {fileID: 332093503759350286} + m_Layer: 0 + m_Name: Paper Socket_NPC + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5827847534764219374 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3421695620289022411} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} + m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.358} + m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3732948466575516741} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8034639137699156371 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3421695620289022411} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 0.51218075} + m_Center: {x: -1.1612629e-15, y: 0, z: -0.047450446} +--- !u!54 &2365727132839469332 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3421695620289022411} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &7287598442288487378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3421695620289022411} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 2 + m_Handedness: 0 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_ShowInteractableHoverMeshes: 1 + m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} + m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} + m_SocketActive: 1 + m_InteractableHoverScale: 1 + m_RecycleDelayTime: 1 + m_HoverSocketSnapping: 0 + m_SocketSnappingRadius: 0.1 + m_SocketScaleMode: 0 + m_FixedScale: {x: 1, y: 1, z: 1} + m_TargetBoundsSize: {x: 1, y: 1, z: 1} +--- !u!114 &332093503759350286 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3421695620289022411} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1 &4770540122891911902 GameObject: m_ObjectHideFlags: 0 @@ -1300,7 +1300,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: bab3991b5f3a46d4ab41482be4494587, type: 3} insertIndex: 0 - addedObject: {fileID: 3788829144626472458} + addedObject: {fileID: 5827847534764219374} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: bab3991b5f3a46d4ab41482be4494587, type: 3} insertIndex: 1 addedObject: {fileID: 4094013088347936308} @@ -1374,7 +1374,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0 + m_BaseOffset: 0.2 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &5062195734015408324 diff --git a/SSLR/Assets/NpcModels/Prefabs/male5.prefab b/SSLR/Assets/NpcModels/Prefabs/male5.prefab index 5063c85..be445f5 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male5.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male5.prefab @@ -284,148 +284,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &834682010213193268 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5789158253097012276} - - component: {fileID: 7529258161914379365} - - component: {fileID: 8819534525301295992} - - component: {fileID: 4826892333024719854} - - component: {fileID: 7959226109949322247} - m_Layer: 0 - m_Name: Paper Socket_NPC - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5789158253097012276 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 834682010213193268} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} - m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.474} - m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2485024722450441020} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &7529258161914379365 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 834682010213193268} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &8819534525301295992 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 834682010213193268} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &4826892333024719854 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 834682010213193268} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_InteractionLayers: - m_Bits: 2 - m_Handedness: 0 - m_AttachTransform: {fileID: 0} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_ShowInteractableHoverMeshes: 1 - m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} - m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} - m_SocketActive: 1 - m_InteractableHoverScale: 1 - m_RecycleDelayTime: 1 - m_HoverSocketSnapping: 0 - m_SocketSnappingRadius: 0.1 - m_SocketScaleMode: 0 - m_FixedScale: {x: 1, y: 1, z: 1} - m_TargetBoundsSize: {x: 1, y: 1, z: 1} ---- !u!114 &7959226109949322247 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 834682010213193268} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} - m_Name: - m_EditorClassIdentifier: - socketName: Paper Socket_NPC --- !u!1 &1231251048609564001 GameObject: m_ObjectHideFlags: 0 @@ -1096,6 +954,148 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8291956227591586806 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3274782287270475334} + - component: {fileID: 2385522773352993652} + - component: {fileID: 8857337725835543014} + - component: {fileID: 4420323387666269343} + - component: {fileID: 2653498892724747618} + m_Layer: 0 + m_Name: Paper Socket_NPC + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3274782287270475334 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8291956227591586806} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} + m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.358} + m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2485024722450441020} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2385522773352993652 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8291956227591586806} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 0.51218075} + m_Center: {x: -1.1612629e-15, y: 0, z: -0.047450446} +--- !u!54 &8857337725835543014 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8291956227591586806} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &4420323387666269343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8291956227591586806} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 2 + m_Handedness: 0 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_ShowInteractableHoverMeshes: 1 + m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} + m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} + m_SocketActive: 1 + m_InteractableHoverScale: 1 + m_RecycleDelayTime: 1 + m_HoverSocketSnapping: 0 + m_SocketSnappingRadius: 0.1 + m_SocketScaleMode: 0 + m_FixedScale: {x: 1, y: 1, z: 1} + m_TargetBoundsSize: {x: 1, y: 1, z: 1} +--- !u!114 &2653498892724747618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8291956227591586806} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1 &8507578913368972172 GameObject: m_ObjectHideFlags: 0 @@ -1300,7 +1300,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: fa019e4b86d491842b5fa525d23d5dc6, type: 3} insertIndex: 0 - addedObject: {fileID: 5789158253097012276} + addedObject: {fileID: 3274782287270475334} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: fa019e4b86d491842b5fa525d23d5dc6, type: 3} insertIndex: 1 addedObject: {fileID: 3684930622034501885} @@ -1374,7 +1374,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0 + m_BaseOffset: 0.2 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &1028939866706718389 diff --git a/SSLR/Assets/NpcModels/Prefabs/male6.prefab b/SSLR/Assets/NpcModels/Prefabs/male6.prefab index 044fe8f..06a5bc9 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male6.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male6.prefab @@ -102,6 +102,148 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &2042425670853850966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1922100100971106761} + - component: {fileID: 8115444205658327939} + - component: {fileID: 1101644899952505418} + - component: {fileID: 3213235129855863313} + - component: {fileID: 4608521305268907107} + m_Layer: 0 + m_Name: Paper Socket_NPC + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1922100100971106761 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042425670853850966} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} + m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.358} + m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1520089297785738869} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8115444205658327939 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042425670853850966} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 0.51218075} + m_Center: {x: -1.1612629e-15, y: 0, z: -0.047450446} +--- !u!54 &1101644899952505418 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042425670853850966} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &3213235129855863313 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042425670853850966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 2 + m_Handedness: 0 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_ShowInteractableHoverMeshes: 1 + m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} + m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} + m_SocketActive: 1 + m_InteractableHoverScale: 1 + m_RecycleDelayTime: 1 + m_HoverSocketSnapping: 0 + m_SocketSnappingRadius: 0.1 + m_SocketScaleMode: 0 + m_FixedScale: {x: 1, y: 1, z: 1} + m_TargetBoundsSize: {x: 1, y: 1, z: 1} +--- !u!114 &4608521305268907107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2042425670853850966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1 &2402844475017022137 GameObject: m_ObjectHideFlags: 0 @@ -504,148 +646,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4081393121370720058 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4775966555899934063} - - component: {fileID: 6852349600815238374} - - component: {fileID: 7420584261371413356} - - component: {fileID: 4619728359034544238} - - component: {fileID: 7528223214505676768} - m_Layer: 0 - m_Name: Paper Socket_NPC - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4775966555899934063 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4081393121370720058} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} - m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.474} - m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1520089297785738869} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &6852349600815238374 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4081393121370720058} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &7420584261371413356 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4081393121370720058} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &4619728359034544238 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4081393121370720058} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_InteractionLayers: - m_Bits: 2 - m_Handedness: 0 - m_AttachTransform: {fileID: 0} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_ShowInteractableHoverMeshes: 1 - m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} - m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} - m_SocketActive: 1 - m_InteractableHoverScale: 1 - m_RecycleDelayTime: 1 - m_HoverSocketSnapping: 0 - m_SocketSnappingRadius: 0.1 - m_SocketScaleMode: 0 - m_FixedScale: {x: 1, y: 1, z: 1} - m_TargetBoundsSize: {x: 1, y: 1, z: 1} ---- !u!114 &7528223214505676768 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4081393121370720058} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} - m_Name: - m_EditorClassIdentifier: - socketName: Paper Socket_NPC --- !u!1 &4666290201182243509 GameObject: m_ObjectHideFlags: 0 @@ -1300,7 +1300,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 71e4c682b22e1934d86e97035c9aad3b, type: 3} insertIndex: 0 - addedObject: {fileID: 4775966555899934063} + addedObject: {fileID: 1922100100971106761} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 71e4c682b22e1934d86e97035c9aad3b, type: 3} insertIndex: 1 addedObject: {fileID: 8692384854035936300} @@ -1374,7 +1374,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0 + m_BaseOffset: 0.2 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &7364405088423112622 diff --git a/SSLR/Assets/NpcModels/Prefabs/male7.prefab b/SSLR/Assets/NpcModels/Prefabs/male7.prefab index cb5a19d..3661d2e 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male7.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male7.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &102797962149389305 +--- !u!1 &328167471551146664 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,11 +8,11 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7304717892021046370} - - component: {fileID: 7705288101545872315} - - component: {fileID: 2411696036420907349} - - component: {fileID: 7643006924499703527} - - component: {fileID: 5744356475577156156} + - component: {fileID: 6373918399224920231} + - component: {fileID: 1608441381211348258} + - component: {fileID: 7819777996169414175} + - component: {fileID: 1218775044710545216} + - component: {fileID: 7395735104596621265} m_Layer: 0 m_Name: Paper Socket_NPC m_TagString: Untagged @@ -20,28 +20,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7304717892021046370 +--- !u!4 &6373918399224920231 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102797962149389305} + m_GameObject: {fileID: 328167471551146664} serializedVersion: 2 m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} - m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.474} + m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.358} m_LocalScale: {x: 0.45396, y: 0.01469, z: 0.57689} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1000822648102938752} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &7705288101545872315 +--- !u!65 &1608441381211348258 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102797962149389305} + m_GameObject: {fileID: 328167471551146664} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -54,15 +54,15 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &2411696036420907349 + m_Size: {x: 1, y: 1, z: 0.51218075} + m_Center: {x: -1.1612629e-15, y: 0, z: -0.047450446} +--- !u!54 &7819777996169414175 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102797962149389305} + m_GameObject: {fileID: 328167471551146664} serializedVersion: 4 m_Mass: 1 m_Drag: 0 @@ -83,13 +83,13 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!114 &7643006924499703527 +--- !u!114 &1218775044710545216 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102797962149389305} + m_GameObject: {fileID: 328167471551146664} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} @@ -129,13 +129,13 @@ MonoBehaviour: m_SocketScaleMode: 0 m_FixedScale: {x: 1, y: 1, z: 1} m_TargetBoundsSize: {x: 1, y: 1, z: 1} ---- !u!114 &5744356475577156156 +--- !u!114 &7395735104596621265 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102797962149389305} + m_GameObject: {fileID: 328167471551146664} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} @@ -1300,7 +1300,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 067304c8fbfe24149a9b200ce3ebe428, type: 3} insertIndex: 0 - addedObject: {fileID: 7304717892021046370} + addedObject: {fileID: 6373918399224920231} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 067304c8fbfe24149a9b200ce3ebe428, type: 3} insertIndex: 1 addedObject: {fileID: 6749832729263900794} @@ -1369,7 +1369,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0 + m_BaseOffset: 0.2 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &839382620823816501 diff --git a/SSLR/Assets/Scenes/Game Scene.unity b/SSLR/Assets/Scenes/Game Scene.unity index e094f82..326a8e3 100644 --- a/SSLR/Assets/Scenes/Game Scene.unity +++ b/SSLR/Assets/Scenes/Game Scene.unity @@ -488,7 +488,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} propertyPath: m_LocalPosition.y - value: 11.834326 + value: 11.630854 objectReference: {fileID: 0} - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} propertyPath: m_LocalPosition.z @@ -7492,7 +7492,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} propertyPath: m_LocalPosition.y - value: 12.204 + value: 12.000528 objectReference: {fileID: 0} - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} propertyPath: m_LocalPosition.z @@ -14370,7 +14370,7 @@ Transform: m_GameObject: {fileID: 181151625} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.70710677, z: -0, w: 0.7071068} - m_LocalPosition: {x: 732.911, y: 12.0181, z: 456.933} + m_LocalPosition: {x: 732.911, y: 11.814628, z: 456.933} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -14981,7 +14981,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7591921673328099837, guid: bc7aab643b4d1ae4cadc4b6abba2b349, type: 3} propertyPath: m_LocalPosition.y - value: 11.945 + value: 11.741528 objectReference: {fileID: 0} - target: {fileID: 7591921673328099837, guid: bc7aab643b4d1ae4cadc4b6abba2b349, type: 3} propertyPath: m_LocalPosition.z @@ -15208,7 +15208,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7591921673328099837, guid: bc7aab643b4d1ae4cadc4b6abba2b349, type: 3} propertyPath: m_LocalPosition.y - value: 11.945 + value: 11.741528 objectReference: {fileID: 0} - target: {fileID: 7591921673328099837, guid: bc7aab643b4d1ae4cadc4b6abba2b349, type: 3} propertyPath: m_LocalPosition.z @@ -22952,6 +22952,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 8015901809606894381, guid: b56d0d6f1af266d40a4f4268408f6db2, type: 3} m_PrefabInstance: {fileID: 539269778} m_PrefabAsset: {fileID: 0} +--- !u!1001 &540856747 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.x + value: 732.5761 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.y + value: 11.812528 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalPosition.z + value: 457.80408 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.w + value: -0.711384 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000010600463 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7028036 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000010472574 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -89.305 + objectReference: {fileID: 0} + - target: {fileID: 987810662684709338, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7198325426086921740, guid: e82a63e1655bf9645aba4697304f862d, type: 3} + propertyPath: m_Name + value: Spawnable_Doc (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e82a63e1655bf9645aba4697304f862d, type: 3} --- !u!1001 &541007200 PrefabInstance: m_ObjectHideFlags: 0 @@ -28858,7 +28915,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4483003418975104608, guid: bf2904ee269479c45824f006be54365e, type: 3} propertyPath: m_LocalPosition.y - value: 12.0476 + value: 11.844128 objectReference: {fileID: 0} - target: {fileID: 4483003418975104608, guid: bf2904ee269479c45824f006be54365e, type: 3} propertyPath: m_LocalPosition.z @@ -30268,7 +30325,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3} propertyPath: m_LocalPosition.y - value: 11.9467 + value: 11.743228 objectReference: {fileID: 0} - target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3} propertyPath: m_LocalPosition.z @@ -31605,7 +31662,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 118.495, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 733.3562, y: 12.792} + m_AnchoredPosition: {x: 733.3562, y: 12.588528} m_SizeDelta: {x: 659.8499, y: 839.4154} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &900728217 @@ -31742,6 +31799,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: b8ee657c6800ab849bb30b4375d02323, type: 3} m_PrefabInstance: {fileID: 665465256} m_PrefabAsset: {fileID: 0} +--- !u!1 &911287960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 911287961} + m_Layer: 0 + m_Name: Right Despawn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &911287961 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 911287960} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 730.866, y: 12.199528, z: 454.205} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &913416678 GameObject: m_ObjectHideFlags: 0 @@ -32464,7 +32552,7 @@ Transform: m_GameObject: {fileID: 932833872} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 732.79, y: 12.45, z: 453.05942} + m_LocalPosition: {x: 732.79, y: 12.246528, z: 453.05942} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -34224,7 +34312,7 @@ Transform: m_GameObject: {fileID: 990127391} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.70710677, z: -0, w: 0.7071068} - m_LocalPosition: {x: 732.7768, y: 12.0181, z: 456.933} + m_LocalPosition: {x: 732.7768, y: 11.814628, z: 456.933} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -36133,6 +36221,53 @@ MonoBehaviour: m_IgnoreFromBuild: 0 m_ApplyToChildren: 1 m_AffectedAgents: ffffffff +--- !u!1 &1101273640 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1101273642} + - component: {fileID: 1101273641} + m_Layer: 0 + m_Name: backend + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1101273641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101273640} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e8dc8c9a0f5dd0243895dc3a63323b85, type: 3} + m_Name: + m_EditorClassIdentifier: + url: + anonKey: + menuButtons: {fileID: 0} +--- !u!4 &1101273642 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101273640} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 765.20447, y: 6.4224076, z: 465.607} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1101331263 PrefabInstance: m_ObjectHideFlags: 0 @@ -36623,7 +36758,7 @@ Transform: m_GameObject: {fileID: 1125438666} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 753.24915, y: 11.643472, z: 435.5898} + m_LocalPosition: {x: 753.24915, y: 11.44, z: 435.5898} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -36839,8 +36974,10 @@ MonoBehaviour: - SeatObject: {fileID: 715642141} Available: 1 currentNpcs: [] - despawnPoints: [] - desk: {fileID: 1150502775} + despawnPoints: + - {fileID: 2043700348} + - {fileID: 911287961} + desk: {fileID: 1731510885} --- !u!4 &1127196877 Transform: m_ObjectHideFlags: 0 @@ -37053,7 +37190,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1552558632447623175, guid: 453c268b2605da942844009bc76e30b3, type: 3} + insertIndex: -1 + addedObject: {fileID: 1731510885} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 453c268b2605da942844009bc76e30b3, type: 3} --- !u!4 &1150502775 stripped @@ -38577,7 +38717,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6408093667559809449, guid: 7795d1095e0684f468f5b8231bb7705f, type: 3} propertyPath: m_LocalPosition.y - value: 11.972 + value: 11.768528 objectReference: {fileID: 0} - target: {fileID: 6408093667559809449, guid: 7795d1095e0684f468f5b8231bb7705f, type: 3} propertyPath: m_LocalPosition.z @@ -39137,7 +39277,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7591921673328099837, guid: bc7aab643b4d1ae4cadc4b6abba2b349, type: 3} propertyPath: m_LocalPosition.y - value: 11.945 + value: 11.741528 objectReference: {fileID: 0} - target: {fileID: 7591921673328099837, guid: bc7aab643b4d1ae4cadc4b6abba2b349, type: 3} propertyPath: m_LocalPosition.z @@ -40470,7 +40610,7 @@ Transform: m_GameObject: {fileID: 1260636921} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 829.4, y: 6.6679177, z: 375.3} + m_LocalPosition: {x: 829.4, y: 6.4, z: 375.3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -42704,7 +42844,7 @@ MonoBehaviour: m_fontSizeBase: 60.45 m_fontWeight: 400 m_enableAutoSizing: 1 - m_fontSizeMin: 40 + m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 2 @@ -47450,7 +47590,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7591921673328099837, guid: bc7aab643b4d1ae4cadc4b6abba2b349, type: 3} propertyPath: m_LocalPosition.y - value: 11.945 + value: 11.741528 objectReference: {fileID: 0} - target: {fileID: 7591921673328099837, guid: bc7aab643b4d1ae4cadc4b6abba2b349, type: 3} propertyPath: m_LocalPosition.z @@ -48471,7 +48611,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} propertyPath: m_LocalPosition.x - value: 743.64 + value: 731.597 objectReference: {fileID: 0} - target: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} propertyPath: m_LocalPosition.y @@ -49634,7 +49774,7 @@ Transform: m_GameObject: {fileID: 1626285529} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.70710677, z: -0, w: 0.7071068} - m_LocalPosition: {x: 733.0558, y: 12.0181, z: 456.933} + m_LocalPosition: {x: 733.0558, y: 11.814628, z: 456.933} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -50065,7 +50205,7 @@ Transform: m_GameObject: {fileID: 1641699556} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.70710677, z: -0, w: 0.7071068} - m_LocalPosition: {x: 732.6411, y: 12.0181, z: 456.933} + m_LocalPosition: {x: 732.6411, y: 11.814628, z: 456.933} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -52418,6 +52558,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1729846895} m_CullTransparentMesh: 1 +--- !u!1 &1731510884 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1731510885} + m_Layer: 0 + m_Name: Stop Point + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1731510885 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1731510884} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.94, y: -0.27, z: 0.38} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1150502775} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1738285190 PrefabInstance: m_ObjectHideFlags: 0 @@ -53348,8 +53519,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0bab791ccf13189449b82b8f0b70b269, type: 3} m_Name: m_EditorClassIdentifier: - shiftDuration: 20 - npcSpawnArea: {fileID: 1151894174} + shiftDuration: 60 --- !u!65 &1779211428 BoxCollider: m_ObjectHideFlags: 0 @@ -53380,7 +53550,7 @@ Transform: m_GameObject: {fileID: 1779211426} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.70710677, z: -0, w: 0.7071068} - m_LocalPosition: {x: 731.799, y: 11.551, z: 457.11} + m_LocalPosition: {x: 731.799, y: 11.3475275, z: 457.11} m_LocalScale: {x: 0.6641, y: 0.6641, z: 0.6641} m_ConstrainProportionsScale: 0 m_Children: [] @@ -59209,6 +59379,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 6218193170447474458, guid: 2ba5ac2de7ff0764e8874d18fcb4484c, type: 3} m_PrefabInstance: {fileID: 2036667740} m_PrefabAsset: {fileID: 0} +--- !u!1 &2043700347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2043700348} + m_Layer: 0 + m_Name: Left Despawn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2043700348 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2043700347} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 730.866, y: 12.199528, z: 461.495} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2048826130 PrefabInstance: m_ObjectHideFlags: 0 @@ -62457,7 +62658,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4026698271103144159, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} propertyPath: m_LocalPosition.y - value: 11.944 + value: 11.740528 objectReference: {fileID: 0} - target: {fileID: 4026698271103144159, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} propertyPath: m_LocalPosition.z @@ -62823,7 +63024,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3724260340657694007, guid: ae102ddf369a56d4b8834536a6b7d4a4, type: 3} propertyPath: m_LocalPosition.y - value: 13.228791 + value: 13.025319 objectReference: {fileID: 0} - target: {fileID: 3724260340657694007, guid: ae102ddf369a56d4b8834536a6b7d4a4, type: 3} propertyPath: m_LocalPosition.z @@ -63310,7 +63511,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6358536725365014431, guid: e64be2bab61d27d4bad6f595a2bac752, type: 3} propertyPath: m_LocalPosition.y - value: 11.9597 + value: 11.7562275 objectReference: {fileID: 0} - target: {fileID: 6358536725365014431, guid: e64be2bab61d27d4bad6f595a2bac752, type: 3} propertyPath: m_LocalPosition.z @@ -63620,7 +63821,7 @@ MonoBehaviour: m_EditorClassIdentifier: doorLeft: {fileID: 258950658} doorRight: {fileID: 790949543} - doorCloseDelay: 0.75 + doorCloseDelay: 2 --- !u!1001 &7311116721847566827 PrefabInstance: m_ObjectHideFlags: 0 @@ -64444,7 +64645,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5196039106528504735, guid: 803c1c3bf0b83c04da05ed705dc40243, type: 3} propertyPath: m_LocalPosition.y - value: 11.406 + value: 11.202528 objectReference: {fileID: 0} - target: {fileID: 5196039106528504735, guid: 803c1c3bf0b83c04da05ed705dc40243, type: 3} propertyPath: m_LocalPosition.z @@ -64713,3 +64914,7 @@ SceneRoots: - {fileID: 1163508320} - {fileID: 135242119} - {fileID: 1779211429} + - {fileID: 540856747} + - {fileID: 2043700348} + - {fileID: 911287961} + - {fileID: 1101273642} diff --git a/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset b/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset index 928f3fe..194941a 100644 Binary files a/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset and b/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset differ diff --git a/SSLR/Assets/Scripts/NPCMovementRework.cs b/SSLR/Assets/Scripts/NPCMovementRework.cs index 255a4ba..858ac46 100644 --- a/SSLR/Assets/Scripts/NPCMovementRework.cs +++ b/SSLR/Assets/Scripts/NPCMovementRework.cs @@ -55,7 +55,6 @@ public class NpcMovementRework : MonoBehaviour if (agent.velocity.magnitude > 0.1) { animator.SetFloat(Speed, 1); - animator.SetBool(IsSitting, false); } else { @@ -91,6 +90,7 @@ public class NpcMovementRework : MonoBehaviour /// public IEnumerator CustomerCalled() { + animator.SetBool(IsSitting, false); var pos = NpcManager.instance.desk; agent.SetDestination(pos.position); @@ -100,7 +100,7 @@ public class NpcMovementRework : MonoBehaviour npcpos.y = 0; var dist = Vector3.Distance(pos.position, npcpos); - if (dist < 0.5f) + if (dist < 1.0f) { agent.SetDestination(gameObject.transform.position); gameObject.transform.rotation = pos.transform.rotation; diff --git a/SSLR/ProjectSettings/NavMeshAreas.asset b/SSLR/ProjectSettings/NavMeshAreas.asset index 39cee31..71ed390 100644 --- a/SSLR/ProjectSettings/NavMeshAreas.asset +++ b/SSLR/ProjectSettings/NavMeshAreas.asset @@ -76,7 +76,7 @@ NavMeshProjectSettings: agentRadius: 0.2 agentHeight: 1.5 agentSlope: 45 - agentClimb: 0.75 + agentClimb: 2 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 minRegionArea: 2