From 8e0ce907d066f4e062983435635eb575584d176f Mon Sep 17 00:00:00 2001 From: lishuo Date: Tue, 28 Dec 2021 11:25:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E4=BA=AB=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Images/Ride/share_APP_pengyouquan.png | Bin 0 -> 2976 bytes .../Ride/share_APP_pengyouquan.png.meta | 128 +++ .../Images/Ride/share_APP_wechat.png | Bin 0 -> 3130 bytes .../Images/Ride/share_APP_wechat.png.meta | 128 +++ .../Mobile/CompetitionResultPanel.prefab | 8 +- .../Match/Mobile/CompetitonPanel.prefab | 134 ++- .../Prefab/Match/Mobile/ToolBarPanel.prefab | 10 +- .../UI/Prefab/Ride/Mobile/LoadingPanel.prefab | 235 +++-- .../UI/Prefab/Ride/Mobile/MultiTips.prefab | 94 ++ .../Prefab/Ride/Mobile/MultiTips.prefab.meta | 7 + .../UI/Prefab/Ride/Mobile/Panel.prefab | 905 ++++++++++-------- .../Competiton/CompetitionResultFactory.cs | 23 +- .../Scenes/Ride/Scripts/ResultPanelScript.cs | 28 +- Assets/Scripts/UI/Prefab/MultiTips.cs | 2 +- 14 files changed, 1173 insertions(+), 529 deletions(-) create mode 100644 Assets/Resources/Images/Ride/share_APP_pengyouquan.png create mode 100644 Assets/Resources/Images/Ride/share_APP_pengyouquan.png.meta create mode 100644 Assets/Resources/Images/Ride/share_APP_wechat.png create mode 100644 Assets/Resources/Images/Ride/share_APP_wechat.png.meta create mode 100644 Assets/Resources/UI/Prefab/Ride/Mobile/MultiTips.prefab create mode 100644 Assets/Resources/UI/Prefab/Ride/Mobile/MultiTips.prefab.meta diff --git a/Assets/Resources/Images/Ride/share_APP_pengyouquan.png b/Assets/Resources/Images/Ride/share_APP_pengyouquan.png new file mode 100644 index 0000000000000000000000000000000000000000..6d4784d63e1529f9402ed79f4baece08de7130e4 GIT binary patch literal 2976 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 Uv&RNRrT_o{07*qoM6N<$f;*4tm;e9( literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/Ride/share_APP_wechat.png.meta b/Assets/Resources/Images/Ride/share_APP_wechat.png.meta new file mode 100644 index 00000000..41303ea0 --- /dev/null +++ b/Assets/Resources/Images/Ride/share_APP_wechat.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: b48ea72f3838c7c488621e80fc51c270 +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/Match/Mobile/CompetitionResultPanel.prefab b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitionResultPanel.prefab index 799025ba..b60ea218 100644 --- a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitionResultPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitionResultPanel.prefab @@ -2984,7 +2984,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1567329384924788571 RectTransform: m_ObjectHideFlags: 0 @@ -4945,7 +4945,7 @@ PrefabInstance: - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, type: 3} propertyPath: m_LocalScale.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, type: 3} @@ -4985,12 +4985,12 @@ PrefabInstance: - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, type: 3} propertyPath: m_AnchoredPosition.x - value: 177 + value: 137.5 objectReference: {fileID: 0} - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, type: 3} propertyPath: m_AnchoredPosition.y - value: -78 + value: -29.100006 objectReference: {fileID: 0} - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, type: 3} diff --git a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab index 571f12f3..0b06203c 100644 --- a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab @@ -3159,6 +3159,7 @@ RectTransform: - {fileID: 3664757228482092608} - {fileID: 6558498177216885471} - {fileID: 6558498178561756610} + - {fileID: 978563753921066300} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3763,9 +3764,9 @@ RectTransform: m_Father: {fileID: 6558498177448486125} m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -344, y: 79} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 414.5, y: 38} m_SizeDelta: {x: 39, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6558498177866866919 @@ -3802,7 +3803,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 2 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -7491,3 +7492,128 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &5356534747490461938 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6558498177448486125} + m_Modifications: + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_RootOrder + value: 42 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_SizeDelta.x + value: 345 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_SizeDelta.y + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 222.5 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 39 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5449041719336151766, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_Name + value: MultiTips + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3} +--- !u!224 &978563753921066300 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + m_PrefabInstance: {fileID: 5356534747490461938} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab b/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab index c4aab99a..9ffaf195 100644 --- a/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0016d579a79d1324b8c0ab019d7b324e, type: 3} + m_Sprite: {fileID: 21300000, guid: b48ea72f3838c7c488621e80fc51c270, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -183,7 +183,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a52d3365198fe5046ad9d0aa48ce18a6, type: 3} + m_Sprite: {fileID: 21300000, guid: 78b0b245ac3f5d14ca7854e685d94361, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -308,7 +308,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -474,7 +474,7 @@ RectTransform: m_GameObject: {fileID: 6130612940446107805} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 1, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6130612939804614209} - {fileID: 6130612938828236869} @@ -510,7 +510,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 0.8} + m_Color: {r: 0.09019608, g: 0.09019608, b: 0.11372549, a: 0.8} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab index 6cad1daf..122124c3 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab @@ -493,7 +493,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 0, y: 34} + m_SizeDelta: {x: 40, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1135116821091102494 CanvasRenderer: @@ -622,7 +622,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 0, y: 34} + m_SizeDelta: {x: 40, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1135116820989721926 CanvasRenderer: @@ -941,7 +941,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1011,7 +1011,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2322716380738134732 RectTransform: m_ObjectHideFlags: 0 @@ -1835,7 +1835,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 410, y: -102} - m_SizeDelta: {x: 360, y: 0} + m_SizeDelta: {x: 360, y: 12} m_Pivot: {x: 1, y: 1} --- !u!222 &3007624748807431536 CanvasRenderer: @@ -3169,7 +3169,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 2 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -4028,9 +4028,9 @@ RectTransform: m_Father: {fileID: 3327674565846436473} 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: 20, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -9} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8640525812794733518 @@ -4135,9 +4135,9 @@ RectTransform: m_Father: {fileID: 3327674566083090465} 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: 20, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -9} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8640525813296669078 @@ -4479,95 +4479,128 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8451213515812577717 -GameObject: +--- !u!1001 &4527911445537327971 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8724855723572369069} - - component: {fileID: 6379280327630955396} - - component: {fileID: 7317912239976424843} - - component: {fileID: 2126716285580818362} - m_Layer: 5 - m_Name: MultiTips - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8724855723572369069 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3007624749581944593} + m_Modifications: + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_RootOrder + value: 33 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_SizeDelta.x + value: 440 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_SizeDelta.y + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 269.9 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 45.899994 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5449041719336151766, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_Name + value: MultiTips + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3} +--- !u!224 &8724855723572369069 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + m_PrefabInstance: {fileID: 4527911445537327971} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8451213515812577717} - 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: 3007624749581944593} - m_RootOrder: 33 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 284.33, y: 53.9} - m_SizeDelta: {x: 467.1488, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6379280327630955396 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8451213515812577717} - m_CullTransparentMesh: 0 ---- !u!114 &7317912239976424843 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8451213515812577717} - 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: 10 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 7 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u6D4B\u8BD5\u6D88\u606F" ---- !u!114 &2126716285580818362 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8451213515812577717} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 81e6186d0c08df64ba2687b894591e90, type: 3} - m_Name: - m_EditorClassIdentifier: - key: diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/MultiTips.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/MultiTips.prefab new file mode 100644 index 00000000..5cbe3ff5 --- /dev/null +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/MultiTips.prefab @@ -0,0 +1,94 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5449041719336151766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5170894839205404110} + - component: {fileID: 7372848685446146279} + - component: {fileID: 6582060407730122472} + - component: {fileID: 2546154786923265241} + m_Layer: 5 + m_Name: MultiTips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5170894839205404110 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5449041719336151766} + 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: 0} + 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: 269.9, y: 45.899994} + m_SizeDelta: {x: 440, y: 14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7372848685446146279 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5449041719336151766} + m_CullTransparentMesh: 0 +--- !u!114 &6582060407730122472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5449041719336151766} + 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: 10 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 7 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: +--- !u!114 &2546154786923265241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5449041719336151766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81e6186d0c08df64ba2687b894591e90, type: 3} + m_Name: + m_EditorClassIdentifier: + key: diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/MultiTips.prefab.meta b/Assets/Resources/UI/Prefab/Ride/Mobile/MultiTips.prefab.meta new file mode 100644 index 00000000..bf2c076d --- /dev/null +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/MultiTips.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3bf4a1387517769468dd74f58f7dc777 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab index 5a1e65e0..ac0ad385 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab @@ -1,83 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &195220181344077106 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6838675856957405650} - - component: {fileID: 3286200949874038542} - - component: {fileID: 3825617332215324456} - - component: {fileID: 3411287482047218279} - m_Layer: 5 - m_Name: Lines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6838675856957405650 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 195220181344077106} - 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: 3129391810705564163} - 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: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3286200949874038542 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 195220181344077106} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &3825617332215324456 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 195220181344077106} - m_CullTransparentMesh: 0 ---- !u!114 &3411287482047218279 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 195220181344077106} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] - Thickness: 2 --- !u!1 &365549535543084997 GameObject: m_ObjectHideFlags: 0 @@ -21514,6 +21436,80 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &1402259113086514018 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5169142479143786078} + - component: {fileID: 3706076263931436501} + - component: {fileID: 5937513735108163836} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5169142479143786078 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402259113086514018} + 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: 1303632357891128829} + m_RootOrder: 2 + 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: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3706076263931436501 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402259113086514018} + m_CullTransparentMesh: 0 +--- !u!114 &5937513735108163836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402259113086514018} + 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: 872c093e5342a5a49aad205e4d80b276, 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 &1510756076438448857 GameObject: m_ObjectHideFlags: 0 @@ -21606,6 +21602,56 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: +--- !u!1 &1559945935907334517 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2297812452528493334} + - component: {fileID: 8374831777359013714} + m_Layer: 0 + m_Name: New Game Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2297812452528493334 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1559945935907334517} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.96, y: 0.96, z: 1} + m_Children: + - {fileID: 3305202635437103895} + - {fileID: 90177269808771703} + m_Father: {fileID: 2877296740073624297} + 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: 500, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8374831777359013714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1559945935907334517} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1571182371018132363 GameObject: m_ObjectHideFlags: 0 @@ -21693,13 +21739,14 @@ GameObject: - component: {fileID: 1481637540043043783} - component: {fileID: 1452915710442759551} - component: {fileID: 7154079148122426033} + - component: {fileID: 2705271716767444468} m_Layer: 5 m_Name: ShareButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1303632357891128829 RectTransform: m_ObjectHideFlags: 0 @@ -21713,13 +21760,14 @@ RectTransform: m_Children: - {fileID: 1054082848925422051} - {fileID: 2123991985786623323} + - {fileID: 5169142479143786078} m_Father: {fileID: 765892905839681543} 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} m_AnchoredPosition: {x: 209, y: -146} - m_SizeDelta: {x: 26, y: 26} + m_SizeDelta: {x: 38, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1234870971996053184 MonoBehaviour: @@ -21734,13 +21782,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.09019608, g: 0.09019608, b: 0.11372549, a: 0.8} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 872c093e5342a5a49aad205e4d80b276, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -21815,6 +21863,19 @@ MonoBehaviour: m_EditorClassIdentifier: mType: 3 Tooltips: +--- !u!114 &2705271716767444468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1666300374460601100} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 19 --- !u!1 &2052024789909891574 GameObject: m_ObjectHideFlags: 0 @@ -24141,7 +24202,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 40, y: 34} + m_SizeDelta: {x: 0, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3232876378760461184 CanvasRenderer: @@ -25265,7 +25326,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3837090425495172034} + - {fileID: 2297812452528493334} - {fileID: 5572785103298013575} m_Father: {fileID: 765892906030958096} m_RootOrder: 3 @@ -25504,9 +25565,9 @@ RectTransform: m_Father: {fileID: 5077741102302251669} 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: 20, y: -9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2283558866165199650 @@ -25690,9 +25751,9 @@ RectTransform: m_Father: {fileID: 4961209012868082246} 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: 20, y: -9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2098351276423107569 @@ -26054,9 +26115,9 @@ RectTransform: m_Father: {fileID: 4932855251421062737} 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: 20, y: -9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7527733694641372725 @@ -26114,69 +26175,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 ---- !u!1 &3288786930340296714 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4736899507108614443} - - component: {fileID: 2645183126741686717} - - component: {fileID: 6672121348063659637} - m_Layer: 5 - m_Name: textController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4736899507108614443 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3288786930340296714} - 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: 3837090425495172034} - m_RootOrder: 1 - 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: -250, y: -25} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2645183126741686717 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3288786930340296714} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &6672121348063659637 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3288786930340296714} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3} - m_Name: - m_EditorClassIdentifier: - Camera: {fileID: 0} - PlaneDistance: 20 --- !u!1 &3465700279815372351 GameObject: m_ObjectHideFlags: 0 @@ -26736,84 +26734,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: ---- !u!1 &3631421572283393105 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1265319162364248192} - - component: {fileID: 1836912562308280236} - - component: {fileID: 6681837220756971483} - - component: {fileID: 1122938739689709444} - m_Layer: 5 - m_Name: Lines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1265319162364248192 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3631421572283393105} - 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: 3129391810705564163} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1836912562308280236 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3631421572283393105} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &6681837220756971483 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3631421572283393105} - m_CullTransparentMesh: 0 ---- !u!114 &1122938739689709444 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3631421572283393105} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] - Thickness: 4 --- !u!1 &3662240177106612474 GameObject: m_ObjectHideFlags: 0 @@ -26892,6 +26812,109 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 35.6KM +--- !u!1 &3676758697390975835 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3305202635437103895} + - component: {fileID: 228295913976326433} + - component: {fileID: 5096137812554892532} + - component: {fileID: 5781091474691819862} + - component: {fileID: 2147767076046861167} + m_Layer: 5 + m_Name: RectMask(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3305202635437103895 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3676758697390975835} + 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: 1813571833499916216} + - {fileID: 5053953882265359692} + m_Father: {fileID: 2297812452528493334} + 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: 50} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0, y: 1} +--- !u!114 &228295913976326433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3676758697390975835} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!222 &5096137812554892532 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3676758697390975835} + m_CullTransparentMesh: 0 +--- !u!114 &5781091474691819862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3676758697390975835} + 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 &2147767076046861167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3676758697390975835} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3828612076740334578 GameObject: m_ObjectHideFlags: 0 @@ -27470,6 +27493,84 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4049799187376486798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1813571833499916216} + - component: {fileID: 7550395192229183794} + - component: {fileID: 3712789421079915729} + - component: {fileID: 147236222342360370} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1813571833499916216 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4049799187376486798} + 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: 3305202635437103895} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7550395192229183794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4049799187376486798} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &3712789421079915729 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4049799187376486798} + m_CullTransparentMesh: 0 +--- !u!114 &147236222342360370 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4049799187376486798} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] + Thickness: 4 --- !u!1 &4191222591262853397 GameObject: m_ObjectHideFlags: 0 @@ -27509,7 +27610,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 40, y: 34} + m_SizeDelta: {x: 0, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6209092356196107112 CanvasRenderer: @@ -27632,9 +27733,9 @@ RectTransform: m_Father: {fileID: 6192553740692896203} 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: 20, y: -9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &880252244998226044 @@ -29971,6 +30072,69 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 +--- !u!1 &6873613086803359259 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 90177269808771703} + - component: {fileID: 410424472596964193} + - component: {fileID: 2592663200621733107} + m_Layer: 5 + m_Name: textController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &90177269808771703 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6873613086803359259} + 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: 2297812452528493334} + m_RootOrder: 1 + 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: -250, y: -25} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &410424472596964193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6873613086803359259} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2592663200621733107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6873613086803359259} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3} + m_Name: + m_EditorClassIdentifier: + Camera: {fileID: 0} + PlaneDistance: 20 --- !u!1 &6885174058740936923 GameObject: m_ObjectHideFlags: 0 @@ -30190,9 +30354,9 @@ RectTransform: m_Father: {fileID: 951248184629005503} 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: 20, y: -9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6121681889495627016 @@ -31003,7 +31167,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 40, y: 34} + m_SizeDelta: {x: 0, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7293361415421648249 CanvasRenderer: @@ -31648,6 +31812,84 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +--- !u!1 &7646336114412120793 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5053953882265359692} + - component: {fileID: 7227630688503237923} + - component: {fileID: 1697818999144882858} + - component: {fileID: 7577946695605831117} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5053953882265359692 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646336114412120793} + 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: 3305202635437103895} + 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: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7227630688503237923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646336114412120793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &1697818999144882858 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646336114412120793} + m_CullTransparentMesh: 0 +--- !u!114 &7577946695605831117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646336114412120793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] + Thickness: 2 --- !u!1 &7664492388540968627 GameObject: m_ObjectHideFlags: 0 @@ -31974,7 +32216,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 40, y: 34} + m_SizeDelta: {x: 0, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7465062170937064874 CanvasRenderer: @@ -32944,7 +33186,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 40, y: 34} + m_SizeDelta: {x: 0, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8367307738007244532 CanvasRenderer: @@ -33339,109 +33581,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: ---- !u!1 &9048801158150479846 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3129391810705564163} - - component: {fileID: 7749184030140669865} - - component: {fileID: 4803148256829114504} - - component: {fileID: 1003356081858851401} - - component: {fileID: 6442588339374225944} - m_Layer: 5 - m_Name: RectMask(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3129391810705564163 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9048801158150479846} - 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: 1265319162364248192} - - {fileID: 6838675856957405650} - m_Father: {fileID: 3837090425495172034} - 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: 50} - m_SizeDelta: {x: 500, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!114 &7749184030140669865 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9048801158150479846} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!222 &4803148256829114504 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9048801158150479846} - m_CullTransparentMesh: 0 ---- !u!114 &1003356081858851401 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9048801158150479846} - 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 &6442588339374225944 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9048801158150479846} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &9118781381026562979 GameObject: m_ObjectHideFlags: 0 @@ -33812,56 +33951,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 ---- !u!1 &9216827629233314319 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3837090425495172034} - - component: {fileID: 4367545398345954200} - m_Layer: 0 - m_Name: New Game Object - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3837090425495172034 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9216827629233314319} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.96, y: 0.96, z: 1} - m_Children: - - {fileID: 3129391810705564163} - - {fileID: 4736899507108614443} - m_Father: {fileID: 2877296740073624297} - 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: 500, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &4367545398345954200 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9216827629233314319} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &6896330953534203776 PrefabInstance: m_ObjectHideFlags: 0 @@ -33914,6 +34003,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 38 objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, type: 3} propertyPath: m_LocalPosition.x @@ -33952,7 +34046,7 @@ PrefabInstance: - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, type: 3} propertyPath: m_AnchoredPosition.x - value: 54 + value: 140.2 objectReference: {fileID: 0} - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, type: 3} @@ -33979,6 +34073,21 @@ PrefabInstance: propertyPath: m_Name value: ToolBarPanel objectReference: {fileID: 0} + - target: {fileID: 6130612940446107806, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_Color.b + value: 0.11372549 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107806, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_Color.g + value: 0.09019608 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107806, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_Color.r + value: 0.09019608 + objectReference: {fileID: 0} - target: {fileID: 6130612940446107806, guid: 4e3c9875893ec9941bbcf94c8800b80b, type: 3} propertyPath: m_Material diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs index 68eaecc8..42aeac9c 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs @@ -23,7 +23,8 @@ namespace Assets.Scenes.Ride.Scripts GameObject ShareButton { get; set; } GameObject ToolBarPanel { get; set; } GameObject WeChatButton { get; set; } - + GameObject WeChatGpButton { get; set; } + RawImage TopHead { get; set; } RawImage SecondHead { get; set; } @@ -60,9 +61,9 @@ namespace Assets.Scenes.Ride.Scripts ShareButton = transform.Find("ShareButton").gameObject; ToolBarPanel = transform.Find("ToolBarPanel").gameObject; WeChatButton = transform.Find("ToolBarPanel/WeChatButton").gameObject; - ShareButton.SetActive(!cyclingController.isWatch); - UIManager.AddEvent(ShareButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, OpenShare); - UIManager.AddEvent(WeChatButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, OpenShare); + WeChatGpButton = transform.Find("ToolBarPanel/GoogleButton").gameObject; + UIManager.AddEvent(WeChatButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShareWechat); + UIManager.AddEvent(WeChatGpButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShareWechatGp); #endif SpriteTop = Resources.Load("Images/Ride/Match/top-1"); SpriteSecond = Resources.Load("Images/Ride/Match/top-2"); @@ -114,7 +115,7 @@ namespace Assets.Scenes.Ride.Scripts Mine.SetActive(!cyclingController.isWatch); RankingPanel.SetActive(cyclingController.isWatch); - TitleImage.SetActive(!cyclingController.isWatch); + //TitleImage.SetActive(!cyclingController.isWatch); WatchTitle.SetActive(cyclingController.isWatch); if (!cyclingController.isWatch) @@ -243,5 +244,17 @@ namespace Assets.Scenes.Ride.Scripts Utils.showToast(null, "未安装微信"); } } + + private void ShareWechatGp(BaseEventData baseEventData) + { + if (App.weChatController.IsWeChatAppInstalled()) + { + App.weChatController.ShareWebpageToWX(1, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.NickName, "By " + App.CurrentUser.Nickname); + } + else + { + Utils.showToast(null, "未安装微信"); + } + } } } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs index 1c49b796..32cba082 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs @@ -41,7 +41,7 @@ namespace Assets.Scenes.Ride.Scripts GameObject goResultBtn; GameObject cancelBtn; GameObject shareWxBtn; - GameObject shareButton; + GameObject shareWxGpButton; Transform toolbar; #endregion @@ -74,7 +74,7 @@ namespace Assets.Scenes.Ride.Scripts toolbar = transform.Find("ToolBarPanel"); #if UNITY_ANDROID || UNITY_IOS shareWxBtn = transform.Find("ToolBarPanel/WeChatButton").gameObject; - shareButton = transform.Find("ShareButton").gameObject; + shareWxGpButton = transform.Find("ToolBarPanel/GoogleButton").gameObject; #endif } @@ -83,16 +83,10 @@ namespace Assets.Scenes.Ride.Scripts cyclingController = controller; cyclingController.AddEvent(goResultBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, GoResult); cyclingController.AddEvent(cancelBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Cancel); +#if UNITY_ANDROID || UNITY_IOS cyclingController.AddEvent(shareWxBtn, EventTriggerType.PointerClick, shareToWx); - cyclingController.AddEvent(shareButton, EventTriggerType.PointerClick, opneShare); - } - - private void opneShare(BaseEventData baseEventData) - { - ((RectTransform)toolbar).pivot = new Vector2(0, ((RectTransform)toolbar).pivot.y); - toolbar.gameObject.SetActive(true); - shareButton.SetActive(false); - toolbar.DOScaleX(1,1); + cyclingController.AddEvent(shareWxGpButton, EventTriggerType.PointerClick, shareToWxGp); +#endif } private void shareToWx(BaseEventData b) @@ -107,6 +101,18 @@ namespace Assets.Scenes.Ride.Scripts } } + private void shareToWxGp(BaseEventData b) + { + if (App.weChatController.IsWeChatAppInstalled()) + { + App.weChatController.ShareWebpageToWX(1, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.NickName, "By " + App.CurrentUser.Nickname); + } + else + { + Utils.showToast(null, "未安装微信"); + } + } + private void GoResult(BaseEventData baseEventData) { if (App.MainSceneParam.ContainsKey("Name")) diff --git a/Assets/Scripts/UI/Prefab/MultiTips.cs b/Assets/Scripts/UI/Prefab/MultiTips.cs index b0b0b2e5..0f0ec6d1 100644 --- a/Assets/Scripts/UI/Prefab/MultiTips.cs +++ b/Assets/Scripts/UI/Prefab/MultiTips.cs @@ -19,7 +19,7 @@ public class MultiTips:PFUIText var tiplist = ConfigHelper.mapApi.GetTipsList(); if (!string.IsNullOrEmpty(tiplist)) { - tips = tiplist.Split(','); + tips = tiplist.Split('#'); } var random = new System.Random(); currentIndex = random.Next(0, tips.Length); From 0500736ffff08e75998b51485a70476c4c86f3a9 Mon Sep 17 00:00:00 2001 From: lishuo Date: Tue, 28 Dec 2021 14:13:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=80=E8=BF=91=E9=AA=91=E8=A1=8C?= =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E9=AA=91=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Apis/Models/MapRoute.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/Scripts/Apis/Models/MapRoute.cs b/Assets/Scripts/Apis/Models/MapRoute.cs index 7a1636d4..927f9791 100644 --- a/Assets/Scripts/Apis/Models/MapRoute.cs +++ b/Assets/Scripts/Apis/Models/MapRoute.cs @@ -111,5 +111,7 @@ namespace Assets.Scripts.Apis.Models public int MineCount { get; set; } public int[] RouteIds { get; set; } + //最近骑行列表使用 + public RouteResult RecentRecord { get; set; } } }