From bc2067b0c4d46a3114ca6ce8cdc88bcbb07d8af2 Mon Sep 17 00:00:00 2001 From: Jan Racek Date: Sun, 29 Mar 2026 14:01:03 +0200 Subject: [PATCH] Samplescene fixups --- Assets/.~lock.SETUP.md# | 1 - Assets/Cutscene_Flyover.asset | 40 ++++++++++++++++++++++++++++++ Assets/Cutscene_Flyover.asset.meta | 8 ++++++ Assets/Scenes/TestScene.unity | 15 +++++------ Assets/lua/cutscene_trigger.lua | 1 - 5 files changed, 56 insertions(+), 9 deletions(-) delete mode 100644 Assets/.~lock.SETUP.md# create mode 100644 Assets/Cutscene_Flyover.asset create mode 100644 Assets/Cutscene_Flyover.asset.meta diff --git a/Assets/.~lock.SETUP.md# b/Assets/.~lock.SETUP.md# deleted file mode 100644 index 87e3262..0000000 --- a/Assets/.~lock.SETUP.md# +++ /dev/null @@ -1 +0,0 @@ -,jracek,NTBucitel,29.03.2026 12:52,file:///home/jracek/.config/libreoffice/4; \ No newline at end of file diff --git a/Assets/Cutscene_Flyover.asset b/Assets/Cutscene_Flyover.asset new file mode 100644 index 0000000..2b644f3 --- /dev/null +++ b/Assets/Cutscene_Flyover.asset @@ -0,0 +1,40 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99c0b28de0bbbf7449afc28106b605dc, type: 3} + m_Name: Cutscene_Flyover + m_EditorClassIdentifier: net.psxsplash.splashedit.Runtime::SplashEdit.RuntimeCode.PSXCutsceneClip + CutsceneName: camera_flyover + DurationFrames: 90 + Tracks: + - TrackType: 0 + ObjectName: + UICanvasName: + UIElementName: + Keyframes: + - Frame: 0 + Value: {x: -23.176208, y: 12.679825, z: -26.457184} + Interp: 0 + - Frame: 90 + Value: {x: 20.04245, y: 14.924713, z: 14.6401825} + Interp: 0 + - TrackType: 1 + ObjectName: + UICanvasName: + UIElementName: + Keyframes: + - Frame: 0 + Value: {x: 9.133217, y: 36.044487, z: -0.001256895} + Interp: 0 + - Frame: 90 + Value: {x: 27.921719, y: 234.00604, z: -0.00039519925} + Interp: 0 + AudioEvents: [] diff --git a/Assets/Cutscene_Flyover.asset.meta b/Assets/Cutscene_Flyover.asset.meta new file mode 100644 index 0000000..02e1771 --- /dev/null +++ b/Assets/Cutscene_Flyover.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bd1fe43914c3ff86187fc10ed74878e3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index f23e6e8..9009cda 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -967,7 +967,7 @@ Transform: m_GameObject: {fileID: 696402649} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 8, y: 1, z: 8} + m_LocalPosition: {x: 8, y: 2.736, z: 8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1290,7 +1290,7 @@ Transform: m_GameObject: {fileID: 808226800} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 8} + m_LocalPosition: {x: 0, y: 2.796, z: 8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1371,7 +1371,7 @@ Transform: m_GameObject: {fileID: 900000001} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -8, y: 0, z: 5} + m_LocalPosition: {x: -8, y: 1.45, z: 5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1463,7 +1463,7 @@ Transform: m_GameObject: {fileID: 900000021} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 12} + m_LocalPosition: {x: 0, y: 1.49, z: 10.2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1509,7 +1509,7 @@ Transform: m_GameObject: {fileID: 900000031} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -8, y: 0, z: -5} + m_LocalPosition: {x: -8, y: 1.55, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2185,7 +2185,7 @@ Transform: m_GameObject: {fileID: 1190212571} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -8, y: 1, z: 8} + m_LocalPosition: {x: -8, y: 2.65, z: 8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2226,7 +2226,8 @@ MonoBehaviour: FogEnabled: 0 FogDensity: 5 SceneType: 1 - Cutscenes: [] + Cutscenes: + - {fileID: 11400000, guid: bd1fe43914c3ff86187fc10ed74878e3, type: 2} LoadingScreenPrefab: {fileID: 7823618876958668176, guid: c528a266b6b4ef649a6dac4e7d5a71aa, type: 3} PreviewBVH: 0 PreviewRoomsPortals: 0 diff --git a/Assets/lua/cutscene_trigger.lua b/Assets/lua/cutscene_trigger.lua index f8d40fb..1660a3a 100644 --- a/Assets/lua/cutscene_trigger.lua +++ b/Assets/lua/cutscene_trigger.lua @@ -12,7 +12,6 @@ function onTriggerEnter() onComplete = function() Controls.SetEnabled(true) setStatus("Cutscene complete!") - played = false -- allow replay end }) end