From 2d38b63c911108f49540fa6cd1fd590ea370cb43 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Wed, 5 Jan 2022 17:40:12 +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 | 28 +- .../Editor/1.2.168.meta | 8 + .../Resources/Images/NewDesign/ICON_Tools.png | Bin 3543 -> 5801 bytes .../Resources/Images/NewDesign/bg_top_APP.png | Bin 0 -> 40991 bytes .../Images/NewDesign/bg_top_APP.png.meta | 128 + .../Resources/Images/NewDesign/icon_none.png | Bin 0 -> 6953 bytes .../Images/NewDesign/icon_none.png.meta | 128 + Assets/Resources/Images/zh/运动地球.png | Bin 0 -> 4135 bytes Assets/Resources/Images/zh/运动地球.png.meta | 128 + .../UI/Prefab/Common/Mobile/Loading.prefab | 3 +- .../Resources/UI/Prefab/MainNav-mobile.prefab | 54 +- .../UI/Prefab/MapList/MapItem-Mobile.prefab | 28 +- .../UI/Prefab/Panel/Mobile/HomePanel.prefab | 1238 ++++++- .../Prefab/Panel/Mobile/MapListPanel.prefab | 974 +++-- .../Panel/Mobile/NewRouteDetailPanel.prefab | 514 ++- Assets/Resources/UI/language.json | 67 +- Assets/Scenes/Login-Mobile.unity | 3281 +++++++++-------- Assets/Scripts/Apis/Models/UserResultModel.cs | 3 + Assets/Scripts/Scenes/LoginController.cs | 20 +- Assets/Scripts/Scenes/MainController.cs | 40 +- Assets/Scripts/UI/Prefab/NewMainNav.cs | 18 +- .../Scripts/UI/Prefab/Panel/HomeController.cs | 36 +- .../UI/Prefab/Panel/MapListExtraController.cs | 22 +- .../Prefab/Panel/NewRouteDetailController.cs | 5 +- .../UI/Prefab/Panel/UserInfoController.cs | 6 +- .../Scripts/UI/Prefab/Race/RaceListScript.cs | 3 + .../AndroidResolverDependencies.xml | 2 +- 27 files changed, 4562 insertions(+), 2172 deletions(-) create mode 100644 Assets/ExternalDependencyManager/Editor/1.2.168.meta create mode 100644 Assets/Resources/Images/NewDesign/bg_top_APP.png create mode 100644 Assets/Resources/Images/NewDesign/bg_top_APP.png.meta create mode 100644 Assets/Resources/Images/NewDesign/icon_none.png create mode 100644 Assets/Resources/Images/NewDesign/icon_none.png.meta create mode 100644 Assets/Resources/Images/zh/运动地球.png create mode 100644 Assets/Resources/Images/zh/运动地球.png.meta diff --git a/Assets/BannerController.cs b/Assets/BannerController.cs index 175837eb..56677ad5 100644 --- a/Assets/BannerController.cs +++ b/Assets/BannerController.cs @@ -162,16 +162,16 @@ public class BannerController : MonoBehaviour void DORight(CanvasGroup left, CanvasGroup center, CanvasGroup right) { Sequence se = DOTween.Sequence(); - se.Join(center.DOFade(0.5f, 0.5f)); - se.Join(center.GetComponent().DOScale(Vector3.one * 0.8f, 0.5f)); - se.Join(center.GetComponent().DOLocalMoveX(43, 0.5f)); - se.Join(right.GetComponent().DOLocalMoveX(-43, 0.5f)); + se.Join(center.DOFade(0.5f, 0.3f)); + se.Join(center.GetComponent().DOScale(Vector3.one * 0.8f, 0.3f)); + se.Join(center.GetComponent().DOLocalMoveX(43, 0.3f)); + se.Join(right.GetComponent().DOLocalMoveX(-43, 0.3f)); var area = list[((currentIndex++) + list.Count) % list.Count]; right.GetComponent().Initial(area); if (currentIndex >= list.Count) currentIndex = 0; - se.Join(left.DOFade(1, 0.5f)); - se.Join(left.GetComponent().DOScale(Vector3.one, 0.5f)); - se.Join(left.GetComponent().DOLocalMoveX(0, 0.5f)); + se.Join(left.DOFade(1, 0.3f)); + se.Join(left.GetComponent().DOScale(Vector3.one, 0.3f)); + se.Join(left.GetComponent().DOLocalMoveX(0, 0.3f)); se.Play(); left.transform.SetAsLastSibling(); //事件改变 @@ -195,17 +195,17 @@ public class BannerController : MonoBehaviour void DOLeft(CanvasGroup left, CanvasGroup center, CanvasGroup right) { Sequence se = DOTween.Sequence(); - se.Join(center.DOFade(0.5f, 0.5f)); - se.Join(center.GetComponent().DOScale(Vector3.one * 0.8f, 0.5f)); - se.Join(center.GetComponent().DOLocalMoveX(-43, 0.5f)); - se.Join(left.GetComponent().DOLocalMoveX(43, 0.5f)); + se.Join(center.DOFade(0.5f, 0.3f)); + se.Join(center.GetComponent().DOScale(Vector3.one * 0.8f, 0.3f)); + se.Join(center.GetComponent().DOLocalMoveX(-43, 0.3f)); + se.Join(left.GetComponent().DOLocalMoveX(43, 0.3f)); var area = list[((currentIndex--) + list.Count) % list.Count]; var centerArea = list[currentIndex + 1]; left.GetComponent().Initial(area); if (currentIndex < 0) currentIndex = list.Count - 1; - se.Join(right.DOFade(1, 0.5f)); - se.Join(right.GetComponent().DOScale(Vector3.one, 0.5f)); - se.Join(right.GetComponent().DOLocalMoveX(0, 0.5f)); + se.Join(right.DOFade(1, 0.3f)); + se.Join(right.GetComponent().DOScale(Vector3.one, 0.3f)); + se.Join(right.GetComponent().DOLocalMoveX(0, 0.3f)); se.Play(); right.transform.SetAsLastSibling(); //事件改变 diff --git a/Assets/ExternalDependencyManager/Editor/1.2.168.meta b/Assets/ExternalDependencyManager/Editor/1.2.168.meta new file mode 100644 index 00000000..e7304b70 --- /dev/null +++ b/Assets/ExternalDependencyManager/Editor/1.2.168.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ccd268c2c2c420741bbf29cb19e4aada +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/NewDesign/ICON_Tools.png b/Assets/Resources/Images/NewDesign/ICON_Tools.png index e0c25f6013ecb4756e2349ab539f8e7c0af9633d..173a1f27a9ef3764b9334dc0ca089db25bebdb7a 100644 GIT binary patch delta 5782 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 diff --git a/Assets/Resources/Images/NewDesign/bg_top_APP.png b/Assets/Resources/Images/NewDesign/bg_top_APP.png new file mode 100644 index 0000000000000000000000000000000000000000..24eddf5a4ac593685b9f771f0756a85217e34757 GIT binary patch literal 40991 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/NewDesign/icon_none.png.meta b/Assets/Resources/Images/NewDesign/icon_none.png.meta new file mode 100644 index 00000000..a68ab4b9 --- /dev/null +++ b/Assets/Resources/Images/NewDesign/icon_none.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: a1a24d26a55a3cd4382984833364e241 +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: iPhone + 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/zh/运动地球.png b/Assets/Resources/Images/zh/运动地球.png new file mode 100644 index 0000000000000000000000000000000000000000..ca8f6ffbd92d1731062bbd7309a352e6d3c8287f GIT binary patch literal 4135 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/zh/运动地球.png.meta b/Assets/Resources/Images/zh/运动地球.png.meta new file mode 100644 index 00000000..721897f4 --- /dev/null +++ b/Assets/Resources/Images/zh/运动地球.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: ca65d10fe38382344b7c0d28114781e1 +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: iPhone + 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/UI/Prefab/Common/Mobile/Loading.prefab b/Assets/Resources/UI/Prefab/Common/Mobile/Loading.prefab index 60a726d3..cef0c87d 100644 --- a/Assets/Resources/UI/Prefab/Common/Mobile/Loading.prefab +++ b/Assets/Resources/UI/Prefab/Common/Mobile/Loading.prefab @@ -36,7 +36,7 @@ RectTransform: 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: 360, y: 360} + m_SizeDelta: {x: 240, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6067144360479621595 CanvasRenderer: @@ -87,3 +87,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cb3d6b847d2e034b9ba054d0220dc0d, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/MainNav-mobile.prefab b/Assets/Resources/UI/Prefab/MainNav-mobile.prefab index 037aff64..32dba143 100644 --- a/Assets/Resources/UI/Prefab/MainNav-mobile.prefab +++ b/Assets/Resources/UI/Prefab/MainNav-mobile.prefab @@ -53,9 +53,9 @@ RectTransform: - {fileID: 3068819108013337933} - {fileID: 8160864935934588695} - {fileID: 1409429025663639838} + - {fileID: 5976554196684205079} - {fileID: 4027836304468151454} - {fileID: 8382612560249065530} - - {fileID: 5976554196684205079} - {fileID: 4204578097682859198} - {fileID: 8763288661036287962} m_Father: {fileID: 0} @@ -326,12 +326,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -561,12 +561,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -763,12 +763,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -843,7 +843,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -948,12 +948,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1129,12 +1129,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1335,12 +1335,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1355,7 +1355,7 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -2 objectReference: {fileID: 0} - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1551,12 +1551,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1737,12 +1737,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2003,7 +2003,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2108,12 +2108,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2189,7 +2189,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_RootOrder - value: 9 + value: 7 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2289,12 +2289,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2490,12 +2490,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} diff --git a/Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab b/Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab index 687644e9..8f7f80ab 100644 --- a/Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab +++ b/Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab @@ -621,7 +621,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8} + m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 0.8} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -953,7 +953,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -187} - m_SizeDelta: {x: 216, y: 22} + m_SizeDelta: {x: 242, y: 22} m_Pivot: {x: 0, y: 1} --- !u!222 &5307116753344173196 CanvasRenderer: @@ -998,7 +998,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 28, y: 0} - m_SizeDelta: {x: 53, y: 20} + m_SizeDelta: {x: 56, y: 14} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5307116753349857061 CanvasRenderer: @@ -1034,7 +1034,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 6 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -1149,7 +1149,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 82, y: 0} + m_AnchoredPosition: {x: 84, y: 0} m_SizeDelta: {x: 12, y: 12} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5307116753709705167 @@ -1223,8 +1223,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 168, y: 0} - m_SizeDelta: {x: 37, y: 20} + m_AnchoredPosition: {x: 172, y: 0} + m_SizeDelta: {x: 56, y: 14} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5307116753824956001 CanvasRenderer: @@ -1260,7 +1260,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 6 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -1301,7 +1301,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 152, y: 0} + m_AnchoredPosition: {x: 156, y: 0} m_SizeDelta: {x: 12, y: 12} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5307116753827441512 @@ -1509,8 +1509,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 97, y: 0} - m_SizeDelta: {x: 53, y: 20} + m_AnchoredPosition: {x: 100, y: 0} + m_SizeDelta: {x: 56, y: 14} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5307116754248337036 CanvasRenderer: @@ -1546,7 +1546,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 6 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -1763,7 +1763,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1} + m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -2045,7 +2045,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1} + m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab index e0415295..7569d2fd 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab @@ -201,6 +201,91 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &492355666741634070 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7458153711918254111} + - component: {fileID: 1786398424944435580} + - component: {fileID: 8663095644729702014} + - component: {fileID: 3684485202079008348} + m_Layer: 5 + m_Name: Avatar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7458153711918254111 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492355666741634070} + 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: 1415850656546707181} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -19} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &1786398424944435580 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492355666741634070} + m_CullTransparentMesh: 0 +--- !u!114 &8663095644729702014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492355666741634070} + 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!114 &3684485202079008348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492355666741634070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 13 --- !u!1 &584266343485612241 GameObject: m_ObjectHideFlags: 0 @@ -420,7 +505,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -440,6 +525,261 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u2014\u2014" +--- !u!1 &1291486659325437699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1548145507139097207} + - component: {fileID: 1619423385784873614} + - component: {fileID: 4022411520941257296} + m_Layer: 5 + m_Name: NickName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1548145507139097207 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1291486659325437699} + 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: 1415850656546707181} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -49} + m_SizeDelta: {x: -6, y: 16} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &1619423385784873614 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1291486659325437699} + m_CullTransparentMesh: 0 +--- !u!114 &4022411520941257296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1291486659325437699} + 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: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 8 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 8 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!1 &1472282361944963679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2480607783488149776} + - component: {fileID: 119190069380378453} + - component: {fileID: 6277876323748517227} + - component: {fileID: 1641223987136604857} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2480607783488149776 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472282361944963679} + 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: 1415850656546707181} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -5} + m_SizeDelta: {x: -6, y: 11} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &119190069380378453 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472282361944963679} + m_CullTransparentMesh: 0 +--- !u!114 &6277876323748517227 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472282361944963679} + 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: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 8 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 8 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Climbing King +--- !u!114 &1641223987136604857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472282361944963679} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: +--- !u!1 &1571956892697826908 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 508011199987177187} + - component: {fileID: 4419348717721257534} + - component: {fileID: 1998524194375037552} + - component: {fileID: 1189539670967916383} + m_Layer: 5 + m_Name: Avatar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &508011199987177187 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1571956892697826908} + 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: 6803950910160924496} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -19} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &4419348717721257534 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1571956892697826908} + m_CullTransparentMesh: 0 +--- !u!114 &1998524194375037552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1571956892697826908} + 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!114 &1189539670967916383 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1571956892697826908} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 13 --- !u!1 &1638774704701942989 GameObject: m_ObjectHideFlags: 0 @@ -635,6 +975,7 @@ RectTransform: - {fileID: 1306094687277852868} - {fileID: 7422200770415638701} - {fileID: 1128757190696039284} + - {fileID: 5441671389935901999} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -678,6 +1019,261 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &1973218873378694667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2276876947988141989} + - component: {fileID: 6570847868903851777} + - component: {fileID: 8995809276098108959} + m_Layer: 5 + m_Name: NickName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2276876947988141989 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1973218873378694667} + 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: 2700656436055691504} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -49} + m_SizeDelta: {x: -6, y: 16} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &6570847868903851777 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1973218873378694667} + m_CullTransparentMesh: 0 +--- !u!114 &8995809276098108959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1973218873378694667} + 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: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 8 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 8 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!1 &2025324135178808275 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9169832607250991135} + - component: {fileID: 7173546907452945526} + - component: {fileID: 5707214364705492339} + - component: {fileID: 1986941863281562645} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9169832607250991135 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025324135178808275} + 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: 2700656436055691504} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -5} + m_SizeDelta: {x: -6, y: 11} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &7173546907452945526 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025324135178808275} + m_CullTransparentMesh: 0 +--- !u!114 &5707214364705492339 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025324135178808275} + 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: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 8 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 8 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Power King +--- !u!114 &1986941863281562645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025324135178808275} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: +--- !u!1 &2368459569441895125 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8134625548925078816} + - component: {fileID: 2583222597396487728} + - component: {fileID: 7128639773822948202} + - component: {fileID: 2155764069152926202} + m_Layer: 5 + m_Name: Avatar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8134625548925078816 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2368459569441895125} + 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: 2700656436055691504} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -19} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2583222597396487728 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2368459569441895125} + m_CullTransparentMesh: 0 +--- !u!114 &7128639773822948202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2368459569441895125} + 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!114 &2155764069152926202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2368459569441895125} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 13 --- !u!1 &2645890273884190885 GameObject: m_ObjectHideFlags: 0 @@ -1880,6 +2476,80 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &3331668867557859427 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9154464921151912093} + - component: {fileID: 3116533229696162758} + - component: {fileID: 8113949204368661265} + m_Layer: 5 + m_Name: Line1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9154464921151912093 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3331668867557859427} + 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: 5441671389935901999} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3116533229696162758 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3331668867557859427} + m_CullTransparentMesh: 0 +--- !u!114 &8113949204368661265 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3331668867557859427} + 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.20784314, g: 0.20784314, b: 0.2627451, 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 &9079218660357868333 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1906,6 +2576,53 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &3784460712729935923 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2700656436055691504} + - component: {fileID: 6284256279542336007} + m_Layer: 5 + m_Name: Power + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2700656436055691504 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3784460712729935923} + 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: 9169832607250991135} + - {fileID: 8134625548925078816} + - {fileID: 2276876947988141989} + m_Father: {fileID: 5441671389935901999} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 70, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6284256279542336007 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3784460712729935923} + m_CullTransparentMesh: 0 --- !u!1 &3931130817493022318 GameObject: m_ObjectHideFlags: 0 @@ -2247,6 +2964,53 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &3983446515297867600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6803950910160924496} + - component: {fileID: 4194374563667086128} + m_Layer: 5 + m_Name: Distance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6803950910160924496 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3983446515297867600} + 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: 3479391097183096054} + - {fileID: 508011199987177187} + - {fileID: 4027651882395503680} + m_Father: {fileID: 5441671389935901999} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 70, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4194374563667086128 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3983446515297867600} + m_CullTransparentMesh: 0 --- !u!225 &5750456731137924102 CanvasGroup: m_ObjectHideFlags: 0 @@ -2331,7 +3095,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -3988,6 +4752,80 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 2020.02.15 +--- !u!1 &4416685164106208229 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4885807610099096164} + - component: {fileID: 4956920032039903494} + - component: {fileID: 3864527100863314502} + m_Layer: 5 + m_Name: Line2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4885807610099096164 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4416685164106208229} + 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: 5441671389935901999} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4956920032039903494 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4416685164106208229} + m_CullTransparentMesh: 0 +--- !u!114 &3864527100863314502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4416685164106208229} + 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.20784314, g: 0.20784314, b: 0.2627451, 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!1 &4715117370818764256 GameObject: m_ObjectHideFlags: 0 @@ -4133,6 +4971,84 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4933881145057569999 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4027651882395503680} + - component: {fileID: 3472730629651353030} + - component: {fileID: 2577896465711751961} + m_Layer: 5 + m_Name: NickName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4027651882395503680 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4933881145057569999} + 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: 6803950910160924496} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -49} + m_SizeDelta: {x: -6, y: 16} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3472730629651353030 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4933881145057569999} + m_CullTransparentMesh: 0 +--- !u!114 &2577896465711751961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4933881145057569999} + 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: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 8 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 8 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: --- !u!1 &5158843870271843054 GameObject: m_ObjectHideFlags: 0 @@ -4211,6 +5127,111 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 17DAYS +--- !u!1 &5248828794390806763 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5441671389935901999} + - component: {fileID: 3568302404605538338} + - component: {fileID: 8349583587824284985} + - component: {fileID: 8098683537823652969} + m_Layer: 5 + m_Name: MaxRankingData + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5441671389935901999 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5248828794390806763} + 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: 2700656436055691504} + - {fileID: 9154464921151912093} + - {fileID: 6803950910160924496} + - {fileID: 4885807610099096164} + - {fileID: 1415850656546707181} + m_Father: {fileID: 1777885814862178517} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -30, y: -140} + m_SizeDelta: {x: 230, y: 70} + m_Pivot: {x: 1, y: 1} +--- !u!222 &3568302404605538338 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5248828794390806763} + m_CullTransparentMesh: 0 +--- !u!114 &8349583587824284985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5248828794390806763} + 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: 80e15f98ba047e042a1a7825f004da85, 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 &8098683537823652969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5248828794390806763} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 9 + m_Right: 9 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 --- !u!1 &5294646333661244148 GameObject: m_ObjectHideFlags: 0 @@ -4621,6 +5642,145 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &6775217088107519216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1415850656546707181} + - component: {fileID: 4887308405188757519} + m_Layer: 5 + m_Name: Climb + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1415850656546707181 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6775217088107519216} + 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: 2480607783488149776} + - {fileID: 7458153711918254111} + - {fileID: 1548145507139097207} + m_Father: {fileID: 5441671389935901999} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 70, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4887308405188757519 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6775217088107519216} + m_CullTransparentMesh: 0 +--- !u!1 &6878144665571740784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3479391097183096054} + - component: {fileID: 5902970080336642818} + - component: {fileID: 4374292000878778106} + - component: {fileID: 6212502599851100490} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3479391097183096054 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6878144665571740784} + 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: 6803950910160924496} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -5} + m_SizeDelta: {x: -6, y: 11} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5902970080336642818 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6878144665571740784} + m_CullTransparentMesh: 0 +--- !u!114 &4374292000878778106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6878144665571740784} + 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: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 8 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 8 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Distance King +--- !u!114 &6212502599851100490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6878144665571740784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &7096132014094238137 GameObject: m_ObjectHideFlags: 0 @@ -5704,9 +6864,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 244353793357a2541a07622eae3d5da6, type: 3} ---- !u!1 &4205490951973352218 stripped +--- !u!1 &4205490952055938429 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3257946120518485715, guid: 244353793357a2541a07622eae3d5da6, + m_CorrespondingSourceObject: {fileID: 3257946120601053364, guid: 244353793357a2541a07622eae3d5da6, type: 3} m_PrefabInstance: {fileID: 1687278662453327305} m_PrefabAsset: {fileID: 0} @@ -5716,9 +6876,9 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1687278662453327305} m_PrefabAsset: {fileID: 0} ---- !u!1 &4205490952055938429 stripped +--- !u!1 &4205490951973352218 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3257946120601053364, guid: 244353793357a2541a07622eae3d5da6, + m_CorrespondingSourceObject: {fileID: 3257946120518485715, guid: 244353793357a2541a07622eae3d5da6, type: 3} m_PrefabInstance: {fileID: 1687278662453327305} m_PrefabAsset: {fileID: 0} @@ -5866,9 +7026,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 244353793357a2541a07622eae3d5da6, type: 3} ---- !u!1 &3983774849533422115 stripped +--- !u!1 &3983774849582974020 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3257946120518485715, guid: 244353793357a2541a07622eae3d5da6, + m_CorrespondingSourceObject: {fileID: 3257946120601053364, guid: 244353793357a2541a07622eae3d5da6, type: 3} m_PrefabInstance: {fileID: 1909449973474192624} m_PrefabAsset: {fileID: 0} @@ -5878,9 +7038,9 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1909449973474192624} m_PrefabAsset: {fileID: 0} ---- !u!1 &3983774849582974020 stripped +--- !u!1 &3983774849533422115 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3257946120601053364, guid: 244353793357a2541a07622eae3d5da6, + m_CorrespondingSourceObject: {fileID: 3257946120518485715, guid: 244353793357a2541a07622eae3d5da6, type: 3} m_PrefabInstance: {fileID: 1909449973474192624} m_PrefabAsset: {fileID: 0} @@ -6033,12 +7193,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 244353793357a2541a07622eae3d5da6, type: 3} ---- !u!1 &3462768965852872763 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3257946120518485715, guid: 244353793357a2541a07622eae3d5da6, - type: 3} - m_PrefabInstance: {fileID: 2105633740577670888} - m_PrefabAsset: {fileID: 0} --- !u!224 &3462768965852872762 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3257946120518485714, guid: 244353793357a2541a07622eae3d5da6, @@ -6051,6 +7205,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2105633740577670888} m_PrefabAsset: {fileID: 0} +--- !u!1 &3462768965852872763 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3257946120518485715, guid: 244353793357a2541a07622eae3d5da6, + type: 3} + m_PrefabInstance: {fileID: 2105633740577670888} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2739862746848942841 PrefabInstance: m_ObjectHideFlags: 0 @@ -6286,12 +7446,12 @@ PrefabInstance: - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -6311,12 +7471,12 @@ PrefabInstance: - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -6326,12 +7486,12 @@ PrefabInstance: - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -6496,12 +7656,12 @@ PrefabInstance: - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -6511,12 +7671,12 @@ PrefabInstance: - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -6576,12 +7736,12 @@ PrefabInstance: - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -6591,12 +7751,12 @@ PrefabInstance: - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -6651,12 +7811,12 @@ PrefabInstance: - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -6671,12 +7831,12 @@ PrefabInstance: - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -6696,12 +7856,12 @@ PrefabInstance: - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -6731,12 +7891,12 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -6746,7 +7906,7 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchoredPosition.y - value: -2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8719966614707449432, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab index ea36a119..27f41149 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab @@ -185,6 +185,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3292737747453648276} + - {fileID: 1329387645722734609} - {fileID: 1618336064856912604} - {fileID: 6653062728990783300} - {fileID: 1879042590406371758} @@ -223,6 +224,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e87cee7d1f8eeb94d986bf6d6eaf4cbc, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} map: {fileID: 5262667172184159175, guid: fb5f2cc3db40bc44589a1d265794a77b, type: 3} content: {fileID: 4891852497544557808} scroll: {fileID: 465239218947862518} @@ -266,6 +268,94 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5a011dd1cd8044a418d1b92b2474ee7c, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} +--- !u!1 &598786992266014097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8736604956466695941} + - component: {fileID: 3435145560446613934} + - component: {fileID: 3968529762568720675} + - component: {fileID: 2056280657203847998} + m_Layer: 5 + m_Name: Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8736604956466695941 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 598786992266014097} + 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: 8128814431325347266} + - {fileID: 793217110346018063} + m_Father: {fileID: 7128732170403506011} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 29.5, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3435145560446613934 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 598786992266014097} + m_CullTransparentMesh: 0 +--- !u!114 &3968529762568720675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 598786992266014097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &2056280657203847998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 598786992266014097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 --- !u!1 &876699419422366196 GameObject: m_ObjectHideFlags: 0 @@ -278,7 +368,6 @@ GameObject: - component: {fileID: 539925695315977005} - component: {fileID: 8682456236724390953} - component: {fileID: 7460486988850958197} - - component: {fileID: 5383723785582012814} m_Layer: 5 m_Name: Collection m_TagString: Untagged @@ -293,17 +382,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 876699419422366196} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 7128732170403506011} - m_RootOrder: 1 + m_Father: {fileID: 6056921201420994045} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 128.5, y: 0} - m_SizeDelta: {x: 0, y: 19} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &539925695315977005 CanvasRenderer: @@ -339,7 +428,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -359,20 +448,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: ---- !u!114 &5383723785582012814 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 876699419422366196} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &1429559310958506577 GameObject: m_ObjectHideFlags: 0 @@ -607,7 +682,7 @@ RectTransform: - {fileID: 7944455583227005010} - {fileID: 990678332190591730} m_Father: {fileID: 465239219729653177} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1013,7 +1088,6 @@ GameObject: - component: {fileID: 8128814431325347266} - component: {fileID: 9016194644714546059} - component: {fileID: 7310879060939701732} - - component: {fileID: 2344419806797920639} - component: {fileID: 3973537374338082186} m_Layer: 5 m_Name: Route @@ -1029,16 +1103,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1511841465192178067} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 7128732170403506011} + m_Father: {fileID: 8736604956466695941} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 29.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 19} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9016194644714546059 @@ -1075,27 +1149,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ROUTES ---- !u!114 &2344419806797920639 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1511841465192178067} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!114 &3973537374338082186 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1109,52 +1169,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: ---- !u!1 &1844114269031981566 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1241915756638420200} - - component: {fileID: 6824934138813382089} - m_Layer: 5 - m_Name: Error - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1241915756638420200 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1844114269031981566} - 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: 2827495877320900510} - - {fileID: 313058552892968899} - m_Father: {fileID: 802540520250792767} - 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: 233.6, y: 265.6} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6824934138813382089 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1844114269031981566} - m_CullTransparentMesh: 0 --- !u!1 &1856582807434622596 GameObject: m_ObjectHideFlags: 0 @@ -1214,80 +1228,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 ---- !u!1 &2268223922189575512 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2827495877320900510} - - component: {fileID: 5110750009399769198} - - component: {fileID: 8335290208466738348} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2827495877320900510 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2268223922189575512} - 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: 1241915756638420200} - 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: 20} - m_SizeDelta: {x: 0, y: -40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5110750009399769198 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2268223922189575512} - m_CullTransparentMesh: 0 ---- !u!114 &8335290208466738348 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2268223922189575512} - 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: e573a7ea39b67e141bbbf37295befcff, 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 &2360510148091404934 GameObject: m_ObjectHideFlags: 0 @@ -1319,7 +1259,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 465239219729653177} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1955,6 +1895,80 @@ MonoBehaviour: m_MaskInteraction: 85 m_UseStencil: 1 m_RaycastFilter: 0 +--- !u!1 &3942151122008487872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1329387645722734609} + - component: {fileID: 2638409750589286356} + - component: {fileID: 8557653409692863134} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1329387645722734609 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3942151122008487872} + 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: 465239219729653177} + m_RootOrder: 1 + 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!222 &2638409750589286356 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3942151122008487872} + m_CullTransparentMesh: 0 +--- !u!114 &8557653409692863134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3942151122008487872} + 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: 0.8} + 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!1 &3967944257997185272 GameObject: m_ObjectHideFlags: 0 @@ -2511,8 +2525,8 @@ RectTransform: 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: 20} - m_SizeDelta: {x: 0, y: -40} + m_AnchoredPosition: {x: 0, y: 12.5} + m_SizeDelta: {x: 0, y: -25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4479758116663823600 CanvasRenderer: @@ -2541,7 +2555,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e573a7ea39b67e141bbbf37295befcff, type: 3} + m_Sprite: {fileID: 21300000, guid: a1a24d26a55a3cd4382984833364e241, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2596,7 +2610,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1241915756638420200} + - {fileID: 8119043696946072022} - {fileID: 4466448737399355102} - {fileID: 429598682220209713} m_Father: {fileID: 4545657409424263385} @@ -3206,7 +3220,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 465239219729653177} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3446,10 +3460,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8128814431325347266} - - {fileID: 1025571349298815060} + - {fileID: 8736604956466695941} + - {fileID: 2037016142584235098} + - {fileID: 6056921201420994045} m_Father: {fileID: 465239219729653177} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -3482,7 +3497,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 20 + m_Spacing: 10 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -3539,7 +3554,7 @@ RectTransform: 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: 233.6, y: 265.6} + m_SizeDelta: {x: 75, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1032965800497702725 CanvasRenderer: @@ -3565,6 +3580,52 @@ MonoBehaviour: m_MaskInteraction: 85 m_UseStencil: 1 m_RaycastFilter: 0 +--- !u!1 &5820517221223289337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8119043696946072022} + - component: {fileID: 3888753239558204969} + m_Layer: 5 + m_Name: Error + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8119043696946072022 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5820517221223289337} + 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: 5250328120460833743} + - {fileID: 4139002795810803856} + m_Father: {fileID: 802540520250792767} + 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: 75, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3888753239558204969 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5820517221223289337} + m_CullTransparentMesh: 0 --- !u!1 &5876314523374917942 GameObject: m_ObjectHideFlags: 0 @@ -3596,7 +3657,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 465239219729653177} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -3650,6 +3711,77 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 26 +--- !u!1 &5886559667800117909 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 793217110346018063} + - component: {fileID: 5597908648170345} + - component: {fileID: 3997525379234087954} + m_Layer: 5 + m_Name: Line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &793217110346018063 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5886559667800117909} + 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: 8736604956466695941} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5597908648170345 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5886559667800117909} + m_CullTransparentMesh: 0 +--- !u!114 &3997525379234087954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5886559667800117909} + 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 &5897143235749881357 GameObject: m_ObjectHideFlags: 0 @@ -3829,6 +3961,80 @@ MonoBehaviour: m_MaskInteraction: 85 m_UseStencil: 1 m_RaycastFilter: 0 +--- !u!1 &5919111563765091824 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5250328120460833743} + - component: {fileID: 6582774662107066299} + - component: {fileID: 3777074761703260594} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5250328120460833743 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5919111563765091824} + 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: 8119043696946072022} + 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: 12.5} + m_SizeDelta: {x: 0, y: -25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6582774662107066299 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5919111563765091824} + m_CullTransparentMesh: 0 +--- !u!114 &3777074761703260594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5919111563765091824} + 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: a1a24d26a55a3cd4382984833364e241, 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 &6050569855701897417 GameObject: m_ObjectHideFlags: 0 @@ -4187,6 +4393,93 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6532441580585531043 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6056921201420994045} + - component: {fileID: 491309581183335073} + - component: {fileID: 2706330020529388913} + - component: {fileID: 2618818671486755011} + m_Layer: 5 + m_Name: Container1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6056921201420994045 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6532441580585531043} + 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: 1025571349298815060} + - {fileID: 5471392759849085635} + m_Father: {fileID: 7128732170403506011} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 129.5, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &491309581183335073 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6532441580585531043} + m_CullTransparentMesh: 0 +--- !u!114 &2706330020529388913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6532441580585531043} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &2618818671486755011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6532441580585531043} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 --- !u!1 &6653062727056844702 GameObject: m_ObjectHideFlags: 0 @@ -5272,7 +5565,7 @@ RectTransform: - {fileID: 1856582807434622599} - {fileID: 4545657409424263385} m_Father: {fileID: 465239219729653177} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} @@ -5552,6 +5845,77 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7161966861965301685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5471392759849085635} + - component: {fileID: 3855641744289035911} + - component: {fileID: 4323964769280663229} + m_Layer: 5 + m_Name: Line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5471392759849085635 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7161966861965301685} + 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: 6056921201420994045} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3855641744289035911 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7161966861965301685} + m_CullTransparentMesh: 0 +--- !u!114 &4323964769280663229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7161966861965301685} + 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 &7181082561524395326 GameObject: m_ObjectHideFlags: 0 @@ -5675,7 +6039,7 @@ RectTransform: m_Children: - {fileID: 6085250142340395341} m_Father: {fileID: 465239219729653177} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -5807,7 +6171,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_SizeDelta: {x: 0, y: 19} m_Pivot: {x: 0.5, y: 0} --- !u!222 &267367882303563041 CanvasRenderer: @@ -5830,7 +6194,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1} + m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -5838,10 +6202,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - m_FontSize: 28 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 2 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -5899,7 +6263,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7597644263241945084 +--- !u!1 &7749477167361371665 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5907,10 +6271,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 313058552892968899} - - component: {fileID: 3749208158370404455} - - component: {fileID: 8151246078411352488} - - component: {fileID: 1039123910498909498} + - component: {fileID: 4139002795810803856} + - component: {fileID: 4537646163777136460} + - component: {fileID: 4655905644472267600} + - component: {fileID: 552228004428471311} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -5918,47 +6282,47 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &313058552892968899 +--- !u!224 &4139002795810803856 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7597644263241945084} + m_GameObject: {fileID: 7749477167361371665} 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: 1241915756638420200} + m_Father: {fileID: 8119043696946072022} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_SizeDelta: {x: 0, y: 19} m_Pivot: {x: 0.5, y: 0} ---- !u!222 &3749208158370404455 +--- !u!222 &4537646163777136460 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7597644263241945084} + m_GameObject: {fileID: 7749477167361371665} m_CullTransparentMesh: 0 ---- !u!114 &8151246078411352488 +--- !u!114 &4655905644472267600 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7597644263241945084} + m_GameObject: {fileID: 7749477167361371665} 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: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1} + m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -5966,10 +6330,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - m_FontSize: 28 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 2 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -5978,19 +6342,93 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Found Nothing ---- !u!114 &1039123910498909498 +--- !u!114 &552228004428471311 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7597644263241945084} + m_GameObject: {fileID: 7749477167361371665} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: key: +--- !u!1 &7751667449439239468 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2037016142584235098} + - component: {fileID: 7798223616792345190} + - component: {fileID: 3926280491098450764} + m_Layer: 5 + m_Name: Line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2037016142584235098 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7751667449439239468} + 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: 7128732170403506011} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1, y: 11} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7798223616792345190 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7751667449439239468} + m_CullTransparentMesh: 0 +--- !u!114 &3926280491098450764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7751667449439239468} + 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.36078432, g: 0.36078432, b: 0.43137255, 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 &1429559311976359837 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6053,7 +6491,7 @@ RectTransform: m_Children: - {fileID: 7174631400083046293} m_Father: {fileID: 465239219729653177} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -6173,12 +6611,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 465239219729653177} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -10} - m_SizeDelta: {x: -120, y: 19} + m_AnchoredPosition: {x: 5, y: -10} + m_SizeDelta: {x: -110, y: 19} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2023812630871860621 CanvasRenderer: @@ -6571,7 +7009,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -6981,6 +7419,21 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} - target: {fileID: 1617869899094122649, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_SizeDelta.x @@ -7366,6 +7819,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 20 objectReference: {fileID: 0} + - target: {fileID: 6376947731341292573, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y @@ -7381,6 +7839,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 20 objectReference: {fileID: 0} + - target: {fileID: 8382612560249065530, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8382612560249065530, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8382612560249065530, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8382612560249065530, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y @@ -7618,21 +8096,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} ---- !u!224 &2234182990056195463 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4628129972378993927 stripped +--- !u!1 &6398833330297696636 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3075247155673026290 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} @@ -7648,15 +8114,21 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} ---- !u!1 &6398833330297696636 stripped +--- !u!1 &3075247155673026290 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} ---- !u!1 &3344798044730818033 stripped +--- !u!1 &4628129972378993927 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!224 &2234182990056195463 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} @@ -7672,6 +8144,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} +--- !u!1 &3344798044730818033 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6073211655158443556 PrefabInstance: m_ObjectHideFlags: 0 @@ -7827,39 +8305,21 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} ---- !u!1 &6423651778393776433 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 6073211655158443556} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3980532922793874755 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 6073211655158443556} - m_PrefabAsset: {fileID: 0} --- !u!1 &5594525415673429112 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} ---- !u!1 &3745822250017908288 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 6073211655158443556} - m_PrefabAsset: {fileID: 0} --- !u!1 &6749386026079657654 stripped GameObject: m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} ---- !u!1 &4998415483215112909 stripped +--- !u!1 &7820744829146851513 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} @@ -7869,9 +8329,27 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} ---- !u!1 &7820744829146851513 stripped +--- !u!1 &3980532922793874755 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 6073211655158443556} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3745822250017908288 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 6073211655158443556} + m_PrefabAsset: {fileID: 0} +--- !u!1 &6423651778393776433 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 6073211655158443556} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4998415483215112909 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} @@ -8039,15 +8517,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} ---- !u!1 &4976321847170018841 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322, - type: 3} - m_PrefabInstance: {fileID: 6653062728498872177} - m_PrefabAsset: {fileID: 0} --- !u!224 &7944455583227005010 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} m_PrefabInstance: {fileID: 6653062728498872177} m_PrefabAsset: {fileID: 0} +--- !u!1 &4976321847170018841 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + m_PrefabInstance: {fileID: 6653062728498872177} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteDetailPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteDetailPanel.prefab index f6bfc06c..f0d04670 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteDetailPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteDetailPanel.prefab @@ -74,6 +74,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2192866306238927730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7422125425058783314} + - component: {fileID: 1441639047239612962} + - component: {fileID: 8978434794956830459} + m_Layer: 5 + m_Name: DescScroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7422125425058783314 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2192866306238927730} + 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: 8784674041717051607} + m_Father: {fileID: 5526612272615142912} + m_RootOrder: 6 + 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: -112} + m_SizeDelta: {x: -20, y: -264} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1441639047239612962 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2192866306238927730} + m_CullTransparentMesh: 0 +--- !u!114 &8978434794956830459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2192866306238927730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 42032582894242611} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 8784674041717051607} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2239030176411737966 GameObject: m_ObjectHideFlags: 0 @@ -85,6 +161,7 @@ GameObject: - component: {fileID: 3894915989844421851} - component: {fileID: 7972066583884027716} - component: {fileID: 2330414139545757493} + - component: {fileID: 842054790776809710} m_Layer: 5 m_Name: Desc m_TagString: Untagged @@ -103,14 +180,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5526612272615142912} - m_RootOrder: 6 + m_Father: {fileID: 42032582894242611} + 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: 50, y: 20} - m_SizeDelta: {x: -70, y: -288} - m_Pivot: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: 211, y: 0} + m_Pivot: {x: 0, y: 1} --- !u!222 &7972066583884027716 CanvasRenderer: m_ObjectHideFlags: 0 @@ -152,6 +229,20 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +--- !u!114 &842054790776809710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2239030176411737966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &3691317595522851050 GameObject: m_ObjectHideFlags: 0 @@ -370,8 +461,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 15, y: -236} - m_SizeDelta: {x: 211, y: 22} + m_AnchoredPosition: {x: 0, y: -212} + m_SizeDelta: {x: 230, y: 22} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1713212118604465205 CanvasRenderer: @@ -496,7 +587,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4575540577362706356 RectTransform: m_ObjectHideFlags: 0 @@ -1105,7 +1196,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 + m_Top: 6 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 @@ -1210,8 +1301,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: -20, y: -20} + m_AnchoredPosition: {x: 10, y: -4} + m_SizeDelta: {x: -20, y: -14} m_Pivot: {x: 0, y: 1} --- !u!222 &5526612272606031881 CanvasRenderer: @@ -1273,7 +1364,6 @@ GameObject: m_Component: - component: {fileID: 5526612272615142912} - component: {fileID: 5526612272615142942} - - component: {fileID: 2968433541682090128} - component: {fileID: 6368635270485513067} m_Layer: 5 m_Name: Left @@ -1299,7 +1389,7 @@ RectTransform: - {fileID: 5526612272636430230} - {fileID: 5526612272941488697} - {fileID: 5526612272165583874} - - {fileID: 3894915989844421851} + - {fileID: 7422125425058783314} - {fileID: 5778423490206480944} - {fileID: 3790473409329199100} - {fileID: 330365734832415941} @@ -1309,7 +1399,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 281, y: 0} + m_SizeDelta: {x: 250, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &5526612272615142942 CanvasRenderer: @@ -1319,35 +1409,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5526612272615142915} m_CullTransparentMesh: 0 ---- !u!114 &2968433541682090128 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5526612272615142915} - 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: 0.8} - 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 &6368635270485513067 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1466,8 +1527,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: 50, y: -178} - m_SizeDelta: {x: 211, y: 48} + m_AnchoredPosition: {x: 10, y: -154} + m_SizeDelta: {x: 230, y: 48} m_Pivot: {x: 0, y: 1} --- !u!222 &5526612272636430228 CanvasRenderer: @@ -1520,6 +1581,8 @@ GameObject: m_Component: - component: {fileID: 5526612272745412623} - component: {fileID: 5526612272745412621} + - component: {fileID: 1369733520845916388} + - component: {fileID: 4454756389916793965} m_Layer: 5 m_Name: Container m_TagString: Untagged @@ -1540,13 +1603,14 @@ RectTransform: m_Children: - {fileID: 5526612272615142912} - {fileID: 5526612273599596600} + - {fileID: 4145096425839109525} m_Father: {fileID: 9155624476384996310} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 764, y: -10} m_Pivot: {x: 0.5, y: 0} --- !u!222 &5526612272745412621 CanvasRenderer: @@ -1556,6 +1620,49 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5526612272745412622} m_CullTransparentMesh: 0 +--- !u!114 &1369733520845916388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5526612272745412622} + 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: 0.8} + 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 &4454756389916793965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5526612272745412622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3} + m_Name: + m_EditorClassIdentifier: + r: {x: 20, y: 20, z: 0, w: 0} + rect2props: {x: 0.000061035156, y: -10, z: 259.5082, w: 259.5082} --- !u!1 &5526612272941488696 GameObject: m_ObjectHideFlags: 0 @@ -1593,7 +1700,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10, y: -74} + m_AnchoredPosition: {x: -10, y: -10} m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 1, y: 1} --- !u!222 &5526612272941488695 @@ -1770,8 +1877,6 @@ GameObject: m_Component: - component: {fileID: 5526612273599596600} - component: {fileID: 5526612273599596601} - - component: {fileID: 793280911815898427} - - component: {fileID: 953103594924131267} m_Layer: 5 m_Name: Right m_TagString: Untagged @@ -1796,8 +1901,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 291, y: -10} - m_SizeDelta: {x: 513, y: -10} + m_AnchoredPosition: {x: 251, y: 0} + m_SizeDelta: {x: 513, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &5526612273599596601 CanvasRenderer: @@ -1807,49 +1912,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5526612273599596603} m_CullTransparentMesh: 0 ---- !u!114 &793280911815898427 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5526612273599596603} - 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: 0.8} - 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 &953103594924131267 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5526612273599596603} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3} - m_Name: - m_EditorClassIdentifier: - r: {x: 20, y: 20, z: 0, w: 0} - rect2props: {x: 0.000015258789, y: -10.000015, z: 170.7663, w: 170.7663} --- !u!1 &5526612273750354113 GameObject: m_ObjectHideFlags: 0 @@ -1956,8 +2018,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: 50, y: -54} - m_SizeDelta: {x: 130, y: 86} + m_AnchoredPosition: {x: 10, y: -10} + m_SizeDelta: {x: 160, y: 106} m_Pivot: {x: 0, y: 1} --- !u!222 &5526612273772399088 CanvasRenderer: @@ -2248,7 +2310,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 242.5, y: -116.5} + m_AnchoredPosition: {x: 212, y: -54} m_SizeDelta: {x: 19, y: 17} m_Pivot: {x: 0, y: 1} --- !u!222 &2453552088492445910 @@ -2362,6 +2424,95 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7422954580519245607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8784674041717051607} + - component: {fileID: 1645100082002518108} + - component: {fileID: 4977025431586088799} + - component: {fileID: 409416936031330657} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8784674041717051607 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7422954580519245607} + 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: 42032582894242611} + m_Father: {fileID: 7422125425058783314} + 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, y: 1} +--- !u!222 &1645100082002518108 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7422954580519245607} + m_CullTransparentMesh: 0 +--- !u!114 &4977025431586088799 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7422954580519245607} + 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: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &409416936031330657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7422954580519245607} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1 &8192472598482676617 GameObject: m_ObjectHideFlags: 0 @@ -2506,6 +2657,157 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &8639126074118007320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 42032582894242611} + - component: {fileID: 6988587361511480002} + - component: {fileID: 2645726034277478883} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &42032582894242611 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8639126074118007320} + 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: 3894915989844421851} + m_Father: {fileID: 8784674041717051607} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &6988587361511480002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8639126074118007320} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &2645726034277478883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8639126074118007320} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 5 + m_Right: 5 + m_Top: 5 + m_Bottom: 5 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!1 &8764234698560013687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4145096425839109525} + - component: {fileID: 3077769259701813193} + - component: {fileID: 5336817673869588156} + m_Layer: 5 + m_Name: Line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4145096425839109525 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8764234698560013687} + 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: 5526612272745412623} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 250, y: 0} + m_SizeDelta: {x: 1, y: -20} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &3077769259701813193 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8764234698560013687} + m_CullTransparentMesh: 0 +--- !u!114 &5336817673869588156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8764234698560013687} + 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.23921569, g: 0.24313726, b: 0.3019608, 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!1 &9155624476384996305 GameObject: m_ObjectHideFlags: 0 @@ -3676,15 +3978,15 @@ PrefabInstance: - {fileID: 7793409217181307314, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} - {fileID: 829206726517620079, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} ---- !u!1 &8210619403058349571 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - m_PrefabInstance: {fileID: 6155413159602679681} - m_PrefabAsset: {fileID: 0} --- !u!224 &8210619403058349570 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} m_PrefabInstance: {fileID: 6155413159602679681} m_PrefabAsset: {fileID: 0} +--- !u!1 &8210619403058349571 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + m_PrefabInstance: {fileID: 6155413159602679681} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/language.json b/Assets/Resources/UI/language.json index ea979e33..c05e436c 100644 --- a/Assets/Resources/UI/language.json +++ b/Assets/Resources/UI/language.json @@ -40,7 +40,7 @@ "Please Connect Device！": "请连接设备", "OK": "好的", "Total Climbed": "累计爬升", - "Other Account": "切换账号", + "Other Account": "添加账号", "Ranking": "排名", "Close Gate:": "倒计时：", "RANK": "排名", @@ -117,20 +117,20 @@ "Year": "年", "Gender": "性别", "Units": "单位", - "FTP": "FTP", + "FTP": "FTP(W)", "Please enter your FTP": "请输入您的FTP", - "Weight": "体重", + "Weight": "体重(KG)", "Please enter your weight": "请输入您的体重", - "Height": "身高", + "Height": "身高(CM)", "Please enter your height": "请输入您的身高", - "Max heart rate": "最大心率", - "Max Heart Rate": "最大心率", + "Max heart rate": "最大心率(BPM)", + "Max Heart Rate": "最大心率(BPM)", "Please enter your MHR": "请输入您的最大心率", - "Bike weight": "车重", - "Bike Weight": "车重", + "Bike weight": "车重(KG)", + "Bike Weight": "车重(KG)", "Please enter your BW": "请输入您的车重", - "Wheel diameter": "轮径", - "Wheel Diameter": "轮径", + "Wheel diameter": "轮径(MM)", + "Wheel Diameter": "轮径(MM)", "Please enter your WD": "请输入您的轮径", "DELIVERY INFO": "收货信息", "Please enter your name": "请输入您的姓名", @@ -148,7 +148,7 @@ "We sincerely look forward to receiving your suggestions......": "我们真诚的希望收到您的建议......", "Submit": "提交", "RACE": "比赛", - "WEIGHT": "体重", + "WEIGHT": "体重(KG)", "FTP/KG": "功体比", "Total Calories Burned": "累计消耗", "Phone/E-mail": "手机号/邮箱", @@ -157,7 +157,7 @@ "Logout": "注销", "Do you want to log out and change accounts?": "您要注销并更改帐户吗？", "Forget password?": "忘记密码?", - "or you can join with": "或者使用如下账号登录", + "or you can join with": "其他登录方式", "Difficulty": "难度", "FLAT": "平路", "Favorite": "收藏", @@ -178,10 +178,10 @@ "Total Rides": "骑行次数", "Total Riding Time": "骑行时间", "times": "次", - "hours": "H", - "KCAL": "KCAL", - "M": "M", - "KM": "KM", + "hours": "小时", + "KCAL": "千卡", + "M": "米", + "KM": "千米", "TRAINING DIARY": "骑行记录", "Downloaded": "下载进度", "Update Now": "立即更新", @@ -219,7 +219,7 @@ "You're almost done.": "马上完成", "Just a little more info to set up your account.": "设置一些额外的账号信息", "Already a member?": "老用户?", - "Or you can continue with": "或者使用如下账号登录", + "Or you can continue with": "其他登录方式", "Not a member?": "还未注册？", "RESET PASSWORD": "重置密码", "Create Race": "创建赛事", @@ -292,9 +292,9 @@ "User refusal of authorisation": "用户拒绝授权", "User deauthorisation": "用户取消授权", "COLLECTIONS": "集合", - "CONTINUOUS": "累计骑行", - "DISTANCE": "距离", - "CARLORIES": "卡路里", + "CONTINUOUS": "连续骑行", + "DISTANCE": "阶段里程(KM)", + "CARLORIES": "卡路里(KCAL)", "DAY": "天", "DAYS": "天", "VIEW1": "查看", @@ -302,7 +302,11 @@ "Competition Time": "比赛时间", "View All": "查看全部", "ABOUT": "简介", - "No Net": "无网络" + "No Net": "无网络", + "PERFECT INFORMATION": "完善信息", + "Distance King": "里程王", + "Power King": "功率王", + "Climbing King": "爬坡王" }, "en": { "HOT ROUTES": "HOT ROUTES", @@ -421,17 +425,18 @@ "Year": "Year", "Gender": "Gender", "Units": "Units", - "FTP": "Units", + "FTP": "FTP(W)", "Please enter your FTP": "Please enter your FTP", - "Weight": "Weight", + "Weight": "Weight(KG)", "Please enter your weight": "Please enter your weight", - "Height": "Height", + "Height": "Height(CM)", "Please enter your height": "Please enter your height", - "Max heart rate": "Max heart rate", + "Max heart rate": "Max heart rate(BPM)", + "Max Heart Rate": "Max Heart Rate(BPM)", "Please enter your MHR": "Please enter your MHR", - "Bike weight": "Bike weight", + "Bike weight": "Bike weight(KG)", "Please enter your BW": "Please enter your BW", - "Wheel diameter": "Wheel diameter", + "Wheel diameter": "Wheel diameter(MM)", "Please enter your WD": "Please enter your WD", "DELIVERY INFO": "DELIVERY INFO", "Please enter your name": "Please enter your name", @@ -449,7 +454,7 @@ "We sincerely look forward to receiving your suggestions......": "We sincerely look forward to receiving your suggestions......", "Submit": "Submit", "RACE": "RACE", - "WEIGHT": "WEIGHT", + "WEIGHT": "WEIGHT(KG)", "FTP/KG": "FTP/KG", "Total Calories Burned": "Total Calories Burned", "Phone/E-mail": "Phone/E-mail", @@ -598,6 +603,10 @@ "Competition Time": "Competition Time", "View All": "View All", "ABOUT": "ABOUT", - "No Net": "No Net" + "No Net": "No Net", + "PERFECT INFORMATION": "PERFECT INFORMATION", + "Distance King": "Distance King", + "Power King": "Power King", + "Climbing King": "Climbing King" } } diff --git a/Assets/Scenes/Login-Mobile.unity b/Assets/Scenes/Login-Mobile.unity index 0fb27eb0..1fe44c32 100644 --- a/Assets/Scenes/Login-Mobile.unity +++ b/Assets/Scenes/Login-Mobile.unity @@ -153,9 +153,9 @@ RectTransform: m_Father: {fileID: 1198026530} 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: 177, y: -185} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 354, y: 301} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1272031 @@ -1027,7 +1027,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1928299625} + m_Material: {fileID: 821959430} m_Color: {r: 0.2392157, g: 0.24313727, b: 0.3019608, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -1207,7 +1207,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1264664788} + m_Material: {fileID: 1601815931} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_Maskable: 0 @@ -1600,6 +1600,92 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 199358470} m_PrefabAsset: {fileID: 0} +--- !u!21 &212417135 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 354, g: 370, b: 40, a: 0} --- !u!1 &225944475 GameObject: m_ObjectHideFlags: 0 @@ -1663,7 +1749,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1283484090} + m_Material: {fileID: 1964382679} m_Color: {r: 0.2392157, g: 0.24313727, b: 0.3019608, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -1688,6 +1774,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 225944475} m_CullTransparentMesh: 0 +--- !u!21 &236240725 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 354, g: 370, b: 40, a: 0} --- !u!1 &248120061 GameObject: m_ObjectHideFlags: 0 @@ -1856,6 +2028,178 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 260522527} m_CullTransparentMesh: 0 +--- !u!21 &284857851 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 314, g: 39, b: 22, a: 0} +--- !u!21 &339496322 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 354, g: 301, b: 60, a: 0} --- !u!1 &372638126 GameObject: m_ObjectHideFlags: 0 @@ -2264,92 +2608,6 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _WidthHeightRadius: {r: 40, g: 34, b: 34, a: 0} ---- !u!21 &409755062 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 280, g: 39, b: 22, a: 0} --- !u!1 &420650120 GameObject: m_ObjectHideFlags: 0 @@ -2577,7 +2835,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1490186951} + m_Material: {fileID: 1986991005} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -2925,92 +3183,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 455270388} m_CullTransparentMesh: 0 ---- !u!21 &460202214 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 301, b: 40, a: 0} --- !u!1 &485958768 GameObject: m_ObjectHideFlags: 0 @@ -3299,9 +3471,9 @@ RectTransform: m_Father: {fileID: 1198026530} 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: 708, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 354, y: 370} m_Pivot: {x: 0, y: 1} --- !u!114 &567535513 @@ -3329,7 +3501,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1889813827} + m_Material: {fileID: 236240725} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -3354,92 +3526,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567535511} m_CullTransparentMesh: 0 ---- !u!21 &602737879 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 301, b: 60, a: 0} --- !u!1001 &608756976 PrefabInstance: m_ObjectHideFlags: 0 @@ -4351,92 +4437,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 704704647} m_CullTransparentMesh: 0 ---- !u!21 &732663456 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 314, g: 39, b: 22, a: 0} --- !u!1 &745977148 GameObject: m_ObjectHideFlags: 0 @@ -4564,181 +4564,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &756711464 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 756711465} - - component: {fileID: 756711468} - - component: {fileID: 756711467} - - component: {fileID: 756711466} - m_Layer: 5 - m_Name: FormContainer-wx2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &756711465 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 756711464} - 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: 485958769} - - {fileID: 2099299219} - - {fileID: 1778434570} - - {fileID: 1226946008} - - {fileID: 1371282018} - - {fileID: 248120062} - - {fileID: 1696356446} - - {fileID: 54016416} - m_Father: {fileID: 1198026530} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 714, y: -34.5} - m_SizeDelta: {x: 354, y: 301} - m_Pivot: {x: 0, y: 1} ---- !u!114 &756711466 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 756711464} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} - m_Name: - m_EditorClassIdentifier: - radius: 30 ---- !u!114 &756711467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 756711464} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 602737879} - m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 - 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!222 &756711468 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 756711464} - m_CullTransparentMesh: 0 ---- !u!1 &791252002 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 791252003} - - component: {fileID: 791252005} - - component: {fileID: 791252004} - m_Layer: 5 - m_Name: BatteryText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &791252003 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 791252002} - 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: 1245142876} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 60, y: 30} - m_Pivot: {x: 1, y: 0.5} ---- !u!114 &791252004 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 791252002} - 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: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 16 - 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: ---- !u!222 &791252005 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 791252002} - m_CullTransparentMesh: 0 ---- !u!21 &802596311 +--- !u!21 &750341442 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -4823,7 +4649,267 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 370, b: 40, a: 0} + - _WidthHeightRadius: {r: 100, g: 39, b: 22, a: 0} +--- !u!1 &756711464 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 756711465} + - component: {fileID: 756711468} + - component: {fileID: 756711467} + - component: {fileID: 756711466} + m_Layer: 5 + m_Name: FormContainer-wx2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &756711465 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 756711464} + 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: 485958769} + - {fileID: 2099299219} + - {fileID: 1778434570} + - {fileID: 1226946008} + - {fileID: 1371282018} + - {fileID: 248120062} + - {fileID: 1696356446} + - {fileID: 54016416} + m_Father: {fileID: 1198026530} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 714, y: -34.5} + m_SizeDelta: {x: 354, y: 301} + m_Pivot: {x: 0, y: 1} +--- !u!114 &756711466 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 756711464} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 30 +--- !u!114 &756711467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 756711464} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 339496322} + m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + 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!222 &756711468 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 756711464} + m_CullTransparentMesh: 0 +--- !u!21 &789357113 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 354, g: 301, b: 40, a: 0} +--- !u!1 &791252002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 791252003} + - component: {fileID: 791252005} + - component: {fileID: 791252004} + m_Layer: 5 + m_Name: BatteryText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &791252003 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791252002} + 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: 1245142876} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 60, y: 30} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &791252004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791252002} + 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: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 16 + 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: +--- !u!222 &791252005 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791252002} + m_CullTransparentMesh: 0 --- !u!1 &804258766 GameObject: m_ObjectHideFlags: 0 @@ -4916,6 +5002,92 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: +--- !u!21 &821959430 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 16, g: 16, b: 16, a: 0} --- !u!1 &828967545 GameObject: m_ObjectHideFlags: 0 @@ -5294,9 +5466,9 @@ RectTransform: m_Father: {fileID: 1084309180} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 106, y: 122} m_Pivot: {x: 0, y: 1} --- !u!222 &838289239 @@ -5307,6 +5479,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 838289237} m_CullTransparentMesh: 0 +--- !u!21 &877306735 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 354, g: 301, b: 40, a: 0} --- !u!1 &885308276 GameObject: m_ObjectHideFlags: 0 @@ -5449,9 +5707,9 @@ RectTransform: m_Father: {fileID: 1198026530} 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: 1062, y: -34.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 354, y: 301} m_Pivot: {x: 0, y: 1} --- !u!114 &913700441 @@ -5479,7 +5737,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 460202214} + m_Material: {fileID: 1855269280} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -6568,6 +6826,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1038488566} m_CullTransparentMesh: 0 +--- !u!21 &1051304321 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 280, g: 39, b: 22, a: 0} --- !u!1001 &1058426967 PrefabInstance: m_ObjectHideFlags: 0 @@ -7555,92 +7899,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1125353412} m_CullTransparentMesh: 0 ---- !u!21 &1145480163 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 314, g: 39, b: 22, a: 0} --- !u!1 &1146012646 GameObject: m_ObjectHideFlags: 0 @@ -7895,92 +8153,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1186584108} m_CullTransparentMesh: 0 ---- !u!21 &1190015796 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 301, b: 40, a: 0} --- !u!1 &1198026529 GameObject: m_ObjectHideFlags: 0 @@ -8300,6 +8472,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1245142875} m_CullTransparentMesh: 0 +--- !u!21 &1247904011 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 354, g: 370, b: 40, a: 0} --- !u!21 &1258602188 Material: serializedVersion: 6 @@ -8386,92 +8644,6 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _WidthHeightRadius: {r: 0, g: 34, b: 34, a: 0} ---- !u!21 &1264664788 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 300, b: 40, a: 0} --- !u!1 &1268802441 GameObject: m_ObjectHideFlags: 0 @@ -8546,92 +8718,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268802441} m_CullTransparentMesh: 0 ---- !u!21 &1283484090 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 16, g: 16, b: 16, a: 0} --- !u!21 &1286832191 Material: serializedVersion: 6 @@ -8718,92 +8804,6 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _WidthHeightRadius: {r: 40, g: 34, b: 34, a: 0} ---- !u!21 &1303041474 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 100, g: 39, b: 22, a: 0} --- !u!1 &1332028083 GameObject: m_ObjectHideFlags: 0 @@ -9601,9 +9601,9 @@ RectTransform: m_Father: {fileID: 1198026530} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 531, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 354, y: 370} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1406457430 @@ -9618,7 +9618,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1704896264} + m_Material: {fileID: 1247904011} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -9845,92 +9845,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1417780816} m_PrefabAsset: {fileID: 0} ---- !u!21 &1439924407 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 301, b: 40, a: 0} --- !u!1001 &1454741467 PrefabInstance: m_ObjectHideFlags: 0 @@ -10146,6 +10060,92 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1454741467} m_PrefabAsset: {fileID: 0} +--- !u!21 &1483718230 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 314, g: 39, b: 22, a: 0} --- !u!1 &1488868001 GameObject: m_ObjectHideFlags: 0 @@ -10237,178 +10237,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1488868001} m_CullTransparentMesh: 0 ---- !u!21 &1490186951 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 60, g: 60, b: 60, a: 0} ---- !u!21 &1524899394 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 100, g: 39, b: 22, a: 0} --- !u!1 &1538255648 GameObject: m_ObjectHideFlags: 0 @@ -10420,6 +10248,7 @@ GameObject: - component: {fileID: 1538255649} - component: {fileID: 1538255651} - component: {fileID: 1538255650} + - component: {fileID: 1538255652} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -10487,6 +10316,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1538255648} m_CullTransparentMesh: 0 +--- !u!114 &1538255652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1538255648} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1001 &1560149220 PrefabInstance: m_ObjectHideFlags: 0 @@ -10667,6 +10509,178 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1560149220} m_PrefabAsset: {fileID: 0} +--- !u!21 &1583036278 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 60, g: 60, b: 60, a: 0} +--- !u!21 &1601815931 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 354, g: 300, b: 40, a: 0} --- !u!1 &1602252557 GameObject: m_ObjectHideFlags: 0 @@ -10737,7 +10751,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1439924407} + m_Material: {fileID: 789357113} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -10762,6 +10776,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1602252557} m_CullTransparentMesh: 0 +--- !u!21 &1623018399 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 100, g: 39, b: 22, a: 0} --- !u!21 &1669864889 Material: serializedVersion: 6 @@ -10926,92 +11026,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1696356445} m_CullTransparentMesh: 0 ---- !u!21 &1704896264 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 370, b: 40, a: 0} --- !u!1 &1713385733 GameObject: m_ObjectHideFlags: 0 @@ -11188,6 +11202,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} --- !u!1001 &1762177178 PrefabInstance: m_ObjectHideFlags: 0 @@ -11495,7 +11510,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1780966138} + m_Material: {fileID: 1583036278} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -11517,92 +11532,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1778434569} m_CullTransparentMesh: 0 ---- !u!21 &1780966138 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 60, g: 60, b: 60, a: 0} --- !u!1 &1803032529 GameObject: m_ObjectHideFlags: 0 @@ -11674,92 +11603,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1803032529} m_CullTransparentMesh: 0 ---- !u!21 &1815240524 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 100, g: 39, b: 22, a: 0} --- !u!1001 &1815654368 PrefabInstance: m_ObjectHideFlags: 0 @@ -11972,7 +11815,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1190015796} + m_Material: {fileID: 877306735} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -12036,9 +11879,9 @@ RectTransform: m_Father: {fileID: 381190218} 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: 354, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 354, y: 316} m_Pivot: {x: 1, y: 1} --- !u!222 &1832674273 @@ -12274,6 +12117,178 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1836221522} m_PrefabAsset: {fileID: 0} +--- !u!21 &1855269280 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 354, g: 301, b: 40, a: 0} +--- !u!21 &1868449424 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 100, g: 39, b: 22, a: 0} --- !u!21 &1874759590 Material: serializedVersion: 6 @@ -12520,93 +12535,60 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _WidthHeightRadius: {r: 40, g: 34, b: 34, a: 0} ---- !u!21 &1889813827 -Material: - serializedVersion: 6 +--- !u!1 &1934359711 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 370, b: 40, a: 0} ---- !u!21 &1928299625 + serializedVersion: 6 + m_Component: + - component: {fileID: 1934359712} + - component: {fileID: 1934359714} + m_Layer: 5 + m_Name: NextPage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1934359712 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1934359711} + 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: 1815654369} + - {fileID: 1035872849} + - {fileID: 608756977} + - {fileID: 1390782629} + - {fileID: 53860479} + - {fileID: 1560149221} + - {fileID: 2128251820} + - {fileID: 949964387} + - {fileID: 23459891} + m_Father: {fileID: 381190218} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 354, y: 316} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1934359714 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1934359711} + m_CullTransparentMesh: 0 +--- !u!21 &1964382679 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -12692,59 +12674,6 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _WidthHeightRadius: {r: 16, g: 16, b: 16, a: 0} ---- !u!1 &1934359711 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1934359712} - - component: {fileID: 1934359714} - m_Layer: 5 - m_Name: NextPage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1934359712 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1934359711} - 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: 1815654369} - - {fileID: 1035872849} - - {fileID: 608756977} - - {fileID: 1390782629} - - {fileID: 53860479} - - {fileID: 1560149221} - - {fileID: 2128251820} - - {fileID: 949964387} - - {fileID: 23459891} - m_Father: {fileID: 381190218} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 531, y: -158} - m_SizeDelta: {x: 354, y: 316} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1934359714 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1934359711} - m_CullTransparentMesh: 0 --- !u!1001 &1973948708 PrefabInstance: m_ObjectHideFlags: 0 @@ -13000,6 +12929,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1982416542} m_CullTransparentMesh: 0 +--- !u!21 &1986991005 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 60, g: 60, b: 60, a: 0} --- !u!1 &2003946479 GameObject: m_ObjectHideFlags: 0 @@ -14862,7 +14877,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 802596311} + m_Material: {fileID: 212417135} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -15063,7 +15078,7 @@ PrefabInstance: - target: {fileID: 8672365918516275962, guid: 959deb2e0e03f4443a5adba7f7e626f9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8672365918516275962, guid: 959deb2e0e03f4443a5adba7f7e626f9, type: 3} @@ -15073,7 +15088,7 @@ PrefabInstance: - target: {fileID: 8672365918516275962, guid: 959deb2e0e03f4443a5adba7f7e626f9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8672365918516275962, guid: 959deb2e0e03f4443a5adba7f7e626f9, type: 3} diff --git a/Assets/Scripts/Apis/Models/UserResultModel.cs b/Assets/Scripts/Apis/Models/UserResultModel.cs index 237c9c7f..b85d66bf 100644 --- a/Assets/Scripts/Apis/Models/UserResultModel.cs +++ b/Assets/Scripts/Apis/Models/UserResultModel.cs @@ -74,5 +74,8 @@ namespace Assets.Scripts.Apis.Models public DateTime UpdateTime { get; set; } public string WebHost { get; set; }//创建比赛url public bool CanCreateRace { get; set; }//是否可以创建比赛 + //第三方userid + public string AppleUserId { get; set; } + public string FacebookUserId { get; set; } } } diff --git a/Assets/Scripts/Scenes/LoginController.cs b/Assets/Scripts/Scenes/LoginController.cs index 9d1b40f1..edd37b4d 100644 --- a/Assets/Scripts/Scenes/LoginController.cs +++ b/Assets/Scripts/Scenes/LoginController.cs @@ -762,6 +762,7 @@ public class LoginController : BaseScene wxLogin3.Find("NickName").GetComponent().text = wxInfoJson.Value("nickname"); pageNums = 5; //this.goSign(); + PerfectInfo(); StartScrollPanel(2); } else @@ -1120,6 +1121,7 @@ public class LoginController : BaseScene if (wxLogin2.gameObject.activeSelf) wxLogin2.gameObject.SetActive(false); //if (wxLogin3.gameObject.activeSelf) wxLogin3.gameObject.SetActive(false); pageNums = 4; + signType = 0; #if !(UNITY_ANDROID || UNITY_IOS) if (wxLogin1.transform.localPosition.y == 0) { @@ -1254,6 +1256,18 @@ public class LoginController : BaseScene { return signType > 0; } + void PerfectInfo() + { + var txt = transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Sign/signText").GetComponent(); + if (isThird()) + { + txt.text = App.GetLocalString("PERFECT INFORMATION"); + } + else + { + txt.text = App.GetLocalString("SIGN UP"); + } + } ///

/// /// @@ -1272,6 +1286,7 @@ public class LoginController : BaseScene #endif signPage1.Find("signThird").gameObject.SetActive(true); ShowPassword(); + PerfectInfo(); this.StartScrollPanel(3); this.StartScrollSign(0); } @@ -1280,10 +1295,6 @@ public class LoginController : BaseScene if (type == 0) { pageNums = 4; - if (signType < 2) - { - signType = 0; - } signContainer.Find("signText").GetComponent().text = App.GetLocalString("SIGN UP"); wxLogin2.gameObject.SetActive(false); signPage1.Find("next").gameObject.SetActive(true); @@ -1291,6 +1302,7 @@ public class LoginController : BaseScene signPage1.Find("previousThird").gameObject.SetActive(false); signPage1.Find("signThird").gameObject.SetActive(false); ShowPassword(); + PerfectInfo(); this.StartScrollPanel(2); this.StartScrollSign(0); } diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index abc6cd9f..d9365f83 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -86,7 +86,7 @@ public class MainController : BaseScene msgs = List { msg, msg2, msg3 }; rightMessage = transform.Find("GameObject/MessageRight").GetComponent(); #else - msgLocation = new Vector3(168, 37, 0); + msgLocation = new Vector3(168, 37-80, 0); var go = transform.Find("GameObject"); go.GetComponent().anchorMin = Vector2.zero; go.GetComponent().anchorMax = Vector2.one; @@ -102,7 +102,7 @@ public class MainController : BaseScene rightMessage.transform.localPosition = 1 * msgLocation; rightMessage.alpha = 0; msgs = new List { rightMessage }; - for (int i = 0; i < 5; i++) + for (int i = 0; i < 3; i++) { var tmpm = Instantiate(rightMessage); tmpm.transform.SetParent(rightMessage.transform.parent); @@ -172,9 +172,9 @@ public class MainController : BaseScene } private void DoMessage6(LinkedMessageEvent e) { - var selectIndex = msgIndex % 6; + var selectIndex = msgIndex % 4; var m = msgs[selectIndex]; - if (msgIndex >= 6) // + if (msgIndex >= 4) // { //msgIndex = 0; Sequence se = DOTween.Sequence(); @@ -363,7 +363,7 @@ public class MainController : BaseScene UIManager.UpdateJoinCompetition();//查询当前我参加的赛事 } - float maxt = 0f; //用于获取全服最值内容 + float emptyt = 0;//用于无消息计时 float t = 1f; float scanTicks = 0; @@ -430,54 +430,36 @@ public class MainController : BaseScene //距离50 if (item.EndDistance >= 50) { - var message = lang == "zh" ? $"骑行里程突破{"50KM"}！" : $"riding distance reaches {"50KM"}!"; + var message = lang == "zh" ? $"骑行里程达到{"50KM"}！" : $"riding distance reaches {"50KM"}!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM"); } //距离100 if (item.EndDistance >= 100) { - var message = lang == "zh" ? $"骑行里程突破{"100KM"}！" : $"riding distance reaches {"100KM"}!"; + var message = lang == "zh" ? $"骑行里程达到{"100KM"}！" : $"riding distance reaches {"100KM"}!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}100KM"); } //速度35 if (item.Speed >= 35) { - var message = lang == "zh" ? $"骑行速度突破{Math.Round(item.Speed, 2)}KM/H！" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; + var message = lang == "zh" ? $"骑行速度达到{Math.Round(item.Speed, 2)}KM/H！" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}35KM/H"); } //速度50 if (item.Speed >= 50) { - var message = lang == "zh" ? $"骑行速度突破{Math.Round(item.Speed,2)}KM/H！" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; + var message = lang == "zh" ? $"骑行速度达到{Math.Round(item.Speed,2)}KM/H！" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM/H"); } //功体比 if (item.WeightKg >= 3) { - var message = lang == "zh" ? $"骑行功体比突破{Math.Round(item.WeightKg, 2)}w/kg！" : $" riding PWR reaches {Math.Round(item.WeightKg, 2)}w/kg!"; + var message = lang == "zh" ? $"骑行功体比达到{Math.Round(item.WeightKg, 2)}w/kg！" : $" riding PWR reaches {Math.Round(item.WeightKg, 2)}w/kg!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}3WeightKg"); } } } - maxt -= Time.deltaTime; - if (maxt <= 0) - { - GetMaxRanking(); - - maxt += 60f; - } - } - - private async void GetMaxRanking() - { - var res = await ConfigHelper.mapApi.GetMaxRanking(); - if (res.result) - { - foreach (var item in res.data) - { - EventQueueSystem.QueueEvent(new LinkedMessageEvent(-1, item.Message, item.WxHeadImg, item.NickName,null)); - } - } + } diff --git a/Assets/Scripts/UI/Prefab/NewMainNav.cs b/Assets/Scripts/UI/Prefab/NewMainNav.cs index e6e987b9..5d378e33 100644 --- a/Assets/Scripts/UI/Prefab/NewMainNav.cs +++ b/Assets/Scripts/UI/Prefab/NewMainNav.cs @@ -91,14 +91,6 @@ public class NewMainNav : MonoBehaviour { item.gameObject.SetActive(false); } - else if (item.name == "Custom") - { - item.gameObject.SetActive(custom != null && types.Contains(item.name)); - } - else if (item.name == "Custom2") - { - item.gameObject.SetActive(custom2 != null && types.Contains(item.name)); - } else { item.gameObject.SetActive(types.Contains(item.name)); @@ -108,7 +100,15 @@ public class NewMainNav : MonoBehaviour { item.gameObject.SetActive(item.name == "PF"|| item.name == shrinkName); } - + //自定义按钮出来 + if (item.name == "Custom") + { + item.gameObject.SetActive(custom != null && types.Contains(item.name)); + } + else if (item.name == "Custom2") + { + item.gameObject.SetActive(custom2 != null && types.Contains(item.name)); + } } } diff --git a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs index c4536bb0..139e7a80 100644 --- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs @@ -246,10 +246,10 @@ public class HomeController : PFUIPanel { Utils.DisplayHead(todayData.Find("Avatar").GetComponent(), App.CurrentUser.WxHeadImg); todayData.Find("Datas/Distance/Value").GetComponent().text = $"{summary.ContinuesDay}"+ (summary.ContinuesDay > 1 ? App.GetLocalString("DAYS") : App.GetLocalString("DAY")); - todayData.Find("Datas/Climb/Value").GetComponent().text = $"{summary.ContinuesKm.ToString("#0")}KM";//$"{double.Parse(summary.TotalClimb, CultureInfo.InvariantCulture).ToString("0")}M"; - todayData.Find("Datas/Carlories/Value").GetComponent().text = $"{summary.ContinuesKcal.ToString("#0")}KCAL"; + todayData.Find("Datas/Climb/Value").GetComponent().text = $"{summary.ContinuesKm.ToString("#0.0")}";//$"{double.Parse(summary.TotalClimb, CultureInfo.InvariantCulture).ToString("0")}M"; + todayData.Find("Datas/Carlories/Value").GetComponent().text = $"{summary.ContinuesKcal.ToString("#0")}"; //todayData.Find("Datas/Distance/Rank").GetComponent().text = summary.CurrentTotalDistance == 0 ? "——" : $"+{summary.CurrentTotalDistance.ToString("#0")}"; - todayData.Find("Datas/Climb/Rank").GetComponent().text = summary.CurrentTotalDistance == 0 ? "——" : $"+{summary.CurrentTotalDistance.ToString("#0")}"; + todayData.Find("Datas/Climb/Rank").GetComponent().text = summary.CurrentTotalDistance == 0 ? "——" : $"+{summary.CurrentTotalDistance.ToString("#0.0")}"; todayData.Find("Datas/Carlories/Rank").GetComponent().text = summary.CurrentTotalKcal == 0 ? "——" : $"+{summary.CurrentTotalKcal.ToString("#0")}"; } @@ -282,12 +282,38 @@ public class HomeController : PFUIPanel // Utils.showToast(gameObject, res.errMsg); //} } + float maxt = 0f; //用于获取全服最值内容 // Update is called once per frame void Update() { - + maxt -= Time.deltaTime; + if (maxt <= 0) + { + GetMaxRanking(); + maxt += 60f; + } + } + private async void GetMaxRanking() + { + var res = await ConfigHelper.mapApi.GetMaxRanking(); + if (res.result) + { + var list = res.data; + if (list.Count >= 3) + { + Transform p = transform.Find("MaxRankingData/Power"), + d = transform.Find("MaxRankingData/Distance"), + c = transform.Find("MaxRankingData/Climb"); + Utils.DisplayHead(p.Find("Avatar").GetComponent(), list[1].WxHeadImg); + Utils.DisplayHead(d.Find("Avatar").GetComponent(), list[0].WxHeadImg); + Utils.DisplayHead(c.Find("Avatar").GetComponent(), list[2].WxHeadImg); + p.Find("NickName").GetComponent().text = list[1].NickName; + d.Find("NickName").GetComponent().text = list[0].NickName; + c.Find("NickName").GetComponent().text = list[2].NickName; + } + + } } - public override void Show() { base.Show(); diff --git a/Assets/Scripts/UI/Prefab/Panel/MapListExtraController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListExtraController.cs index ea451625..5830abb5 100644 --- a/Assets/Scripts/UI/Prefab/Panel/MapListExtraController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/MapListExtraController.cs @@ -34,18 +34,22 @@ public class MapListExtraController : PFUIPanel #else tmpCollectItem = Resources.Load("UI/Prefab/NewRoute/RouteItem"); #endif - UIManager.AddEvent(typeSelector.Find("Route").gameObject, EventTriggerType.PointerClick, b => + UIManager.AddEvent(typeSelector.Find("Container/Route").gameObject, EventTriggerType.PointerClick, b => { - typeSelector.Find("Route").GetComponent().color = Utils.HexToColorHtml("#ffffff"); - typeSelector.Find("Collection").GetComponent().color = Utils.HexToColorHtml("#5c5c6e"); + typeSelector.Find("Container/Route").GetComponent().color = Utils.HexToColorHtml("#ffffff"); + typeSelector.Find("Container1/Collection").GetComponent().color = Utils.HexToColorHtml("#5c5c6e"); + typeSelector.Find("Container/Line").gameObject.SetActive(true); + typeSelector.Find("Container1/Line").gameObject.SetActive(false); p1.DOLocalMoveX(p1originx, 0.5f); p2.DOLocalMoveX(p2originx, 0.5f); transform.Find("Tmp/MainNav-mobile").GetComponent().ShowButton("Custom"); }); - UIManager.AddEvent(typeSelector.Find("Collection").gameObject, EventTriggerType.PointerClick, b => + UIManager.AddEvent(typeSelector.Find("Container1/Collection").gameObject, EventTriggerType.PointerClick, b => { - typeSelector.Find("Route").GetComponent().color = Utils.HexToColorHtml("#5c5c6e"); - typeSelector.Find("Collection").GetComponent().color = Utils.HexToColorHtml("#ffffff"); + typeSelector.Find("Container/Route").GetComponent().color = Utils.HexToColorHtml("#5c5c6e"); + typeSelector.Find("Container1/Collection").GetComponent().color = Utils.HexToColorHtml("#ffffff"); + typeSelector.Find("Container/Line").gameObject.SetActive(false); + typeSelector.Find("Container1/Line").gameObject.SetActive(true); p1.DOLocalMoveX(p1originx - 764f, 0.5f); p2.DOLocalMoveX(p2originx - 764f, 0.5f); transform.Find("Tmp/MainNav-mobile").GetComponent().HideButton("Custom"); @@ -82,8 +86,10 @@ public class MapListExtraController : PFUIPanel } p1.localPosition = new Vector3(p1originx, p1.localPosition.y, p1.localPosition.z); p2.localPosition = new Vector3(p2originx, p2.localPosition.y, p2.localPosition.z); - typeSelector.Find("Route").GetComponent().color = Utils.HexToColorHtml("#ffffff"); - typeSelector.Find("Collection").GetComponent().color = Utils.HexToColorHtml("#5c5c6e"); + typeSelector.Find("Container/Route").GetComponent().color = Utils.HexToColorHtml("#ffffff"); + typeSelector.Find("Container1/Collection").GetComponent().color = Utils.HexToColorHtml("#5c5c6e"); + typeSelector.Find("Container/Line").gameObject.SetActive(true); + typeSelector.Find("Container1/Line").gameObject.SetActive(false); transform.Find("Tmp/MainNav-mobile").GetComponent().ShowButton("Custom"); } private async void GetList() diff --git a/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs b/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs index d1bc313d..08a2f6fd 100644 --- a/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs @@ -147,7 +147,7 @@ public class NewRouteDetailController : PFUIPanel .text = string.Empty; transform.Find("Container/Left/Infos/SlopeContainer/Text").GetComponent() .text = string.Empty; - transform.Find("Container/Left/Desc").GetComponent() + transform.Find("Container/Left/DescScroll/Viewport/Content/Desc").GetComponent() .text = string.Empty; if (area.CoverImage != null) { @@ -253,8 +253,9 @@ public class NewRouteDetailController : PFUIPanel .text = $"{res.data.TotalClimb.ToString("#0")}M"; transform.Find("Container/Left/Infos/SlopeContainer/Text").GetComponent() .text = $"{res.data.AverageGrade.ToString("#0.00")}%"; - transform.Find("Container/Left/Desc").GetComponent() + transform.Find("Container/Left/DescScroll/Viewport/Content/Desc").GetComponent() .text = res.data.Description; + LayoutRebuilder.ForceRebuildLayoutImmediate(transform.Find("Container/Left/DescScroll").GetComponent().content); transform.Find("Container/Left/Fav").GetComponent().sprite = FavDict[res.data.IsFav]; LayoutRebuilder.ForceRebuildLayoutImmediate(transform.Find("Container/Left/RideContainer").GetComponent()); } diff --git a/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs b/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs index 40742a77..696444ab 100644 --- a/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs @@ -112,9 +112,9 @@ public class UserInfoController : PFUIPanel #if UNITY_IOS || UNITY_ANDROID infoPanel.Find("Container/Ftp").Find("Value").GetComponent().text = user.FTP.ToString(); infoPanel.Find("Container/MHR").Find("Value").GetComponent().text = user.MaxHeartRate.ToString(); - infoPanel.Find("Container/Weight").Find("Value").GetComponent().text = $"{user.Weight}KG"; - infoPanel.Find("Container/BW").Find("Value").GetComponent().text = $"{user.BicycleWeight}KG"; - infoPanel.Find("Container/WD").Find("Value").GetComponent().text = $"{user.WheelDiameter}MM"; + infoPanel.Find("Container/Weight").Find("Value").GetComponent().text = $"{user.Weight}"; + infoPanel.Find("Container/BW").Find("Value").GetComponent().text = $"{user.BicycleWeight}"; + infoPanel.Find("Container/WD").Find("Value").GetComponent().text = $"{user.WheelDiameter}"; infoPanel.Find("Container/Ftp").Find("Time").GetComponent().text = user.LastUpdateFtpTime.ToLocalString("dd-MM-yyyy"); infoPanel.Find("Container/Weight").Find("Time").GetComponent().text = user.LastUpdateWeightTime.ToLocalString("dd-MM-yyyy"); infoPanel.Find("Container/BW").Find("Time").GetComponent().text = user.LastUpdateBicycleWeightTime.ToLocalString("dd-MM-yyyy"); diff --git a/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs index ebd9cd0f..6726aad8 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs @@ -255,6 +255,9 @@ public class RaceListScript : RaceScript mc.gameObject.SetActive(true); mc.GetComponent().alpha = 0; mc.GetComponent().DOFade(1, 0.3f); + }),custom2:new NewMainNav.CustomButton(Resources.Load("Images/Race/back up"),()=> + { + UIManager.ShowPrePanel(); })); newNav = nav; #else diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml index 79f001d5..b7cdca94 100644 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -22,7 +22,7 @@ - + \ No newline at end of file