diff --git a/Assets/LongMessageScript.cs b/Assets/LongMessageScript.cs index 4448de11..e9843837 100644 --- a/Assets/LongMessageScript.cs +++ b/Assets/LongMessageScript.cs @@ -30,7 +30,7 @@ public class LongMessageScript : MonoBehaviour var txtTransform = transform.Find("TextContainer/Content"); txtTransform.GetComponent().text = txt; LayoutRebuilder.ForceRebuildLayoutImmediate(txtTransform.GetComponent()); - txtTransform.localPosition = new Vector2(startX, transform.Find("TextContainer/Content").localPosition.y); + txtTransform.localPosition = new Vector2(startX + maxWidth, transform.Find("TextContainer/Content").localPosition.y); isAnimated = false; timer = 2; } @@ -54,19 +54,25 @@ public class LongMessageScript : MonoBehaviour //do if (textWidth.HasValue && textWidth > maxWidth) { - var offset = textWidth.Value - maxWidth; + var offset = textWidth.Value; var game = transform.Find("TextContainer/Content"); - var v = 30 / 0.3f; + var v = 20 / 0.3f; playtime = offset / v; //匀速播放 game.DOLocalMoveX(startX - offset, playtime).onComplete - = () => Invoke("returnAni", 1.5f); + = () => + { + var txtTransform = transform.Find("TextContainer/Content"); + txtTransform.localPosition = new Vector2(startX + maxWidth, transform.Find("TextContainer/Content").localPosition.y); + }; } - timer += (playtime * 2f + 1.5f + 2f); + timer += (playtime + 0.5f); } } void returnAni() { - transform.Find("TextContainer/Content").DOLocalMoveX(startX, playtime); + var txtTransform = transform.Find("TextContainer/Content"); + txtTransform.localPosition = new Vector2(startX + maxWidth, transform.Find("TextContainer/Content").localPosition.y); + //transform.Find("TextContainer/Content").DOLocalMoveX(startX, playtime); } } diff --git a/Assets/Resources/Images/newroute/System_map_mode.png b/Assets/Resources/Images/newroute/System_map_mode.png index 015d5fb9..dcc25c39 100644 Binary files a/Assets/Resources/Images/newroute/System_map_mode.png and b/Assets/Resources/Images/newroute/System_map_mode.png differ diff --git a/Assets/Scripts/UI/Prefab/Login/LoginRegOptions.cs b/Assets/Scripts/UI/Prefab/Login/LoginRegOptions.cs index 08d9a7d8..18b394e7 100644 --- a/Assets/Scripts/UI/Prefab/Login/LoginRegOptions.cs +++ b/Assets/Scripts/UI/Prefab/Login/LoginRegOptions.cs @@ -56,7 +56,7 @@ namespace Assets.Scripts.UI.Prefab.Login } days = new List(); - genders = new List() {new Dropdown.OptionData(App.GetLocalString("Male")), new Dropdown.OptionData(App.GetLocalString("FeMale")) }; + genders = new List() {new Dropdown.OptionData(App.GetLocalString("Male")), new Dropdown.OptionData(App.GetLocalString("Female")) }; var countryJson = Resources.Load("UI/flags-mini").text; countryList = JsonConvert.DeserializeObject>(countryJson); countrys = countryList.Select(x => new Dropdown.OptionData(x.country)).ToList();