diff --git a/Scenes/GameManager.tscn b/Scenes/GameManager.tscn new file mode 100644 index 0000000..2e3dcaa --- /dev/null +++ b/Scenes/GameManager.tscn @@ -0,0 +1,35 @@ +[gd_scene load_steps=6 format=3 uid="uid://cxj6yeddshy16"] + +[ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Scenes/TestCharacter.tscn" id="1_6lmun"] +[ext_resource type="PackedScene" uid="uid://si4byubqnng4" path="res://Scenes/TestBullet.tscn" id="2_nt6in"] +[ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Scenes/ShotgunBullet.tscn" id="3_ienc8"] +[ext_resource type="Script" path="res://Scenes/Player2.cs" id="4_qaumf"] +[ext_resource type="PackedScene" uid="uid://dq1gtd55p04do" path="res://Scenes/StageGUI.tscn" id="5_gsh7q"] + +[node name="GameManager" type="Node"] + +[node name="Player1" parent="." groups=["Player1"] instance=ExtResource("1_6lmun")] +transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, -2.05794, 0, 5.4546) +collision_layer = 17 +collision_mask = 17 +_fireProjectile = ExtResource("2_nt6in") +_altFireProjectile = ExtResource("3_ienc8") + +[node name="Player2" parent="." groups=["Player2"] instance=ExtResource("1_6lmun")] +transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0.915219, 0, 5.4546) +collision_layer = 17 +collision_mask = 17 +script = ExtResource("4_qaumf") +_fireProjectile = ExtResource("2_nt6in") +_altFireProjectile = ExtResource("3_ienc8") + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] +transform = Transform3D(-0.929007, 0.136193, 0.34409, 0.369825, 0.375014, 0.850055, -0.0132668, 0.91696, -0.398758, -3.58319, 11.9025, 0.163277) + +[node name="Camera3D" type="Camera3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 0.496974, 0.867765, 0, -0.867765, 0.496974, -0.536318, 21.2932, 12.4591) +projection = 1 +fov = 30.0 +size = 10.5 + +[node name="StageGUI" parent="." instance=ExtResource("5_gsh7q")] diff --git a/Scenes/Main.tscn b/Scenes/Main.tscn index 7343229..1c9df05 100644 --- a/Scenes/Main.tscn +++ b/Scenes/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=17 format=3 uid="uid://vwrw05ob2caq"] +[gd_scene load_steps=13 format=3 uid="uid://vwrw05ob2caq"] [ext_resource type="Script" path="res://Scripts/Main.cs" id="1_g4hua"] [ext_resource type="PackedScene" uid="uid://dqv03pua4j8ga" path="res://Scenes/Levels/Level1.tscn" id="2_cqnvi"] @@ -11,40 +11,12 @@ [ext_resource type="PackedScene" uid="uid://bsq7edeueqyjg" path="res://Scenes/Levels/Level7.tscn" id="8_407wt"] [ext_resource type="PackedScene" uid="uid://c4xcka4ekuur8" path="res://Scenes/Levels/Level8.tscn" id="9_q0hjs"] [ext_resource type="PackedScene" uid="uid://0hdnmilwrsq6" path="res://Scenes/Levels/Level9.tscn" id="10_imcyj"] -[ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Scenes/TestCharacter.tscn" id="12_jopfo"] -[ext_resource type="PackedScene" uid="uid://si4byubqnng4" path="res://Scenes/TestBullet.tscn" id="13_3mmxc"] -[ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Scenes/ShotgunBullet.tscn" id="14_32wp5"] -[ext_resource type="Script" path="res://Scenes/Player2.cs" id="15_0cpy3"] -[ext_resource type="PackedScene" uid="uid://dq1gtd55p04do" path="res://Scenes/StageGUI.tscn" id="16_imn5y"] +[ext_resource type="PackedScene" uid="uid://cxj6yeddshy16" path="res://Scenes/GameManager.tscn" id="11_wiyvp"] [node name="Main" type="Node"] script = ExtResource("1_g4hua") Levels = Array[PackedScene]([ExtResource("2_cqnvi"), ExtResource("3_2qwg5"), ExtResource("4_8bgmu"), ExtResource("5_6rnhl"), ExtResource("6_krvi4"), ExtResource("7_or04k"), ExtResource("8_407wt"), ExtResource("9_q0hjs"), ExtResource("10_imcyj")]) +GameManager = ExtResource("11_wiyvp") [node name="MainMenu" parent="." instance=ExtResource("2_kvovw")] - -[node name="Player1" parent="." groups=["Player1"] instance=ExtResource("12_jopfo")] -transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, -2.05794, 0, 5.4546) -collision_layer = 17 -collision_mask = 17 -_fireProjectile = ExtResource("13_3mmxc") -_altFireProjectile = ExtResource("14_32wp5") - -[node name="Player2" parent="." groups=["Player2"] instance=ExtResource("12_jopfo")] -transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0.915219, 0, 5.4546) -collision_layer = 17 -collision_mask = 17 -script = ExtResource("15_0cpy3") -_fireProjectile = ExtResource("13_3mmxc") -_altFireProjectile = ExtResource("14_32wp5") - -[node name="StageGUI" parent="." instance=ExtResource("16_imn5y")] - -[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(-0.929007, 0.136193, 0.34409, 0.369825, 0.375014, 0.850056, -0.0132668, 0.91696, -0.398758, -3.58319, 11.9025, 0.163277) - -[node name="Camera3D" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.496974, 0.867765, 0, -0.867765, 0.496974, -0.536318, 21.2932, 12.4591) -projection = 1 -fov = 30.0 -size = 10.5 +z_index = 100 diff --git a/Scenes/MainMenu.tscn b/Scenes/MainMenu.tscn index 52d30ef..342b523 100644 --- a/Scenes/MainMenu.tscn +++ b/Scenes/MainMenu.tscn @@ -7,7 +7,6 @@ script = ExtResource("1_6aikc") [node name="Control" type="Control" parent="."] -visible = false z_index = 10 layout_mode = 3 anchors_preset = 15 diff --git a/Scripts/Main.cs b/Scripts/Main.cs index 7d65028..4ffeb4b 100644 --- a/Scripts/Main.cs +++ b/Scripts/Main.cs @@ -6,11 +6,15 @@ public partial class Main : Node { [Export] public Array Levels; + [Export] + public PackedScene GameManager; public void LoadLevel(int indexToLoad) { var sceneToLoad = Levels.ElementAt(indexToLoad); CallDeferred(nameof(DeferredGoToScene), sceneToLoad); + var gameManager = GameManager.Instantiate(); + AddChild(gameManager); } public void LoadNextLevel(int currentSceneIndex) diff --git a/Scripts/MainMenu.cs b/Scripts/MainMenu.cs index b20e32a..44417c6 100644 --- a/Scripts/MainMenu.cs +++ b/Scripts/MainMenu.cs @@ -16,13 +16,12 @@ public partial class MainMenu : Node2D var bgmPlayer = GetTree().Root.GetNode("BgmPlayer"); bgmPlayer.SetBGMFromFilepath("Audio/BGM/02 MovinOn.mp3"); bgmPlayer.PlayBGM(); - var main = GetTree().Root.GetNode
("/root/Main"); - main.LoadLevel(0); } private void OnStartButtonPressed() { _player.Play("FirstLevel"); + var main = GetTree().Root.GetNode
("/root/Main"); Hide(); _player.AnimationFinished += OnAnimationFinished; } diff --git a/UI/Animations/UIAnimations.tscn b/UI/Animations/UIAnimations.tscn index 8ec80fb..56a6f1c 100644 --- a/UI/Animations/UIAnimations.tscn +++ b/UI/Animations/UIAnimations.tscn @@ -198,7 +198,6 @@ mouse_filter = 2 color = Color(0, 0, 0, 1) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] -speed_scale = 64.0 libraries = { "": SubResource("AnimationLibrary_iabf8") }