Skip to content

Commit 0ecfed8

Browse files
ClockWritesDevClockWritesDev
authored
Merge pull request #163 from tecMTST/Task-Triplice-Parte-2
Task triplice parte 2
2 parents e96058d + 4fa2033 commit 0ecfed8

File tree

591 files changed

+4007
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

591 files changed

+4007
-30
lines changed

‎Projeto/Cenas/cutscene_quadrinhos_fase_4.tscn‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
[gd_scene load_steps=15 format=3 uid="uid://kmitecqt0a2c"]
1+
[gd_scene load_steps=12 format=3 uid="uid://kmitecqt0a2c"]
22

33
[ext_resource type="Script" uid="uid://bfvf214mhvl7c" path="res://Scripts/Cutscenes/CutsceneQuadrinhos.gd" id="1_407oy"]
44
[ext_resource type="Script" uid="uid://dxcd21ohsu4ga" path="res://Scripts/Cutscenes/Quadrinho.gd" id="2_stkc4"]
55
[ext_resource type="Texture2D" uid="uid://dwk2co0akmvu4" path="res://Recursos/Graficos/Quadrinhos/hqFase4Quadro1.png" id="3_407oy"]
6-
[ext_resource type="Texture2D" uid="uid://bsc1yc8t5uc3b" path="res://Recursos/Graficos/Quadrinhos/hqFase4Quadro1Balao.png" id="4_stkc4"]
76
[ext_resource type="Texture2D" uid="uid://dl6k3v7tp6fng" path="res://Recursos/Graficos/Quadrinhos/hqFase4Quadro2.png" id="5_ghvk5"]
87
[ext_resource type="Texture2D" uid="uid://d3i4qo04l7e8" path="res://Recursos/Graficos/Quadrinhos/hqFase4Quadro2Balao.png" id="6_m7wcg"]
98
[ext_resource type="Texture2D" uid="uid://b4kucjcf1lyf4" path="res://Recursos/Graficos/Quadrinhos/hqFase4Quadro3.png" id="7_3mnih"]
109
[ext_resource type="Texture2D" uid="uid://bira86t21iems" path="res://Recursos/Graficos/Quadrinhos/hqFase4Quadro3Balao.png" id="8_e37gs"]
11-
[ext_resource type="Texture2D" uid="uid://c2c4kvlswj6py" path="res://Recursos/Graficos/Quadrinhos/hqFase4Quadro4.png" id="9_364w1"]
12-
[ext_resource type="Texture2D" uid="uid://dfvwgk7fmrxr6" path="res://Recursos/Graficos/Quadrinhos/hqFase4Quadro4Balao.png" id="10_ebw6r"]
1310
[ext_resource type="Texture2D" uid="uid://dgl7feovfqnct" path="res://Recursos/Graficos/UI/Componentes/button_action/button_action_default_base.svg" id="11_ovoec"]
1411
[ext_resource type="Texture2D" uid="uid://b5xaxdpfkjjg6" path="res://Recursos/Graficos/UI/Componentes/button_action/button_action_pressed_base.svg" id="12_k06xs"]
1512
[ext_resource type="Theme" uid="uid://cxq6lm4ve0eqq" path="res://UI/TextoBotaoTheme.tres" id="13_j6xn2"]
@@ -23,8 +20,8 @@ anchor_bottom = 1.0
2320
grow_horizontal = 2
2421
grow_vertical = 2
2522
script = ExtResource("1_407oy")
26-
lista_quadrinhos = [NodePath("Quadrinho_1"), NodePath("Quadrinho_2"), NodePath("Quadrinho_3"), NodePath("Quadrinho_4")]
27-
caminho_proxima_cena = "res://Cenas/CozinhaSolidaria.tscn"
23+
lista_quadrinhos = [NodePath("Quadrinho_1"), NodePath("Quadrinho_2"), NodePath("Quadrinho_3")]
24+
caminho_proxima_cena = "res://Cenas/cutscene_quadrinhos_fase_4_2.tscn"
2825

