diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index c336e51d..a6734ba1 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -7,15 +7,14 @@ * uurida miks buildis Whisper halvemini töötab * proovida suuremat Whisperi mudelit, äkki töötab mürases keskkonnas paremini * npc character: - * eraldi trigger kust hakkab pöörama mängija poole, aga pole veel "aggro range'is" * klaas on näha temast eespool * shape detection: * professor võiks öelda "good job, continue..." pärast esimest successi * kui kõik configurationid tehtud, siis professor ütleb "thank you" + * uks võiks käia ainult väljapoole * peab mängijale kuidagi selgitama, kuidas scale'ida prinditud objekte * prinditud objekti scale'imisele min ja max size limiit * soft particle'id, et ei clipiks - * uks võiks käia ainult väljapoole * archery range: * võiks jääda kordama viimast instruktsiooni, kui mängija ei progressi edasi * kui archery range läbi, võiks npc öelda "good job, try again..." diff --git a/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset b/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset index e3cd2b02..bf558840 100644 --- a/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset +++ b/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a158e4994ba50bd35823b6fd28ce018c4cf209693d71ddbccea2c2fda63bf8e2 -size 2146317 +oid sha256:7b3d7e6231b8054585523d3afddeb757f48bb9e8d70de0a5e952e9c8805f6b6a +size 2146842 diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ArcheryRangeNPC.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ArcheryRangeNPC.prefab index 05059f6e..d4c7d115 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ArcheryRangeNPC.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ArcheryRangeNPC.prefab @@ -93,6 +93,7 @@ GameObject: - component: {fileID: 7699707098595015193} - component: {fileID: 1413215456818694348} - component: {fileID: 483845010817450077} + - component: {fileID: 8646891389811022226} m_Layer: 0 m_Name: ArcheryRangeNPC m_TagString: Untagged @@ -267,7 +268,7 @@ MonoBehaviour: _initializeOrder: 0 _defaultDespawnType: 0 NetworkObserver: {fileID: 0} - k__BackingField: 18 + k__BackingField: 6 k__BackingField: 0 _scenePathHash: 0 k__BackingField: 0 @@ -465,6 +466,27 @@ MonoBehaviour: X: 0 Y: 0 Z: 0 +--- !u!135 &8646891389811022226 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4663194936290788516} + 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_Radius: 5 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &7802421088258943189 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab index 93e2f1dc..f73c2408 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab @@ -195,6 +195,7 @@ GameObject: - component: {fileID: 7699707098595015193} - component: {fileID: 1413215456818694348} - component: {fileID: 483845010817450077} + - component: {fileID: 8270600859684143550} m_Layer: 0 m_Name: CafeWaiterNPC m_TagString: Untagged @@ -270,7 +271,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &6105090838799004608 MonoBehaviour: m_ObjectHideFlags: 0 @@ -569,6 +570,27 @@ MonoBehaviour: X: 0 Y: 0 Z: 0 +--- !u!135 &8270600859684143550 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4663194936290788516} + 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_Radius: 5 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &7802421088258943189 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ShapeDetectionNPC.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ShapeDetectionNPC.prefab index f8b1b105..587c7d27 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ShapeDetectionNPC.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/ShapeDetectionNPC.prefab @@ -93,6 +93,7 @@ GameObject: - component: {fileID: 1653195237934660084} - component: {fileID: 1413215456818694348} - component: {fileID: 483845010817450077} + - component: {fileID: 1179918406964740421} m_Layer: 0 m_Name: ShapeDetectionNPC m_TagString: Untagged @@ -233,10 +234,14 @@ MonoBehaviour: questMarker: {fileID: 0} radio: {fileID: 0} computerKeyboardKey: {fileID: 0} - computerPrinter: {fileID: 0} printerInsertionHole: {fileID: 0} + computerPrinter: {fileID: 0} shapeScanner: {fileID: 0} + staticRadio: {fileID: 0} + questMarkerPoint: {fileID: 0} radioAmount: 1 + movementPath: [] + moveSpeedPerSecond: 2 --- !u!114 &1413215456818694348 MonoBehaviour: m_ObjectHideFlags: 0 @@ -459,6 +464,27 @@ MonoBehaviour: X: 0 Y: 0 Z: 0 +--- !u!135 &1179918406964740421 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4663194936290788516} + 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_Radius: 5 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &7802421088258943189 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 61bd314b..6a9e5fad 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:023b05c8a61e232d575e1ac0605f27a8408f6395494355e3db66006845f443fc -size 68699963 +oid sha256:a2b601bcd1661dacc903c78ed8528927000d1612eab235d789a35e6b78dc3f7b +size 68700932 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/NPCController.cs b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/NPCController.cs index 524aa0b2..3e7b3647 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/NPCController.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/NPCController.cs @@ -121,14 +121,14 @@ public abstract class NPCController : MonoBehaviour currentVoicelineEvent.release(); } - public void PlayerApproach(Transform player) { - playerTransform = player; + public void PlayerApproach() { + OnPlayerApproach(); } public void PlayerLeave() { - playerTransform = null; + OnPlayerLeave(); } @@ -136,6 +136,22 @@ public abstract class NPCController : MonoBehaviour protected virtual void OnPlayerLeave() {} + private void OnTriggerEnter(Collider other) + { + if (other.gameObject.tag == "Player Head") + { + playerTransform = other.transform; + } + } + + private void OnTriggerExit(Collider other) + { + if (other.gameObject.tag == "Player Head") + { + playerTransform = null; + } + } + public void SpeakVoiceLine(int voiceLineId, GameObject emitter = null, float radioAmount = 0f) { if (voiceLineId < 0 || voiceLineId >= voiceLineKeys.Length) diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/NPCTriggerArea.cs b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/NPCTriggerArea.cs index ff476c78..a2df84cc 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/NPCTriggerArea.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/NPCTriggerArea.cs @@ -24,7 +24,7 @@ public class NPCTriggerArea : MonoBehaviour if (isEnter && other.gameObject.tag == "Player Head") { - npcController.PlayerApproach(other.transform); + npcController.PlayerApproach(); } } diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 6452ee58..494db100 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:231534437a99b9060be88b8cbf067c8b4f173635c994f894c93d63236be2def1 -size 4794 +oid sha256:14cd80e0dd0fd2281bc36098124a842b2e082f9c6b90af0330bb69812c012cf6 +size 4833