diff --git a/Assets/ResRaw/Fgui/Common/Common_atlas0.png b/Assets/ResRaw/Fgui/Common/Common_atlas0.png index 7cc9eb601..5c81922b3 100644 Binary files a/Assets/ResRaw/Fgui/Common/Common_atlas0.png and b/Assets/ResRaw/Fgui/Common/Common_atlas0.png differ diff --git a/Assets/ResRaw/Fgui/Common/Common_fui.bytes b/Assets/ResRaw/Fgui/Common/Common_fui.bytes index 83bfa9747..f0abccb73 100644 Binary files a/Assets/ResRaw/Fgui/Common/Common_fui.bytes and b/Assets/ResRaw/Fgui/Common/Common_fui.bytes differ diff --git a/Assets/Scripts/UI/Common/Panel/MessageBox.Designer.cs b/Assets/Scripts/UI/Common/Panel/MessageBox.Designer.cs index 67c6a26ed..32e407815 100644 --- a/Assets/Scripts/UI/Common/Panel/MessageBox.Designer.cs +++ b/Assets/Scripts/UI/Common/Panel/MessageBox.Designer.cs @@ -18,12 +18,8 @@ namespace NBF public Controller style; [AutoFind(Name = "back_full")] public GImage back_full; - [AutoFind(Name = "back")] - public GImage back; - [AutoFind(Name = "back2")] - public GImage back2; - [AutoFind(Name = "TextTitle")] - public GTextField TextTitle; + [AutoFind(Name = "Modal")] + public GLabel Modal; [AutoFind(Name = "TextContent")] public GTextField TextContent; [AutoFind(Name = "BtnConfirm1")] diff --git a/Assets/Scripts/UI/Common/Panel/MessageBox.cs b/Assets/Scripts/UI/Common/Panel/MessageBox.cs index 40872e677..4d5361a03 100644 --- a/Assets/Scripts/UI/Common/Panel/MessageBox.cs +++ b/Assets/Scripts/UI/Common/Panel/MessageBox.cs @@ -57,8 +57,8 @@ namespace NBF BtnConfirm1.SetLanguage(_confirmText); BtnConfirm2.SetLanguage(_confirmText); BtnCancel.SetLanguage(_cancelText); - // MessageStyle.selectedIndex = _style; - TextTitle.SetLanguage(_title); + style.selectedIndex = _style; + Modal.SetLanguage(_title); TextContent.SetLanguage(_content); } diff --git a/FGUIProject/assets/Common/Com/Modal1.xml b/FGUIProject/assets/Common/Com/Modal1.xml new file mode 100644 index 000000000..7a104c2e4 --- /dev/null +++ b/FGUIProject/assets/Common/Com/Modal1.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FGUIProject/assets/Common/Panel/MessageBox.xml b/FGUIProject/assets/Common/Panel/MessageBox.xml index 14735fb91..4848144d9 100644 --- a/FGUIProject/assets/Common/Panel/MessageBox.xml +++ b/FGUIProject/assets/Common/Panel/MessageBox.xml @@ -1,6 +1,6 @@ - - + + @@ -8,33 +8,17 @@ - - - - - - - - - - - - - - - + + - -