From 83dc96928d0e30f376310fb6fb9c295710537bb0 Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Fri, 24 Mar 2023 17:57:17 -0400 Subject: Make main_menu_button.png a Texture2D Make main_menu_button_normal a text resource Easier to manage with Git --- game/src/MainMenu/MainMenu.tscn | 2 +- game/theme/assets/main_menu_button_normal.stylebox | Bin 497 -> 0 bytes game/theme/assets/main_menu_button_normal.tres | 10 ++++++++++ game/theme/main_menu.tres | 13 +++++-------- 4 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 game/theme/assets/main_menu_button_normal.stylebox create mode 100644 game/theme/assets/main_menu_button_normal.tres diff --git a/game/src/MainMenu/MainMenu.tscn b/game/src/MainMenu/MainMenu.tscn index 0fcae05..6159ea6 100644 --- a/game/src/MainMenu/MainMenu.tscn +++ b/game/src/MainMenu/MainMenu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://c5nyjkpsx14h1"] -[ext_resource type="Theme" uid="uid://dx1s0qdvtcb6l" path="res://theme/main_menu.tres" id="1_1yri4"] +[ext_resource type="Theme" uid="uid://qoi3oec48jp0" path="res://theme/main_menu.tres" id="1_1yri4"] [ext_resource type="Script" path="res://src/MainMenu/MainMenu.gd" id="2_nm1fq"] [ext_resource type="PackedScene" uid="uid://b7oncobnacxmt" path="res://src/LocaleButton.tscn" id="3_amonp"] diff --git a/game/theme/assets/main_menu_button_normal.stylebox b/game/theme/assets/main_menu_button_normal.stylebox deleted file mode 100644 index 563b302..0000000 Binary files a/game/theme/assets/main_menu_button_normal.stylebox and /dev/null differ diff --git a/game/theme/assets/main_menu_button_normal.tres b/game/theme/assets/main_menu_button_normal.tres new file mode 100644 index 0000000..3521264 --- /dev/null +++ b/game/theme/assets/main_menu_button_normal.tres @@ -0,0 +1,10 @@ +[gd_resource type="StyleBoxTexture" load_steps=2 format=3 uid="uid://blwilunhmyvpq"] + +[ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://theme/assets/main_menu_button.png" id="1_o43lq"] + +[resource] +content_margin_left = 20.0 +content_margin_top = 10.0 +content_margin_right = 20.0 +content_margin_bottom = 14.0 +texture = ExtResource("1_o43lq") diff --git a/game/theme/main_menu.tres b/game/theme/main_menu.tres index 5bf8c9a..9093252 100644 --- a/game/theme/main_menu.tres +++ b/game/theme/main_menu.tres @@ -1,11 +1,11 @@ -[gd_resource type="Theme" load_steps=18 format=3 uid="uid://dx1s0qdvtcb6l"] +[gd_resource type="Theme" load_steps=17 format=3 uid="uid://qoi3oec48jp0"] [ext_resource type="Script" path="res://src/Utility/StyleBoxCombinedTexture.gd" id="1_axke7"] [ext_resource type="Script" path="res://src/Utility/TextureSetting.gd" id="2_7bwl2"] [ext_resource type="Texture2D" uid="uid://dapuqgpjs56bs" path="res://theme/assets/main_menu_background.png" id="3_cpatd"] [ext_resource type="Texture2D" uid="uid://q25s41oavuxw" path="res://theme/assets/main_menu_border_paper.png" id="4_sl60o"] [ext_resource type="Texture2D" uid="uid://c0p34i3d3b0pw" path="res://theme/assets/main_menu_button.png" id="5_xj7ql"] -[ext_resource type="StyleBox" uid="uid://4ypja147f4mb" path="res://theme/assets/main_menu_button_normal.stylebox" id="6_ibm8p"] +[ext_resource type="StyleBox" uid="uid://blwilunhmyvpq" path="res://theme/assets/main_menu_button_normal.tres" id="6_dx0aj"] [ext_resource type="Script" path="res://src/Utility/StyleBoxWithSound.gd" id="7_qo00e"] [ext_resource type="AudioStream" uid="uid://bsldcs3l8s7ug" path="res://addons/kenney_ui_audio/click3.wav" id="8_etuft"] @@ -83,15 +83,12 @@ corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 corner_detail = 20 -[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_wrcgq"] -load_path = "res://.godot/imported/main_menu_button.png-c10c48e0a8cab217f3c5b89e1e5b8b32.ctex" - [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_3efxh"] content_margin_left = 20.0 content_margin_top = 10.0 content_margin_right = 20.0 content_margin_bottom = 14.0 -texture = SubResource("CompressedTexture2D_wrcgq") +texture = ExtResource("5_xj7ql") modulate_color = Color(0.588235, 0.588235, 0.588235, 1) [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_l2rw3"] @@ -99,7 +96,7 @@ content_margin_left = 20.0 content_margin_top = 10.0 content_margin_right = 20.0 content_margin_bottom = 14.0 -texture = SubResource("CompressedTexture2D_wrcgq") +texture = ExtResource("5_xj7ql") modulate_color = Color(0.85098, 0.85098, 0.85098, 1) [sub_resource type="StyleBox" id="StyleBox_uuspe"] @@ -140,7 +137,7 @@ TitleButton/font_sizes/font_size = 16 TitleButton/styles/disabled = SubResource("StyleBoxTexture_dd2b8") TitleButton/styles/focus = SubResource("StyleBoxFlat_2txce") TitleButton/styles/hover = SubResource("StyleBoxTexture_3efxh") -TitleButton/styles/normal = ExtResource("6_ibm8p") +TitleButton/styles/normal = ExtResource("6_dx0aj") TitleButton/styles/pressed = SubResource("StyleBox_uuspe") TitleLabel/base_type = &"Label" TitleLabel/font_sizes/font_size = 90 -- cgit v1.2.3-56-ga3b1