From dd08f916eb818316375d5c4b7db4bebc4e2c2741 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Wed, 21 Apr 2021 16:16:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Circle/ImageWithRoundedCorners.cs | 13 + Assets/Resources/Images/c-1.png | Bin 0 -> 2272 bytes Assets/Resources/Images/c-1.png.meta | 116 + Assets/Resources/Images/c-4.png | Bin 0 -> 3188 bytes Assets/Resources/Images/c-4.png.meta | 116 + Assets/Resources/Images/c-5.png | Bin 0 -> 3651 bytes Assets/Resources/Images/c-5.png.meta | 116 + Assets/Resources/Images/c-6.png | Bin 0 -> 3793 bytes Assets/Resources/Images/c-6.png.meta | 116 + Assets/Resources/Images/ipt-0.png.meta | 14 +- Assets/Resources/Images/login_headlight.png | Bin 0 -> 45785 bytes .../Resources/Images/login_headlight.png.meta | 116 + Assets/Resources/Images/搜索.png.meta | 12 + .../Resources/UI/Control/PFUIDropdown.prefab | 34 +- .../UI/Prefab/Panel/EditUserPanel.prefab | 2 +- .../UI/Prefab/Panel/FeedbackModal.prefab | 3163 +++++++++++++++++ .../UI/Prefab/Panel/FeedbackModal.prefab.meta | 7 + .../UI/Prefab/Panel/MapListPanel.prefab | 152 +- .../UI/Prefab/Panel/NewsModal.prefab | 2 +- .../Resources/UI/Prefab/ToastContainer.prefab | 100 +- Assets/Scenes/1-Login.unity | 2623 +++++++++----- Assets/Scenes/3-MapList.unity | 765 +++- Assets/Scripts/Apis/ApiBase.cs | 17 + Assets/Scripts/Apis/MapApi.cs | 4 +- Assets/Scripts/Apis/UserApi.cs | 81 +- Assets/Scripts/ConfigHelper.cs | 31 +- Assets/Scripts/Scenes/LoginController.cs | 300 +- Assets/Scripts/UI/Control/PFUIDropdown.cs | 13 +- Assets/Scripts/UI/Control/PFUIInputField.cs | 6 +- .../Scripts/UI/Prefab/FeedbackController.cs | 121 + .../UI/Prefab/FeedbackController.cs.meta | 11 + .../UI/Prefab/Login/QuickLoginScroll.cs | 21 +- .../Scripts/UI/Prefab/Login/QuickLoginUser.cs | 13 +- Assets/Scripts/UI/Prefab/MainNav.cs | 4 + Assets/Scripts/UI/Prefab/MapList/RotateBg.cs | 2 +- Assets/Scripts/UI/Prefab/NewsController.cs | 2 +- .../UI/Prefab/Panel/EditUserController.cs | 14 +- .../UI/Prefab/Panel/MapListController.cs | 4 +- .../Scripts/UI/Prefab/ResultList/RouteItem.cs | 5 +- Assets/Scripts/UIManager.cs | 12 + Assets/Scripts/Utils/Utils.cs | 49 + 41 files changed, 7043 insertions(+), 1134 deletions(-) create mode 100644 Assets/Resources/Images/c-1.png create mode 100644 Assets/Resources/Images/c-1.png.meta create mode 100644 Assets/Resources/Images/c-4.png create mode 100644 Assets/Resources/Images/c-4.png.meta create mode 100644 Assets/Resources/Images/c-5.png create mode 100644 Assets/Resources/Images/c-5.png.meta create mode 100644 Assets/Resources/Images/c-6.png create mode 100644 Assets/Resources/Images/c-6.png.meta create mode 100644 Assets/Resources/Images/login_headlight.png create mode 100644 Assets/Resources/Images/login_headlight.png.meta create mode 100644 Assets/Resources/UI/Prefab/Panel/FeedbackModal.prefab create mode 100644 Assets/Resources/UI/Prefab/Panel/FeedbackModal.prefab.meta create mode 100644 Assets/Scripts/UI/Prefab/FeedbackController.cs create mode 100644 Assets/Scripts/UI/Prefab/FeedbackController.cs.meta diff --git a/Assets/Resources/Circle/ImageWithRoundedCorners.cs b/Assets/Resources/Circle/ImageWithRoundedCorners.cs index 3bd1e7c6..a0b7bb61 100644 --- a/Assets/Resources/Circle/ImageWithRoundedCorners.cs +++ b/Assets/Resources/Circle/ImageWithRoundedCorners.cs @@ -31,6 +31,19 @@ public class ImageWithRoundedCorners : MonoBehaviour { var rect = ((RectTransform)transform).rect; material.SetVector(Props, new Vector4(rect.width, rect.height, radius * 2, 0)); if (gameObject.GetComponent() != null) + { + gameObject.GetComponent().material = material; + //gameObject.GetComponent().sprite = null; + } + else if (gameObject.GetComponent() != null) + { + gameObject.GetComponent().material = material; + } + } + public void Refresh(Vector2 r) + { + material.SetVector(Props, new Vector4(r.x, r.y, radius * 2, 0)); + if (gameObject.GetComponent() != null) { gameObject.GetComponent().material = material; gameObject.GetComponent().sprite = null; diff --git a/Assets/Resources/Images/c-1.png b/Assets/Resources/Images/c-1.png new file mode 100644 index 0000000000000000000000000000000000000000..c8dc933c41260dfd6318607926fe2ad65c059b71 GIT binary patch literal 2272 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/c-4.png.meta b/Assets/Resources/Images/c-4.png.meta new file mode 100644 index 00000000..b71ed1a6 --- /dev/null +++ b/Assets/Resources/Images/c-4.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 05aa2629316868449b07d46192ad5208 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/c-5.png b/Assets/Resources/Images/c-5.png new file mode 100644 index 0000000000000000000000000000000000000000..55de14e42bcb8e72036dc246ea87650806a3f2bf GIT binary patch literal 3651 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