From 4796869a2911c0c52428b9bdb2a1a4d12367a078 Mon Sep 17 00:00:00 2001 From: henrisel Date: Fri, 20 Mar 2026 14:50:15 +0200 Subject: [PATCH] professor final voice line comes from himself, not radio --- 3d-generation-pipeline/README.md | 16 +++-- .../XROrigin Scripts/TutorialAudioListener.cs | 20 ++----- .../NewHandPresence/TutorialController.cs | 23 ++++--- .../_PROJECT/Fonts/Handlee-Regular SDF.asset | 4 +- .../_PROJECT/Fonts/Quantico-Regular SDF.asset | 4 +- .../ModeGeneration/NPCs/ShapeDetectionNPC.cs | 2 +- config.json | 2 +- highscore.json | 2 +- highscores.json | 60 +++++++++---------- 9 files changed, 67 insertions(+), 66 deletions(-) diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index 29a8aa52..89f5a718 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -1,6 +1,11 @@ ### TODO +* tutorialis kuubikud blokivad liikumist +* pidev krabamise heli, kui kahe käega korraga krabada: "(Un)requesting ownership of Cube" * FMOD ChannelControl errorid +* keyboard numbrid ei tööta pärast minigame'i completemist? * speech-to-text: + * vahepeal lakkab töötamast lih??? tundub et siis kui pikalt tühjust salvestab + * sööta talle nulle kui on disabled, sest ikka kuidagi tuvastab eelnevat rääkimist * uurida miks buildis Whisper halvemini töötab * proovida suuremat Whisperi mudelit, äkki töötab mürases keskkonnas paremini * npc character: @@ -8,14 +13,12 @@ * shape detection: * peab mängijale kuidagi selgitama, kuidas scale'ida prinditud objekte * prinditud objekti scale'imisele min ja max size limiit - * 3d printerile soft particle'id, et ei clipiks seina sisse + * 3d printerile soft particle'id, et ei oleks teravaid ääri seina sisse minnes * archery range: - * archery targettide rework, et buildis ka töötaks + * archery targetite rework, et buildis ka töötaks * võiks jääda kordama viimast instruktsiooni, kui mängija ei progressi edasi * UFO möödalendamise animation/cutscene alguses kui ütleb "delta attacked by ufos" + panna juba alguses kapsli sisse ufo pöörlema * cafe: - * audio detection sama heaks nagu ülejäänud 2 mängul! - * continuous krabamise heli miskipärast * võiks saada hinnata saadud tellimust * "order again" nupp @@ -31,3 +34,8 @@ Can't/Won't Do: * Getting Whisper stream to work with FMOD instead of Unity default audio * TRELLIS: added functionality to specify texture baking optimisation total steps as an argument (`texture_opt_total_steps`), to replace the hardcoded 2500. But this is not tracked in Git (because modified this https://github.com/IgorAherne/trellis-stable-projectorz/releases/tag/latest) * Custom Shader Variant Collection to include glTF-pbrMetallicRoughness shader in build + +Katse tähelepanekud: +* peab väga proper english accenti tegema +* mõne inimese puhul kuuleb "cat" asemel "cut" +* kui helitugevus oli liiga suur siis cafe waiter kuulis kohviku taustaheli taldriku klirinat kui "piano music" diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/TutorialAudioListener.cs b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/TutorialAudioListener.cs index cc7f52ad..01389253 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/TutorialAudioListener.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/TutorialAudioListener.cs @@ -168,20 +168,14 @@ public class TutorialAudioListener : MonoBehaviour private EventReference GetGrabEvent(GrabSoundType type) { - switch (type) + return type switch { - case GrabSoundType.Bow: - return FMODEvents.Instance.BowGrab; - - case GrabSoundType.Sprayer: - return FMODEvents.Instance.SprayerGrab; - + GrabSoundType.Bow => FMODEvents.Instance.BowGrab, + GrabSoundType.Sprayer => FMODEvents.Instance.SprayerGrab, //Add more objects for grabbing here and do not forget to define them in FMODEvents.cs //Add the GrabAudioProfile.cs component to an object instance - - default: - return FMODEvents.Instance.DefaultGrab; - } + _ => FMODEvents.Instance.DefaultGrab, + }; } private void HandleGrab(XRGrabInteractable grab) @@ -195,10 +189,6 @@ public class TutorialAudioListener : MonoBehaviour : GrabSoundType.Default; EventReference grabEvent = GetGrabEvent(type); - Debug.Log(grabEvent); AudioManager.Instance.PlayAttachedInstance(grabEvent, grab.gameObject); } - - - } diff --git a/Assets/_PROJECT/Components/NewHandPresence/TutorialController.cs b/Assets/_PROJECT/Components/NewHandPresence/TutorialController.cs index 14d21d7d..592d2b69 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/TutorialController.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/TutorialController.cs @@ -31,6 +31,7 @@ namespace _PROJECT.NewHandPresence private XRControllerHintController _leftHintController; private XRControllerHintController _rightHintController; + private XRBaseInteractor lastInteractor = null; private SmartHandPresence _leftSmartHandPresence; private SmartHandPresence _rightSmartHandPresence; @@ -244,18 +245,24 @@ namespace _PROJECT.NewHandPresence StopCoroutine(initializationInfoCoroutine); } - private void OnGripPerformed(SelectEnterEventArgs arg0) + private void OnGripPerformed(SelectEnterEventArgs args) { - var grab = arg0.interactableObject as XRGrabInteractable; - // Notify any listeners - OnGrab?.Invoke(grab); + var interactor = args.interactorObject as XRBaseInteractor; + var interactable = args.interactableObject as XRGrabInteractable; - if (_state != TutorialState.Grip) return; - Debug.Log("Grip performed"); - UpdateState(_state.Next()); + if (lastInteractor == interactor) + return; // same hand grabbing again + + lastInteractor = interactor; + + + OnGrab?.Invoke(interactable as XRGrabInteractable); + + if (_state == TutorialState.Grip) + UpdateState(_state.Next()); } - + private void OnTeleportPerformed(LocomotionSystem obj) { if (_state != TutorialState.Teleport) return; diff --git a/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset b/Assets/_PROJECT/Fonts/Handlee-Regular SDF.asset index cf34c01c..0df3a826 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:abd311b89e47274df75bcc8da9cb5c62748252689e26a70b7ea7a572ba782c38 -size 2756670 +oid sha256:cc9c3b7d052c482436aac284ef0084b72fc0533e7804cffbc7618c914f51faea +size 2777316 diff --git a/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset b/Assets/_PROJECT/Fonts/Quantico-Regular SDF.asset index 67c42292..79c4ecd9 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:e7b93b54901e7d731e6e381bae63b627626f44e22fbead4f41ce56cedaf44603 -size 2120747 +oid sha256:5285ff0b635e38a437642a6fb535d415cd9e8cd0bf71132a7a2510e0c48f5b1d +size 2143250 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs index c60b1671..6483c424 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs @@ -171,7 +171,7 @@ public class ShapeDetectionNPC : NPCController state = 8; staticRadio.SetActive(false); questMarker.gameObject.SetActive(false); - SpeakVoiceLine(7, radio.gameObject, 0); + SpeakVoiceLine(7, gameObject, 0); await Task.Delay(6500); MoveToNextPoint(0); } diff --git a/config.json b/config.json index b028539d..ae9c0246 100644 --- a/config.json +++ b/config.json @@ -1,7 +1,7 @@ { "isContinuousLocomotion": true, "continuousLocomotionSpeed": 3.0, - "volumeMaster": 0.5, + "volumeMaster": 0.6466318964958191, "volumeAmbient": 0.1889490932226181, "volumeMusic": 0.5, "volumeSFX": 0.5, diff --git a/highscore.json b/highscore.json index 6f3fd90f..ecb9d789 100644 --- a/highscore.json +++ b/highscore.json @@ -1 +1 @@ -{"HighScore":416.0} \ No newline at end of file +{"HighScore":1.0} \ No newline at end of file diff --git a/highscores.json b/highscores.json index 7d263f3c..3b024257 100644 --- a/highscores.json +++ b/highscores.json @@ -1,13 +1,17 @@ { "entries": [ { - "name": "Perfoon", - "score": 416.0 + "name": "karlkolm", + "score": 241.0 }, { "name": "andreas", "score": 207.0 }, + { + "name": "karlkaks", + "score": 198.0 + }, { "name": "rikkss", "score": 195.0 @@ -16,49 +20,41 @@ "name": "jjkujkkg", "score": 194.0 }, + { + "name": "gert", + "score": 184.0 + }, + { + "name": "karl", + "score": 183.0 + }, { "name": "f", "score": 181.0 }, + { + "name": "gg", + "score": 179.0 + }, + { + "name": "gert", + "score": 164.0 + }, { "name": "rikkss", "score": 163.0 }, + { + "name": "hendrik", + "score": 163.0 + }, { "name": "andeas", "score": 161.0 }, { - "name": "rikkss", - "score": 141.0 - }, - { - "name": "h", - "score": 138.0 - }, - { - "name": "raimps", - "score": 115.0 - }, - { - "name": "m", - "score": 109.0 - }, - { - "name": "andreas", - "score": 96.0 - }, - { - "name": "m", - "score": 76.0 - }, - { - "name": "k", - "score": 58.0 - }, - { - "name": "kr", - "score": 53.0 + "name": "fark..........", + "score": 142.0 } ] } \ No newline at end of file