Fixed merge errors
This commit is contained in:
14
Assets/Scenes/Persistant/CommonData.tscn
Normal file
14
Assets/Scenes/Persistant/CommonData.tscn
Normal file
@@ -0,0 +1,14 @@
|
||||
[gd_scene load_steps=4 format=3 uid="uid://bn5opy6atakg"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://nc2lwwjistrq" path="res://Assets/Scripts/CommonScripts/CommonData.cs" id="1_2g1ed"]
|
||||
[ext_resource type="AudioStream" uid="uid://dq1cnjtb2whma" path="res://Assets/Audio/Music/Level1.mp3" id="2_rv15i"]
|
||||
[ext_resource type="Script" uid="uid://b28bv2l2asbpy" path="res://Assets/Scripts/CommonScripts/ChangeMenuInitiator.cs" id="3_m0c8c"]
|
||||
|
||||
[node name="CommonData" type="Node"]
|
||||
script = ExtResource("1_2g1ed")
|
||||
|
||||
[node name="ChangeMenuInitiator" type="Node" parent="."]
|
||||
script = ExtResource("3_m0c8c")
|
||||
|
||||
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
|
||||
stream = ExtResource("2_rv15i")
|
||||
6
Assets/Scenes/Persistant/LevelManager.tscn
Normal file
6
Assets/Scenes/Persistant/LevelManager.tscn
Normal file
@@ -0,0 +1,6 @@
|
||||
[gd_scene load_steps=2 format=3 uid="uid://j3d4u4gjxncu"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://i8yvg41jip3n" path="res://Assets/Scripts/LevelScripts/LevelManager.cs" id="1_ndy45"]
|
||||
|
||||
[node name="LevelManager" type="Node"]
|
||||
script = ExtResource("1_ndy45")
|
||||
Reference in New Issue
Block a user