From 99518e16dd35a60b10c915480e046622037e6a08 Mon Sep 17 00:00:00 2001 From: kookiekenobi Date: Tue, 18 Feb 2025 03:22:04 +0800 Subject: [PATCH] game: smoother game flow --- SSLR/Assets/NpcModels/Prefabs/female1.prefab | 22 +- SSLR/Assets/NpcModels/Prefabs/female2.prefab | 48 +-- SSLR/Assets/NpcModels/Prefabs/female3.prefab | 296 +++++++++--------- SSLR/Assets/NpcModels/Prefabs/male1.prefab | 296 +++++++++--------- SSLR/Assets/NpcModels/Prefabs/male2.prefab | 296 +++++++++--------- SSLR/Assets/NpcModels/Prefabs/male3.prefab | 296 +++++++++--------- SSLR/Assets/NpcModels/Prefabs/male4.prefab | 296 +++++++++--------- SSLR/Assets/NpcModels/Prefabs/male5.prefab | 296 +++++++++--------- SSLR/Assets/NpcModels/Prefabs/male6.prefab | 296 +++++++++--------- SSLR/Assets/NpcModels/Prefabs/male7.prefab | 296 +++++++++--------- SSLR/Assets/Scenes/Game Scene.unity | 58 ++-- .../Game Scene/NavMesh-Game Manager.asset | Bin 14418719 -> 14418719 bytes SSLR/Assets/Scripts/NPCMovementRework.cs | 4 +- 13 files changed, 1257 insertions(+), 1243 deletions(-) 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 1abbe69cd138b86c2db10ea8e113dd8a432d9499..418fdc86324da910f1b707f0e789a62a4c0450dd 100644 GIT binary patch delta 21570 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 delta 21661 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 UUC? 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);