2926
[node name="PlanoDeFundoRect" type="ColorRect" parent="."]
3027
layout_mode = 1
@@ -43,9 +40,6 @@ position = Vector2(365, 143)
4340
scale = Vector2(1.3, 1.3)
4441
texture = ExtResource("3_407oy")
4542

46-
[node name="Balao" type="Sprite2D" parent="Quadrinho_1/QuadrinhoSprite"]
47-
texture = ExtResource("4_stkc4")
48-
4943
[node name="posicaoInicial" type="Node2D" parent="Quadrinho_1"]
5044
position = Vector2(-365, 198)
5145

@@ -55,7 +49,7 @@ posicao_bounce_inicial = NodePath("posicaoInicial")
5549
duracao_fade_alfa = 1.0
5650

5751
[node name="QuadrinhoSprite" type="Sprite2D" parent="Quadrinho_2"]
58-
position = Vector2(364.8, 408)
52+
position = Vector2(364.8, 501.00003)
5953
scale = Vector2(1.3, 1.3)
6054
texture = ExtResource("5_ghvk5")
6155

@@ -72,7 +66,7 @@ velocidade_bounce = 1.5
7266
duracao_fade_alfa = 0.5
7367

7468
[node name="QuadrinhoSprite" type="Sprite2D" parent="Quadrinho_3"]
75-
position = Vector2(365, 674)
69+
position = Vector2(365, 867.00006)
7670
scale = Vector2(1.3, 1.3)
7771
texture = ExtResource("7_3mnih")
7872

@@ -82,22 +76,6 @@ texture = ExtResource("8_e37gs")
8276
[node name="posicaoInicial" type="Node2D" parent="Quadrinho_3"]
8377
position = Vector2(1093, 599)
8478

85-
[node name="Quadrinho_4" type="Node2D" parent="."]
86-
script = ExtResource("2_stkc4")
87-
duracao_fade_alfa = 3.0
88-
89-
[node name="QuadrinhoSprite" type="Sprite2D" parent="Quadrinho_4"]
90-
position = Vector2(357, 940)
91-
scale = Vector2(1.3, 1.3)
92-
texture = ExtResource("9_364w1")
93-
94-
[node name="Balao" type="Sprite2D" parent="Quadrinho_4/QuadrinhoSprite"]
95-
texture = ExtResource("10_ebw6r")
96-
97-
[node name="posicaoInicial" type="Node2D" parent="Quadrinho_4"]
98-
visible = false
99-
position = Vector2(1090.5, 888.5)
100-
10179
[node name="Avancar" type="TextureButton" parent="."]
10280
layout_mode = 1
10381
anchors_preset = 7

