From 58a823369736773710faab1846ff3c5ac68e20ae Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Tue, 18 Jan 2022 13:24:19 +0800 Subject: [PATCH] =?UTF-8?q?google=20=E7=99=BB=E5=BD=95=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/BannerController.cs | 7 +- Assets/Plugins/Android/AndroidManifest.xml | 1 + .../Android/PowerFunAndroidPlugin-release.aar | Bin 79447 -> 79588 bytes Assets/RecommendController.cs | 2 +- .../UI/Prefab/Panel/Mobile/HomePanel.prefab | 192 ++++++++++++++++++ Assets/Scripts/Apis/Models/MapRouteArea.cs | 29 +-- Assets/Scripts/Apis/Models/UserResultModel.cs | 1 + Assets/Scripts/Apis/UserApi.cs | 13 +- .../Scripts/Mobile/LoginControllerMobile.cs | 28 ++- Assets/Scripts/Scenes/LoginController.cs | 41 +++- Assets/Scripts/Scenes/MainController.cs | 2 +- .../Prefab/NewRoute/NewRouteItemController.cs | 2 +- .../UI/Prefab/Panel/EditUserController.cs | 4 + .../Scripts/UI/Prefab/Panel/HomeController.cs | 4 +- .../Prefab/Panel/NewRouteDetailController.cs | 85 ++++---- Assets/Scripts/UIManager.cs | 4 +- Assets/Scripts/Utils/Utils.cs | 14 ++ Assets/test.cs | 14 +- .../AndroidResolverDependencies.xml | 2 +- ProjectSettings/EditorBuildSettings.asset | 4 +- ProjectSettings/ProjectSettings.asset | 8 +- 21 files changed, 355 insertions(+), 102 deletions(-) diff --git a/Assets/BannerController.cs b/Assets/BannerController.cs index b32359f4..38c3a822 100644 --- a/Assets/BannerController.cs +++ b/Assets/BannerController.cs @@ -161,7 +161,7 @@ public class BannerController : MonoBehaviour right = GetSideIndex(false); if (center == -1 || left == -1 || right == -1 || animateLock) return; animateLock = true; - DOTween.CompleteAll(); + if (leftse != null) leftse.Complete(true); DORight(itemList[left], itemList[center], itemList[right]); } void DORight(CanvasGroup left, CanvasGroup center, CanvasGroup right) @@ -182,6 +182,7 @@ public class BannerController : MonoBehaviour se.Join(left.GetComponent().DOScale(Vector3.one, 0.3f)); se.Join(left.GetComponent().DOLocalMoveX(0, 0.3f)); se.Play().onComplete = ()=> { animateLock = false; }; + rightse = se; left.transform.SetAsLastSibling(); //事件改变 left.GetComponent