diff --git a/SSLR/Assets/NpcModels/Prefabs/female1.prefab b/SSLR/Assets/NpcModels/Prefabs/female1.prefab index 5b93f05..d517a05 100644 --- a/SSLR/Assets/NpcModels/Prefabs/female1.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/female1.prefab @@ -331,10 +331,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 120 + m_fontSize: 72 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -603,10 +603,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 120 + m_fontSize: 72 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -699,8 +699,8 @@ BoxCollider: 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} + m_Size: {x: 1, y: 5.3994, z: 0.90533143} + m_Center: {x: -1.2204483e-15, y: -0.07571786, z: -0.24402575} --- !u!54 &1204833351552570936 Rigidbody: m_ObjectHideFlags: 0 @@ -956,10 +956,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 120 + m_fontSize: 72 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1090,10 +1090,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 120 + m_fontSize: 72 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1432,7 +1432,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.45121086 + m_Radius: 0.2 m_Height: 1.5958242 m_Direction: 1 m_Center: {x: -0.018182006, y: 0.68892586, z: 0.020771388} diff --git a/SSLR/Assets/NpcModels/Prefabs/female2.prefab b/SSLR/Assets/NpcModels/Prefabs/female2.prefab index 41a70a6..3fd1fb0 100644 --- a/SSLR/Assets/NpcModels/Prefabs/female2.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/female2.prefab @@ -95,7 +95,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -239,7 +239,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &1913304662308635010 +--- !u!1 &3865561692632312853 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -247,11 +247,11 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6480171934249429200} - - component: {fileID: 106824583410403480} - - component: {fileID: 3108262879989979906} - - component: {fileID: 2544595398727898354} - - component: {fileID: 4322952686222931750} + - component: {fileID: 2949904260630900657} + - component: {fileID: 2609476860265840055} + - component: {fileID: 5779511102218347113} + - component: {fileID: 9136391136541684671} + - component: {fileID: 670675633052940613} m_Layer: 0 m_Name: Paper Socket_NPC m_TagString: Untagged @@ -259,13 +259,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6480171934249429200 +--- !u!4 &2949904260630900657 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1913304662308635010} + m_GameObject: {fileID: 3865561692632312853} serializedVersion: 2 m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016391276} m_LocalPosition: {x: -0.4565086, y: 0.918, z: 0.358} @@ -274,13 +274,13 @@ Transform: m_Children: [] m_Father: {fileID: 1104961981622706960} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &106824583410403480 +--- !u!65 &2609476860265840055 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1913304662308635010} + m_GameObject: {fileID: 3865561692632312853} 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: 0.51218075} - m_Center: {x: -1.1612629e-15, y: 0, z: -0.047450446} ---- !u!54 &3108262879989979906 + m_Size: {x: 1, y: 5.3994, z: 0.90533143} + m_Center: {x: -1.2204483e-15, y: -0.07571786, z: -0.24402575} +--- !u!54 &5779511102218347113 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1913304662308635010} + m_GameObject: {fileID: 3865561692632312853} serializedVersion: 4 m_Mass: 1 m_Drag: 0 @@ -322,13 +322,13 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!114 &2544595398727898354 +--- !u!114 &9136391136541684671 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1913304662308635010} + m_GameObject: {fileID: 3865561692632312853} 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 &4322952686222931750 +--- !u!114 &670675633052940613 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1913304662308635010} + m_GameObject: {fileID: 3865561692632312853} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} @@ -687,7 +687,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1057,7 +1057,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1191,7 +1191,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1299,7 +1299,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5322a15b17a89d54387e0ed089c3f36c, type: 3} insertIndex: 0 - addedObject: {fileID: 6480171934249429200} + addedObject: {fileID: 2949904260630900657} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5322a15b17a89d54387e0ed089c3f36c, type: 3} insertIndex: 1 addedObject: {fileID: 7742407613049353203} @@ -1427,7 +1427,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.39 + m_Radius: 0.2 m_Height: 1.679373 m_Direction: 1 m_Center: {x: -0.013732197, y: 0.71740484, z: -0.04328109} diff --git a/SSLR/Assets/NpcModels/Prefabs/female3.prefab b/SSLR/Assets/NpcModels/Prefabs/female3.prefab index 131bfa8..65f1675 100644 --- a/SSLR/Assets/NpcModels/Prefabs/female3.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/female3.prefab @@ -172,7 +172,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -306,7 +306,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -708,7 +708,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -849,148 +849,6 @@ 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 @@ -1096,6 +954,148 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &7472251136508976698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 932427952952332461} + - component: {fileID: 232927669270923688} + - component: {fileID: 2345223317940604842} + - component: {fileID: 9189398870518781508} + - component: {fileID: 3391385232499112433} + 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 &932427952952332461 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7472251136508976698} + 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 &232927669270923688 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7472251136508976698} + 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: 5.3994, z: 0.90533143} + m_Center: {x: -1.2204483e-15, y: -0.07571786, z: -0.24402575} +--- !u!54 &2345223317940604842 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7472251136508976698} + 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 &9189398870518781508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7472251136508976698} + 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 &3391385232499112433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7472251136508976698} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1 &7569642085917757711 GameObject: m_ObjectHideFlags: 0 @@ -1191,7 +1191,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1300,7 +1300,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 55e2055054d94ee4aa07586779090ee5, type: 3} insertIndex: 0 - addedObject: {fileID: 3045071268070528650} + addedObject: {fileID: 932427952952332461} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 55e2055054d94ee4aa07586779090ee5, type: 3} insertIndex: 1 addedObject: {fileID: 5469791572987278424} @@ -1428,7 +1428,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.4133244 + m_Radius: 0.2 m_Height: 1.5967945 m_Direction: 1 m_Center: {x: -0.011231842, y: 0.6904125, z: -0.02031434} diff --git a/SSLR/Assets/NpcModels/Prefabs/male1.prefab b/SSLR/Assets/NpcModels/Prefabs/male1.prefab index 1576927..1f67daa 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male1.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male1.prefab @@ -200,7 +200,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -334,7 +334,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -373,148 +373,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &6280747184112191635 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - 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 - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2280984794637822111 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - 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.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 &8995155076247729339 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6280747184112191635} - 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 &699726177547340921 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6280747184112191635} - 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 &1868741122290621516 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6280747184112191635} - 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 &8445696845888888275 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6280747184112191635} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} - m_Name: - m_EditorClassIdentifier: - socketName: Paper Socket_NPC --- !u!1 &6400911348859965150 GameObject: m_ObjectHideFlags: 0 @@ -617,6 +475,148 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &6449435123231901961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5787979898813829040} + - component: {fileID: 1531313694854750225} + - component: {fileID: 9030100765618935576} + - component: {fileID: 1434699835785558818} + - component: {fileID: 4652146063608146668} + 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 &5787979898813829040 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6449435123231901961} + 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: 4853797667259607755} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1531313694854750225 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6449435123231901961} + 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: 5.3994, z: 0.90533143} + m_Center: {x: -1.2204483e-15, y: -0.07571786, z: -0.24402575} +--- !u!54 &9030100765618935576 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6449435123231901961} + 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 &1434699835785558818 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6449435123231901961} + 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 &4652146063608146668 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6449435123231901961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1 &6950677787399373087 GameObject: m_ObjectHideFlags: 0 @@ -923,7 +923,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1057,7 +1057,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1300,7 +1300,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 208f8e7ee2310474aa57f8901d61d5f6, type: 3} insertIndex: 0 - addedObject: {fileID: 2280984794637822111} + addedObject: {fileID: 5787979898813829040} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 208f8e7ee2310474aa57f8901d61d5f6, type: 3} insertIndex: 1 addedObject: {fileID: 7624190420235664298} @@ -1433,7 +1433,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.45456997 + m_Radius: 0.2 m_Height: 1.6367437 m_Direction: 1 m_Center: {x: -0.031971335, y: 0.7065709, z: 0.024362} diff --git a/SSLR/Assets/NpcModels/Prefabs/male2.prefab b/SSLR/Assets/NpcModels/Prefabs/male2.prefab index 7a5b089..d9f52b8 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male2.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male2.prefab @@ -95,7 +95,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -211,6 +211,148 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2811550167581898591 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4877192780395234569} + - component: {fileID: 5370470649862990554} + - component: {fileID: 1733765628165601826} + - component: {fileID: 5878221178466679702} + - component: {fileID: 7012415981231074188} + 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 &4877192780395234569 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2811550167581898591} + 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 &5370470649862990554 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2811550167581898591} + 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: 5.3994, z: 0.90533143} + m_Center: {x: -1.2204483e-15, y: -0.07571786, z: -0.24402575} +--- !u!54 &1733765628165601826 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2811550167581898591} + 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 &5878221178466679702 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2811550167581898591} + 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 &7012415981231074188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2811550167581898591} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1 &3233171938292520611 GameObject: m_ObjectHideFlags: 0 @@ -408,7 +550,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -542,7 +684,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1049,7 +1191,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1088,148 +1230,6 @@ 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: 2759216358178088516} + addedObject: {fileID: 4877192780395234569} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 8c08f173abfeb6740b1d9707f1bf5a3c, type: 3} insertIndex: 1 addedObject: {fileID: 4566066686622745497} @@ -1433,7 +1433,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.4323206 + m_Radius: 0.2 m_Height: 1.5600688 m_Direction: 1 m_Center: {x: -0.027673395, y: 0.6663737, z: 0.03350651} diff --git a/SSLR/Assets/NpcModels/Prefabs/male3.prefab b/SSLR/Assets/NpcModels/Prefabs/male3.prefab index 717a6e1..2d9b231 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male3.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male3.prefab @@ -229,7 +229,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -465,7 +465,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -609,148 +609,6 @@ 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 @@ -980,7 +838,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1114,7 +972,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1153,6 +1011,148 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7202624686903857754 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4471245639976169676} + - component: {fileID: 1089059997714944567} + - component: {fileID: 7550749995324356504} + - component: {fileID: 2026525036924068566} + - component: {fileID: 2278764019377931345} + 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 &4471245639976169676 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7202624686903857754} + 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 &1089059997714944567 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7202624686903857754} + 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: 5.3994, z: 0.90533143} + m_Center: {x: -1.2204483e-15, y: -0.07571786, z: -0.24402575} +--- !u!54 &7550749995324356504 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7202624686903857754} + 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 &2026525036924068566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7202624686903857754} + 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 &2278764019377931345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7202624686903857754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1 &7428696067211263792 GameObject: m_ObjectHideFlags: 0 @@ -1296,7 +1296,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e815cd9e50092a54a972db0a7c381b5e, type: 3} insertIndex: 0 - addedObject: {fileID: 1415954078842339315} + addedObject: {fileID: 4471245639976169676} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e815cd9e50092a54a972db0a7c381b5e, type: 3} insertIndex: 1 addedObject: {fileID: 5389246775543483731} @@ -1429,7 +1429,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.43364292 + m_Radius: 0.2 m_Height: 1.5263268 m_Direction: 1 m_Center: {x: -0.0017922422, y: 0.6650117, z: 0.027809434} diff --git a/SSLR/Assets/NpcModels/Prefabs/male4.prefab b/SSLR/Assets/NpcModels/Prefabs/male4.prefab index 47f9ffa..8ffb136 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male4.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male4.prefab @@ -229,7 +229,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -268,148 +268,6 @@ 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 @@ -505,7 +363,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -639,7 +497,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -885,6 +743,148 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &8126997341833261988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 665481775402394355} + - component: {fileID: 3173934152447675581} + - component: {fileID: 5362012321242111688} + - component: {fileID: 4937561283028384730} + - component: {fileID: 2071900689757623037} + 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 &665481775402394355 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8126997341833261988} + 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 &3173934152447675581 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8126997341833261988} + 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: 5.3994, z: 0.90533143} + m_Center: {x: -1.2204483e-15, y: -0.07571786, z: -0.24402575} +--- !u!54 &5362012321242111688 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8126997341833261988} + 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 &4937561283028384730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8126997341833261988} + 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 &2071900689757623037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8126997341833261988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1 &8151712092283150263 GameObject: m_ObjectHideFlags: 0 @@ -1057,7 +1057,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1300,7 +1300,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: bab3991b5f3a46d4ab41482be4494587, type: 3} insertIndex: 0 - addedObject: {fileID: 5827847534764219374} + addedObject: {fileID: 665481775402394355} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: bab3991b5f3a46d4ab41482be4494587, type: 3} insertIndex: 1 addedObject: {fileID: 4094013088347936308} @@ -1433,7 +1433,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.4310173 + m_Radius: 0.2 m_Height: 1.5318547 m_Direction: 1 m_Center: {x: -0.002712782, y: 0.6603073, z: 0.029899184} diff --git a/SSLR/Assets/NpcModels/Prefabs/male5.prefab b/SSLR/Assets/NpcModels/Prefabs/male5.prefab index 1059140..c7e3c81 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male5.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male5.prefab @@ -379,7 +379,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -513,7 +513,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -647,7 +647,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -686,6 +686,148 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3013460948811463375 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3574033126809478079} + - component: {fileID: 8949947632533797368} + - component: {fileID: 1063926715590959369} + - component: {fileID: 2700757076173578414} + - component: {fileID: 8483877754710179529} + 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 &3574033126809478079 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3013460948811463375} + 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 &8949947632533797368 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3013460948811463375} + 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: 5.3994, z: 0.90533143} + m_Center: {x: -1.2204483e-15, y: -0.07571786, z: -0.24402575} +--- !u!54 &1063926715590959369 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3013460948811463375} + 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 &2700757076173578414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3013460948811463375} + 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 &8483877754710179529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3013460948811463375} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1 &4457145171852666790 GameObject: m_ObjectHideFlags: 0 @@ -781,7 +923,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -954,148 +1096,6 @@ 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: 3274782287270475334} + addedObject: {fileID: 3574033126809478079} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: fa019e4b86d491842b5fa525d23d5dc6, type: 3} insertIndex: 1 addedObject: {fileID: 3684930622034501885} @@ -1433,7 +1433,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.40953615 + m_Radius: 0.2 m_Height: 1.6166384 m_Direction: 1 m_Center: {x: -0.014044526, y: 0.70912236, z: 0.0071219206} diff --git a/SSLR/Assets/NpcModels/Prefabs/male6.prefab b/SSLR/Assets/NpcModels/Prefabs/male6.prefab index 9418053..37032dd 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male6.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male6.prefab @@ -102,148 +102,6 @@ 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 @@ -339,7 +197,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -607,7 +465,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -846,7 +704,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -980,7 +838,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1230,6 +1088,148 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8815011488778687895 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3908893469622605743} + - component: {fileID: 5909889710860507675} + - component: {fileID: 183766129047224259} + - component: {fileID: 7514184493802300077} + - component: {fileID: 6759785992546966614} + 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 &3908893469622605743 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8815011488778687895} + 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 &5909889710860507675 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8815011488778687895} + 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: 5.3994, z: 0.90533143} + m_Center: {x: -1.2204483e-15, y: -0.07571786, z: -0.24402575} +--- !u!54 &183766129047224259 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8815011488778687895} + 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 &7514184493802300077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8815011488778687895} + 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 &6759785992546966614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8815011488778687895} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1001 &1338352306207928734 PrefabInstance: m_ObjectHideFlags: 0 @@ -1300,7 +1300,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 71e4c682b22e1934d86e97035c9aad3b, type: 3} insertIndex: 0 - addedObject: {fileID: 1922100100971106761} + addedObject: {fileID: 3908893469622605743} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 71e4c682b22e1934d86e97035c9aad3b, type: 3} insertIndex: 1 addedObject: {fileID: 8692384854035936300} @@ -1433,7 +1433,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.41258785 + m_Radius: 0.2 m_Height: 1.6037118 m_Direction: 1 m_Center: {x: -0.012226362, y: 0.69864094, z: 0.004717591} diff --git a/SSLR/Assets/NpcModels/Prefabs/male7.prefab b/SSLR/Assets/NpcModels/Prefabs/male7.prefab index 0b41a4f..3f4e55e 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male7.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male7.prefab @@ -1,147 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &328167471551146664 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - 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 - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6373918399224920231 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - 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.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 &1608441381211348258 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 328167471551146664} - 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 &7819777996169414175 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 328167471551146664} - 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 &1218775044710545216 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 328167471551146664} - 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 &7395735104596621265 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 328167471551146664} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} - m_Name: - m_EditorClassIdentifier: - socketName: Paper Socket_NPC --- !u!1 &2318345400293521170 GameObject: m_ObjectHideFlags: 0 @@ -505,7 +363,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -639,7 +497,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -773,7 +631,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -812,6 +670,148 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4976667405867453112 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5959072951981234672} + - component: {fileID: 4453786564774584579} + - component: {fileID: 6320409334403071122} + - component: {fileID: 4150279369548823761} + - component: {fileID: 1663359315947705056} + 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 &5959072951981234672 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4976667405867453112} + 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: 1000822648102938752} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &4453786564774584579 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4976667405867453112} + 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: 5.3994, z: 0.90533143} + m_Center: {x: -1.2204483e-15, y: -0.07571786, z: -0.24402575} +--- !u!54 &6320409334403071122 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4976667405867453112} + 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 &4150279369548823761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4976667405867453112} + 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 &1663359315947705056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4976667405867453112} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120dec3a4fef31d4c8b88a1e19de3d80, type: 3} + m_Name: + m_EditorClassIdentifier: + socketName: Paper Socket_NPC --- !u!1 &5760558744458294385 GameObject: m_ObjectHideFlags: 0 @@ -1089,7 +1089,7 @@ MonoBehaviour: m_fontSize: 120 m_fontSizeBase: 120 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 20 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1300,7 +1300,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 067304c8fbfe24149a9b200ce3ebe428, type: 3} insertIndex: 0 - addedObject: {fileID: 6373918399224920231} + addedObject: {fileID: 5959072951981234672} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 067304c8fbfe24149a9b200ce3ebe428, type: 3} insertIndex: 1 addedObject: {fileID: 6749832729263900794} @@ -1428,7 +1428,7 @@ CapsuleCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 0.40457124 + m_Radius: 0.2 m_Height: 1.6034385 m_Direction: 1 m_Center: {x: 0.048211753, y: 0.7536191, z: -0.03552592} diff --git a/SSLR/Assets/Scenes/Game Scene.unity b/SSLR/Assets/Scenes/Game Scene.unity index 040264b..6566409 100644 --- a/SSLR/Assets/Scenes/Game Scene.unity +++ b/SSLR/Assets/Scenes/Game Scene.unity @@ -7481,21 +7481,33 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} + propertyPath: m_LocalScale.x + value: 23.21937 + objectReference: {fileID: 0} + - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} + propertyPath: m_LocalScale.y + value: 23.21937 + objectReference: {fileID: 0} + - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} + propertyPath: m_LocalScale.z + value: 33.380165 + objectReference: {fileID: 0} - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} propertyPath: m_LocalPosition.x - value: 732.402 + value: 732.324 objectReference: {fileID: 0} - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} propertyPath: m_LocalPosition.y - value: 12.000528 + value: 12.082 objectReference: {fileID: 0} - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} propertyPath: m_LocalPosition.z - value: 458.176 + value: 458.16 objectReference: {fileID: 0} - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} propertyPath: m_LocalRotation.w - value: 0.863429 + value: 0.8847917 objectReference: {fileID: 0} - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} propertyPath: m_LocalRotation.x @@ -7503,7 +7515,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} propertyPath: m_LocalRotation.y - value: -0.50447035 + value: -0.46598688 objectReference: {fileID: 0} - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} propertyPath: m_LocalRotation.z @@ -7515,7 +7527,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -60.592 + value: -55.548 objectReference: {fileID: 0} - target: {fileID: 5940097386731835566, guid: a4b2e48ac74f47741bb6e2978280d546, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -28929,7 +28941,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4483003418975104608, guid: bf2904ee269479c45824f006be54365e, type: 3} propertyPath: m_LocalPosition.x - value: 732.0021 + value: 731.9752 objectReference: {fileID: 0} - target: {fileID: 4483003418975104608, guid: bf2904ee269479c45824f006be54365e, type: 3} propertyPath: m_LocalPosition.y @@ -28937,7 +28949,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4483003418975104608, guid: bf2904ee269479c45824f006be54365e, type: 3} propertyPath: m_LocalPosition.z - value: 458.4359 + value: 458.1944 objectReference: {fileID: 0} - target: {fileID: 4483003418975104608, guid: bf2904ee269479c45824f006be54365e, type: 3} propertyPath: m_LocalRotation.w @@ -30339,7 +30351,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3} propertyPath: m_LocalPosition.x - value: 732.906 + value: 732.905 objectReference: {fileID: 0} - target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3} propertyPath: m_LocalPosition.y @@ -30347,7 +30359,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3} propertyPath: m_LocalPosition.z - value: 458.142 + value: 458.092 objectReference: {fileID: 0} - target: {fileID: 8980189677058893101, guid: 0197fe44356b38740b9747f44a27fa94, type: 3} propertyPath: m_LocalRotation.w @@ -31567,7 +31579,7 @@ MonoBehaviour: welcomeButton: {fileID: 468237684} questionPanel: {fileID: 548226582} responsePanel: {fileID: 1372357220} - servicesPanel: {fileID: 468237684} + servicesPanel: {fileID: 409772302} playerQuestionOneText: {fileID: 1445258888} playerQuestionTwoText: {fileID: 1170363877} playerQuestionThreeText: {fileID: 1488388192} @@ -41570,7 +41582,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5149354031723783093, guid: dcbc5e51cc6f74648b2c6a933bb746d4, type: 3} propertyPath: m_LocalPosition.x - value: -0.64904785 + value: -0.667 objectReference: {fileID: 0} - target: {fileID: 5149354031723783093, guid: dcbc5e51cc6f74648b2c6a933bb746d4, type: 3} propertyPath: m_LocalPosition.y @@ -41578,7 +41590,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5149354031723783093, guid: dcbc5e51cc6f74648b2c6a933bb746d4, type: 3} propertyPath: m_LocalPosition.z - value: 5.377411 + value: 5.452 objectReference: {fileID: 0} - target: {fileID: 5149354031723783093, guid: dcbc5e51cc6f74648b2c6a933bb746d4, type: 3} propertyPath: m_LocalRotation.w @@ -42934,16 +42946,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1381034102} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.30532727} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1871002742} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.009387777, y: 0} + m_SizeDelta: {x: 532, y: 287.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1382543024 PrefabInstance: @@ -49391,7 +49403,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: Comcare + m_StringArgument: ComCare m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1595432480 @@ -52621,7 +52633,7 @@ Transform: m_GameObject: {fileID: 1731510884} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7.29, y: -0.27, z: 0.38} + m_LocalPosition: {x: 5.52, y: -0.28, z: 0.38} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -52646,8 +52658,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 3.63, y: 4.82, z: 6.53} - m_Center: {x: 0, y: 0, z: 3.32} + m_Size: {x: 1.7471739, y: 4.8199983, z: 6.5300007} + m_Center: {x: 0.8949787, y: 2.4929028e-10, z: 3.32} --- !u!114 &1731510887 MonoBehaviour: m_ObjectHideFlags: 0 @@ -53590,7 +53602,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0bab791ccf13189449b82b8f0b70b269, type: 3} m_Name: m_EditorClassIdentifier: - shiftDuration: 60 + shiftDuration: 120 --- !u!65 &1779211428 BoxCollider: m_ObjectHideFlags: 0 diff --git a/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset b/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset index 1abbe69..418fdc8 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 c06a56d..6bf36ff 100644 --- a/SSLR/Assets/Scripts/NPCMovementRework.cs +++ b/SSLR/Assets/Scripts/NPCMovementRework.cs @@ -149,6 +149,8 @@ public class NpcMovementRework : MonoBehaviour /// public void Despawn(bool endDay = false) { + animator.SetBool(IsSitting, false); + if (endDay) { var random = Random.Range(0, NpcManager.instance.spawnPoints.Length); @@ -172,7 +174,7 @@ public class NpcMovementRework : MonoBehaviour while (true) { var dist = Vector3.Distance(destination.position, gameObject.transform.position); - if (dist < 1) + if (dist < 2) { agent.SetDestination(gameObject.transform.position); Destroy(gameObject);