From 971ee312e1d3dffa8555203585bbcf56746359e1 Mon Sep 17 00:00:00 2001 From: pg999w Date: Mon, 7 Oct 2019 09:10:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E4=BB=A3=E7=A0=81=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/MainScene.unity | 18 ++++++++++-------- Assets/Scripts/Scene/Main/UI/GUI_MainMenu.cs | 9 ++++++++- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index c3e5b4f..5db9c86 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -133,7 +133,7 @@ GameObject: - component: {fileID: 215313479} - component: {fileID: 215313478} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Version m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -178,7 +178,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: 1.1.1 + m_text: 1.* m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: ace54f8fedf1b834b9a6860a473115b6, type: 2} m_sharedMaterial: {fileID: -200639151326893713, guid: ace54f8fedf1b834b9a6860a473115b6, @@ -248,10 +248,10 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 215313478} - characterCount: 5 + characterCount: 3 spriteCount: 0 spaceCount: 0 - wordCount: 3 + wordCount: 1 linkCount: 0 lineCount: 1 pageCount: 1 @@ -889,6 +889,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: aboutPage: {fileID: 1069566573} + cornerText: {fileID: 769260644} + versionNumber: {fileID: 215313478} --- !u!1 &769260642 GameObject: m_ObjectHideFlags: 0 @@ -901,7 +903,7 @@ GameObject: - component: {fileID: 769260645} - component: {fileID: 769260644} m_Layer: 5 - m_Name: Version + m_Name: CornerText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -946,7 +948,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Simuro5v5 v1.1.1 + m_text: Simuro5v5 v1.* m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1015,10 +1017,10 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 5, w: 0} m_textInfo: textComponent: {fileID: 769260644} - characterCount: 16 + characterCount: 14 spriteCount: 0 spaceCount: 1 - wordCount: 4 + wordCount: 2 linkCount: 0 lineCount: 1 pageCount: 1 diff --git a/Assets/Scripts/Scene/Main/UI/GUI_MainMenu.cs b/Assets/Scripts/Scene/Main/UI/GUI_MainMenu.cs index 169d581..5e7e003 100644 --- a/Assets/Scripts/Scene/Main/UI/GUI_MainMenu.cs +++ b/Assets/Scripts/Scene/Main/UI/GUI_MainMenu.cs @@ -1,4 +1,5 @@ using Simuro5v5; +using TMPro; using UnityEngine; using UnityEngine.UI; using UnityEngine.SceneManagement; @@ -6,13 +7,19 @@ public class GUI_MainMenu : MonoBehaviour { public GameObject aboutPage; + public TMP_Text cornerText; + public TMP_Text versionNumber; + + private const string Version = "1.1.1"; void Start() { Screen.fullScreen = false; Configuration.ReadFromFileOrCreate("config.json"); aboutPage.SetActive(false); - } + cornerText.text = $"Simuro5v5 v{Version}"; + versionNumber.text = Version; + } private void Update() {