diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index 717ad4d4..082dea63 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -13,7 +13,6 @@ * klaas on näha temast eespool * voicelines: list listidest, mille hulgast saab valida * shape detection: - * enter key võiks olla disabled, kuni raadiot on kasutatud * professor võiks öelda "good job, continue..." pärast esimest successi * kui kõik configurationid tehtud, siis professor ütleb "thank you" * peab mängijale kuidagi selgitama, kuidas scale'ida prinditud objekte diff --git a/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset b/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset index e1088063..ac7f1293 100644 --- a/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset +++ b/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d96479009b70cecb035250286d778377d89c5a9b4191197a0015a81e891966e -size 2684429 +oid sha256:38a4a9df6a00fe1e38cbc31213fe7175af5094eb6056ae372ec1d079e38d04d5 +size 2663614 diff --git a/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset b/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset index 0c469865..142f6029 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:a6bbd57443630bf31b4b1d63094066190abf4ad4e96a6dd756836b1c00c25b57 -size 2122582 +oid sha256:2251d1d828eea7c6d9273a26ee4a33b3257c54102421df386671c89447694d0a +size 2121724 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 0dc30e86..1f108f1b 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:d2967c76a6632fd63cca03b0eeb837784ad119952953785be1a6958936ba0400 -size 68640493 +oid sha256:0557ab6bcd52fca246f40d12b4e68080850335443340bf924ef7391bf5d85a59 +size 68640865 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs index c01e30d5..3f35f104 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs @@ -7,7 +7,7 @@ public class ShapeDetectionNPC : NPCController [Header("Shape Detection Minigame Config")] public QuestMarker questMarker; public RadioTransmitter radio; - public Transform computerKeyboardKey; + public PushableButton computerKeyboardKey; public Printer3DInputHole printerInsertionHole; public ComputerPrinter computerPrinter; public ShapeScanner shapeScanner; @@ -101,7 +101,8 @@ public class ShapeDetectionNPC : NPCController { SpeakVoiceLine(3, radio.gameObject, radioAmount); state = 3; - questMarker.MoveTo(computerKeyboardKey); + questMarker.MoveTo(computerKeyboardKey.transform); + computerKeyboardKey.Deactivate(); } }