This commit is contained in:
Booklordofthedings 2024-08-18 12:20:39 +02:00
parent e19e906e19
commit e1f2423761
5 changed files with 353 additions and 8 deletions

View file

@ -42,7 +42,6 @@ grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
script = ExtResource("3_b82rx") script = ExtResource("3_b82rx")
player = NodePath("../../Player") player = NodePath("../../Player")
scale_duration = null
[node name="HBoxContainer" type="HBoxContainer" parent="UILayer/UI"] [node name="HBoxContainer" type="HBoxContainer" parent="UILayer/UI"]
layout_mode = 0 layout_mode = 0

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -7,7 +7,7 @@
[ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="6_xhax5"] [ext_resource type="PackedScene" uid="uid://d0gpnqknarkg7" path="res://objects/Goal.tscn" id="6_xhax5"]
[ext_resource type="PackedScene" uid="uid://cpa66thuxma15" path="res://objects/MirrorOrb.tscn" id="7_dyi0e"] [ext_resource type="PackedScene" uid="uid://cpa66thuxma15" path="res://objects/MirrorOrb.tscn" id="7_dyi0e"]
[ext_resource type="PackedScene" uid="uid://br6fngf5208j0" path="res://objects/ResizableBlock.tscn" id="8_ec71m"] [ext_resource type="PackedScene" uid="uid://br6fngf5208j0" path="res://objects/ResizableBlock.tscn" id="8_ec71m"]
[ext_resource type="PackedScene" path="res://objects/BoxPushable_1.tscn" id="8_o0q03"] [ext_resource type="PackedScene" uid="uid://d17jpcgayfg6i" path="res://objects/BoxPushable_1.tscn" id="8_o0q03"]
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_e817v"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_e817v"]
texture = ExtResource("2_wqskp") texture = ExtResource("2_wqskp")
@ -131,6 +131,7 @@ position = Vector2(-542, 331)
[node name="UI" parent="UILayer" index="0"] [node name="UI" parent="UILayer" index="0"]
mouse_filter = 2 mouse_filter = 2
scale_duration = 0.5
[node name="HBoxContainer" parent="UILayer/UI" index="0"] [node name="HBoxContainer" parent="UILayer/UI" index="0"]
mouse_filter = 0 mouse_filter = 0

View file

@ -3,17 +3,12 @@ extends Node
@export var player : CharacterBody2D; @export var player : CharacterBody2D;
var current_selected = "none"; var current_selected = "none";
<<<<<<< HEAD
func _process(delta: float) -> void:
if Input.is_action_just_pressed("click"):
=======
@export var scale_duration: float = 0.5 @export var scale_duration: float = 0.5
var target_scale: Vector2 = Vector2(1, 1) var target_scale: Vector2 = Vector2(1, 1)
func _unhandled_input(event: InputEvent) -> void: func _unhandled_input(event: InputEvent) -> void:
if event.is_action_pressed("click"): if event.is_action_pressed("click"):
>>>>>>> dev
if current_selected == "scale_up": if current_selected == "scale_up":
scale_up() scale_up()
elif current_selected == "scale_down": elif current_selected == "scale_down":