‎Projeto/Cenas/cutscene_quadrinhos_fase_4_2.tscn‎

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
[gd_scene load_steps=13 format=3 uid="uid://dnfk7nx6jweav"]
2+
3+
[ext_resource type="Script" uid="uid://bfvf214mhvl7c" path="res://Scripts/Cutscenes/CutsceneQuadrinhos.gd" id="1_er4i8"]
4+
[ext_resource type="Script" uid="uid://dxcd21ohsu4ga" path="res://Scripts/Cutscenes/Quadrinho.gd" id="2_rx6or"]
5+
[ext_resource type="Texture2D" uid="uid://c76qnklkkeeng" path="res://Recursos/Graficos/Quadrinhos/hqFase4.2Quadro1.png" id="3_t8k2a"]
6+
[ext_resource type="Texture2D" uid="uid://hg82ewanw3qg" path="res://Recursos/Graficos/Quadrinhos/hqFase4.2Quadro2.png" id="4_oxfqn"]
7+
[ext_resource type="Texture2D" uid="uid://b84allr2ux7kg" path="res://Recursos/Graficos/Quadrinhos/hqFase4.2Quadro2Balao.png" id="5_t8k2a"]
8+
[ext_resource type="Texture2D" uid="uid://xp68b5ybwbkv" path="res://Recursos/Graficos/Quadrinhos/hqFase4.2Quadro3.png" id="6_er4i8"]
9+
[ext_resource type="Texture2D" uid="uid://2otm4wkvo3a3" path="res://Recursos/Graficos/Quadrinhos/hqFase4.2Quadro4.png" id="7_rx6or"]
10+
[ext_resource type="Texture2D" uid="uid://dd1u7gq6n4eyg" path="res://Recursos/Graficos/Quadrinhos/hqFase4.2Quadro4Balao.png" id="8_eci6y"]
11+
[ext_resource type="Texture2D" uid="uid://dgl7feovfqnct" path="res://Recursos/Graficos/UI/Componentes/button_action/button_action_default_base.svg" id="11_vnv3i"]
12+
[ext_resource type="Texture2D" uid="uid://b5xaxdpfkjjg6" path="res://Recursos/Graficos/UI/Componentes/button_action/button_action_pressed_base.svg" id="12_633q3"]
13+
[ext_resource type="Theme" uid="uid://cxq6lm4ve0eqq" path="res://UI/TextoBotaoTheme.tres" id="13_l3sbl"]
14+
[ext_resource type="PackedScene" uid="uid://ofpflnpic4l5" path="res://Componentes/Utilitarios/TransicaoCena.tscn" id="14_nbvs2"]
15+
16+
[node name="Control" type="Control" node_paths=PackedStringArray("lista_quadrinhos")]
17+
layout_mode = 3
18+
anchors_preset = 15
19+
anchor_right = 1.0
20+
anchor_bottom = 1.0
21+
grow_horizontal = 2
22+
grow_vertical = 2
23+
script = ExtResource("1_er4i8")
24+
lista_quadrinhos = [NodePath("Quadrinho_1"), NodePath("Quadrinho_2"), NodePath("Quadrinho_3"), NodePath("Quadrinho_4")]
25+
caminho_proxima_cena = "res://Cenas/CozinhaSolidaria.tscn"
26+
27+
[node name="PlanoDeFundoRect" type="ColorRect" parent="."]
28+
layout_mode = 1
29+
anchors_preset = 15
30+
anchor_right = 1.0
31+
anchor_bottom = 1.0
32+
grow_horizontal = 2
33+
grow_vertical = 2
34+
35+
[node name="Quadrinho_1" type="Node2D" parent="."]
36+
script = ExtResource("2_rx6or")
37+
duracao_fade_alfa = 1.5
38+
39+
[node name="QuadrinhoSprite" type="Sprite2D" parent="Quadrinho_1"]
40+
position = Vector2(360.00003, 96.00001)
41+
scale = Vector2(1.3, 1.3)
42+
texture = ExtResource("3_t8k2a")
43+
44+
[node name="posicaoInicial" type="Node2D" parent="Quadrinho_1"]
45+
position = Vector2(-365, 198)
46+
47+
[node name="Quadrinho_2" type="Node2D" parent="." node_paths=PackedStringArray("posicao_bounce_inicial")]
48+
script = ExtResource("2_rx6or")
49+
posicao_bounce_inicial = NodePath("posicaoInicial")
50+
duracao_fade_alfa = 1.0
51+
52+
[node name="QuadrinhoSprite" type="Sprite2D" parent="Quadrinho_2"]
53+
z_index = 1
54+
position = Vector2(359.59998, 345.1)
55+
scale = Vector2(1.3, 1.3)
56+
texture = ExtResource("4_oxfqn")
57+
58+
[node name="Balao" type="Sprite2D" parent="Quadrinho_2/QuadrinhoSprite"]
59+
texture = ExtResource("5_t8k2a")
60+
61+
[node name="posicaoInicial" type="Node2D" parent="Quadrinho_2"]
62+
position = Vector2(-365, 489)
63+
64+
[node name="Quadrinho_3" type="Node2D" parent="." node_paths=PackedStringArray("posicao_bounce_inicial")]
65+
script = ExtResource("2_rx6or")
66+
posicao_bounce_inicial = NodePath("posicaoInicial")
67+
velocidade_bounce = 1.5
68+
duracao_fade_alfa = 0.5
69+
70+
[node name="QuadrinhoSprite" type="Sprite2D" parent="Quadrinho_3"]
71+
position = Vector2(359.8, 586.15)
72+
scale = Vector2(1.3, 1.3)
73+
texture = ExtResource("6_er4i8")
74+
75+
[node name="posicaoInicial" type="Node2D" parent="Quadrinho_3"]
76+
position = Vector2(1093, 599)
77+
78+
[node name="Quadrinho_4" type="Node2D" parent="."]
79+
script = ExtResource("2_rx6or")
80+
duracao_fade_alfa = 3.0
81+
82+
[node name="QuadrinhoSprite" type="Sprite2D" parent="Quadrinho_4"]
83+
position = Vector2(358, 751.05005)
84+
scale = Vector2(1.3, 1.3)
85+
texture = ExtResource("7_rx6or")
86+
87+
[node name="Balao" type="Sprite2D" parent="Quadrinho_4/QuadrinhoSprite"]
88+
texture = ExtResource("8_eci6y")
89+
90+
[node name="posicaoInicial" type="Node2D" parent="Quadrinho_4"]
91+
visible = false
92+
position = Vector2(1090.5, 888.5)
93+
94+
[node name="Avancar" type="TextureButton" parent="."]
95+
layout_mode = 1
96+
anchors_preset = 7
97+
anchor_left = 0.5
98+
anchor_top = 1.0
99+
anchor_right = 0.5
100+
anchor_bottom = 1.0
101+
offset_left = -126.0
102+
offset_top = -193.0
103+
offset_right = 126.0
104+
offset_bottom = -25.0
105+
grow_horizontal = 2
106+
grow_vertical = 0
107+
texture_normal = ExtResource("11_vnv3i")
108+
texture_pressed = ExtResource("12_633q3")
109+
stretch_mode = 5
110+
111+
[node name="Label" type="Label" parent="Avancar"]
112+
layout_mode = 1
113+
anchors_preset = 8
114+
anchor_left = 0.5
115+
anchor_top = 0.5
116+
anchor_right = 0.5
117+
anchor_bottom = 0.5
118+
offset_left = -67.5
119+
offset_top = -23.0
120+
offset_right = 67.5
121+
offset_bottom = 23.0
122+
grow_horizontal = 2
123+
grow_vertical = 2
124+
theme = ExtResource("13_l3sbl")
125+
text = "Avançar"
126+
horizontal_alignment = 1
127+
vertical_alignment = 1
128+
129+
[node name="TransicaoCena" parent="." instance=ExtResource("14_nbvs2")]
130+
visible = false
131+
132+
[node name="Pular" type="TextureButton" parent="."]
133+
layout_mode = 1
134+
anchors_preset = 7
135+
anchor_left = 0.5
136+
anchor_top = 1.0
137+
anchor_right = 0.5
138+
anchor_bottom = 1.0
139+
offset_left = -319.0
140+
offset_top = -132.0
141+
offset_right = -67.0
142+
offset_bottom = 35.9999
143+
grow_horizontal = 2
144+
grow_vertical = 0
145+
scale = Vector2(0.56, 0.56)
146+
toggle_mode = true
147+
texture_normal = ExtResource("11_vnv3i")
148+
texture_pressed = ExtResource("12_633q3")
149+
stretch_mode = 5
150+
151+
[node name="Label" type="Label" parent="Pular"]
152+
layout_mode = 1
153+
anchors_preset = 8
154+
anchor_left = 0.5
155+
anchor_top = 0.5
156+
anchor_right = 0.5
157+
anchor_bottom = 0.5
158+
offset_left = -67.5
159+
offset_top = -23.0
160+
offset_right = 67.5
161+
offset_bottom = 23.0
162+
grow_horizontal = 2
163+
grow_vertical = 2
164+
theme = ExtResource("13_l3sbl")
165+
text = "Pular"
166+
horizontal_alignment = 1
167+
vertical_alignment = 1
168+
169+
[connection signal="pressed" from="Avancar" to="." method="_on_input_action_pressed"]
170+
[connection signal="toggled" from="Pular" to="." method="_on_pular_toggled"]

