Merge branch 'main' into dev

IES-Rafael-Alberti · Nov 22, 2024 · b1957ec · b1957ec
2 parents 7c64e35 + e6b53a1
commit b1957ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/scenes/Principal.tscn b/scenes/Principal.tscn
@@ -6,11 +6,11 @@
 [ext_resource type="Script" path="res://scenes/bath_room_light.gd" id="4_4yf2j"]
 [ext_resource type="PackedScene" uid="uid://j82vpwbejb38" path="res://scenes/Prefabs/trigger.tscn" id="5_omke0"]
 [ext_resource type="Script" path="res://scenes/shaders_control.gd" id="6_31grw"]
-[ext_resource type="Material" uid="uid://dc7hpj2ikl847" path="res://assets/materials/vignette_materia.tres" id="6_pug0m"]
+[ext_resource type="Material" uid="uid://b04543apja7w8" path="res://assets/materials/vignette_materia.tres" id="6_pug0m"]
 [ext_resource type="PackedScene" uid="uid://j2kel3e4mudp" path="res://scenes/Prefabs/zoom_item.tscn" id="6_youc5"]
 [ext_resource type="Texture2D" uid="uid://bxelkdl102274" path="res://assets/materials/transparent-background.png" id="7_1dy4f"]
-[ext_resource type="Material" uid="uid://ilp3hdc66mxl" path="res://assets/materials/blood_materia.tres" id="8_op68h"]
-[ext_resource type="Material" uid="uid://qm4tflob2hed" path="res://assets/materials/bathroom_shader.tres" id="9_n7lhl"]
+[ext_resource type="Material" uid="uid://b0wmofx38qqu2" path="res://assets/materials/blood_materia.tres" id="8_op68h"]
+[ext_resource type="Material" uid="uid://cm1iq0isxjdqv" path="res://assets/materials/bathroom_shader.tres" id="9_n7lhl"]
 [ext_resource type="PackedScene" uid="uid://cdtljaux3f3i1" path="res://scenes/puzzles/puzzles.tscn" id="12_c3sp8"]
 [ext_resource type="PackedScene" uid="uid://dqp3w3mh0bjad" path="res://scenes/Prefabs/Ending.tscn" id="13_1osdi"]
 

diff --git a/scripts/puzzle/puzzle_fotos_estanteria.gd b/scripts/puzzle/puzzle_fotos_estanteria.gd
@@ -8,7 +8,8 @@ const FOTO_ROTA_TRASERA = preload("res://assets/sprites/Puzles/puzle4_fotos/foto
 var canExit=true
 
 @onready var fotos_estanterias_vacia: TextureRect = $FotosEstanteriasVacia240x135
-@onready var trasera_button: TextureButton = $TraseraButton
+@onready var trasera_button: TextureButton = $TextureButton
+
 
 
 
@@ -25,8 +26,6 @@ var canExit=true
 func _ready() -> void:
 	SignalBus.wait_input.connect(_on_input_recieved)
 	SignalBus.exit_zoom_item.connect(_on_zoom_out)
-	trasera_button.hide()
-	fotos_estanterias_vacia.hide()
 	pass 
 
 func _on_zoom_out(texture):
@@ -77,4 +76,5 @@ func _on_esquina_rota_pressed() -> void:
 
 
 func _on_trasera_button_pressed() -> void:
+
 	pass # Replace with function body.