From e04ae0b08503fece3ad78c3694bcc5421ad4a8ac Mon Sep 17 00:00:00 2001 From: suntao Date: Thu, 15 Apr 2021 15:57:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Images/back.png | Bin 0 -> 3891 bytes Assets/Resources/Images/back.png.meta | 104 +++ Assets/Resources/Images/change account.png | Bin 0 -> 5031 bytes .../Resources/Images/change account.png.meta | 104 +++ Assets/Resources/Images/搜索.png | Bin 0 -> 3962 bytes Assets/Resources/Images/搜索.png.meta | 104 +++ Assets/Resources/UI/Prefab/BigMap/Tips.prefab | 724 +++++++++++++++++- .../Prefab/Device/ConnectDeviceModal.prefab | 5 + .../UI/Prefab/Panel/BigMapPanel.prefab | 167 +++- .../UI/Prefab/Panel/EditUserPanel.prefab | 280 ++++++- .../UI/Prefab/Panel/MapListPanel.prefab | 481 +++++++----- Assets/Scripts/Apis/Models/NearRouteModel.cs | 8 + Assets/Scripts/UI/Control/PFUIInputField.cs | 3 +- Assets/Scripts/UI/Control/PfUIButton.cs | 2 +- Assets/Scripts/UI/Prefab/BigMap/Tips.cs | 61 +- .../UI/Prefab/Device/ConnectDeviceModal.cs | 4 +- .../UI/Prefab/Panel/BigMapController.cs | 46 +- .../UI/Prefab/Panel/DeviceController.cs | 3 +- .../UI/Prefab/Panel/EditUserController.cs | 66 +- .../UI/Prefab/Panel/MapListController.cs | 24 +- Assets/Scripts/UI/Prefab/Panel/PFUIPanel.cs | 25 + Assets/Scripts/UIManager.cs | 2 +- Assets/Scripts/Utils/Win32.cs | 50 ++ Assets/Scripts/Utils/Win32.cs.meta | 11 + 24 files changed, 2012 insertions(+), 262 deletions(-) create mode 100644 Assets/Resources/Images/back.png create mode 100644 Assets/Resources/Images/back.png.meta create mode 100644 Assets/Resources/Images/change account.png create mode 100644 Assets/Resources/Images/change account.png.meta create mode 100644 Assets/Resources/Images/搜索.png create mode 100644 Assets/Resources/Images/搜索.png.meta create mode 100644 Assets/Scripts/Utils/Win32.cs create mode 100644 Assets/Scripts/Utils/Win32.cs.meta diff --git a/Assets/Resources/Images/back.png b/Assets/Resources/Images/back.png new file mode 100644 index 0000000000000000000000000000000000000000..e93a00dcec271715e5146728b187c86be1f63715 GIT binary patch literal 3891 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 BR{#J2 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/back.png.meta b/Assets/Resources/Images/back.png.meta new file mode 100644 index 00000000..f0e20ddc --- /dev/null +++ b/Assets/Resources/Images/back.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: fdb6d865c6f1a0d45a6fa4e26e4784a8 +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 + 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/change account.png b/Assets/Resources/Images/change account.png new file mode 100644 index 0000000000000000000000000000000000000000..96f9a8478a84b880ace238c37b314d8e62ddb3f8 GIT binary patch literal 5031 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/change account.png.meta b/Assets/Resources/Images/change account.png.meta new file mode 100644 index 00000000..508d3c06 --- /dev/null +++ b/Assets/Resources/Images/change account.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 16d4d4e1a880b14419e1e59044ca21d0 +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 + 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/搜索.png b/Assets/Resources/Images/搜索.png new file mode 100644 index 0000000000000000000000000000000000000000..3abc6547924956fb862b7d128f86cd037005320a GIT binary patch literal 3962 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 NcC>Y|sj&8s{~z*F01E&B literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/搜索.png.meta b/Assets/Resources/Images/搜索.png.meta new file mode 100644 index 00000000..a6bfca91 --- /dev/null +++ b/Assets/Resources/Images/搜索.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 3310016e37ca7444a8f68647672fc888 +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 + 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/UI/Prefab/BigMap/Tips.prefab b/Assets/Resources/UI/Prefab/BigMap/Tips.prefab index f73358ce..fc675d11 100644 --- a/Assets/Resources/UI/Prefab/BigMap/Tips.prefab +++ b/Assets/Resources/UI/Prefab/BigMap/Tips.prefab @@ -1,5 +1,153 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &969489167844635592 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8022915073535944964} + - component: {fileID: 2480647355327437206} + - component: {fileID: 4376209253818929467} + m_Layer: 5 + m_Name: ClimbIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8022915073535944964 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 969489167844635592} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6863560505873109966} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 123, y: -157} + m_SizeDelta: {x: 14, y: 14} + m_Pivot: {x: 0, y: 1} +--- !u!222 &2480647355327437206 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 969489167844635592} + m_CullTransparentMesh: 0 +--- !u!114 &4376209253818929467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 969489167844635592} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 095d056d4cfa9b04aac79ae91a02cc5d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1302866719288954312 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7171638826596304883} + - component: {fileID: 4268312594999367378} + - component: {fileID: 1885902519416331632} + m_Layer: 5 + m_Name: AvgIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7171638826596304883 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302866719288954312} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6863560505873109966} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 224, y: -157} + m_SizeDelta: {x: 14, y: 14} + m_Pivot: {x: 0, y: 1} +--- !u!222 &4268312594999367378 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302866719288954312} + m_CullTransparentMesh: 0 +--- !u!114 &1885902519416331632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302866719288954312} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b2c1508eb4114424b8cc31999d94c079, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2594476502820618556 GameObject: m_ObjectHideFlags: 0 @@ -34,8 +182,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 300, y: -107} - m_SizeDelta: {x: 60, y: 19} + m_AnchoredPosition: {x: 308, y: -107} + m_SizeDelta: {x: 40, y: 19} m_Pivot: {x: 0, y: 1} --- !u!222 &8848262766535284511 CanvasRenderer: @@ -78,6 +226,84 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 000 +--- !u!1 &3724904730239188879 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2224189869626763640} + - component: {fileID: 5406223409013810468} + - component: {fileID: 9169371514156264374} + m_Layer: 5 + m_Name: AverageGrade + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2224189869626763640 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3724904730239188879} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6863560505873109966} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 243, y: -154} + m_SizeDelta: {x: 45, y: 19} + m_Pivot: {x: 0, y: 1} +--- !u!222 &5406223409013810468 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3724904730239188879} + m_CullTransparentMesh: 0 +--- !u!114 &9169371514156264374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3724904730239188879} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 0% --- !u!1 &4286186333184849785 GameObject: m_ObjectHideFlags: 0 @@ -156,6 +382,105 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 00.0KM +--- !u!1 &4624700583557312223 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8243496190560064870} + - component: {fileID: 7993266955219060461} + - component: {fileID: 5823517499065831510} + - component: {fileID: 3513447304773179576} + m_Layer: 0 + m_Name: Level + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8243496190560064870 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4624700583557312223} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8497929000405638754} + m_Father: {fileID: 6863560505873109966} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -105} + m_SizeDelta: {x: 45, y: 24} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7993266955219060461 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4624700583557312223} + m_CullTransparentMesh: 0 +--- !u!114 &5823517499065831510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4624700583557312223} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3513447304773179576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4624700583557312223} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Direction: 0 + m_Color1: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1} + m_Color2: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1} + m_Color3: {r: 1, g: 1, b: 1, a: 1} + m_Color4: {r: 1, g: 1, b: 1, a: 1} + m_Rotation: 0 + m_Offset1: 0 + m_Offset2: 0 + m_GradientStyle: 0 + m_ColorSpace: -1 + m_IgnoreAspectRatio: 1 --- !u!1 &5336839624876387216 GameObject: m_ObjectHideFlags: 0 @@ -234,6 +559,229 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 +--- !u!1 &5833715185638741841 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2722580046731890951} + - component: {fileID: 5918983523920123693} + - component: {fileID: 5183122370950843078} + m_Layer: 5 + m_Name: 3DIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2722580046731890951 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5833715185638741841} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6863560505873109966} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 101, y: -105} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0, y: 1} +--- !u!222 &5918983523920123693 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5833715185638741841} + m_CullTransparentMesh: 0 +--- !u!114 &5183122370950843078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5833715185638741841} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 98f92b5e975e0c4499757c042e515628, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6583878025330511796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8497929000405638754} + - component: {fileID: 5569439723943778073} + - component: {fileID: 3988923772982317454} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8497929000405638754 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6583878025330511796} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8243496190560064870} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 45, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5569439723943778073 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6583878025330511796} + m_CullTransparentMesh: 0 +--- !u!114 &3988923772982317454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6583878025330511796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Lv.2 +--- !u!1 &6652849314270380805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8991763474801765394} + - component: {fileID: 3039675134757304197} + - component: {fileID: 3062084359641139297} + m_Layer: 5 + m_Name: FavoriteIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8991763474801765394 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6652849314270380805} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6863560505873109966} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 331, y: -12} + m_SizeDelta: {x: 18, y: 17} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3039675134757304197 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6652849314270380805} + m_CullTransparentMesh: 0 +--- !u!114 &3062084359641139297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6652849314270380805} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 7c2626727948cc44aa1c453b746a578d, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &6863560505873109961 GameObject: m_ObjectHideFlags: 0 @@ -271,6 +819,14 @@ RectTransform: - {fileID: 3395037359819743163} - {fileID: 9153523518070882339} - {fileID: 7202064334367090665} + - {fileID: 2224189869626763640} + - {fileID: 7796454748637946497} + - {fileID: 4561642187198993313} + - {fileID: 7171638826596304883} + - {fileID: 8022915073535944964} + - {fileID: 8243496190560064870} + - {fileID: 2722580046731890951} + - {fileID: 8991763474801765394} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -405,7 +961,152 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: New Text + m_Text: Route Name +--- !u!1 &7156696587629465326 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7796454748637946497} + - component: {fileID: 4128258724169575510} + - component: {fileID: 1391765823549116325} + m_Layer: 5 + m_Name: CountryIco + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7796454748637946497 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7156696587629465326} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6863560505873109966} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -105} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0, y: 1} +--- !u!222 &4128258724169575510 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7156696587629465326} + m_CullTransparentMesh: 0 +--- !u!114 &1391765823549116325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7156696587629465326} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!1 &7582904632417415396 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4561642187198993313} + - component: {fileID: 2810234525063364866} + - component: {fileID: 530061773446594702} + m_Layer: 5 + m_Name: BikeIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4561642187198993313 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7582904632417415396} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6863560505873109966} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 288, y: -109} + m_SizeDelta: {x: 16, y: 16} + m_Pivot: {x: 0, y: 1} +--- !u!222 &2810234525063364866 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7582904632417415396} + m_CullTransparentMesh: 0 +--- !u!114 &530061773446594702 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7582904632417415396} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: be80a5497a75b1d4194d3f7cbd04d72d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8119342552395580572 GameObject: m_ObjectHideFlags: 0 @@ -470,7 +1171,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8adf51874688e8b48a396a83ccc7ad9d, type: 3} + m_Sprite: {fileID: 21300000, guid: 415109a50bc816a409dc0f7b73d9ba70, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -607,6 +1308,16 @@ PrefabInstance: propertyPath: m_Text value: RIDE NOW objectReference: {fileID: 0} + - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_FontData.m_FontStyle + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: mType + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} --- !u!224 &4052172461455070761 stripped @@ -737,6 +1448,11 @@ PrefabInstance: propertyPath: m_Text value: INFO objectReference: {fileID: 0} + - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_FontData.m_FontStyle + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} --- !u!224 &8334077500523104476 stripped diff --git a/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab b/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab index 37ecf371..6f60a4ac 100644 --- a/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab +++ b/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab @@ -1547,6 +1547,11 @@ PrefabInstance: propertyPath: m_Text value: CONNECT objectReference: {fileID: 0} + - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: mType + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} --- !u!224 &373244018917157862 stripped diff --git a/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab b/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab index 04beb715..efb57ba0 100644 --- a/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab @@ -252,7 +252,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4609279353588439486} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -443,11 +443,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 2432749051672017236} - - {fileID: 5033434782108908188} - {fileID: 8125072195018992878} - {fileID: 185737327203972733} + - {fileID: 2432749051672017236} + - {fileID: 6114093792508456481} - {fileID: 9219694857725158026} + - {fileID: 6852378552522628550} m_Father: {fileID: 3945718112839240075} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -794,7 +795,7 @@ MonoBehaviour: _options: locationOptions: latitudeLongitude: 32.051203, 118.771572 - zoom: 13 + zoom: 11 extentOptions: extentType: 0 defaultExtents: @@ -1000,12 +1001,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 4609279353588439486} - m_RootOrder: 1 + m_Father: {fileID: 6114093792508456481} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 370, y: -40} + m_AnchoredPosition: {x: 10, y: -10} m_SizeDelta: {x: 44, y: 44} m_Pivot: {x: 0, y: 1} --- !u!222 &6054987918574992224 @@ -1035,7 +1036,82 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 55aa9eb51a3634c4290b1fa929f89215, type: 3} + m_Sprite: {fileID: 21300000, guid: 3310016e37ca7444a8f68647672fc888, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4780901690327224105 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6114093792508456481} + - component: {fileID: 4997743358586351338} + - component: {fileID: 1001509854261221806} + m_Layer: 5 + m_Name: SwitchMode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6114093792508456481 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4780901690327224105} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5033434782108908188} + m_Father: {fileID: 4609279353588439486} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 360, y: -30} + m_SizeDelta: {x: 64, y: 64} + m_Pivot: {x: 0, y: 1} +--- !u!222 &4997743358586351338 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4780901690327224105} + m_CullTransparentMesh: 0 +--- !u!114 &1001509854261221806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4780901690327224105} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1149,13 +1225,84 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4609279353588439486} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7102241949137060339 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6852378552522628550} + - component: {fileID: 1312187700918761134} + - component: {fileID: 7217607498348791145} + m_Layer: 5 + m_Name: HeadImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6852378552522628550 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7102241949137060339} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4609279353588439486} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1476, y: -30} + m_SizeDelta: {x: 64, y: 64} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1312187700918761134 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7102241949137060339} + m_CullTransparentMesh: 0 +--- !u!114 &7217607498348791145 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7102241949137060339} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &8077202101654977058 GameObject: m_ObjectHideFlags: 0 @@ -1259,7 +1406,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_RootOrder - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab b/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab index f2aadeab..613a52e3 100644 --- a/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/EditUserPanel.prefab @@ -893,6 +893,8 @@ RectTransform: - {fileID: 1569894540830352816} - {fileID: 4499205944832415859} - {fileID: 4499205946660838030} + - {fileID: 8546090188842659637} + - {fileID: 5163718731316197084} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2374,6 +2376,124 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &3139651356721893005 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5163718731316197084} + - component: {fileID: 7298159502760009828} + - component: {fileID: 772158007339630849} + - component: {fileID: 9130991260161619550} + m_Layer: 5 + m_Name: SwitchAccountButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5163718731316197084 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3139651356721893005} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 956475306156679521} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 124, y: -40} + m_SizeDelta: {x: 44, y: 44} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7298159502760009828 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3139651356721893005} + m_CullTransparentMesh: 0 +--- !u!114 &772158007339630849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3139651356721893005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 16d4d4e1a880b14419e1e59044ca21d0, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &9130991260161619550 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3139651356721893005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 772158007339630849} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3522044069208059799 GameObject: m_ObjectHideFlags: 0 @@ -3161,6 +3281,124 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 70 +--- !u!1 &8689305987597920378 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8546090188842659637} + - component: {fileID: 2944807616352031413} + - component: {fileID: 8708793093022515780} + - component: {fileID: 1371993397897782999} + m_Layer: 5 + m_Name: BackButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8546090188842659637 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8689305987597920378} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 956475306156679521} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 70, y: -40} + m_SizeDelta: {x: 44, y: 44} + m_Pivot: {x: 0, y: 1} +--- !u!222 &2944807616352031413 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8689305987597920378} + m_CullTransparentMesh: 0 +--- !u!114 &8708793093022515780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8689305987597920378} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: fdb6d865c6f1a0d45a6fa4e26e4784a8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1371993397897782999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8689305987597920378} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8708793093022515780} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1001 &67343026149243667 PrefabInstance: m_ObjectHideFlags: 0 @@ -4268,6 +4506,46 @@ PrefabInstance: propertyPath: m_FontData.m_Alignment value: 0 objectReference: {fileID: 0} + - target: {fileID: 7511924356665468489, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_FontData.m_HorizontalOverflow + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7789118244628022189, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_LineType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8098460543711191387, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_SizeDelta.x + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 8098460543711191387, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_SizeDelta.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 8098460543711191387, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 8306171861788952873, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_SizeDelta.x + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 8306171861788952873, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_SizeDelta.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 8306171861788952873, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} --- !u!224 &4144642892539597472 stripped @@ -5141,7 +5419,7 @@ PrefabInstance: - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_SizeDelta.x - value: 260 + value: 314 objectReference: {fileID: 0} - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab index 3d74fd41..27eb3afe 100644 --- a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab @@ -2382,6 +2382,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3889196182959378545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5499711730237207362} + - component: {fileID: 8343395811988274841} + - component: {fileID: 8193748530532596727} + m_Layer: 5 + m_Name: SwitchMode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5499711730237207362 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3889196182959378545} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5692760043962084493} + m_Father: {fileID: 5779676824674420565} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 360, y: -30} + m_SizeDelta: {x: 64, y: 64} + m_Pivot: {x: 0, y: 1} +--- !u!222 &8343395811988274841 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3889196182959378545} + m_CullTransparentMesh: 0 +--- !u!114 &8193748530532596727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3889196182959378545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &8993034858053653662 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2553,7 +2628,8 @@ RectTransform: - {fileID: 8931608246266398584} - {fileID: 2905060696191417379} - {fileID: 726549195090357672} - - {fileID: 1248362869423199793} + - {fileID: 5499711730237207362} + - {fileID: 5284463610994455041} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2604,124 +2680,6 @@ MonoBehaviour: m_MaskInteraction: 85 m_UseStencil: 1 m_RaycastFilter: 0 ---- !u!1 &7172869851243440747 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1248362869423199793} - - component: {fileID: 6685963006912187438} - - component: {fileID: 5847585516911786048} - - component: {fileID: 3395264102253877575} - m_Layer: 5 - m_Name: BtnMapMode - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1248362869423199793 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7172869851243440747} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5779676824674420565} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 370, y: -40} - m_SizeDelta: {x: 44, y: 44} - m_Pivot: {x: 0, y: 1} ---- !u!222 &6685963006912187438 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7172869851243440747} - m_CullTransparentMesh: 0 ---- !u!114 &5847585516911786048 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7172869851243440747} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3ddaf6cc607735e438668d0845102529, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3395264102253877575 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7172869851243440747} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 5847585516911786048} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &7314766655927333696 GameObject: m_ObjectHideFlags: 0 @@ -3353,6 +3311,151 @@ MonoBehaviour: m_MaskInteraction: 85 m_UseStencil: 1 m_RaycastFilter: 0 +--- !u!1 &8296637580613539111 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5692760043962084493} + - component: {fileID: 6644751111942277666} + - component: {fileID: 1909824527552891219} + m_Layer: 5 + m_Name: GoList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5692760043962084493 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8296637580613539111} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5499711730237207362} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -10} + m_SizeDelta: {x: 44, y: 44} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6644751111942277666 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8296637580613539111} + m_CullTransparentMesh: 0 +--- !u!114 &1909824527552891219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8296637580613539111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3ddaf6cc607735e438668d0845102529, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8539777692955277418 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5284463610994455041} + - component: {fileID: 303740406447834766} + - component: {fileID: 3355939243696161375} + m_Layer: 5 + m_Name: HeadImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5284463610994455041 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8539777692955277418} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5779676824674420565} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1476, y: -30} + m_SizeDelta: {x: 64, y: 64} + m_Pivot: {x: 0, y: 1} +--- !u!222 &303740406447834766 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8539777692955277418} + m_CullTransparentMesh: 0 +--- !u!114 &3355939243696161375 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8539777692955277418} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &8563758702630356359 GameObject: m_ObjectHideFlags: 0 @@ -4287,30 +4390,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} ---- !u!1 &1377157623896305697 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 146705893016024264} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4236066551055479381 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 146705893016024264} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1109064923048164317 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 146705893016024264} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7330312719675194540 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 146705893016024264} - m_PrefabAsset: {fileID: 0} --- !u!224 &6111654188722717914 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, @@ -4323,12 +4402,42 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 146705893016024264} m_PrefabAsset: {fileID: 0} +--- !u!1 &1109064923048164317 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 146705893016024264} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2049799399839608 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 146705893016024264} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7330312719675194540 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 146705893016024264} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1377157623896305697 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 146705893016024264} + m_PrefabAsset: {fileID: 0} --- !u!1 &2009426565801043604 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 146705893016024264} m_PrefabAsset: {fileID: 0} +--- !u!1 &4236066551055479381 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 146705893016024264} + m_PrefabAsset: {fileID: 0} --- !u!1 &7024740704437292975 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, @@ -4341,12 +4450,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 146705893016024264} m_PrefabAsset: {fileID: 0} ---- !u!1 &2049799399839608 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 146705893016024264} - m_PrefabAsset: {fileID: 0} --- !u!1001 &726549194336560541 PrefabInstance: m_ObjectHideFlags: 0 @@ -4472,18 +4575,18 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 726549194336560541} m_PrefabAsset: {fileID: 0} ---- !u!224 &4035565750273659582 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, - type: 3} - m_PrefabInstance: {fileID: 726549194336560541} - m_PrefabAsset: {fileID: 0} --- !u!1 &818606349787290569 stripped GameObject: m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} m_PrefabInstance: {fileID: 726549194336560541} m_PrefabAsset: {fileID: 0} +--- !u!224 &4035565750273659582 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + m_PrefabInstance: {fileID: 726549194336560541} + m_PrefabAsset: {fileID: 0} --- !u!1001 &922472870509598112 PrefabInstance: m_ObjectHideFlags: 0 @@ -4748,51 +4851,27 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} +--- !u!1 &1619957045781012459 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 2277129673863769977} + m_PrefabAsset: {fileID: 0} --- !u!1 &464472969339895077 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 2277129673863769977} m_PrefabAsset: {fileID: 0} ---- !u!1 &2835369396092332516 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 2277129673863769977} - m_PrefabAsset: {fileID: 0} ---- !u!1 &121617211609223412 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2173531533974716301, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 2277129673863769977} - m_PrefabAsset: {fileID: 0} ---- !u!224 &5278285276573278059 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 2277129673863769977} - m_PrefabAsset: {fileID: 0} --- !u!1 &9001619333872210974 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 2277129673863769977} m_PrefabAsset: {fileID: 0} ---- !u!1 &1365991255437877356 stripped +--- !u!1 &2835369396092332516 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 2277129673863769977} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2132314977860390089 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 2277129673863769977} - m_PrefabAsset: {fileID: 0} ---- !u!1 &8658814530548131613 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 2277129673863769977} m_PrefabAsset: {fileID: 0} @@ -4802,9 +4881,33 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2277129673863769977} m_PrefabAsset: {fileID: 0} ---- !u!1 &1619957045781012459 stripped +--- !u!1 &8658814530548131613 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 2277129673863769977} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2132314977860390089 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 2277129673863769977} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1365991255437877356 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 2277129673863769977} + m_PrefabAsset: {fileID: 0} +--- !u!224 &5278285276573278059 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 2277129673863769977} + m_PrefabAsset: {fileID: 0} +--- !u!1 &121617211609223412 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2173531533974716301, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 2277129673863769977} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/Apis/Models/NearRouteModel.cs b/Assets/Scripts/Apis/Models/NearRouteModel.cs index 5d3820b5..1ce7b2c7 100644 --- a/Assets/Scripts/Apis/Models/NearRouteModel.cs +++ b/Assets/Scripts/Apis/Models/NearRouteModel.cs @@ -25,5 +25,13 @@ namespace Assets.Scripts.Apis.Models /// 骑行热度 /// public int TheHeat { get; set; } + + public string Hard { get; set; } + public bool IsFire { get; set; } + public string CountryCode { get; set; } + + public bool IsFavorite { get; set; } + + public bool Enable3D { get; set; } } } diff --git a/Assets/Scripts/UI/Control/PFUIInputField.cs b/Assets/Scripts/UI/Control/PFUIInputField.cs index 7af4a01e..c77e0c03 100644 --- a/Assets/Scripts/UI/Control/PFUIInputField.cs +++ b/Assets/Scripts/UI/Control/PFUIInputField.cs @@ -72,7 +72,7 @@ namespace Assets.Scripts.UI.Control material = Instantiate(Resources.Load("UI/Material/RoundedCornersTextureMaterial")); } var rect = ((RectTransform)transform).rect; - material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height*0.5f, 0)); + material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, Math.Min(rect.height*0.7f, 50f), 0)); gameObject.GetComponent().material = material; outline = this.GetComponent(); @@ -80,6 +80,7 @@ namespace Assets.Scripts.UI.Control { outline = this.gameObject.AddComponent(); outline.effectDistance = new Vector2(2, 2); + outline.enabled = false; } UIManager.AddEvent(this.mInnerInputField.gameObject, EventTriggerType.PointerClick, new UnityAction(this.OnSelect)); diff --git a/Assets/Scripts/UI/Control/PfUIButton.cs b/Assets/Scripts/UI/Control/PfUIButton.cs index 793eb55d..ef659a91 100644 --- a/Assets/Scripts/UI/Control/PfUIButton.cs +++ b/Assets/Scripts/UI/Control/PfUIButton.cs @@ -10,7 +10,7 @@ using UnityEngine.EventSystems; namespace Assets.Scripts.UI.Control { [RequireComponent(typeof(Button))] - public class PFUIButton : PFUIComponentBase + public class PfUIButton : PFUIComponentBase { public enum Type { diff --git a/Assets/Scripts/UI/Prefab/BigMap/Tips.cs b/Assets/Scripts/UI/Prefab/BigMap/Tips.cs index b34f2a3b..06fbcfa1 100644 --- a/Assets/Scripts/UI/Prefab/BigMap/Tips.cs +++ b/Assets/Scripts/UI/Prefab/BigMap/Tips.cs @@ -1,10 +1,14 @@ using Assets.Scripts.Apis.Models; using Assets.Scripts.UI.Control; +using Assets.Scripts.UI.Prefab.Login; +using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; using UnityEngine.UI; +using System; +using System.Linq; public class Tips : MonoBehaviour { @@ -20,10 +24,16 @@ public class Tips : MonoBehaviour private Text Count; private Text Distance; private Text TotalClimb; - private PFUIButton pFUIButton; + private PfUIButton pFUIButton; + private RawImage countryIcon; + private Text averageGrade; + private List countryList; + private GameObject level; + private GameObject m3DIcon; private void Awake() { - var material = Instantiate(Resources.Load("UI/Material/RoundedCornersTextureMaterial")); + var materialSource = Resources.Load("UI/Material/RoundedCornersTextureMaterial"); + var material = Instantiate(materialSource); var rect = ((RectTransform)transform).rect; material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, 40f, 0)); @@ -34,11 +44,25 @@ public class Tips : MonoBehaviour Distance = this.transform.Find("Distance").GetComponent(); TotalClimb = this.transform.Find("TotalClimb").GetComponent(); - pFUIButton = this.transform.Find("Ride").GetComponent(); + pFUIButton = this.transform.Find("Ride").GetComponent(); UIManager.AddEvent(pFUIButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (e) => { App.RouteIdParam = _model.Id; SceneManager.LoadScene("Ride"); }); + + averageGrade = this.transform.Find("AverageGrade").GetComponent(); + countryIcon = this.transform.Find("CountryIco").GetComponent(); + + var countryJson = Resources.Load("UI/flags-mini").text; + countryList = JsonConvert.DeserializeObject>(countryJson); + + level = this.transform.Find("Level").gameObject; + var material1 = Instantiate(materialSource); + var rect1 = ((RectTransform)level.transform).rect; + material1.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect1.width, rect1.height, rect1.height, 0)); + level.GetComponent().material = material1; + + m3DIcon = this.transform.Find("3DIcon").gameObject; } // Start is called before the first frame update @@ -63,17 +87,30 @@ public class Tips : MonoBehaviour return; } } - else + + //this.gameObject.SetActive(true); + _model = model; + + Name.text = _model.Name; + + Count.text = _model.TheHeat.ToString(); + Distance.text = _model.Distance.ToString("#.0")+"KM"; + TotalClimb.text = _model.TotalClimb.ToString(); + + averageGrade.text = _model.AverageGrade.ToString() + "%"; + + //var country = countryList.SingleOrDefault(r => r.abbreviation.Equals(_model.CountryCode, StringComparison.InvariantCultureIgnoreCase)); + //if(country ) + var country = Resources.Load($"UI/flags-mini/{ _model.CountryCode.ToLower() }"); + if(country != null) { - //this.gameObject.SetActive(true); - _model = model; - - Name.text = _model.Name; - - Count.text = _model.TheHeat.ToString(); - Distance.text = _model.Distance.ToString("#.0")+"KM"; - TotalClimb.text = _model.TotalClimb.ToString(); + countryIcon.texture = country.texture; } + + level.transform.Find("Text").GetComponent().text = _model.Hard; + + m3DIcon.SetActive(_model.Enable3D); + } diff --git a/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs b/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs index 85ed0305..0f9957ba 100644 --- a/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs +++ b/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs @@ -27,7 +27,7 @@ public class ConnectDeviceModal : PFUIPanel private Image Logo; private UnityEngine.Object deviceItem; private VerticalLayoutGroup content; - private PFUIButton connectBtn; + private PfUIButton connectBtn; private Dictionary deviceList; protected override void Awake() @@ -60,7 +60,7 @@ public class ConnectDeviceModal : PFUIPanel deviceItem = Resources.Load("UI/Prefab/Device/DeviceItem"); - connectBtn = container.Find("ConnectBtn").GetComponent(); + connectBtn = container.Find("ConnectBtn").GetComponent(); UIManager.AddEvent(connectBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction(e => { diff --git a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs b/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs index 20934b25..19afa582 100644 --- a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs @@ -41,14 +41,6 @@ public class BigMapController : PFUIPanel mapManager = this.transform.Find("Map").GetComponent(); mapManager.OnInitialized += MapManager_OnInitialized; mapManager.OnUpdated += MapManager_OnUpdated; - mapManager.OnMapRedrawn += () => - { - //Debug.Log("map redrawn"); - }; - mapManager.OnTileFinished += (e) => - { - //Debug.Log("finished"); - }; //// mapManager.OnTileFinished += MapManager_OnTileFinished; //mapManager.SetZoom(13); @@ -58,26 +50,22 @@ public class BigMapController : PFUIPanel canvas = this.transform.Find("Canvas").gameObject; canvas.GetComponent().worldCamera = Camera.main; - var goList = canvas.transform.Find("GoList"); + var goList = canvas.transform.Find("SwitchMode"); + SetRounded(goList, 64); UIManager.AddEvent(goList.gameObject, EventTriggerType.PointerClick, (e) => { - //App.MainSceneParam.Add("Name", "MapListPanel"); - //SceneManager.LoadScene("MainScene"); - mapManager.Destroy(); - UIManager.ShowMapListPanel(); - //this.gameObject.SetActive(false); DestroyImmediate(this.gameObject); }); var panel = canvas.transform.Find("Panel"); - SetRounded(panel,30f); + base.SetRounded(panel,30f); content = panel.Find("Scroll View").Find("Viewport").Find("Content").gameObject; var input = panel.Find("InputField"); - SetRounded(input, 20f); + base.SetRounded(input, 20f); keyword = input.Find("Text").GetComponent(); var searchBtn = input.Find("Search").gameObject; UIManager.AddEvent(searchBtn, EventTriggerType.PointerClick, Search); @@ -85,20 +73,26 @@ public class BigMapController : PFUIPanel tips = ((GameObject)Instantiate(Resources.Load("UI/Prefab/BigMap/Tips"), canvas.transform.Find("TipsContainer"))).GetComponent(); tips.Hide(); + BindHeadImage(); } - /// - /// 给对象设置圆角 + /// 绑定头像 /// - /// - /// - void SetRounded(Transform panel, float radius) + void BindHeadImage() { - var rounded = Resources.Load("UI/Material/RoundedCornersTextureMaterial"); - var material = Instantiate(rounded); - var rect = ((RectTransform)panel).rect; - material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, radius, 0)); - panel.GetComponent().material = material; + var headImage = canvas.transform.Find("HeadImage").GetComponent(); + //var material = Instantiate(Resources.Load("UI/Material/RoundedCornersTextureMaterial")); + var rect = ((RectTransform)headImage.transform).rect; + //material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height, 0)); + //headImage.material = material; + SetRounded(headImage.transform, rect.height); + + Utils.DisplayImage(StartCoroutine, headImage, App.CurrentUser.WxHeadImg); + + UIManager.AddEvent(headImage.gameObject, EventTriggerType.PointerClick, (e) => + { + UIManager.ShowEditUserPanel(); + }); } // Start is called before the first frame update diff --git a/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs b/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs index 4d502b14..8a2317aa 100644 --- a/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs @@ -37,7 +37,8 @@ public class DeviceController : PFUIPanel UIManager.AddEvent(mReturnBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction(e => { //UIManager.ShowHomePanel(); - UIManager.CloseModal(); + //UIManager.CloseModal(); + this.Close(); })); var bg = this.transform.Find("Status").Find("Bg"); diff --git a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs index 37c347e2..aeed4565 100644 --- a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs @@ -6,6 +6,7 @@ using Newtonsoft.Json; using System; using System.Collections; using System.Collections.Generic; +using System.Runtime.InteropServices; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; @@ -21,6 +22,9 @@ public class EditUserController : PFUIPanel private Text mNameText; private RawImage mHeadImage; private UserApi userApi; + private Button mCancelButton; + private Button mBackButton; + PfUIButton mChangeAvatar; protected override void Awake() { userApi = new UserApi(); @@ -33,7 +37,43 @@ public class EditUserController : PFUIPanel mMonthDropdown = panel.Find("MonthDropdown").GetComponent(); mDayDropdown = panel.Find("DayDropdown").GetComponent(); mSaveButton = this.transform.Find("SaveButton").GetComponent