diff --git a/Assets/AndroidUpdate.cs b/Assets/AndroidUpdate.cs index 87f337a5..84838dd2 100644 --- a/Assets/AndroidUpdate.cs +++ b/Assets/AndroidUpdate.cs @@ -23,8 +23,8 @@ public class AndroidUpdate : PFUIPanel JObject data { get; set; } public void StartDownload(JObject jo) { - transform.Find("Panel/CurrentVersion").GetComponent().text = $"Current Version: {App.AppVersion}"; - transform.Find("Panel/LastestVersion").GetComponent().text = $"Latest Version: {jo.Value("Version")}"; + transform.Find("Panel/CurrentVersion").GetComponent().text = $"{App.GetLocalString("Current Version:")} {App.AppVersion}"; + transform.Find("Panel/LastestVersion").GetComponent().text = $"{App.GetLocalString("Latest Version:")} {jo.Value("Version")}"; data = jo; var path = Application.temporaryCachePath + "/PowerFun.apk"; StartCoroutine(DownLoadExe(data.Value("Url"), path, (p, isComplete) => diff --git a/Assets/LongMessageScript.cs b/Assets/LongMessageScript.cs index e9843837..ae1c364f 100644 --- a/Assets/LongMessageScript.cs +++ b/Assets/LongMessageScript.cs @@ -52,7 +52,7 @@ public class LongMessageScript : MonoBehaviour this.textWidth = width; } //do - if (textWidth.HasValue && textWidth > maxWidth) + if (textWidth.HasValue) { var offset = textWidth.Value; var game = transform.Find("TextContainer/Content"); diff --git a/Assets/Resources/UI/language.json b/Assets/Resources/UI/language.json index c8669b20..dddda770 100644 --- a/Assets/Resources/UI/language.json +++ b/Assets/Resources/UI/language.json @@ -314,7 +314,9 @@ "WAIT": "稍后", "RIDERS": "骑行人数", "Current ride distance too short to save.": "当前骑行距离过短无法保存", - "NO RIDERS": "暂无用户" + "NO RIDERS": "暂无用户", + "Current Version:": "当前版本:", + "Latest Version:": "最新版本:" }, "en": { "HOT ROUTES": "HOT ROUTES", @@ -623,6 +625,8 @@ "WAIT": "WAIT", "RIDERS": "RIDERS", "Current ride distance too short to save.": "Current ride distance too short to save.", - "NO RIDERS": "NO RIDERS" + "NO RIDERS": "NO RIDERS", + "Current Version:": "Current Version:", + "Latest Version:": "Latest Version:" } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 999e430b..c5b8a1b5 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,8 +6,8 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/Login-Mobile.unity - guid: 4be878da00cf764499988cf403faf94d + path: Assets/Scenes/Login.unity + guid: 6dce3e17997730b4492f91dd8fede429 - enabled: 1 path: Assets/Scenes/MainScene.unity guid: ab586a3c1bacd4a48a55178eb06fe0cc diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 9b996cb4..4706883c 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,7 +38,6 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}