‎Projeto/Componentes/Casa/Interagiveis/EntregaNaFila.tscn‎

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
[gd_scene load_steps=8 format=3 uid="uid://n52w7lk2j46x"]
1+
[gd_scene load_steps=10 format=3 uid="uid://n52w7lk2j46x"]
22

33
[ext_resource type="Script" uid="uid://cpi6tydbas0r3" path="res://Componentes/Casa/Interagiveis/mesa_filha.gd" id="1_7fq27"]
44
[ext_resource type="Script" uid="uid://ddwsslb5nraqq" path="res://Componentes/Base/Interagiveis/componente_interagivel.gd" id="2_7fq27"]
55
[ext_resource type="Texture2D" uid="uid://cfp770tffb0ns" path="res://Recursos/Graficos/UI/Componentes/display_proximo_passo/display_proximo_passo.svg" id="3_7gv1b"]
66
[ext_resource type="Script" uid="uid://d1lhbtx247tsg" path="res://addons/uiJuicer/Bouncer.gd" id="4_0holi"]
77
[ext_resource type="Script" uid="uid://mkb6qqi4x84c" path="res://Componentes/Personagens/fila_para_comida.gd" id="5_7gv1b"]
88
[ext_resource type="PackedScene" uid="uid://c3rsirptmnfb1" path="res://Componentes/Personagens/pessoa_na_fila.tscn" id="6_7gv1b"]
9+
[ext_resource type="Texture2D" uid="uid://lqcqston0ich" path="res://Recursos/Graficos/UI/Componentes/display_prato/display_prato_pill_1_digito.svg" id="7_clgs1"]
10+
[ext_resource type="Texture2D" uid="uid://cgmb5en4i7hr7" path="res://Recursos/Graficos/UI/Ingredientes/pessoas.svg" id="8_2jnta"]
911

