From cd73a21ab787c71fee009869fbd45edbab310f43 Mon Sep 17 00:00:00 2001 From: siim Date: Mon, 20 Jul 2026 22:40:50 +0300 Subject: [PATCH] intro menu alustasin --- Assets/matador_intro_menu.gd | 12 ++++++ Assets/matador_intro_menu.gd.uid | 1 + Intro_MENU.tscn | 70 ++++++++++++++++++++++++++++++++ scene.tscn | 3 +- 4 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 Assets/matador_intro_menu.gd create mode 100644 Assets/matador_intro_menu.gd.uid create mode 100644 Intro_MENU.tscn diff --git a/Assets/matador_intro_menu.gd b/Assets/matador_intro_menu.gd new file mode 100644 index 0000000..890e363 --- /dev/null +++ b/Assets/matador_intro_menu.gd @@ -0,0 +1,12 @@ +extends Node3D + + +@onready var animation_player: AnimationPlayer = $AnimationPlayer + +func _ready(): + animation_player.play("Taunt") + animation_player.animation_finished.connect(_on_animation_finished) + +func _on_animation_finished(anim_name): + if anim_name == "Taunt": + animation_player.play("Taunt") diff --git a/Assets/matador_intro_menu.gd.uid b/Assets/matador_intro_menu.gd.uid new file mode 100644 index 0000000..d7d6979 --- /dev/null +++ b/Assets/matador_intro_menu.gd.uid @@ -0,0 +1 @@ +uid://dycnoiadljbb1 diff --git a/Intro_MENU.tscn b/Intro_MENU.tscn new file mode 100644 index 0000000..795dbe7 --- /dev/null +++ b/Intro_MENU.tscn @@ -0,0 +1,70 @@ +[gd_scene format=3 uid="uid://c4df4qgpc3d5g"] + +[ext_resource type="PackedScene" uid="uid://eu2lqjhowj4t" path="res://Assets/Matador.glb" id="1_eicjn"] +[ext_resource type="Script" uid="uid://dycnoiadljbb1" path="res://Assets/matador_intro_menu.gd" id="2_5jr0i"] +[ext_resource type="PackedScene" uid="uid://dio67r8ambe7h" path="res://Assets/arena_placeholder_v01.glb" id="3_1v6n4"] +[ext_resource type="PackedScene" uid="uid://crtm0xtiql3r8" path="res://Player.tscn" id="4_eicjn"] + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_eicjn"] + +[node name="IntroMenu" type="Node3D" unique_id=2130618263] + +[node name="Matador" parent="." unique_id=166852612 instance=ExtResource("1_eicjn")] +transform = Transform3D(-0.56715536, 0, -0.8236109, 0, 1, 0, 0.8236109, 0, -0.56715536, 5.2114463, 3.8146973e-06, 1.8927763) +script = ExtResource("2_5jr0i") + +[node name="Skeleton3D" parent="Matador/Armature" parent_id_path=PackedInt32Array(166852612, 1269629432) index="0" unique_id=978366810] +bones/0/position = Vector3(0.056660548, 0.6424767, -0.0167365) +bones/0/rotation = Quaternion(0.013179442, -0.2660563, 0.073319815, 0.9610747) +bones/1/rotation = Quaternion(0.06234612, 0.049236443, 0.08183311, 0.99347484) +bones/2/rotation = Quaternion(-0.073883414, -0.049860783, -0.17668208, 0.9802238) +bones/3/rotation = Quaternion(0.1986702, -0.17794952, -0.71790075, 0.6430262) +bones/4/rotation = Quaternion(0.34491858, -0.4473084, -0.25076818, 0.7861691) +bones/5/rotation = Quaternion(0.2577085, 0.103201896, -0.6748433, 0.68375605) +bones/6/rotation = Quaternion(1.7417646e-08, -1.0305205e-07, -0.05870078, 0.99827564) +bones/7/rotation = Quaternion(0.24033272, 0.3103031, 0.5222128, 0.7571301) +bones/8/rotation = Quaternion(5.5530215e-08, 1.2911333e-07, 0.055464897, 0.99846065) +bones/9/rotation = Quaternion(-6.3051346e-09, -3.6333955e-07, 0.005667881, 0.999984) +bones/10/rotation = Quaternion(2.5839595e-08, 9.468444e-08, 0.058700778, 0.99827564) +bones/11/rotation = Quaternion(0.39202607, 0.47060946, 0.57993996, 0.53713304) +bones/12/rotation = Quaternion(0.8712108, 0.008231261, 0.48523128, 0.073990606) +bones/13/rotation = Quaternion(-0.056263044, 0.0027001738, 0.3080972, 0.9496859) +bones/14/rotation = Quaternion(0.016082464, 0.024660494, -0.86586916, 0.4994036) +bones/15/rotation = Quaternion(0.6067664, -0.3062479, -0.7163194, 0.15790276) +bones/16/rotation = Quaternion(-0.0731876, -0.0023153822, -0.47496143, 0.87695485) +bones/17/rotation = Quaternion(-0.11824294, -0.17776872, 0.80557114, 0.55269533) +bones/18/rotation = Quaternion(0.5305965, -0.28927496, 0.76720744, -0.21489605) +bones/20/position = Vector3(0.22012731, 0.38421977, 0.36399037) +bones/21/position = Vector3(-0.23671798, 0.052281797, -0.027087089) +bones/21/rotation = Quaternion(0.5078295, -0.4920459, -0.4920459, 0.50782955) +bones/22/position = Vector3(-0.39721552, 0.31719273, 0.3595722) +bones/23/position = Vector3(-0.9167187, 1.3206767, 0.42621902) +bones/23/rotation = Quaternion(0.9993525, -0.0021175682, 0.03502641, -0.00795782) +bones/24/rotation = Quaternion(0.08874816, -0.018719967, -0.04671622, 0.99478185) +bones/25/rotation = Quaternion(0.09634846, -0.0268489, -0.04050248, 0.9941608) + +[node name="matador" parent="Matador/Armature/Skeleton3D" index="0" unique_id=256196413] +transform = Transform3D(0.8642424, 0, 0.50307554, 0, 1, 0, -0.50307554, 0, 0.8642424, 0, 0, 0) + +[node name="Camera3D" type="Camera3D" parent="." unique_id=1531255459] +transform = Transform3D(0.42176014, 0.2362673, 0.8753835, -0.10687317, 0.97167695, -0.21076548, -0.900387, -0.0046625203, 0.4350652, 7.7111793, 0.33837324, 1.8288292) +fov = 52.2 + +[node name="arena_placeholder_v01" parent="." unique_id=1343590504 instance=ExtResource("3_1v6n4")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.3344436, 0, -1.5401263) + +[node name="StaticBody3D" type="StaticBody3D" parent="arena_placeholder_v01" unique_id=340133176] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="arena_placeholder_v01/StaticBody3D" unique_id=201484167] +transform = Transform3D(-33.265, 4.9526625e-07, -2.9081186e-06, 5.0228755e-06, 3.28, 0, -2.9081186e-06, 4.329755e-14, 33.265, 0, -3.3065948, 0) +shape = SubResource("CylinderShape3D_eicjn") + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="." unique_id=660229295] +transform = Transform3D(0.8578195, 0.25224286, 0.44779384, -0.49237096, 0.6531548, 0.575291, -0.14736567, -0.71397644, 0.68448615, 1.1162033, 7.3956842, -4.480528) +shadow_enabled = true +shadow_blur = 10.0 + +[node name="Player" parent="." unique_id=165510044 instance=ExtResource("4_eicjn")] +transform = Transform3D(0.848106, 0, 0.52982646, 0, 1, 0, -0.52982646, 0, 0.848106, 1.6194592, 0.87947464, -6.6596518) + +[editable path="Matador"] diff --git a/scene.tscn b/scene.tscn index fe21755..c4c69c2 100644 --- a/scene.tscn +++ b/scene.tscn @@ -8,7 +8,7 @@ [ext_resource type="PackedScene" uid="uid://1y07gn65ktsi" path="res://Animations/ANIM_publik_mees.glb" id="7_xlvrw"] [ext_resource type="Script" uid="uid://dr6phggarm73e" path="res://Animations/anim_publik_mees.gd" id="8_73fnb"] [ext_resource type="Script" uid="uid://di0jafakftp3n" path="res://publikum_controller.gd" id="9_pubctrl"] -[ext_resource type="Script" uid="uid://xu6osmd62rj2" path="res://hud.gd" id="10_hud"] +[ext_resource type="Script" uid="uid://butd6b3tdwxrv" path="res://hud.gd" id="10_hud"] [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_73fnb"] dof_blur_far_enabled = true @@ -68,6 +68,7 @@ script = ExtResource("10_hud") [node name="CanvasLayer" type="CanvasLayer" parent="." unique_id=1032421313] layer = 10 +visible = false [node name="PS1Filter" type="ColorRect" parent="CanvasLayer" unique_id=1449116873] material = SubResource("ShaderMaterial_ps1")