Browse Source

work done on menu

galo 1 year ago
parent
commit
5399614358
3 changed files with 40 additions and 11 deletions
  1. 38 9
      Client.tscn
  2. 1 1
      main.tscn
  3. 1 1
      opts.gd

+ 38 - 9
Client.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=2]
+[gd_scene load_steps=17 format=2]
 
 [ext_resource path="res://Debug.tscn" type="PackedScene" id=1]
 [ext_resource path="res://PowerMenu.tscn" type="PackedScene" id=2]
@@ -11,6 +11,7 @@
 [ext_resource path="res://font/8bit.tres" type="DynamicFont" id=9]
 [ext_resource path="res://art/player/emote/esclamation.png" type="Texture" id=10]
 [ext_resource path="res://opts.gd" type="Script" id=11]
+[ext_resource path="res://art/coffeemilk.png" type="Texture" id=12]
 
 [sub_resource type="GDScript" id=1]
 script/source = "extends Label
@@ -25,6 +26,19 @@ func _input(event):
 			print('sending spawn request...')
 "
 
+[sub_resource type="Shader" id=19]
+code = "// NOTE: Shader automatically converted from Godot Engine 3.4.4.stable's CanvasItemMaterial.
+
+shader_type canvas_item;
+render_mode blend_mix;
+
+void fragment(){
+	COLOR = texture(TEXTURE,UV+TIME/5.00);
+}"
+
+[sub_resource type="ShaderMaterial" id=20]
+shader = SubResource( 19 )
+
 [sub_resource type="StyleBoxFlat" id=2]
 bg_color = Color( 0, 0, 0, 0.415686 )
 
@@ -133,17 +147,32 @@ color = Color( 0, 0, 0, 0.333333 )
 
 [node name="Options" type="CanvasLayer" parent="."]
 
-[node name="VBoxContainer" type="VBoxContainer" parent="Options"]
+[node name="Control" type="Control" parent="Options"]
 visible = false
+margin_right = 40.0
+margin_bottom = 40.0
+
+[node name="TextureRect" type="TextureRect" parent="Options/Control"]
+material = SubResource( 20 )
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_right = 600.0
+margin_bottom = 320.0
+texture = ExtResource( 12 )
+expand = true
+stretch_mode = 2
+
+[node name="VBoxContainer" type="VBoxContainer" parent="Options/Control"]
 anchor_left = 0.5
 anchor_right = 0.5
 anchor_bottom = 1.0
-margin_left = -64.5
-margin_right = 64.5
+margin_left = 236.0
+margin_right = 365.0
+margin_bottom = 321.0
 alignment = 1
 script = ExtResource( 11 )
 
-[node name="Label" type="Label" parent="Options/VBoxContainer"]
+[node name="Label" type="Label" parent="Options/Control/VBoxContainer"]
 margin_top = 156.0
 margin_right = 129.0
 margin_bottom = 168.0
@@ -151,7 +180,7 @@ custom_fonts/font = ExtResource( 9 )
 text = "volume:"
 align = 1
 
-[node name="HSlider" type="HSlider" parent="Options/VBoxContainer"]
+[node name="HSlider" type="HSlider" parent="Options/Control/VBoxContainer"]
 margin_top = 172.0
 margin_right = 129.0
 margin_bottom = 188.0
@@ -160,7 +189,7 @@ custom_icons/grabber_disabled = ExtResource( 10 )
 custom_icons/grabber_highlight = ExtResource( 10 )
 custom_icons/grabber = ExtResource( 10 )
 
-[node name="OptionButton" type="OptionButton" parent="Options/VBoxContainer"]
+[node name="OptionButton" type="OptionButton" parent="Options/Control/VBoxContainer"]
 margin_top = 192.0
 margin_right = 129.0
 margin_bottom = 204.0
@@ -174,5 +203,5 @@ text = "window option"
 
 [connection signal="timeout" from="Debug/ping/Timer" to="Debug/ping" method="_on_Timer_timeout"]
 [connection signal="text_entered" from="Chat/LineEdit" to="." method="chat_messages"]
-[connection signal="value_changed" from="Options/VBoxContainer/HSlider" to="Options/VBoxContainer" method="_on_HSlider_value_changed"]
-[connection signal="item_selected" from="Options/VBoxContainer/OptionButton" to="Options/VBoxContainer" method="_on_OptionButton_item_selected"]
+[connection signal="value_changed" from="Options/Control/VBoxContainer/HSlider" to="Options/Control/VBoxContainer" method="_on_HSlider_value_changed"]
+[connection signal="item_selected" from="Options/Control/VBoxContainer/OptionButton" to="Options/Control/VBoxContainer" method="_on_OptionButton_item_selected"]

+ 1 - 1
main.tscn

@@ -221,7 +221,7 @@ render_target_v_flip = true
 [node name="Goblin" type="AnimatedSprite" parent="Textures/Goblin4"]
 modulate = Color( 1, 0, 0.984314, 1 )
 frames = SubResource( 5 )
-frame = 1
+frame = 3
 speed_scale = 0.9
 playing = true
 offset = Vector2( 32, 32 )

+ 1 - 1
opts.gd

@@ -8,7 +8,7 @@ func _ready():
 
 func _input(event):
 	if Input.is_action_just_pressed("opts"):
-		visible = !visible
+		get_parent().visible = !get_parent().visible
 	if Input.is_action_just_pressed("f12"):
 		OS.window_fullscreen = !OS.window_fullscreen