diff --git a/.DS_Store b/.DS_Store index 43a1384..0ce457d 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/APK/Paradox_Vr_Konzept_Demo.apk b/APK/Paradox_Vr_Konzept_Demo.apk new file mode 100644 index 0000000..3065b5e Binary files /dev/null and b/APK/Paradox_Vr_Konzept_Demo.apk differ diff --git a/assets/Midevel/ambien_sound.gd b/assets/Midevel/ambien_sound.gd new file mode 100644 index 0000000..0b5f74f --- /dev/null +++ b/assets/Midevel/ambien_sound.gd @@ -0,0 +1,4 @@ +extends AudioStreamPlayer + +func _ready() -> void: + play() diff --git a/assets/Midevel/ambien_sound.gd.uid b/assets/Midevel/ambien_sound.gd.uid new file mode 100644 index 0000000..810ae53 --- /dev/null +++ b/assets/Midevel/ambien_sound.gd.uid @@ -0,0 +1 @@ +uid://j6f2ax1fwds7 diff --git a/assets/Midevel/room_1.tscn b/assets/Midevel/room_1.tscn index 48deefa..38609ab 100644 --- a/assets/Midevel/room_1.tscn +++ b/assets/Midevel/room_1.tscn @@ -1,12 +1,14 @@ -[gd_scene load_steps=29 format=3 uid="uid://dtcuaadd2wrys"] +[gd_scene load_steps=31 format=3 uid="uid://dtcuaadd2wrys"] [ext_resource type="PackedScene" uid="uid://d3foohm3asqek" path="res://assets/Space/zone_base.tscn" id="1_hrfef"] [ext_resource type="PackedScene" uid="uid://bidp3paljsym7" path="res://import_scene/escape-room-szene-room.tscn" id="2_gg573"] [ext_resource type="Animation" uid="uid://nq3xh1olqipq" path="res://addons/godot-xr-tools/hands/animations/left/Grip Shaft.res" id="3_qj6my"] +[ext_resource type="Script" uid="uid://j6f2ax1fwds7" path="res://assets/Midevel/ambien_sound.gd" id="3_umk1a"] [ext_resource type="Script" uid="uid://dvobm6vcfnqe8" path="res://addons/godot-xr-tools/hands/poses/hand_pose_settings.gd" id="4_vvkbb"] [ext_resource type="Animation" uid="uid://c8dghcftg1thx" path="res://addons/godot-xr-tools/hands/animations/right/Grip Shaft.res" id="5_pd4dd"] [ext_resource type="Script" uid="uid://btjwoudtrpk18" path="res://assets/Midevel/door.gd" id="6_vvkbb"] [ext_resource type="PackedScene" uid="uid://33ohbl8cmtth" path="res://assets/Midevel/teleport_area.tscn" id="7_cqmfl"] +[ext_resource type="AudioStream" uid="uid://cdv54aw8os7o6" path="res://music/dungeon-air-6983.mp3" id="8_cqmfl"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_hrfef"] sky_top_color = Color(0.13930686, 0.16966733, 0.21217196, 1) @@ -129,16 +131,21 @@ size = Vector3(0.8486328, 1.524292, 2.895996) [node name="Room1" instance=ExtResource("1_hrfef")] -[node name="WorldEnvironment" type="WorldEnvironment" parent="." index="0"] +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." index="0"] +stream = ExtResource("8_cqmfl") +volume_db = -12.283 +script = ExtResource("3_umk1a") + +[node name="WorldEnvironment" type="WorldEnvironment" parent="." index="1"] environment = SubResource("Environment_2nb8s") -[node name="DirectionalLight3D" type="DirectionalLight3D" parent="." index="1"] +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="." index="2"] transform = Transform3D(-0.8660254, -0.43301278, 0.25, 0, 0.49999997, 0.86602545, -0.50000006, 0.75, -0.43301266, 0, 0, 0) light_color = Color(0.4584386, 0.8133019, 0.9480516, 1) light_energy = 0.258 shadow_enabled = true -[node name="XROrigin3D" parent="." index="2"] +[node name="XROrigin3D" parent="." index="3"] transform = Transform3D(-0.99998224, 0, -0.0059689283, 0, 1, 0, 0.0059689283, 0, -0.99998224, 3.7627926, 0.3416624, -0.92848015) [node name="XRCamera3D" parent="XROrigin3D" index="0"] @@ -153,7 +160,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.02, -0.05, 0) [node name="FunctionPickup" parent="XROrigin3D/RightHand" index="3"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.02, -0.05, 0.1) -[node name="Node3D" parent="." index="3" instance=ExtResource("2_gg573")] +[node name="Node3D" parent="." index="4" instance=ExtResource("2_gg573")] [node name="GrabPointHandLeft" parent="Node3D/Interactions/CubeTable/RiddleCube" index="2"] hand_pose = SubResource("Resource_cqmfl") @@ -234,7 +241,7 @@ font_size = 11 outline_size = 3 horizontal_alignment = 1 -[node name="StaticBody3D" type="StaticBody3D" parent="." index="4"] +[node name="StaticBody3D" type="StaticBody3D" parent="." index="5"] transform = Transform3D(0.9999648, 0, -0.008394934, 0, 1, 0, 0.008394934, 0, 0.9999648, -7.767475, 1.791698, -5.2399845) [node name="MeshInstance3D" type="MeshInstance3D" parent="StaticBody3D" index="0"] @@ -309,10 +316,10 @@ text = "⁓" transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.075683594, 0.262146, -0.51770544) shape = SubResource("BoxShape3D_is5ow") -[node name="OmniLight3D" type="OmniLight3D" parent="." index="5"] +[node name="OmniLight3D" type="OmniLight3D" parent="." index="6"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.2770333, 1.687937, 9.864775) -[node name="TeleportArea" parent="." index="6" instance=ExtResource("7_cqmfl")] +[node name="TeleportArea" parent="." index="7" instance=ExtResource("7_cqmfl")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5508242, -0.02803725, 10.182404) target_szene = "uid://bni72mm8xa0fp" diff --git a/assets/Space/Space-Room.tscn b/assets/Space/Space-Room.tscn index 6e4a51c..1fde90b 100644 --- a/assets/Space/Space-Room.tscn +++ b/assets/Space/Space-Room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=46 format=3 uid="uid://bcvysxds78qa2"] +[gd_scene load_steps=48 format=3 uid="uid://bcvysxds78qa2"] [ext_resource type="Script" uid="uid://177gygw2xqqu" path="res://addons/godot-xr-tools/staging/scene_base.gd" id="1_jge5j"] [ext_resource type="PackedScene" uid="uid://bvuu54l2us43f" path="res://assets/Space/SpaceRoom.tscn" id="2_uidku"] @@ -18,6 +18,8 @@ [ext_resource type="PackedScene" uid="uid://cgue6x2lkbduf" path="res://import_scene/book_holder.tscn" id="16_1pnxa"] [ext_resource type="Script" uid="uid://dun34x3n2cqnm" path="res://assets/Space/portal.gd" id="17_csc38"] [ext_resource type="PackedScene" uid="uid://33ohbl8cmtth" path="res://assets/Midevel/teleport_area.tscn" id="18_ovbjo"] +[ext_resource type="AudioStream" uid="uid://csddkjcj5t88t" path="res://music/space-ambient-351305.mp3" id="19_ovbjo"] +[ext_resource type="Script" uid="uid://cbcdmdtjufipo" path="res://assets/Space/audio_stream_player.gd" id="20_0u6ep"] [sub_resource type="PhysicalSkyMaterial" id="PhysicalSkyMaterial_5gj4w"] rayleigh_coefficient = 1.2 @@ -204,7 +206,7 @@ size = Vector3(1, 0.3249634, 0.5) transform = Transform3D(0.95735484, 0, 0.28891483, 0, 1, 0, -0.28891483, 0, 0.95735484, 10.854718, 0.54382396, 3.5149474) [node name="CubeNumber" parent="CubeTable2/RiddleCube" index="1"] -cubeNumber = "⁓ " +cubeNumber = "⁓" [node name="GrabPointHandLeft" parent="CubeTable2/RiddleCube" index="2"] hand_pose = SubResource("Resource_o4poo") @@ -297,8 +299,8 @@ hand_pose = SubResource("Resource_34578") hand_pose = SubResource("Resource_v8jd1") [node name="RiddelCubeBoard" parent="CubeTable2" instance=ExtResource("7_wti6a")] -transform = Transform3D(-0.8990999, 0, 0.43774337, 0, 1, 0, -0.43774337, 0, -0.8990999, 18.105413, 1.0031731, 11.166063) -correct_solution = "21538764" +transform = Transform3D(-0.8990999, 0, 0.43774337, 0, 1, 0, -0.43774337, 0, -0.8990999, 18.105413, 1.428241, 11.166063) +correct_solution = "ϕ⁓⨙▧§⁖⫔X" [node name="StaticBody3D" parent="CubeTable2/RiddelCubeBoard" index="0"] transform = Transform3D(1, 0, -3.5527137e-15, 0, 1, 0, 3.5527137e-15, 0, 1, 0, 0, 0) @@ -424,7 +426,7 @@ transform = Transform3D(1, 0, -1.4210855e-14, 0, 1, 0, 1.4210855e-14, 0, 1, -0.1 transform = Transform3D(1, 0, -1.4210855e-14, 0, 1, 0, 1.4210855e-14, 0, 1, -0.11969346, 0, 0) [node name="Box" parent="CubeTable2/RiddelCubeBoard" index="9"] -size = Vector3(0.2517578, 1.8494141, 1.5) +size = Vector3(0.2517578, 2.3290038, 1.5) [node name="XROrigin3D" type="XROrigin3D" parent="."] transform = Transform3D(-0.9999822, 0, -0.0059689246, 0, 1, 0, 0.0059689246, 0, -0.9999822, -1.2342949, 0.123805344, 0.22105265) @@ -591,7 +593,12 @@ teleport_scene = ExtResource("18_ovbjo") target_szene = "uid://bni72mm8xa0fp" [node name="Marker3D" type="Marker3D" parent="MeshInstance3D"] -transform = Transform3D(1, -4.3655746e-10, 4.1909516e-09, -2.3283064e-10, 0.9999999, 0, 1.8626451e-08, -7.450581e-09, 1.0000002, -0.0020041466, -0.84229064, 0.6517706) +transform = Transform3D(1, -6.1118044e-10, 5.5879354e-09, 0, 0.9999999, 0, 2.7939677e-08, -7.450581e-09, 1.0000002, -0.0030474663, -1.002243, 0.9434376) + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("19_ovbjo") +volume_db = -29.807 +script = ExtResource("20_0u6ep") [connection signal="solution_correct" from="CubeTable2/RiddelCubeBoard" to="MeshInstance3D" method="_on_riddel_cube_board_solution_correct"] diff --git a/assets/Space/audio_stream_player.gd b/assets/Space/audio_stream_player.gd new file mode 100644 index 0000000..0b5f74f --- /dev/null +++ b/assets/Space/audio_stream_player.gd @@ -0,0 +1,4 @@ +extends AudioStreamPlayer + +func _ready() -> void: + play() diff --git a/assets/Space/audio_stream_player.gd.uid b/assets/Space/audio_stream_player.gd.uid new file mode 100644 index 0000000..f7e9c9e --- /dev/null +++ b/assets/Space/audio_stream_player.gd.uid @@ -0,0 +1 @@ +uid://cbcdmdtjufipo diff --git a/export_presets.cfg b/export_presets.cfg index 1d744f4..4a3ae70 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -9,7 +9,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../../APK/Paradox_Vr_test01.apk" +export_path="APK/Paradox_Vr_Konzept_Demo.apk" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" diff --git a/music/dungeon-air-6983.mp3 b/music/dungeon-air-6983.mp3 new file mode 100644 index 0000000..5f62b0f Binary files /dev/null and b/music/dungeon-air-6983.mp3 differ diff --git a/music/dungeon-air-6983.mp3.import b/music/dungeon-air-6983.mp3.import new file mode 100644 index 0000000..8e9e98e --- /dev/null +++ b/music/dungeon-air-6983.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://cdv54aw8os7o6" +path="res://.godot/imported/dungeon-air-6983.mp3-d7b5370fae8f1f4e8c6f665f4ee8f9d8.mp3str" + +[deps] + +source_file="res://music/dungeon-air-6983.mp3" +dest_files=["res://.godot/imported/dungeon-air-6983.mp3-d7b5370fae8f1f4e8c6f665f4ee8f9d8.mp3str"] + +[params] + +loop=true +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/music/space-ambient-351305.mp3 b/music/space-ambient-351305.mp3 new file mode 100644 index 0000000..f7f74b5 Binary files /dev/null and b/music/space-ambient-351305.mp3 differ diff --git a/music/space-ambient-351305.mp3.import b/music/space-ambient-351305.mp3.import new file mode 100644 index 0000000..54825d2 --- /dev/null +++ b/music/space-ambient-351305.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://csddkjcj5t88t" +path="res://.godot/imported/space-ambient-351305.mp3-d273b33eac7883dd0a9d6d876aff7bb4.mp3str" + +[deps] + +source_file="res://music/space-ambient-351305.mp3" +dest_files=["res://.godot/imported/space-ambient-351305.mp3-d273b33eac7883dd0a9d6d876aff7bb4.mp3str"] + +[params] + +loop=true +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4