Change resolution to 720p and add UI to BattleScene

This commit is contained in:
CactiChameleon9 2022-07-16 21:34:02 +01:00
parent e52716c793
commit 12525b0095
4 changed files with 53 additions and 33 deletions

View File

@ -1,9 +1,10 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=7 format=2]
[ext_resource path="res://icon.png" type="Texture" id=1]
[ext_resource path="res://Characters/Player.tscn" type="PackedScene" id=2]
[ext_resource path="res://Scenes/BattleScene.gd" type="Script" id=3]
[ext_resource path="res://UI/CardView.tscn" type="PackedScene" id=4]
[ext_resource path="res://UI/DiceView.tscn" type="PackedScene" id=5]
[sub_resource type="TileSet" id=1]
0/name = "icon.png 0"
@ -35,19 +36,23 @@ tile_data = PoolIntArray( 65540, 0, 0, 131074, 0, 0, 131075, 0, 0, 131076, 0, 0,
[node name="Player" parent="." instance=ExtResource( 2 )]
[node name="Camera2D" type="Camera2D" parent="Player"]
offset = Vector2( 0, 200 )
current = true
drag_margin_h_enabled = true
drag_margin_v_enabled = true
drag_margin_left = 0.3
drag_margin_top = 0.05
drag_margin_right = 0.3
editor_draw_drag_margin = true
[node name="CanvasLayer" type="CanvasLayer" parent="."]
[node name="MarginContainer" type="MarginContainer" parent="CanvasLayer"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 30.0
margin_top = 285.0
margin_right = -30.0
margin_bottom = -5.0
[node name="CardView" parent="CanvasLayer" instance=ExtResource( 4 )]
margin_top = 367.0
margin_right = -314.0
[node name="CardView" parent="CanvasLayer/MarginContainer" instance=ExtResource( 4 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 0.0
margin_right = 964.0
margin_bottom = 310.0
[node name="DiceView" parent="CanvasLayer" instance=ExtResource( 5 )]
margin_left = 966.0
margin_top = 367.0
grow_horizontal = 0

View File

@ -54,7 +54,7 @@ margin_right = -10.0
margin_bottom = -10.0
[node name="Name" type="Label" parent="VBox"]
margin_right = 1004.0
margin_right = 1260.0
margin_bottom = 31.0
custom_fonts/font = SubResource( 2 )
text = "Default"
@ -63,8 +63,8 @@ autowrap = true
[node name="AutoGrid" parent="VBox" instance=ExtResource( 5 )]
margin_top = 35.0
margin_right = 1004.0
margin_bottom = 486.0
margin_right = 1260.0
margin_bottom = 606.0
[node name="InputDice0" type="TextureRect" parent="VBox/AutoGrid"]
margin_left = 42.0
@ -89,9 +89,9 @@ align = 1
valign = 1
[node name="Description" type="Label" parent="VBox"]
margin_top = 490.0
margin_right = 1004.0
margin_bottom = 580.0
margin_top = 610.0
margin_right = 1260.0
margin_bottom = 700.0
rect_min_size = Vector2( 0, 90 )
custom_fonts/font = SubResource( 5 )
text = "Default Description"

View File

@ -8,32 +8,40 @@
[node name="CardView" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = 249.0
[node name="HBox" type="HBoxContainer" parent="."]
[node name="Margin" type="MarginContainer" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 30.0
margin_top = 30.0
margin_right = -30.0
margin_bottom = -30.0
[node name="HBox" type="HBoxContainer" parent="Margin"]
margin_right = 1220.0
margin_bottom = 660.0
rect_min_size = Vector2( 0, 300 )
custom_constants/separation = 50
[node name="Card1" parent="HBox" instance=ExtResource( 1 )]
[node name="Card1" parent="Margin/HBox" instance=ExtResource( 1 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 308.0
margin_bottom = 351.0
margin_right = 373.0
margin_bottom = 660.0
card_info = ExtResource( 2 )
[node name="Card2" parent="HBox" instance=ExtResource( 1 )]
[node name="Card2" parent="Margin/HBox" instance=ExtResource( 1 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 358.0
margin_right = 666.0
margin_bottom = 351.0
margin_left = 423.0
margin_right = 796.0
margin_bottom = 660.0
card_info = ExtResource( 4 )
[node name="Card3" parent="HBox" instance=ExtResource( 1 )]
[node name="Card3" parent="Margin/HBox" instance=ExtResource( 1 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 716.0
margin_right = 1024.0
margin_bottom = 351.0
margin_left = 846.0
margin_right = 1220.0
margin_bottom = 660.0
card_info = ExtResource( 3 )

View File

@ -23,6 +23,13 @@ _global_script_class_icons={
config/name="Quit Rolling Around"
config/icon="res://icon.png"
[display]
window/size/width=1280
window/size/height=720
window/stretch/mode="2d"
window/stretch/aspect="keep_width"
[physics]
common/enable_pause_aware_picking=true