Add stuff

This commit is contained in:
2023-09-03 00:43:27 -07:00
parent 23443546b2
commit a15973a621
6 changed files with 113 additions and 10 deletions

View File

@@ -3,7 +3,7 @@
[ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Scenes/TestCharacter.tscn" id="1_6lmun"] [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://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="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="Script" path="res://Scripts/Player2.cs" id="4_ff7nl"]
[ext_resource type="PackedScene" uid="uid://dq1gtd55p04do" path="res://Scenes/StageGUI.tscn" id="5_gsh7q"] [ext_resource type="PackedScene" uid="uid://dq1gtd55p04do" path="res://Scenes/StageGUI.tscn" id="5_gsh7q"]
[node name="GameManager" type="Node"] [node name="GameManager" type="Node"]
@@ -19,7 +19,7 @@ _altFireProjectile = ExtResource("3_ienc8")
transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0.915219, 0, 5.4546) transform = Transform3D(0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, 0.915219, 0, 5.4546)
collision_layer = 17 collision_layer = 17
collision_mask = 17 collision_mask = 17
script = ExtResource("4_qaumf") script = ExtResource("4_ff7nl")
_fireProjectile = ExtResource("2_nt6in") _fireProjectile = ExtResource("2_nt6in")
_altFireProjectile = ExtResource("3_ienc8") _altFireProjectile = ExtResource("3_ienc8")
@@ -30,6 +30,12 @@ transform = Transform3D(-0.929007, 0.136193, 0.34409, 0.369825, 0.375014, 0.8500
transform = Transform3D(1, 0, 0, 0, 0.496974, 0.867765, 0, -0.867765, 0.496974, -0.536318, 21.2932, 12.4591) transform = Transform3D(1, 0, 0, 0, 0.496974, 0.867765, 0, -0.867765, 0.496974, -0.536318, 21.2932, 12.4591)
projection = 1 projection = 1
fov = 30.0 fov = 30.0
size = 10.5 size = 9.0
[node name="StageGUI" parent="." instance=ExtResource("5_gsh7q")] [node name="StageGUI" parent="." instance=ExtResource("5_gsh7q")]
offset_left = 0.0
offset_top = 0.0
offset_right = 0.0
offset_bottom = 0.0
size_flags_horizontal = 4
size_flags_vertical = 4

View File

@@ -1,3 +1,3 @@
[gd_scene format=3 uid="uid://cf263gvuap16n"] [gd_scene format=3 uid="uid://gvvqybsmsj1w"]
[node name="Level2" type="Node3D"] [node name="Level2" type="Node3D"]

View File

@@ -1,12 +1,22 @@
[gd_scene load_steps=3 format=3 uid="uid://b12gq4yqc3d8i"] [gd_scene load_steps=7 format=3 uid="uid://b12gq4yqc3d8i"]
[ext_resource type="Script" path="res://Scripts/MainMenu.cs" id="1_6aikc"] [ext_resource type="Script" path="res://Scripts/MainMenu.cs" id="1_6aikc"]
[ext_resource type="PackedScene" uid="uid://cjl20bs56430j" path="res://UI/Animations/UIAnimations.tscn" id="2_erh7e"] [ext_resource type="PackedScene" uid="uid://cjl20bs56430j" path="res://UI/Animations/UIAnimations.tscn" id="2_erh7e"]
[ext_resource type="Texture2D" uid="uid://haxbuoepqn2b" path="res://UI/LEVEL DROP 1.png" id="3_g1vq2"]
[ext_resource type="Texture2D" uid="uid://dieoh0r7a5try" path="res://Textures/Portraits/Pisces.jpg" id="4_sm8v0"]
[sub_resource type="Animation" id="Animation_ptfpl"]
resource_name = "Rollover"
[sub_resource type="AnimationLibrary" id="AnimationLibrary_05shj"]
_data = {
"Rollover": SubResource("Animation_ptfpl")
}
[node name="MainMenu" type="Node2D"] [node name="MainMenu" type="Node2D"]
script = ExtResource("1_6aikc") script = ExtResource("1_6aikc")
[node name="Control" type="Control" parent="."] [node name="NewGame" type="Control" parent="."]
z_index = 10 z_index = 10
layout_mode = 3 layout_mode = 3
anchors_preset = 15 anchors_preset = 15
@@ -15,7 +25,7 @@ anchor_bottom = 1.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
[node name="Button" type="Button" parent="Control"] [node name="Button" type="Button" parent="NewGame"]
layout_mode = 0 layout_mode = 0
offset_left = 583.0 offset_left = 583.0
offset_top = 441.0 offset_top = 441.0
@@ -25,5 +35,56 @@ text = "Play"
[node name="UIAnimations" parent="." instance=ExtResource("2_erh7e")] [node name="UIAnimations" parent="." instance=ExtResource("2_erh7e")]
[node name="CharacterSelect" type="Control" parent="."]
visible = false
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="BG" type="TextureRect" parent="CharacterSelect"]
layout_mode = 0
offset_right = 40.0
offset_bottom = 40.0
texture = ExtResource("3_g1vq2")
[node name="P1_Portrait" type="TextureRect" parent="CharacterSelect"]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 24.0
offset_top = 312.0
offset_right = 1565.0
offset_bottom = 1841.0
grow_horizontal = 2
grow_vertical = 2
scale = Vector2(0.3, 0.3)
texture = ExtResource("4_sm8v0")
flip_h = true
[node name="P2_Portrait" type="TextureRect" parent="CharacterSelect"]
layout_mode = 1
anchors_preset = 6
anchor_left = 1.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_left = 1444.0
offset_top = 324.0
offset_right = 2985.0
offset_bottom = 1853.0
grow_horizontal = 0
grow_vertical = 2
scale = Vector2(0.3, 0.3)
texture = ExtResource("4_sm8v0")
[node name="AnimationPlayer" type="AnimationPlayer" parent="CharacterSelect"]
libraries = {
"": SubResource("AnimationLibrary_05shj")
}
[connection signal="IntroAnimationsCompleted" from="." to="." method="OnAllAnimationsFinished"] [connection signal="IntroAnimationsCompleted" from="." to="." method="OnAllAnimationsFinished"]
[connection signal="pressed" from="Control/Button" to="." method="OnStartButtonPressed"] [connection signal="pressed" from="NewGame/Button" to="." method="OnStartButtonPressed"]

