chara integration and mask position
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 12s
Create tag and build when new code gets to main / Export (push) Successful in 1m37s

This commit is contained in:
2026-02-01 16:33:28 +01:00
parent fa2062b87d
commit 8b4590b980
17 changed files with 100 additions and 31 deletions

View File

@@ -6,6 +6,9 @@ extends Camera2D
var should_move_right = false
var should_move_left = false
@onready var arrow_001: Sprite2D = $"../Arrow001"
@onready var arrow_002: Sprite2D = $"../Arrow002"
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
@@ -14,6 +17,9 @@ func _ready() -> void:
# Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(delta: float) -> void:
arrow_001.visible = position.x <= 440.0
arrow_002.visible = position.x >= 2076.0
var limit_left_at_center = limit_left + get_viewport_rect().size.x/2
var limit_right_at_center = limit_right - get_viewport_rect().size.x/2
if position.x < limit_left_at_center:

View File

@@ -1,8 +1,8 @@
[gd_scene format=3 uid="uid://bvpyqyftqhy45"]
[ext_resource type="Script" uid="uid://dnt4l1eghm1gi" path="res://scenes/character/character.gd" id="1_cuyo6"]
[ext_resource type="Resource" uid="uid://i4yr7hqobna7" path="res://resources/characters/prince.tres" id="2_fgi2k"]
[ext_resource type="Texture2D" uid="uid://c61n5v2xrlwy2" path="res://assets/characters/Perso 5.png" id="3_f8hpl"]
[ext_resource type="Resource" uid="uid://wq3g1j3l4gl6" path="res://resources/characters/queen.tres" id="2_fgi2k"]
[ext_resource type="Texture2D" uid="uid://c726frtpkk1a8" path="res://assets/characters/Perso 2.png" id="3_f8hpl"]
[ext_resource type="PackedScene" uid="uid://3jlukpb5hefb" path="res://scenes/mask/mask.tscn" id="3_mutn8"]
[sub_resource type="Animation" id="Animation_fgi2k"]
@@ -164,11 +164,13 @@ chara_resource = ExtResource("2_fgi2k")
texture = ExtResource("3_f8hpl")
[node name="MaskMouth" parent="." unique_id=1087336064 instance=ExtResource("3_mutn8")]
position = Vector2(88.32, -14.73)
position = Vector2(31.595, 176.245)
rotation = 0.017453292
[node name="MaskEyes" parent="." unique_id=428968220 instance=ExtResource("3_mutn8")]
position = Vector2(104.295, 9.395)
rotation = -0.017453292
visible = false
position = Vector2(47.78, 157.815)
rotation = 0.033161256
[node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=713965213]
libraries/ = SubResource("AnimationLibrary_7ex5l")

View File

@@ -51,6 +51,7 @@
[ext_resource type="Texture2D" uid="uid://dj267xgqniy2i" path="res://assets/decor/table_item_a_2.png" id="43_jucdw"]
[ext_resource type="Texture2D" uid="uid://b4u3o7fyryxxq" path="res://assets/decor/table_item_a.png" id="44_6miv3"]
[ext_resource type="Texture2D" uid="uid://c3jx3y0mbueoo" path="res://assets/ui/arrow_004.png" id="47_6miv3"]
[ext_resource type="Texture2D" uid="uid://cgrudt5ev651p" path="res://assets/ui/arrow_001.png" id="52_yisfj"]
[sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_gkmcc"]
random_pitch = 1.122462
@@ -392,6 +393,44 @@ _data = {
&"idle": SubResource("Animation_62f45")
}
[sub_resource type="Animation" id="Animation_ftp6y"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath(".:scale")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector2(0.5, 0.5)]
}
[sub_resource type="Animation" id="Animation_pd34m"]
resource_name = "idle"
length = 2.0
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath(".:scale")
tracks/0/interp = 2
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [Vector2(0.5, 0.5), Vector2(0.4, 0.4)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_qjyke"]
_data = {
&"RESET": SubResource("Animation_ftp6y"),
&"idle": SubResource("Animation_pd34m")
}
[node name="Main" type="Node2D" unique_id=875553242]
script = ExtResource("1_7smn1")
@@ -469,12 +508,12 @@ scale = Vector2(0.5, 0.5)
texture = ExtResource("35_62f45")
[node name="TableItemA2" type="Sprite2D" parent="." unique_id=611798307]
position = Vector2(-933, 164)
scale = Vector2(0.5, 0.5)
position = Vector2(-882, 149)
scale = Vector2(0.4, 0.4)
texture = ExtResource("43_jucdw")
[node name="TableItemA" type="Sprite2D" parent="." unique_id=1146510015]
position = Vector2(911.00006, 385.00003)
position = Vector2(903, 382)
scale = Vector2(0.3, 0.3)
texture = ExtResource("44_6miv3")
@@ -531,6 +570,25 @@ texture = ExtResource("39_62f45")
libraries/ = SubResource("AnimationLibrary_6g32y")
autoplay = &"idle"
[node name="Arrow001" type="Sprite2D" parent="." unique_id=2051768141]
position = Vector2(828, 7)
scale = Vector2(0.5, 0.5)
texture = ExtResource("52_yisfj")
[node name="AnimationPlayer" type="AnimationPlayer" parent="Arrow001" unique_id=23670381]
libraries/ = SubResource("AnimationLibrary_qjyke")
autoplay = &"idle"
[node name="Arrow002" type="Sprite2D" parent="." unique_id=557480206]
position = Vector2(1631.9999, 4.9999995)
rotation = 3.1415927
scale = Vector2(0.5, 0.5)
texture = ExtResource("52_yisfj")
[node name="AnimationPlayer" type="AnimationPlayer" parent="Arrow002" unique_id=1862466503]
libraries/ = SubResource("AnimationLibrary_qjyke")
autoplay = &"idle"
[connection signal="defeat_noise" from="GameManager" to="." method="_on_game_manager_defeat_noise"]
[connection signal="ring_bell_noise" from="GameManager" to="." method="_on_game_manager_ring_bell_noise"]
[connection signal="victory_noise" from="GameManager" to="." method="_on_game_manager_victory_noise"]

View File

@@ -1,8 +1,8 @@
[gd_scene format=3 uid="uid://3jlukpb5hefb"]
[ext_resource type="Script" uid="uid://cfo3mk5f2q3ej" path="res://scenes/mask/mask.gd" id="1_61b51"]
[ext_resource type="Resource" uid="uid://vsvgpvluq7sh" path="res://resources/masks/blind.tres" id="2_0pm64"]
[ext_resource type="Texture2D" uid="uid://sf7sjug1spau" path="res://assets/masks/Masque 1.png" id="3_htpgb"]
[ext_resource type="Resource" uid="uid://divy6byhpwgs2" path="res://resources/masks/truthy.tres" id="2_0pm64"]
[ext_resource type="Texture2D" uid="uid://02al0mfbvjc1" path="res://assets/masks/Bouche 2.png" id="3_htpgb"]
[node name="Mask" type="Node2D" unique_id=428968220]
script = ExtResource("1_61b51")