diff --git a/Assets/HomeMessageController.cs b/Assets/HomeMessageController.cs index f04b3b13..d811ea1b 100644 --- a/Assets/HomeMessageController.cs +++ b/Assets/HomeMessageController.cs @@ -17,7 +17,13 @@ public class HomeMessageController : MonoBehaviour } float timer = 2; public float? textWidth = null; - [HideInInspector]public bool isAnimated = false; + private bool isAnimated = false; + public void Initial() + { + transform.Find("TextContainer/Content").localPosition = new Vector2(startX, transform.Find("TextContainer/Content").localPosition.y); + isAnimated = false; + } + float playtime = 0; // Update is called once per frame void Update() { @@ -30,14 +36,17 @@ public class HomeMessageController : MonoBehaviour isAnimated = true; var offset = textWidth.Value - 180; var game = transform.Find("TextContainer/Content"); - game.DOLocalMoveX(startX - offset, 0.5f).onComplete + var v = 20 / 0.3f; + playtime = offset / v; + //匀速播放 + game.DOLocalMoveX(startX - offset, playtime).onComplete = () => Invoke("returnAni", 1.5f); } - timer += 4; + timer += 3; } } void returnAni() { - transform.Find("TextContainer/Content").DOLocalMoveX(startX, 0.5f); + transform.Find("TextContainer/Content").DOLocalMoveX(startX, playtime); } } diff --git a/Assets/Resources/Images/NewDesign/icon_heji_like.png b/Assets/Resources/Images/NewDesign/icon_heji_like.png index 4c5329b9..a31c2354 100644 Binary files a/Assets/Resources/Images/NewDesign/icon_heji_like.png and b/Assets/Resources/Images/NewDesign/icon_heji_like.png differ diff --git a/Assets/Resources/Images/NewDesign/icon_heji_unlike.png b/Assets/Resources/Images/NewDesign/icon_heji_unlike.png index 94d1ab75..a7d5d82c 100644 Binary files a/Assets/Resources/Images/NewDesign/icon_heji_unlike.png and b/Assets/Resources/Images/NewDesign/icon_heji_unlike.png differ diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 729431da..abc6cd9f 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -61,7 +61,7 @@ public class MainController : BaseScene //切换页面后 private void OnIsHomeChanged(object sender, EventArgs e) { - DOTween.KillAll(); + //DOTween.KillAll(); FinishMessage(sender); } @@ -100,6 +100,7 @@ public class MainController : BaseScene rightMessage.transform.SetParent(go); rightMessage.transform.localScale = Vector3.one; rightMessage.transform.localPosition = 1 * msgLocation; + rightMessage.alpha = 0; msgs = new List { rightMessage }; for (int i = 0; i < 5; i++) { @@ -131,7 +132,7 @@ public class MainController : BaseScene DoMessageRight(e); } #else - if (App.currentPageIsHome) + if (App.currentPageIsHome) { DoMessage6(e); } @@ -176,12 +177,14 @@ public class MainController : BaseScene if (msgIndex >= 6) // { //msgIndex = 0; + Sequence se = DOTween.Sequence(); //m.transform.DOLocalMoveY(m.transform.localPosition.y - 38, 0.5f); foreach (var item in msgs) { - item.transform.DOLocalMoveY(item.transform.localPosition.y - 38, 0.5f); + se.Join(item.transform.DOLocalMoveY(item.transform.localPosition.y - 38, 0.5f)); } - m.DOFade(0, 0.5f).onComplete = () => + se.Join(m.DOFade(0, 0.5f)); + se.Play().onComplete = () => { SetMessage(m, e); m.transform.localPosition = 1 * msgLocation; @@ -192,12 +195,14 @@ public class MainController : BaseScene { Debug.Log(191); SetMessage(m, e); + Sequence se = DOTween.Sequence(); for (int i = 0; i < msgIndex; i++) { var rect = msgs[i].GetComponent(); - rect.DOLocalMoveY(rect.localPosition.y - 38, 0.5f); + se.Join(rect.DOLocalMoveY(rect.localPosition.y - 38, 0.5f)); } - m.DOFade(1, 0.5f); + se.Join(m.DOFade(1, 0.5f)); + se.Play(); } m.transform.SetAsLastSibling(); msgIndex++; @@ -215,14 +220,17 @@ public class MainController : BaseScene FinishMessageLeft(); } #else + if (!(bool)sender) { //FinishMessage6(); - transform.Find("GameObject").SetAsFirstSibling(); + //DOTween.CompleteAll(true); + DOTween.CompleteAll(true); + transform.Find("GameObject").gameObject.SetActive(false); } else { - transform.Find("GameObject").SetSiblingIndex(1); + transform.Find("GameObject").gameObject.SetActive(true); } #endif } @@ -276,7 +284,7 @@ public class MainController : BaseScene txt.GetComponent().text = e.content; LayoutRebuilder.ForceRebuildLayoutImmediate(txt); Debug.Log(e.content + txt.sizeDelta.x); - m.GetComponent().isAnimated = false; + m.GetComponent().Initial(); m.GetComponent().textWidth = txt.sizeDelta.x; } CanvasGroup msg; @@ -434,19 +442,19 @@ public class MainController : BaseScene //速度35 if (item.Speed >= 35) { - var message = lang == "zh" ? $"骑行速度突破{Math.Round(item.Speed, 2)}KM/H!" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; + var message = lang == "zh" ? $"骑行速度突破{Math.Round(item.Speed, 2)}KM/H!" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}35KM/H"); } //速度50 if (item.Speed >= 50) { - var message = lang == "zh" ? $"骑行速度突破{Math.Round(item.Speed,2)}KM/H!" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; + var message = lang == "zh" ? $"骑行速度突破{Math.Round(item.Speed,2)}KM/H!" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM/H"); } //功体比 if (item.WeightKg >= 3) { - var message = lang == "zh" ? $"骑行功体比突破{Math.Round(item.WeightKg, 2)}w/kg!" : $" riding w/kg reaches {Math.Round(item.WeightKg, 2)}w/kg!"; + var message = lang == "zh" ? $"骑行功体比突破{Math.Round(item.WeightKg, 2)}w/kg!" : $" riding PWR reaches {Math.Round(item.WeightKg, 2)}w/kg!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}3WeightKg"); } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a6273bad..b8255e7e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -256,7 +256,7 @@ PlayerSettings: clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@4.2.8 templateDefaultScene: Assets/Scenes/SampleScene.unity - AndroidTargetArchitectures: 1 + AndroidTargetArchitectures: 3 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore' @@ -868,7 +868,7 @@ PlayerSettings: platformArchitecture: iPhone: 1 scriptingBackend: - Android: 0 + Android: 1 Standalone: 0 il2cppCompilerConfiguration: Standalone: 0