diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ArcheryRangeNPC.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ArcheryRangeNPC.prefab index fd444283..9c7ed61d 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ArcheryRangeNPC.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ArcheryRangeNPC.prefab @@ -196,6 +196,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ea1b6453c1ef8e24d921a6dbaa549eba, type: 3} m_Name: m_EditorClassIdentifier: + mouth: {fileID: 5759406807219530703} + turnSpeed: 5 voicelinesFolder: CharacterVoicelines characterSpecificFolder: voiceLineKeys: @@ -203,13 +205,21 @@ MonoBehaviour: - Alien/Madis_Mic_Speak1 - Alien/Madis_Button_Press2 - - mouth: {fileID: 5759406807219530703} minScaleY: 1 maxScaleY: 9.7 gain: 60 attack: 0.6 release: 0.2 inverted: 1 + questMarker: {fileID: 0} + microphoneStand: {fileID: 0} + microphoneStandQuestMarkerPoint: {fileID: 0} + imageGenerationButton: {fileID: 0} + modelGenerationButton: {fileID: 0} + imageDisplay: {fileID: 0} + modelDisplay: {fileID: 0} + modelDisplaySize: 0.75 + startTargetQuestMarkerPoint: {fileID: 0} --- !u!114 &7699707098595015193 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +264,7 @@ BoxCollider: m_Enabled: 1 serializedVersion: 3 m_Size: {x: 7.5, y: 2, z: 7.5} - m_Center: {x: 0, y: 0, z: 0} + m_Center: {x: 0, y: 0.25, z: 0} --- !u!114 &1413215456818694348 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab index 1b1ea95d..58cdaada 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab @@ -264,8 +264,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 5, y: 1, z: 5} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 5, y: 2, z: 5} + m_Center: {x: 0, y: 0.25, z: 0} --- !u!114 &1413215456818694348 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ShapeDetectionNPC.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ShapeDetectionNPC.prefab index 0516fd6d..f04c4548 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ShapeDetectionNPC.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ShapeDetectionNPC.prefab @@ -166,7 +166,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!114 &6105090838799004608 MonoBehaviour: m_ObjectHideFlags: 0 @@ -231,8 +231,14 @@ MonoBehaviour: attack: 0.6 release: 0.2 inverted: 0 - fmodWhisperBridge: {fileID: 0} - ignorePlayerCollisionLayer: 2 + questMarker: {fileID: 0} + radio: {fileID: 0} + computerKeyboardKey: {fileID: 0} + computerPrinter: {fileID: 0} + printerInsertionHole: {fileID: 0} + imageDisplay: {fileID: 0} + shapeScanner: {fileID: 0} + radioAmount: 1 --- !u!65 &7980494176537648463 BoxCollider: m_ObjectHideFlags: 0 @@ -252,8 +258,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 5, y: 1, z: 5} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 5, y: 2, z: 5} + m_Center: {x: 0, y: 0.25, z: 0} --- !u!114 &1413215456818694348 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 4e2eea20..866383cf 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:541468ec40be3492050f4e8f9e9fe7561ba54aefeb8c3d79f4c5a969bf5fd28a +oid sha256:f1ddef8d052b8270611ce8866ab1239e582e7fa34d3fb967617f7e259c955edf size 68519215