From 3a86230b280c6733fe3fca403a1a1b216a1731f2 Mon Sep 17 00:00:00 2001 From: McbeEringi <46889548+McbeEringi@users.noreply.github.com> Date: Fri, 3 Jan 2020 23:00:19 +0900 Subject: [PATCH] ui --- ESBE_2G/ui/start_screen.json | 49 +++++++++++++++- ESBE_2G/ui/tabbed_upsell_screen.json | 57 +------------------ ESBE_2G/ui/win10_trial_conversion_screen.json | 2 +- his&memo_ja.txt | 3 +- 4 files changed, 49 insertions(+), 62 deletions(-) diff --git a/ESBE_2G/ui/start_screen.json b/ESBE_2G/ui/start_screen.json index ce1a2b1..e920898 100644 --- a/ESBE_2G/ui/start_screen.json +++ b/ESBE_2G/ui/start_screen.json @@ -1,7 +1,51 @@ { "namespace": "start", - "esbe_panel":{ + "esbe_panel": { + "type": "stack_panel", + "orientation": "horizontal", + "size": ["100%",256], + "offset": [4,4], + "controls": [ + { + "l":{ + "type": "stack_panel", + "size": [132,"100%"], + "controls": [ + {"i": {"type": "image","texture": "ESBE_2G","size": [128,128]}}, + {"s": {"type": "panel","size": [6,6]}}, + {"v": {"type": "label","font_scale_factor": 1.5,"text": "§bESBE_2G§a v4.2"}}, + {"c": {"type": "label","font_scale_factor": 1.2,"text": "esbe.c"}} + ] + } + }, + { + "r":{ + "type": "stack_panel", + "size": ["fill","100%"], + "controls": [ + {"n": {"type": "label","font_scale_factor": 1.5,"text": "§bEntropyShader\n§7for§bBedrockEdition\n2ndGeneration\n "}}, + {"l": {"type": "label","text": "©2019~ §b@McbeEringi(twitter)\n§rAll Rights Reserved.\nSee 'LICENSE.txt'.\n \n§6URL"}}, + {"u": {"type": "label","font_scale_factor": 0.8,"text": "§bOfficial(ja)§r: mcbeeringi.github.io/esbe-2g\n§aMCPEDL§r: mcpedl.com/esbe-2g\n "}}, + {"0": {"type": "label","text": "esbe.c0"}}, + {"1": {"type": "label","text": "esbe.c1"}}, + {"2": {"type": "label","text": "esbe.c2"}}, + {"3": {"type": "label","text": "esbe.c3"}}, + {"4": {"type": "label","text": "esbe.c4"}}, + {"5": {"type": "label","text": "esbe.c5"}}, + {"6": {"type": "label","text": "esbe.c6"}}, + {"7": {"type": "label","text": "esbe.c7"}}, + {"8": {"type": "label","text": "esbe.c8"}}, + {"9": {"type": "label","text": "esbe.c9"}} + ] + } + } + ] + }, + "esbe_scroll@common.scrolling_panel":{"$show_background": false,"$scrolling_content": "start.esbe_panel"}, + "esbe_main@common_dialogs.main_panel_no_buttons":{"size":["80%","80%"],"$text_name":"§bESBE_2G §ainfo","$child_control":"start.esbe_scroll"}, + + "esbe_start": { "type": "stack_panel", "orientation": "horizontal", "controls": [ @@ -9,13 +53,12 @@ {"ver": {"type": "label","text": "§b ESBE_2G\n§a v4.2"}} ] }, - "copyright@common_buttons.light_content_button": { "anchor_from": "bottom_left", "anchor_to": "bottom_left", "size": [72,26], "$pressed_button_name": "button.menu_buy_game", - "$button_content": "start.esbe_panel", + "$button_content": "start.esbe_start", "$default_button_alpha": 0.5, "$default_hover_alpha": 0.5 } diff --git a/ESBE_2G/ui/tabbed_upsell_screen.json b/ESBE_2G/ui/tabbed_upsell_screen.json index 037b313..4ab2ae3 100644 --- a/ESBE_2G/ui/tabbed_upsell_screen.json +++ b/ESBE_2G/ui/tabbed_upsell_screen.json @@ -1,56 +1 @@ -{ - "namespace": "tabbed_upsell", - - "esbe_panel": { - "type": "stack_panel", - "orientation": "horizontal", - "size": ["100%",256], - "offset": [4,4], - "controls": [ - { - "l":{ - "type": "stack_panel", - "size": [132,"100%"], - "controls": [ - {"i": {"type": "image","texture": "ESBE_2G","size": [128,128]}}, - {"s": {"type": "panel","size": [6,6]}}, - {"v": {"type": "label","font_scale_factor": 1.5,"text": "§bESBE_2G§a v4.2"}}, - {"c": {"type": "label","font_scale_factor": 1.2,"text": "esbe.c"}} - ] - } - }, - { - "r":{ - "type": "stack_panel", - "size": ["fill","100%"], - "controls": [ - {"n": {"type": "label","font_scale_factor": 1.5,"text": "§bEntropyShader\n§7for§bBedrockEdition\n2ndGeneration\n "}}, - {"l": {"type": "label","text": "©2019~ §b@McbeEringi(twitter)\n§rAll Rights Reserved.\nSee 'LICENSE.txt'.\n \n§6URL"}}, - {"u": {"type": "label","font_scale_factor": 0.8,"text": "§bOfficial(ja)§r: mcbeeringi.github.io/esbe-2g\n§aMCPEDL§r: mcpedl.com/esbe-2g\n "}}, - {"0": {"type": "label","text": "esbe.c0"}}, - {"1": {"type": "label","text": "esbe.c1"}}, - {"2": {"type": "label","text": "esbe.c2"}}, - {"3": {"type": "label","text": "esbe.c3"}}, - {"4": {"type": "label","text": "esbe.c4"}}, - {"5": {"type": "label","text": "esbe.c5"}}, - {"6": {"type": "label","text": "esbe.c6"}}, - {"7": {"type": "label","text": "esbe.c7"}}, - {"8": {"type": "label","text": "esbe.c8"}}, - {"9": {"type": "label","text": "esbe.c9"}} - ] - } - } - ] - }, - - "scroll@common.scrolling_panel": { - "$show_background": false, - "$scrolling_content": "tabbed_upsell.esbe_panel" - }, - - "tabbed_upseel_screen_panel@common_dialogs.main_panel_no_buttons": { - "size": ["80%","80%"], - "$text_name": "§bESBE_2G §ainfo", - "$child_control": "tabbed_upsell.scroll" - } -} +{"namespace":"tabbed_upsell","tabbed_upseel_screen_panel@start.esbe_main":{}} diff --git a/ESBE_2G/ui/win10_trial_conversion_screen.json b/ESBE_2G/ui/win10_trial_conversion_screen.json index 323f64e..75754a0 100755 --- a/ESBE_2G/ui/win10_trial_conversion_screen.json +++ b/ESBE_2G/ui/win10_trial_conversion_screen.json @@ -1 +1 @@ -{"namespace":"win10_trial_conversion","win10_trial_conversion_panel@tabbed_upsell.tabbed_upseel_screen_panel":{}} +{"namespace":"win10_trial_conversion","win10_trial_conversion_panel@start.esbe_main":{}} diff --git a/his&memo_ja.txt b/his&memo_ja.txt index 0cb492b..8026dfa 100644 --- a/his&memo_ja.txt +++ b/his&memo_ja.txt @@ -1,7 +1,6 @@ ver書き換え manifest.json -ui>start_screen.json -ui>tabbed_upsell_screen.json l17 +ui>start_screen.json l17,53 snow … texture2D( TEXTURE_2, vec2(.7,.05))