Tweaked UI

master
Martin Felis 2021-07-18 16:56:18 +02:00
parent 0e34313ac6
commit a79ee05ca7
5 changed files with 77 additions and 47 deletions

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/icon.png-8ef70a3ee536a318ef1cf6a9c072251e.stex" path="res://.import/icon.png-94d6536ee4af028a7ca4b709cae95011.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://thirdparty/gdhexgrid/addons/gut/icon.png" source_file="res://addons/gdhexgrid/addons/gut/icon.png"
dest_files=[ "res://.import/icon.png-8ef70a3ee536a318ef1cf6a9c072251e.stex" ] dest_files=[ "res://.import/icon.png-94d6536ee4af028a7ca4b709cae95011.stex" ]
[params] [params]

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/icon.png-55a505cd80fd03b4057438c68aa35b70.stex" path="res://.import/icon.png-9e2c68854eff2ba15efab32e39b37c44.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://thirdparty/gdhexgrid/icon.png" source_file="res://addons/gdhexgrid/icon.png"
dest_files=[ "res://.import/icon.png-55a505cd80fd03b4057438c68aa35b70.stex" ] dest_files=[ "res://.import/icon.png-9e2c68854eff2ba15efab32e39b37c44.stex" ]
[params] [params]

View File

@ -4,9 +4,8 @@ name="Pirate Treasure Hunt"
platform="HTML5" platform="HTML5"
runnable=true runnable=true
custom_features="" custom_features=""
export_filter="resources" export_filter="all_resources"
export_files=PoolStringArray( ) include_filter="*"
include_filter="*,*.gd,islands/*,thirdparty/gdhexgrid/*"
exclude_filter="" exclude_filter=""
export_path="export/html/index.html" export_path="export/html/index.html"
script_export_mode=1 script_export_mode=1
@ -17,8 +16,8 @@ script_encryption_key=""
custom_template/debug="" custom_template/debug=""
custom_template/release="" custom_template/release=""
variant/export_type=0 variant/export_type=0
vram_texture_compression/for_desktop=true vram_texture_compression/for_desktop=false
vram_texture_compression/for_mobile=false vram_texture_compression/for_mobile=true
html/custom_html_shell="" html/custom_html_shell=""
html/head_include="" html/head_include=""
html/canvas_resize_policy=2 html/canvas_resize_policy=2

View File