1012
[sub_resource type="RectangleShape2D" id="RectangleShape2D_eo1ls"]
1113
size = Vector2(163, 254.338)
@@ -17,7 +19,6 @@ fila = NodePath("Fila")
1719
[node name="Area2D" type="Area2D" parent="."]
1820

1921
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
20-
position = Vector2(2.5, 4.37137)
2122
scale = Vector2(1, 0.476757)
2223
shape = SubResource("RectangleShape2D_eo1ls")
2324

@@ -54,5 +55,54 @@ tempo_maximo_proxima_pessoa = 30.0
5455
[node name="Timer" type="Timer" parent="Fila"]
5556
one_shot = true
5657

58+
[node name="Counter" type="TextureRect" parent="."]
59+
offset_left = 80.0
60+
offset_top = 135.0
61+
offset_right = 145.0
62+
offset_bottom = 167.0
63+
grow_horizontal = 2
64+
grow_vertical = 2
65+
scale = Vector2(0.79, 0.79)
66+
pivot_offset = Vector2(32, 16)
67+
texture = ExtResource("7_clgs1")
68+
stretch_mode = 3
69+
metadata/_edit_use_anchors_ = true
70+
71+
[node name="TextCounter" type="Label" parent="Counter"]
72+
layout_mode = 1
73+
anchors_preset = -1
74+
anchor_left = 0.68700004
75+
anchor_top = 0.46400002
76+
anchor_right = 0.68700004
77+
anchor_bottom = 0.46400002
78+
offset_left = -15.186653
79+
offset_top = -11.5062275
80+
offset_right = 15.193092
81+
offset_bottom = 11.493773
82+
theme_override_colors/font_color = Color(0, 0, 0, 1)
83+
text = "0"
84+
horizontal_alignment = 1
85+
vertical_alignment = 1
86+
clip_text = true
87+
88+
[node name="PessoaIcon" type="TextureRect" parent="Counter"]
89+
layout_mode = 1
90+
anchors_preset = -1
91+
anchor_left = 0.319
92+
anchor_top = 0.467
93+
anchor_right = 0.319
94+
anchor_bottom = 0.467
95+
offset_left = -6.456521
96+
offset_top = -12.868052
97+
offset_right = 6.199621
98+
offset_bottom = 12.78072
99+
grow_horizontal = 2
100+
grow_vertical = 2
101+
scale = Vector2(0.79, 0.79)
102+
pivot_offset = Vector2(7, 13)
103+
texture = ExtResource("8_2jnta")
104+
stretch_mode = 4
105+
metadata/_edit_use_anchors_ = true
106+
57107
[connection signal="interagir" from="ComponenteInteragivel" to="." method="_interagir"]
58108
[connection signal="timeout" from="Fila/Timer" to="Fila" method="_on_hora_de_entrar_na_fila"]

