Fixes the highlight animation for the crabs minigame.

This commit is contained in:
Dylan Sarrazyn
2024-10-23 14:50:40 +02:00
parent ac4ae00a99
commit 46d32176c7
8 changed files with 25 additions and 37 deletions
+1 -1
View File
@@ -577,7 +577,7 @@ architectures/armeabi-v7a=false
architectures/arm64-v8a=true architectures/arm64-v8a=true
architectures/x86=false architectures/x86=false
architectures/x86_64=false architectures/x86_64=false
version/code=34 version/code=35
version/name="" version/name=""
package/unique_name="org.godotengine.kalulu" package/unique_name="org.godotengine.kalulu"
package/name="" package/name=""
File diff suppressed because one or more lines are too long
+1
View File
@@ -35,6 +35,7 @@ var stimulus: Dictionary:
func _ready() -> void: func _ready() -> void:
set_button_active(false) set_button_active(false)
animated_sprite.play("idle1") animated_sprite.play("idle1")
if not Engine.is_editor_hint():
_on_audio_stream_player_finished() _on_audio_stream_player_finished()
+4 -3
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=37 format=3 uid="uid://bwe3fp0vkpufb"] [gd_scene load_steps=37 format=3 uid="uid://bwe3fp0vkpufb"]
[ext_resource type="Script" path="res://sources/minigames/crabs/crab/crab.gd" id="1_5hgg8"] [ext_resource type="Script" path="res://sources/minigames/crabs/crab/crab.gd" id="1_5hgg8"]
[ext_resource type="AudioStream" uid="uid://y8hwaul7nmhj" path="res://assets/minigames/crabs/audio/sfx/crab_random_10.mp3" id="2_l6obh"] [ext_resource type="AudioStream" uid="uid://1ibmtydnewa8" path="res://assets/minigames/crabs/audio/sfx/crab_random_6.mp3" id="2_gc7a0"]
[ext_resource type="Texture2D" uid="uid://c36217nu30yh3" path="res://assets/minigames/crabs/graphic/crab_spritesheet.png" id="2_yu4q0"] [ext_resource type="Texture2D" uid="uid://c36217nu30yh3" path="res://assets/minigames/crabs/graphic/crab_spritesheet.png" id="2_yu4q0"]
[ext_resource type="Script" path="res://sources/utils/sprite_control.gd" id="3_e1twq"] [ext_resource type="Script" path="res://sources/utils/sprite_control.gd" id="3_e1twq"]
[ext_resource type="PackedScene" uid="uid://cge0uyn30tcpv" path="res://sources/utils/fx/highlight.tscn" id="3_is4em"] [ext_resource type="PackedScene" uid="uid://cge0uyn30tcpv" path="res://sources/utils/fx/highlight.tscn" id="3_is4em"]
@@ -205,9 +205,8 @@ offset_bottom = 320.0
script = ExtResource("1_5hgg8") script = ExtResource("1_5hgg8")
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource("2_l6obh") stream = ExtResource("2_gc7a0")
volume_db = -3.0 volume_db = -3.0
stream_paused = true
bus = &"Effects" bus = &"Effects"
[node name="BackFX" type="Control" parent="."] [node name="BackFX" type="Control" parent="."]
@@ -241,6 +240,7 @@ anchor_right = 0.5
anchor_bottom = 0.5 anchor_bottom = 0.5
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
scale = Vector2(0.6, 0.6)
[node name="Body" type="Control" parent="."] [node name="Body" type="Control" parent="."]
layout_mode = 1 layout_mode = 1
@@ -267,6 +267,7 @@ scale = Vector2(1.79512, 1.78771)
sprite_frames = SubResource("SpriteFrames_g5q5i") sprite_frames = SubResource("SpriteFrames_g5q5i")
animation = &"idle1" animation = &"idle1"
autoplay = "idle1" autoplay = "idle1"
frame_progress = 0.698723
centered = false centered = false
offset = Vector2(-5, 0) offset = Vector2(-5, 0)
+1 -1
View File
@@ -13,7 +13,7 @@ const crab_scene: = preload("res://sources/minigames/crabs/crab/crab.tscn")
@onready var hole_back: Sprite2D = $HoleBack @onready var hole_back: Sprite2D = $HoleBack
@onready var hole_front: Sprite2D = $HoleFront @onready var hole_front: Sprite2D = $HoleFront
@onready var mask: Control = %Mask @onready var mask: Sprite2D = %Mask
@onready var sand_vfx: SandVFX = $SandVFX @onready var sand_vfx: SandVFX = $SandVFX
@onready var timer: Timer = $Timer @onready var timer: Timer = $Timer
@onready var crab_audio_stream_player: CrabAudioStreamPlayer = $CrabAudioStreamPlayer2D @onready var crab_audio_stream_player: CrabAudioStreamPlayer = $CrabAudioStreamPlayer2D
+3 -19
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=3 uid="uid://bggrf54kye5vl"] [gd_scene load_steps=7 format=3 uid="uid://bggrf54kye5vl"]
[ext_resource type="Script" path="res://sources/minigames/crabs/hole/hole.gd" id="1_05s8c"] [ext_resource type="Script" path="res://sources/minigames/crabs/hole/hole.gd" id="1_05s8c"]
[ext_resource type="Texture2D" uid="uid://tfigqbebxmal" path="res://assets/minigames/crabs/graphic/hole_back.png" id="2_osih7"] [ext_resource type="Texture2D" uid="uid://tfigqbebxmal" path="res://assets/minigames/crabs/graphic/hole_back.png" id="2_osih7"]
@@ -7,12 +7,6 @@
[ext_resource type="PackedScene" uid="uid://dt8ynpufhqs5w" path="res://sources/utils/fx/sand.tscn" id="5_vress"] [ext_resource type="PackedScene" uid="uid://dt8ynpufhqs5w" path="res://sources/utils/fx/sand.tscn" id="5_vress"]
[ext_resource type="Script" path="res://sources/minigames/crabs/hole/hole_audio_stream_player_2d.gd" id="6_2rg3s"] [ext_resource type="Script" path="res://sources/minigames/crabs/hole/hole_audio_stream_player_2d.gd" id="6_2rg3s"]
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_8wu08"]
blend_mode = 1
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_ertip"]
blend_mode = 3
[node name="Hole" type="Node2D"] [node name="Hole" type="Node2D"]
script = ExtResource("1_05s8c") script = ExtResource("1_05s8c")
@@ -20,19 +14,9 @@ script = ExtResource("1_05s8c")
scale = Vector2(1.8, 1.8) scale = Vector2(1.8, 1.8)
texture = ExtResource("2_osih7") texture = ExtResource("2_osih7")
[node name="MaskGroup" type="CanvasGroup" parent="."] [node name="Mask" type="Sprite2D" parent="."]
[node name="Mask" type="Control" parent="MaskGroup"]
unique_name_in_owner = true unique_name_in_owner = true
material = SubResource("CanvasItemMaterial_8wu08") clip_children = 1
layout_mode = 3
anchors_preset = 0
offset_right = 40.0
offset_bottom = 40.0
[node name="MaskSprite" type="Sprite2D" parent="MaskGroup"]
material = SubResource("CanvasItemMaterial_ertip")
position = Vector2(0, -40)
texture = ExtResource("3_ietrg") texture = ExtResource("3_ietrg")
[node name="SandVFX" parent="." instance=ExtResource("5_vress")] [node name="SandVFX" parent="." instance=ExtResource("5_vress")]
+1
View File
@@ -1,3 +1,4 @@
@tool
extends Control extends Control
class_name HighlightFX class_name HighlightFX
+1
View File
@@ -1,3 +1,4 @@
@tool
extends Control extends Control
class_name RightFX class_name RightFX