From 2b390717c2c82bb1cbeb292f789a5c8a6dcb65cb Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Tue, 28 Dec 2021 11:25:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/BannerController.cs | 63 +- .../Resources/Images/Mobile/登录 - 快捷.png | Bin 6911 -> 6603 bytes .../Resources/Images/NewDesign/icon_fode.png | Bin 0 -> 1269 bytes .../Images/NewDesign/icon_fode.png.meta | 128 + .../Images/NewDesign/icon_heji_like.png | Bin 0 -> 614 bytes .../Images/NewDesign/icon_heji_like.png.meta | 128 + .../Images/NewDesign/icon_heji_unlike.png | Bin 0 -> 804 bytes .../NewDesign/icon_heji_unlike.png.meta | 128 + .../Images/NewDesign/share_APP_facebook.png | Bin 0 -> 2024 bytes .../NewDesign/share_APP_facebook.png.meta | 128 + .../Images/newroute/bg_app_路线功功能小.png | Bin 8169 -> 3345 bytes .../Resources/UI/Prefab/MainNav-mobile.prefab | 295 +- .../UI/Prefab/MapList/MapItem-Mobile.prefab | 32 +- .../Prefab/NewRoute/Mobile/RouteGroup.prefab | 16 +- .../Prefab/NewRoute/Mobile/RouteItem.prefab | 2 +- .../UI/Prefab/Panel/Mobile/HomePanel.prefab | 1796 ++++++- .../Prefab/Panel/Mobile/MapListPanel.prefab | 32 +- .../Panel/Mobile/NewRouteDetailPanel.prefab | 1075 +++- .../Panel/Mobile/NewRouteOverviewPanel.prefab | 1145 +++-- Assets/Scenes/Login-Mobile.unity | 2400 ++++----- Assets/Scenes/Test2.unity | 710 +-- Assets/Scripts/Apis/MapApi.cs | 10 + .../Scripts/Apis/Models/SummaryResultModel.cs | 5 +- Assets/Scripts/Scenes/LoginController.cs | 13 +- Assets/Scripts/UI/Control/PfUIButton.cs | 14 +- Assets/Scripts/UI/Prefab/NewMainNav.cs | 26 +- .../Prefab/NewRoute/NewRouteItemController.cs | 3 +- .../Scripts/UI/Prefab/Panel/HomeController.cs | 13 + .../Prefab/Panel/NewRouteDetailController.cs | 38 +- .../Panel/NewRouteOverviewController.cs | 18 +- Assets/Scripts/UI/UIEffect/Common.meta | 5 +- .../UI/UIEffect/Common/BaseMeshEffect.cs | 66 +- .../UI/UIEffect/Common/BaseMeshEffect.cs.meta | 2 +- Assets/Scripts/UI/UIEffect/Common/BlurMode.cs | 13 + .../UI/UIEffect/Common/BlurMode.cs.meta | 12 + .../Scripts/UI/UIEffect/Common/ColorMode.cs | 13 + .../UI/UIEffect/Common/ColorMode.cs.meta | 12 + .../Scripts/UI/UIEffect/Common/EffectArea.cs | 112 + .../UI/UIEffect/Common/EffectArea.cs.meta | 12 + .../UI/UIEffect/Common/EffectPlayer.cs | 156 + .../UI/UIEffect/Common/EffectPlayer.cs.meta | 12 + .../UI/UIEffect/Common/MaterialCache.cs | 95 + .../UI/UIEffect/Common/MaterialCache.cs.meta | 12 + .../UI/UIEffect/Common/MaterialResolver.cs | 126 + .../UIEffect/Common/MaterialResolver.cs.meta | 12 + .../Scripts/UI/UIEffect/Common/Matrix2x3.cs | 33 + .../UI/UIEffect/Common/Matrix2x3.cs.meta | 12 + Assets/Scripts/UI/UIEffect/Common/Packer.cs | 60 + .../Scripts/UI/UIEffect/Common/Packer.cs.meta | 12 + .../UI/UIEffect/Common/ParameterTexture.cs | 190 + .../UIEffect/Common/ParameterTexture.cs.meta | 12 + .../Scripts/UI/UIEffect/Common/ShadowStyle.cs | 14 + .../UI/UIEffect/Common/ShadowStyle.cs.meta | 12 + Assets/Scripts/UI/UIEffect/Common/ToneMode.cs | 14 + .../UI/UIEffect/Common/ToneMode.cs.meta | 12 + .../UI/UIEffect/Common/UIEffectBase.cs | 165 + .../UI/UIEffect/Common/UIEffectBase.cs.meta | 12 + Assets/Scripts/UI/UIEffect/Editor.meta | 9 + .../UIEffect/Editor/BaseMeshEffectEditor.cs | 86 + .../Editor/BaseMeshEffectEditor.cs.meta | 11 + .../UI/UIEffect/Editor/DeprecatedRemover.cs | 53 + .../UIEffect/Editor/DeprecatedRemover.cs.meta | 12 + .../UI/UIEffect/Editor/UIDissolveEditor.cs | 181 + .../UIEffect/Editor/UIDissolveEditor.cs.meta | 12 + .../Editor/UIEffectCapturedImageEditor.cs | 188 + .../UIEffectCapturedImageEditor.cs.meta | 12 + .../UI/UIEffect/Editor/UIEffectEditor.cs | 253 + .../UI/UIEffect/Editor/UIEffectEditor.cs.meta | 12 + .../UI/UIEffect/Editor/UIGradientEditor.cs | 102 + .../UIEffect/Editor/UIGradientEditor.cs.meta | 12 + .../UI/UIEffect/Editor/UIHsvModifierEditor.cs | 84 + .../Editor/UIHsvModifierEditor.cs.meta | 12 + .../UI/UIEffect/Editor/UIShadowEditor.cs | 54 + .../UI/UIEffect/Editor/UIShadowEditor.cs.meta | 12 + .../UI/UIEffect/Editor/UIShinyEditor.cs | 135 + .../UI/UIEffect/Editor/UIShinyEditor.cs.meta | 12 + .../Editor/UITransitionEffectEditor.cs | 190 + .../Editor/UITransitionEffectEditor.cs.meta | 12 + Assets/Scripts/UI/UIEffect/Materials.meta | 8 + .../UIEffect/Materials/UI-Effect-Dissolve.mat | 238 + .../Materials/UI-Effect-Dissolve.mat.meta | 8 + .../UI/UIEffect/Materials/UI-Effect-HSV.mat | 154 + .../UIEffect/Materials/UI-Effect-HSV.mat.meta | 8 + .../UI/UIEffect/Materials/UI-Effect-Shiny.mat | 55 + .../Materials/UI-Effect-Shiny.mat.meta | 8 + .../Materials/UI-Effect-Transition.mat | 1090 ++++ .../Materials/UI-Effect-Transition.mat.meta | 8 + .../UI/UIEffect/Materials/UI-Effect.mat | 4556 +++++++++++++++++ .../UI/UIEffect/Materials/UI-Effect.mat.meta | 8 + .../UIEffect/Materials/UI-EffectCapture.mat | 2946 +++++++++++ .../Materials/UI-EffectCapture.mat.meta | 8 + .../UI/UIEffect/Materials/UIDissolveNoise.png | Bin 0 -> 20547 bytes .../Materials/UIDissolveNoise.png.meta | 100 + .../UI/UIEffect/Materials/UITransitionTex.png | Bin 0 -> 60578 bytes .../Materials/UITransitionTex.png.meta | 100 + Assets/Scripts/UI/UIEffect/Shaders.meta | 8 + .../Shaders/UI-Effect-Dissolve.shader | 88 + .../Shaders/UI-Effect-Dissolve.shader.meta | 11 + .../UI/UIEffect/Shaders/UI-Effect-HSV.shader | 79 + .../Shaders/UI-Effect-HSV.shader.meta | 9 + .../UIEffect/Shaders/UI-Effect-Shiny.shader | 82 + .../Shaders/UI-Effect-Shiny.shader.meta | 9 + .../UIEffect/Shaders/UI-Effect-Sprite.cginc | 77 + .../Shaders/UI-Effect-Sprite.cginc.meta | 9 + .../Shaders/UI-Effect-Transition.shader | 87 + .../Shaders/UI-Effect-Transition.shader.meta | 12 + .../UI/UIEffect/Shaders/UI-Effect.cginc | 309 ++ .../UI/UIEffect/Shaders/UI-Effect.cginc.meta | 9 + .../UI/UIEffect/Shaders/UI-Effect.shader | 113 + .../UI/UIEffect/Shaders/UI-Effect.shader.meta | 9 + .../UIEffect/Shaders/UI-EffectCapture.shader | 101 + .../Shaders/UI-EffectCapture.shader.meta | 9 + Assets/Scripts/UI/UIEffect/UIDissolve.cs | 432 ++ Assets/Scripts/UI/UIEffect/UIDissolve.cs.meta | 15 + Assets/Scripts/UI/UIEffect/UIEffect.cs | 488 ++ Assets/Scripts/UI/UIEffect/UIEffect.cs.meta | 12 + .../UI/UIEffect/UIEffectCapturedImage.cs | 552 ++ .../UI/UIEffect/UIEffectCapturedImage.cs.meta | 15 + Assets/Scripts/UI/UIEffect/UIFlip.cs | 61 + Assets/Scripts/UI/UIEffect/UIFlip.cs.meta | 12 + Assets/Scripts/UI/UIEffect/UIGradient.cs | 14 +- Assets/Scripts/UI/UIEffect/UIHsvModifier.cs | 194 + .../Scripts/UI/UIEffect/UIHsvModifier.cs.meta | 12 + Assets/Scripts/UI/UIEffect/UIShadow.cs | 461 ++ Assets/Scripts/UI/UIEffect/UIShadow.cs.meta | 12 + Assets/Scripts/UI/UIEffect/UIShiny.cs | 408 ++ Assets/Scripts/UI/UIEffect/UIShiny.cs.meta | 12 + .../Scripts/UI/UIEffect/UITransitionEffect.cs | 356 ++ .../UI/UIEffect/UITransitionEffect.cs.meta | 16 + Assets/Scripts/Utils/Utils.cs | 87 +- 130 files changed, 21774 insertions(+), 2581 deletions(-) create mode 100644 Assets/Resources/Images/NewDesign/icon_fode.png create mode 100644 Assets/Resources/Images/NewDesign/icon_fode.png.meta create mode 100644 Assets/Resources/Images/NewDesign/icon_heji_like.png create mode 100644 Assets/Resources/Images/NewDesign/icon_heji_like.png.meta create mode 100644 Assets/Resources/Images/NewDesign/icon_heji_unlike.png create mode 100644 Assets/Resources/Images/NewDesign/icon_heji_unlike.png.meta create mode 100644 Assets/Resources/Images/NewDesign/share_APP_facebook.png create mode 100644 Assets/Resources/Images/NewDesign/share_APP_facebook.png.meta create mode 100644 Assets/Scripts/UI/UIEffect/Common/BlurMode.cs create mode 100644 Assets/Scripts/UI/UIEffect/Common/BlurMode.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Common/ColorMode.cs create mode 100644 Assets/Scripts/UI/UIEffect/Common/ColorMode.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Common/EffectArea.cs create mode 100644 Assets/Scripts/UI/UIEffect/Common/EffectArea.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Common/EffectPlayer.cs create mode 100644 Assets/Scripts/UI/UIEffect/Common/EffectPlayer.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Common/MaterialCache.cs create mode 100644 Assets/Scripts/UI/UIEffect/Common/MaterialCache.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Common/MaterialResolver.cs create mode 100644 Assets/Scripts/UI/UIEffect/Common/MaterialResolver.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Common/Matrix2x3.cs create mode 100644 Assets/Scripts/UI/UIEffect/Common/Matrix2x3.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Common/Packer.cs create mode 100644 Assets/Scripts/UI/UIEffect/Common/Packer.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Common/ParameterTexture.cs create mode 100644 Assets/Scripts/UI/UIEffect/Common/ParameterTexture.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Common/ShadowStyle.cs create mode 100644 Assets/Scripts/UI/UIEffect/Common/ShadowStyle.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Common/ToneMode.cs create mode 100644 Assets/Scripts/UI/UIEffect/Common/ToneMode.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Common/UIEffectBase.cs create mode 100644 Assets/Scripts/UI/UIEffect/Common/UIEffectBase.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Editor.meta create mode 100644 Assets/Scripts/UI/UIEffect/Editor/BaseMeshEffectEditor.cs create mode 100644 Assets/Scripts/UI/UIEffect/Editor/BaseMeshEffectEditor.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Editor/DeprecatedRemover.cs create mode 100644 Assets/Scripts/UI/UIEffect/Editor/DeprecatedRemover.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIDissolveEditor.cs create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIDissolveEditor.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIEffectCapturedImageEditor.cs create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIEffectCapturedImageEditor.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIEffectEditor.cs create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIEffectEditor.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIGradientEditor.cs create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIGradientEditor.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIHsvModifierEditor.cs create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIHsvModifierEditor.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIShadowEditor.cs create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIShadowEditor.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIShinyEditor.cs create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UIShinyEditor.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UITransitionEffectEditor.cs create mode 100644 Assets/Scripts/UI/UIEffect/Editor/UITransitionEffectEditor.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/Materials.meta create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UI-Effect-Dissolve.mat create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UI-Effect-Dissolve.mat.meta create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UI-Effect-HSV.mat create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UI-Effect-HSV.mat.meta create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UI-Effect-Shiny.mat create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UI-Effect-Shiny.mat.meta create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UI-Effect-Transition.mat create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UI-Effect-Transition.mat.meta create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UI-Effect.mat create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UI-Effect.mat.meta create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UI-EffectCapture.mat create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UI-EffectCapture.mat.meta create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UIDissolveNoise.png create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UIDissolveNoise.png.meta create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UITransitionTex.png create mode 100644 Assets/Scripts/UI/UIEffect/Materials/UITransitionTex.png.meta create mode 100644 Assets/Scripts/UI/UIEffect/Shaders.meta create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect-Dissolve.shader create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect-Dissolve.shader.meta create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect-HSV.shader create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect-HSV.shader.meta create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect-Shiny.shader create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect-Shiny.shader.meta create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect-Sprite.cginc create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect-Sprite.cginc.meta create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect-Transition.shader create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect-Transition.shader.meta create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect.cginc create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect.cginc.meta create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect.shader create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-Effect.shader.meta create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-EffectCapture.shader create mode 100644 Assets/Scripts/UI/UIEffect/Shaders/UI-EffectCapture.shader.meta create mode 100644 Assets/Scripts/UI/UIEffect/UIDissolve.cs create mode 100644 Assets/Scripts/UI/UIEffect/UIDissolve.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/UIEffect.cs create mode 100644 Assets/Scripts/UI/UIEffect/UIEffect.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/UIEffectCapturedImage.cs create mode 100644 Assets/Scripts/UI/UIEffect/UIEffectCapturedImage.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/UIFlip.cs create mode 100644 Assets/Scripts/UI/UIEffect/UIFlip.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/UIHsvModifier.cs create mode 100644 Assets/Scripts/UI/UIEffect/UIHsvModifier.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/UIShadow.cs create mode 100644 Assets/Scripts/UI/UIEffect/UIShadow.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/UIShiny.cs create mode 100644 Assets/Scripts/UI/UIEffect/UIShiny.cs.meta create mode 100644 Assets/Scripts/UI/UIEffect/UITransitionEffect.cs create mode 100644 Assets/Scripts/UI/UIEffect/UITransitionEffect.cs.meta diff --git a/Assets/BannerController.cs b/Assets/BannerController.cs index 475b68e0..b31ee7eb 100644 --- a/Assets/BannerController.cs +++ b/Assets/BannerController.cs @@ -6,6 +6,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using UnityEngine; +using UnityEngine.UI; public class BannerController : MonoBehaviour { @@ -16,14 +17,6 @@ public class BannerController : MonoBehaviour private int currentIndex = 1; void Awake() { - UIManager.AddEvent(transform.Find("L").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => - { - Left(); - }); - UIManager.AddEvent(transform.Find("R").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => - { - Right(); - }); itemList = new List { transform.Find("1").GetComponent(), @@ -34,11 +27,15 @@ public class BannerController : MonoBehaviour { transform.Find("1").localPosition,transform.Find("2").localPosition,transform.Find("3").localPosition }; - GetList(); + Debug.Log(standardPositions[0]); Debug.Log(standardPositions[1]); Debug.Log(standardPositions[2]); } + private void Start() + { + GetList(); + } async void GetList() { var res = await ConfigHelper.mapApi.GetRecommendAreaList(); @@ -53,7 +50,20 @@ public class BannerController : MonoBehaviour int index = 0; foreach (CanvasGroup c in itemList) { - c.GetComponent().Initial(list[index++]); + var area = list[index++]; + c.GetComponent().Initial(area); + if (c.alpha != 1) + { + c.GetComponent