From d0494851f17f3ed1c75b50d5b20f0e77350d41ee Mon Sep 17 00:00:00 2001 From: "matanki.saito" Date: Mon, 9 Dec 2019 01:07:39 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=923.?= =?UTF-8?q?3=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=95=E3=81=9B=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/interface/DefaultDialog.gui | 9 ++++ resource/interface/Frontend_settings.gui | 1 + resource/interface/crusades.gui | 2 +- resource/interface/eventwindow.gui | 11 ++++- resource/interface/fonts.gfx | 5 +-- resource/interface/frontend.gui | 56 ++++++++++++++++++++---- resource/interface/menubar.gui | 2 + resource/interface/province.gui | 1 + resource/interface/succession.gui | 9 +++- 9 files changed, 81 insertions(+), 15 deletions(-) diff --git a/resource/interface/DefaultDialog.gui b/resource/interface/DefaultDialog.gui index 3494688..5fee25e 100644 --- a/resource/interface/DefaultDialog.gui +++ b/resource/interface/DefaultDialog.gui @@ -293,11 +293,13 @@ guiTypes = { instantTextBoxType = { name = "Description" +# position = { x = 52 y = 80 } position = { x = 40 y = 80 } textureFile = "" font = "vic_22_black" borderSize = {x = 0 y = 0} text = "UI_MISSING_TEXT" +# maxWidth = 388 maxWidth = 405 maxHeight = 250 format = centre @@ -365,11 +367,13 @@ guiTypes = { instantTextBoxType = { name = "Description" +# position = { x = 52 y = 80 } position = { x = 40 y = 80 } textureFile = "" font = "vic_22_black" borderSize = {x = 0 y = 0} text = "UI_MISSING_TEXT" +# maxWidth = 388 maxWidth = 405 maxHeight = 250 format = centre @@ -505,6 +509,8 @@ guiTypes = { font = "decorative" borderSize = {x = 0 y = 0} text = "" +# maxWidth = 75 +# maxHeight = 75 maxWidth = 120 maxHeight = 120 format = left @@ -887,11 +893,14 @@ guiTypes = { instantTextBoxType = { name = "decorative_letter" +# position = { x = 0 y = 0 } position = { x = 10 y = 0 } textureFile = "" font = "decorative_color" borderSize = { x = 0 y = 0 } text = "" +# maxWidth = 75 +# maxHeight = 75 maxWidth = 120 maxHeight = 120 format = left diff --git a/resource/interface/Frontend_settings.gui b/resource/interface/Frontend_settings.gui index 52bbb14..688e98b 100644 --- a/resource/interface/Frontend_settings.gui +++ b/resource/interface/Frontend_settings.gui @@ -1285,6 +1285,7 @@ guiTypes = { checkboxType = { name = "autosavetocloud_checkbox" +# position = { x = 32 y = 161 } position = { x = 5000 y = 5000 } quadTextureSprite = "GFX_checkbox_default" buttonText = "" diff --git a/resource/interface/crusades.gui b/resource/interface/crusades.gui index 71575f2..31ad59c 100644 --- a/resource/interface/crusades.gui +++ b/resource/interface/crusades.gui @@ -431,7 +431,7 @@ guiTypes = { instantTextBoxType = { name = "participants_strength" position = { x = 314 y = 557 } - font = "vic_18" + font = "vic_22" text = "UI_MISSING_TEXT" format = center maxWidth = 145 diff --git a/resource/interface/eventwindow.gui b/resource/interface/eventwindow.gui index e205826..c2520bd 100644 --- a/resource/interface/eventwindow.gui +++ b/resource/interface/eventwindow.gui @@ -351,7 +351,7 @@ guiTypes = { OverlappingElementsBoxType = { name = "related_traits2" position = { x = 288 y = 477 } - size = { x=193 y=40 } + size = { x=195 y=40 } format = right } ### @@ -1296,11 +1296,15 @@ guiTypes = { instantTextBoxType = { name = "decorative_letter" +# position = { x = 50 y = 274 } position = { x = 0 y = 270 } textureFile = "" font = "decorative" borderSize = {x = 0 y = 0} text = "" +# maxWidth = 75 +# maxHeight = 75 +# format = left maxWidth = 120 maxHeight = 120 format = right @@ -1336,11 +1340,13 @@ guiTypes = { instantTextBoxType = { name = "Description" +# position = { x = 51 y = 351 } position = { x = 40 y = 356 } textureFile = "" font = "vic_18_black" borderSize = {x = 0 y = 0} text = "UI_MISSING_TEXT" +# maxWidth = 452 maxWidth = 456 maxHeight = 200 format = left @@ -2038,11 +2044,14 @@ guiTypes = { instantTextBoxType = { name = "decorative_letter" +# maxWidth = 452 position = { x = 85 y = 300 } textureFile = "" font = "decorative" borderSize = {x = 0 y = 0} text = "" +# maxWidth = 75 +# maxHeight = 75 maxWidth = 120 maxHeight = 120 format = left diff --git a/resource/interface/fonts.gfx b/resource/interface/fonts.gfx index 010e956..779a725 100644 --- a/resource/interface/fonts.gfx +++ b/resource/interface/fonts.gfx @@ -57,7 +57,7 @@ bitmapfonts = { } } - + bitmapfont = { name = "small" @@ -144,12 +144,11 @@ bitmapfonts = { } } - + bitmapfont = { name = "tahoma_60" # fontname = "Mapfont" fontname = "aoyagireisyo60" -# fontname = "crap" color = 0xff333333 } diff --git a/resource/interface/frontend.gui b/resource/interface/frontend.gui index db5e733..bbc13ca 100644 --- a/resource/interface/frontend.gui +++ b/resource/interface/frontend.gui @@ -1251,12 +1251,28 @@ guiTypes = { clicksound = menu_click } + guiButtonType = { + name = "extend_featured_ruler" + position = { x = 145 y = -100 } + quadTextureSprite = "GFX_featured_ruler_arrow_round_right" + Orientation = "UPPER_LEFT" + clicksound = click + } + + guiButtonType = { + name = "extend_browser_window" + position = { x = -180 y = -100 } + quadTextureSprite = "GFX_featured_ruler_arrow_round_left" + Orientation = "UPPER_LEFT" + clicksound = click + } + ###### TEST BUTTONS ###### guiButtonType = { name = "single_player_button" - position = { x = -465 y = -110 } + position = { x = -665 y = -110 } quadTextureSprite ="GFX_big_button_176" buttonText = "FE_NEW_GAME" buttonFont = "vic_22" @@ -1266,7 +1282,7 @@ guiTypes = { guiButtonType = { name = "load_game_button" - position = { x = -465 y = -60 } + position = { x = -665 y = -60 } quadTextureSprite ="GFX_big_button_176" buttonText = "FE_LOAD_GAME" buttonFont = "vic_22" @@ -1276,7 +1292,7 @@ guiTypes = { guiButtonType = { name = "nudge_button" - position = { x = -465 y = -10 } + position = { x = -665 y = -10 } quadTextureSprite ="GFX_big_button_176" buttonText = "NUDGE" buttonFont = "vic_22" @@ -1418,12 +1434,24 @@ guiTypes = { } instantTextBoxType = { - name = "banner_dlc_text" - position = { x=-122 y=268 } - font = "vic_22_black" - text = "" - maxWidth = 244 - maxHeight = 22 + name = "banner_dlc_text_even" + position = { x=-135 y=257 } + font = "vic_22" + text = "UI_MISSING_TEXT" + maxWidth = 270 + maxHeight = 44 + format = centre + fixedsize = yes + alwaystransparent = yes + } + + instantTextBoxType = { + name = "banner_dlc_text_odd" + position = { x=-135 y=246 } + font = "vic_22" + text = "UI_MISSING_TEXT" + maxWidth = 270 + maxHeight = 66 format = centre fixedsize = yes alwaystransparent = yes @@ -6512,6 +6540,14 @@ guiTypes = { downsound = "" fullscreen=no Orientation = "CENTER" + + iconType = { + name = "background_click_blocker" + spriteType ="GFX_transparent_48" + orientation = "CENTER" + position = {x = -24000 y = -24000 } + scale = 1000 + } iconType = { name ="menu" @@ -6546,11 +6582,13 @@ guiTypes = { guiButtonType = { name = "remote_tab" +# position = { x = 118 y = -26 } position = { x = 5000 y = -5000 } quadTextureSprite ="GFX_settings_tab_new" } instantTextBoxType={ +# position = {x = 117 y = -16 } position = {x = 5000 y = -5000 } name = "remote_tab_label" borderSize = {x = 0 y = 0} diff --git a/resource/interface/menubar.gui b/resource/interface/menubar.gui index 41ca09e..372da87 100644 --- a/resource/interface/menubar.gui +++ b/resource/interface/menubar.gui @@ -787,11 +787,13 @@ guiTypes = { guiButtonType = { name = "remote_tab" +# position = { x = 118 y = -26 } position = { x = 5000 y = -5000 } quadTextureSprite ="GFX_settings_tab_new" } instantTextBoxType={ +# position = {x = 117 y = -16 } position = {x = 5000 y = -5000 } name = "remote_tab_label" borderSize = {x = 0 y = 0} diff --git a/resource/interface/province.gui b/resource/interface/province.gui index c2986db..4fce750 100644 --- a/resource/interface/province.gui +++ b/resource/interface/province.gui @@ -19,6 +19,7 @@ guiTypes = { Orientation = "UPPER_LEFT" } + # fix order editBoxType = { name = "province_name" position = { x = 72 y = 5 } diff --git a/resource/interface/succession.gui b/resource/interface/succession.gui index 7312598..8e95856 100644 --- a/resource/interface/succession.gui +++ b/resource/interface/succession.gui @@ -28,9 +28,12 @@ guiTypes = { instantTextBoxType = { name = "dead_decorative_letter" +# position = { x = 44 y = 258 } position = { x = 40 y = 258 } font = "decorative" - borderSize = {x = 0 y = 0} + borderSize = {x = 0 y = 0 } +# maxWidth = 75 +# maxHeight = 75 maxWidth = 120 maxHeight = 120 format = left @@ -39,9 +42,12 @@ guiTypes = { instantTextBoxType = { name = "heir_decorative_letter" +# position = { x = 613 y = 258 } position = { x = 609 y = 258 } font = "decorative" borderSize = {x = 0 y = 0} +# maxWidth = 75 +# maxHeight = 75 maxWidth = 120 maxHeight = 120 format = left @@ -54,6 +60,7 @@ guiTypes = { font = "vic_22_black" borderSize = {x = 0 y = 0} text = "UI_MISSING_TEXT" +# maxWidth = 340 maxWidth = 293 maxHeight = 134 #format = centre