@ -22,7 +22,7 @@ _global_script_class_icons={
config/name="Pirate Treasure Hunt" config/name="Pirate Treasure Hunt"
run/main_scene="res://scenes/Game.tscn" run/main_scene="res://scenes/Game.tscn"
config/icon="res://icon.png" config/icon="res://assets/pirate.svg"
[autoload] [autoload]

View File

@ -126,33 +126,40 @@ script = ExtResource( 8 )
[node name="TopContainer" type="HBoxContainer" parent="World/UI"] [node name="TopContainer" type="HBoxContainer" parent="World/UI"]
anchor_right = 1.0 anchor_right = 1.0
margin_left = 10.0
margin_top = 10.0
margin_right = -10.0
margin_bottom = 20.0 margin_bottom = 20.0
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="GenerateButton" type="Button" parent="World/UI/TopContainer"]
margin_right = 113.0
margin_bottom = 64.0
rect_min_size = Vector2( 64, 64 )
text = "Generate World"
[node name="EditIslandButton" type="CheckButton" parent="World/UI/TopContainer"] [node name="EditIslandButton" type="CheckButton" parent="World/UI/TopContainer"]
margin_right = 117.0 visible = false
margin_left = 117.0
margin_right = 234.0
margin_bottom = 40.0 margin_bottom = 40.0
text = "Editor" text = "Editor"
[node name="Button" type="Button" parent="World/UI/TopContainer"]
margin_left = 121.0
margin_right = 192.0
margin_bottom = 40.0
text = "Generate"
[node name="Offset" type="Label" parent="World/UI/TopContainer"] [node name="Offset" type="Label" parent="World/UI/TopContainer"]
margin_left = 196.0 visible = false
margin_left = 238.0
margin_top = 13.0 margin_top = 13.0
margin_right = 243.0 margin_right = 285.0
margin_bottom = 27.0 margin_bottom = 27.0
text = "Offset: " text = "Offset: "
[node name="OffsetValue" type="Label" parent="World/UI/TopContainer"] [node name="OffsetValue" type="Label" parent="World/UI/TopContainer"]
margin_left = 247.0 visible = false
margin_left = 289.0
margin_top = 13.0 margin_top = 13.0
margin_right = 267.0 margin_right = 309.0
margin_bottom = 27.0 margin_bottom = 27.0
text = "0,0" text = "0,0"
__meta__ = { __meta__ = {
@ -160,16 +167,18 @@ __meta__ = {
} }
[node name="Zoom" type="Label" parent="World/UI/TopContainer"] [node name="Zoom" type="Label" parent="World/UI/TopContainer"]
margin_left = 271.0 visible = false
margin_left = 238.0
margin_top = 13.0 margin_top = 13.0
margin_right = 320.0 margin_right = 287.0
margin_bottom = 27.0 margin_bottom = 27.0
text = " Zoom: " text = " Zoom: "
[node name="ZoomValue" type="Label" parent="World/UI/TopContainer"] [node name="ZoomValue" type="Label" parent="World/UI/TopContainer"]
margin_left = 324.0 visible = false
margin_left = 238.0
margin_top = 13.0 margin_top = 13.0
margin_right = 344.0 margin_right = 258.0
margin_bottom = 27.0 margin_bottom = 27.0
text = "0.0" text = "0.0"
__meta__ = { __meta__ = {
@ -177,37 +186,42 @@ __meta__ = {
} }
[node name="HexCoord" type="Label" parent="World/UI/TopContainer"] [node name="HexCoord" type="Label" parent="World/UI/TopContainer"]
margin_left = 348.0 visible = false
margin_left = 238.0
margin_top = 13.0 margin_top = 13.0
margin_right = 422.0 margin_right = 312.0
margin_bottom = 27.0 margin_bottom = 27.0
text = " HexCoord: " text = " HexCoord: "
[node name="HexCoordValue" type="Label" parent="World/UI/TopContainer"] [node name="HexCoordValue" type="Label" parent="World/UI/TopContainer"]
margin_left = 426.0 visible = false
margin_left = 238.0
margin_top = 13.0 margin_top = 13.0
margin_right = 454.0 margin_right = 266.0
margin_bottom = 27.0 margin_bottom = 27.0
text = "(0,0)" text = "(0,0)"
[node name="WorldCoord" type="Label" parent="World/UI/TopContainer"] [node name="WorldCoord" type="Label" parent="World/UI/TopContainer"]
margin_left = 458.0 visible = false
margin_left = 238.0
margin_top = 13.0 margin_top = 13.0
margin_right = 541.0 margin_right = 321.0
margin_bottom = 27.0 margin_bottom = 27.0
text = "WorldCoord: " text = "WorldCoord: "
[node name="WorldCoordValue" type="Label" parent="World/UI/TopContainer"] [node name="WorldCoordValue" type="Label" parent="World/UI/TopContainer"]
margin_left = 545.0 visible = false
margin_left = 238.0
margin_top = 13.0 margin_top = 13.0
margin_right = 573.0 margin_right = 266.0
margin_bottom = 27.0 margin_bottom = 27.0
text = "(0,0)" text = "(0,0)"
[node name="TileType" type="Label" parent="World/UI/TopContainer"] [node name="TileType" type="Label" parent="World/UI/TopContainer"]
margin_left = 577.0 visible = false
margin_left = 238.0
margin_top = 13.0 margin_top = 13.0
margin_right = 600.0 margin_right = 261.0
margin_bottom = 27.0 margin_bottom = 27.0
text = "Tile" text = "Tile"
__meta__ = { __meta__ = {
@ -215,9 +229,10 @@ __meta__ = {
} }
[node name="TileTypeValue" type="Label" parent="World/UI/TopContainer"] [node name="TileTypeValue" type="Label" parent="World/UI/TopContainer"]
margin_left = 604.0 visible = false
margin_left = 238.0
margin_top = 13.0 margin_top = 13.0
margin_right = 638.0 margin_right = 272.0
margin_bottom = 27.0 margin_bottom = 27.0
text = "None" text = "None"
__meta__ = { __meta__ = {
@ -225,18 +240,34 @@ __meta__ = {
} }
[node name="VSeparator" type="VSeparator" parent="World/UI/TopContainer"] [node name="VSeparator" type="VSeparator" parent="World/UI/TopContainer"]
margin_left = 642.0 visible = false
margin_right = 646.0 margin_left = 117.0
margin_bottom = 40.0 margin_right = 954.0
margin_bottom = 64.0
size_flags_horizontal = 3
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="Label2" type="Label" parent="World/UI/TopContainer"]
margin_left = 117.0
margin_top = 25.0
margin_right = 958.0
margin_bottom = 39.0
size_flags_horizontal = 3
[node name="Label" type="Label" parent="World/UI/TopContainer"]
margin_left = 962.0
margin_top = 25.0
margin_right = 992.0
margin_bottom = 39.0
text = "FPS: "
[node name="FPSValue" type="Label" parent="World/UI/TopContainer"] [node name="FPSValue" type="Label" parent="World/UI/TopContainer"]
margin_left = 650.0 margin_left = 996.0
margin_top = 13.0 margin_top = 25.0
margin_right = 658.0 margin_right = 1004.0
margin_bottom = 27.0 margin_bottom = 39.0
text = "0" text = "0"
align = 2 align = 2
script = ExtResource( 4 ) script = ExtResource( 4 )
@ -358,8 +389,8 @@ render_target_update_mode = 1
[connection signal="pressed" from="Editor/UI/Editor/ClearWorldButton" to="Editor" method="_on_ClearWorldButton_pressed"] [connection signal="pressed" from="Editor/UI/Editor/ClearWorldButton" to="Editor" method="_on_ClearWorldButton_pressed"]
[connection signal="pressed" from="Editor/UI/Editor/LoadWorldButton" to="Editor" method="_on_LoadWorldButton_pressed"] [connection signal="pressed" from="Editor/UI/Editor/LoadWorldButton" to="Editor" method="_on_LoadWorldButton_pressed"]
[connection signal="pressed" from="Editor/UI/Editor/SaveWorldButton" to="Editor" method="_on_SaveWorldButton_pressed"] [connection signal="pressed" from="Editor/UI/Editor/SaveWorldButton" to="Editor" method="_on_SaveWorldButton_pressed"]
[connection signal="pressed" from="World/UI/TopContainer/GenerateButton" to="World" method="_on_generate_button_pressed"]
[connection signal="toggled" from="World/UI/TopContainer/EditIslandButton" to="Editor" method="_on_EditIslandButton_toggled"] [connection signal="toggled" from="World/UI/TopContainer/EditIslandButton" to="Editor" method="_on_EditIslandButton_toggled"]
[connection signal="pressed" from="World/UI/TopContainer/Button" to="World" method="_on_generate_button_pressed"]
[connection signal="pressed" from="World/UI/VBoxContainer/MapButton" to="World" method="_on_MapButton_pressed"] [connection signal="pressed" from="World/UI/VBoxContainer/MapButton" to="World" method="_on_MapButton_pressed"]
[connection signal="pressed" from="World/UI/VBoxContainer/BirdyButton" to="World" method="_on_BirdyButton_pressed"] [connection signal="pressed" from="World/UI/VBoxContainer/BirdyButton" to="World" method="_on_BirdyButton_pressed"]
[connection signal="pressed" from="World/UI/VBoxContainer/DigButton" to="World" method="_on_DigButton_pressed"] [connection signal="pressed" from="World/UI/VBoxContainer/DigButton" to="World" method="_on_DigButton_pressed"]