View File

@@ -1,10 +1,16 @@
[gd_scene format=3 uid="uid://dq1gtd55p04do"] [gd_scene load_steps=2 format=3 uid="uid://dq1gtd55p04do"]
[ext_resource type="Texture2D" uid="uid://dieoh0r7a5try" path="res://Textures/Portraits/Pisces.jpg" id="1_id5nf"]
[node name="StageGUI" type="Control"] [node name="StageGUI" type="Control"]
layout_mode = 3 layout_mode = 3
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
offset_left = -59.0
offset_top = -36.0
offset_right = -59.0
offset_bottom = -36.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
@@ -34,3 +40,34 @@ offset_bottom = 540.0
grow_horizontal = 0 grow_horizontal = 0
grow_vertical = 2 grow_vertical = 2
color = Color(1, 0.447059, 1, 1) color = Color(1, 0.447059, 1, 1)
[node name="P1_Portrait" type="TextureRect" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 30.0
offset_top = 378.0
offset_right = -722.0
offset_bottom = 378.0
grow_horizontal = 2
grow_vertical = 2
scale = Vector2(0.3, 0.3)
texture = ExtResource("1_id5nf")
expand_mode = 1
flip_h = true
[node name="P2_Portrait" type="TextureRect" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 1545.0
offset_top = 404.0
offset_right = 793.0
offset_bottom = 404.0
grow_horizontal = 2
grow_vertical = 2
scale = Vector2(0.3, 0.3)
texture = ExtResource("1_id5nf")
expand_mode = 1

View File

@@ -21,7 +21,6 @@ public partial class MainMenu : Node2D
private void OnStartButtonPressed() private void OnStartButtonPressed()
{ {
_player.Play("FirstLevel"); _player.Play("FirstLevel");
var main = GetTree().Root.GetNode<Main>("/root/Main");
Hide(); Hide();
_player.AnimationFinished += OnAnimationFinished; _player.AnimationFinished += OnAnimationFinished;
} }