‎Projeto/Componentes/Casa/Interagiveis/mesa_filha.gd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func _interagir(jogador: Player) -> void:
1717
jogador.objeto_agarrado != null
1818
and jogador.objeto_agarrado is IngredienteBase
1919
and jogador.objeto_agarrado.ingrediente.acoes[0].alvo == "mesa"
20-
and (!is_instance_valid(fila) or fila.remove_pessoa_da_fila())
20+
and (!is_instance_valid(fila) or await fila.remove_pessoa_da_fila())
2121
):
2222
var objeto_atual = jogador.objeto_agarrado
2323
jogador.soltar()

‎Projeto/Componentes/Personagens/fila_para_comida.gd‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@ var fila = []
2727
func _ready():
2828
for n in range(pessoas_iniciais_na_fila):
2929
adiciona_pessoa_na_fila()
30+
_mudar_contador_pessoa()
3031
ativa_fila_aleatoriamente()
3132

33+
func _mudar_contador_pessoa():
34+
get_parent().get_node("Counter/TextCounter").text = str(fila.size())
3235

3336
func ativa_fila_aleatoriamente() -> void:
3437
var tempo_variavel = randf_range(tempo_minimo_proxima_pessoa, tempo_maximo_proxima_pessoa)
@@ -52,6 +55,7 @@ func adiciona_pessoa_na_fila() -> void:
5255
# pessoa_nova.position = posicao_inicial + Vector2(0, fila.size() * distancia_entre_pessoas)
5356
add_child(pessoa_nova)
5457
fila.append(pessoa_nova)
58+
_mudar_contador_pessoa()
5559
pessoa_nova.position = get_parent().position + posicao_inicial + Vector2(
5660
randi_range(-variacao_maxima_horizontal, +variacao_maxima_horizontal),
5761
(fila.size() - 1) * distancia_entre_pessoas
@@ -60,8 +64,14 @@ func adiciona_pessoa_na_fila() -> void:
6064
func remove_pessoa_da_fila() -> bool:
6165
if fila.is_empty(): return false
6266
var pessoa_atendida = fila.pop_front()
67+
var tween = create_tween()
68+
tween.tween_property(pessoa_atendida, "modulate", Color(1,1,1,1), 0.2)
69+
tween.tween_property(pessoa_atendida, "modulate", Color(1,1,1,0), 0.5)
70+
tween.play()
71+
await tween.finished
6372
pessoa_atendida.queue_free()
6473
atualiza_posicoes_na_fila()
74+
_mudar_contador_pessoa()
6575
return true
6676

6777

‎Projeto/Componentes/Personagens/rigs/vetores_spritesheets/assetsCutscenes.svg.import‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/assetsCutscenes.svg-2e7ae7e4b1ecbb54348a1443b
1818
compress/mode=0
1919
compress/high_quality=false
2020
compress/lossy_quality=0.7
21+
compress/uastc_level=0
22+
compress/rdo_quality_loss=0.0
2123
compress/hdr_compression=1
2224
compress/normal_map=0
2325
compress/channel_pack=0
2426
mipmaps/generate=false
2527
mipmaps/limit=-1
2628
roughness/mode=0
2729
roughness/src_normal=""
30+
process/channel_remap/red=0
31+
process/channel_remap/green=1
32+
process/channel_remap/blue=2
33+
process/channel_remap/alpha=3
2834
process/fix_alpha_border=true
2935
process/premult_alpha=false
3036
process/normal_map_invert_y=false

0 commit comments

Comments
 (0)