oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Dancing animations, some glitch fixed

Browse Source
This commit is contained in:
Oier Bravo
2024-11-02 21:39:16 +01:00
parent 6cfa1d1a05
commit 220c390597
19 changed files with 378 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
addons/escoria-ui-return-monkey-island/game.gd
View File

@@ -377,9 +377,10 @@ func hide_ui():
$CanvasLayer/ui.hide()
func show_ui():
$CanvasLayer/ui/HBoxContainer/inventory_ui.show()
$CanvasLayer/ui/HBoxContainer/inventory_ui.show_ui()
$CanvasLayer/ui.show()
if escoria.room_manager.GLOBAL_CURRENT_SCENE != "turno_cocina_creditos":
$CanvasLayer/ui/HBoxContainer/inventory_ui.show()
$CanvasLayer/ui/HBoxContainer/inventory_ui.show_ui()
$CanvasLayer/ui.show()
func hide_main_menu():
@@ -497,6 +498,7 @@ func get_video_player() -> Node:
func play_video(video_file: String) -> void:
hide_ui()
clear_tooltip()
$CanvasLayer/video_player.visible = true
$CanvasLayer/video_player.play(video_file)

6
addons/escoria-ui-return-monkey-island/theme.tres
View File

@@ -1,7 +1,10 @@
[gd_resource type="Theme" load_steps=5 format=2]
[gd_resource type="Theme" load_steps=6 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres" type="DynamicFont" id=1]
[sub_resource type="StyleBoxFlat" id=4]
bg_color = Color( 0.168627, 0.168627, 0.168627, 0.705882 )
[sub_resource type="StyleBoxFlat" id=1]
content_margin_left = 4.0
content_margin_right = 4.0
@@ -32,6 +35,7 @@ expand_margin_bottom = 5.0
[resource]
default_font = ExtResource( 1 )
Button/styles/normal = SubResource( 4 )
Label/colors/font_color = Color( 1, 1, 1, 1 )
Label/colors/font_color_shadow = Color( 0, 0, 0, 0 )
Label/colors/font_outline_modulate = Color( 1, 0, 0, 1 )

13
addons/escoria-ui-return-monkey-island/video_player/video_player.tscn
View File

@@ -1,6 +1,7 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=6 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/video_player/video_player.gd" type="Script" id=1]
[ext_resource path="res://gymkhana.tres" type="Theme" id=2]
[sub_resource type="VideoStreamTheora" id=1]
@@ -16,13 +17,15 @@ margin_bottom = 753.0
script = ExtResource( 1 )
[node name="ColorRect" type="ColorRect" parent="."]
margin_right = 1275.0
margin_bottom = 744.0
margin_left = -11.0
margin_top = -3.0
margin_right = 1285.0
margin_bottom = 766.0
color = Color( 0, 0, 0, 1 )
[node name="VideoPlayer" type="VideoPlayer" parent="."]
margin_right = 1279.0
margin_bottom = 747.0
margin_bottom = 771.0
stream = SubResource( 1 )
expand = false
@@ -31,10 +34,10 @@ margin_left = 1163.0
margin_top = 680.0
margin_right = 1250.0
margin_bottom = 712.0
theme = ExtResource( 2 )
shortcut_in_tooltip = false
shortcut = SubResource( 3 )
text = "Saltar video"
flat = true
[connection signal="finished" from="VideoPlayer" to="." method="_on_VideoPlayer_finished"]
[connection signal="pressed" from="Skip" to="." method="_on_Skip_pressed"]