diff --git a/Assets/GUIMainNetWorkInfo.cs b/Assets/GUIMainNetWorkInfo.cs index 122f965e..4a8004b6 100644 --- a/Assets/GUIMainNetWorkInfo.cs +++ b/Assets/GUIMainNetWorkInfo.cs @@ -114,7 +114,7 @@ public class GUIMainNetWorkInfo : MonoBehaviour { if (_delayTime != -1) { - labelBattery.text = $"{_delayTime.ToString("0")}MS"; + labelBattery.text = $"{_delayTime.ToString("0")}ms"; } else { diff --git a/Assets/Resources/Images/Ride/Shadow Mode_APP_d.png b/Assets/Resources/Images/Ride/Shadow Mode_APP_d.png new file mode 100644 index 00000000..a48cc2d1 Binary files /dev/null and b/Assets/Resources/Images/Ride/Shadow Mode_APP_d.png differ diff --git a/Assets/Resources/Images/Ride/Shadow Mode_APP_d.png.meta b/Assets/Resources/Images/Ride/Shadow Mode_APP_d.png.meta new file mode 100644 index 00000000..b27f15d5 --- /dev/null +++ b/Assets/Resources/Images/Ride/Shadow Mode_APP_d.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 70b1fb66bf8a73f469abf2bfb1d9d9f3 +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/Ride/Shadow Mode_PC_d.png b/Assets/Resources/Images/Ride/Shadow Mode_PC_d.png new file mode 100644 index 00000000..d7b18f51 Binary files /dev/null and b/Assets/Resources/Images/Ride/Shadow Mode_PC_d.png differ diff --git a/Assets/Resources/Images/Ride/Shadow Mode_PC_d.png.meta b/Assets/Resources/Images/Ride/Shadow Mode_PC_d.png.meta new file mode 100644 index 00000000..38d1cccd --- /dev/null +++ b/Assets/Resources/Images/Ride/Shadow Mode_PC_d.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 2d17c26700d18144e863e9a2864d3392 +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/Ride/share_app.png b/Assets/Resources/Images/Ride/share_app.png new file mode 100644 index 00000000..4a165e95 Binary files /dev/null and b/Assets/Resources/Images/Ride/share_app.png differ diff --git a/Assets/Resources/Images/Ride/share_app.png.meta b/Assets/Resources/Images/Ride/share_app.png.meta new file mode 100644 index 00000000..73d110f3 --- /dev/null +++ b/Assets/Resources/Images/Ride/share_app.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 872c093e5342a5a49aad205e4d80b276 +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 63e1dd86..799025ba 100644 --- a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitionResultPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitionResultPanel.prefab @@ -111,7 +111,7 @@ RectTransform: - {fileID: 319842981847980293} - {fileID: 2907692473210516730} m_Father: {fileID: 8381767031396044147} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1024,6 +1024,84 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 00:00:00 +--- !u!1 &1585392566122050738 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6756588819549615054} + - component: {fileID: 6279584494401713377} + - component: {fileID: 5307643893466968056} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6756588819549615054 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1585392566122050738} + 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: 1567329384924788571} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6279584494401713377 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1585392566122050738} + m_CullTransparentMesh: 0 +--- !u!114 &5307643893466968056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1585392566122050738} + 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.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: --- !u!1 &1594926269769001804 GameObject: m_ObjectHideFlags: 0 @@ -1815,7 +1893,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6837721061288168106 RectTransform: m_ObjectHideFlags: 0 @@ -2126,7 +2204,7 @@ RectTransform: m_Children: - {fileID: 1268885097902296256} m_Father: {fileID: 8381767031396044147} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2288,6 +2366,80 @@ MonoBehaviour: m_GradientStyle: 0 m_ColorSpace: -1 m_IgnoreAspectRatio: 1 +--- !u!1 &4283723792163727610 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8715002383932057139} + - component: {fileID: 6011245139124650037} + - component: {fileID: 1194639971264731366} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8715002383932057139 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4283723792163727610} + 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: 1567329384924788571} + 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: 0, y: 0} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6011245139124650037 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4283723792163727610} + m_CullTransparentMesh: 0 +--- !u!114 &1194639971264731366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4283723792163727610} + 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: 0 + 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 &4628810211892911464 GameObject: m_ObjectHideFlags: 0 @@ -2318,7 +2470,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8381767031396044147} - m_RootOrder: 8 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2813,6 +2965,140 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: +--- !u!1 &5615624721829366287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1567329384924788571} + - component: {fileID: 4217808238298957202} + - component: {fileID: 8790775690333468769} + - component: {fileID: 5607471143417088886} + - component: {fileID: 4915959711129480148} + m_Layer: 5 + m_Name: ShareButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1567329384924788571 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5615624721829366287} + 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: 6756588819549615054} + - {fileID: 8715002383932057139} + m_Father: {fileID: 8381767031396044147} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 196, y: -79} + m_SizeDelta: {x: 38, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4217808238298957202 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5615624721829366287} + m_CullTransparentMesh: 0 +--- !u!114 &8790775690333468769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5615624721829366287} + 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.09019608, g: 0.09019608, b: 0.11372549, 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!114 &5607471143417088886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5615624721829366287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8790775690333468769} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4915959711129480148 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5615624721829366287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 19 --- !u!1 &6025547990755233621 GameObject: m_ObjectHideFlags: 0 @@ -2921,7 +3207,7 @@ RectTransform: - {fileID: 4745770934206233426} - {fileID: 4279861061154212524} m_Father: {fileID: 8381767031396044147} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3051,7 +3337,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8381767031396044147} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4120,6 +4406,8 @@ RectTransform: - {fileID: 2947094133002415378} - {fileID: 6756269851583667743} - {fileID: 6837721061288168106} + - {fileID: 3493501586739935377} + - {fileID: 1567329384924788571} - {fileID: 8648922130929884845} - {fileID: 6716961565728369172} - {fileID: 319842981081321693} @@ -4602,3 +4890,138 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 3 +--- !u!1001 &7309103411705786381 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8381767031396044147} + m_Modifications: + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_SizeDelta.x + value: 174 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_SizeDelta.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalScale.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 177 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -78 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107805, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_Name + value: ToolBarPanel + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107806, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4e3c9875893ec9941bbcf94c8800b80b, type: 3} +--- !u!224 &3493501586739935377 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + m_PrefabInstance: {fileID: 7309103411705786381} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab index 4d1318d3..571f12f3 100644 --- a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab @@ -1316,7 +1316,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8563954619679277008 RectTransform: m_ObjectHideFlags: 0 @@ -5537,7 +5537,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} @@ -5892,7 +5892,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6558498179115500272 RectTransform: m_ObjectHideFlags: 0 @@ -6525,7 +6525,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5987798170253205739 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab b/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab new file mode 100644 index 00000000..c4aab99a --- /dev/null +++ b/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab @@ -0,0 +1,659 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6130612938828236890 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6130612938828236869} + - component: {fileID: 6130612938828236870} + - component: {fileID: 6130612938828236871} + - component: {fileID: 6130612938828236868} + m_Layer: 5 + m_Name: WeChatButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6130612938828236869 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612938828236890} + 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: 6130612940446107804} + m_RootOrder: 1 + 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: 91, y: 0} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6130612938828236870 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612938828236890} + m_CullTransparentMesh: 0 +--- !u!114 &6130612938828236871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612938828236890} + 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: 0016d579a79d1324b8c0ab019d7b324e, 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 &6130612938828236868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612938828236890} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6130612938828236871} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &6130612939245372096 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6130612939245372099} + - component: {fileID: 6130612939245372108} + - component: {fileID: 6130612939245372109} + - component: {fileID: 6130612939245372098} + m_Layer: 5 + m_Name: GoogleButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6130612939245372099 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612939245372096} + 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: 6130612940446107804} + m_RootOrder: 2 + 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: 123, y: 0} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6130612939245372108 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612939245372096} + m_CullTransparentMesh: 0 +--- !u!114 &6130612939245372109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612939245372096} + 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: a52d3365198fe5046ad9d0aa48ce18a6, 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 &6130612939245372098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612939245372096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6130612939245372109} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &6130612939804614214 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6130612939804614209} + - component: {fileID: 6130612939804614210} + - component: {fileID: 6130612939804614211} + - component: {fileID: 6130612939804614208} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6130612939804614209 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612939804614214} + 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: 6130612940446107804} + m_RootOrder: 0 + 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: 39, y: 0} + m_SizeDelta: {x: 58, y: 18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6130612939804614210 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612939804614214} + m_CullTransparentMesh: 0 +--- !u!114 &6130612939804614211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612939804614214} + 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: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Share to:' +--- !u!114 &6130612939804614208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612939804614214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: +--- !u!1 &6130612940224783301 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6130612940224783300} + - component: {fileID: 6130612940224783297} + - component: {fileID: 6130612940224783302} + - component: {fileID: 6130612940224783303} + m_Layer: 5 + m_Name: FaceBookButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6130612940224783300 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612940224783301} + 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: 6130612940446107804} + m_RootOrder: 3 + 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: 155, y: 0} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6130612940224783297 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612940224783301} + m_CullTransparentMesh: 0 +--- !u!114 &6130612940224783302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612940224783301} + 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: 7951c34819fbd124b9314983619c205c, 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 &6130612940224783303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612940224783301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6130612940224783302} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &6130612940446107805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6130612940446107804} + - component: {fileID: 6130612940446107801} + - component: {fileID: 6130612940446107806} + - component: {fileID: 6130612940446107807} + m_Layer: 5 + m_Name: ToolBarPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6130612940446107804 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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_Children: + - {fileID: 6130612939804614209} + - {fileID: 6130612938828236869} + - {fileID: 6130612939245372099} + - {fileID: 6130612940224783300} + - {fileID: 6130612940449423817} + m_Father: {fileID: 0} + 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: 54, y: -146} + m_SizeDelta: {x: 174, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6130612940446107801 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612940446107805} + m_CullTransparentMesh: 0 +--- !u!114 &6130612940446107806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612940446107805} + 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: 0.8} + 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!114 &6130612940446107807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612940446107805} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 19 +--- !u!1 &6130612940449423822 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6130612940449423817} + - component: {fileID: 6130612940449423818} + - component: {fileID: 6130612940449423819} + - component: {fileID: 6130612940449423816} + m_Layer: 5 + m_Name: AppleButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6130612940449423817 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612940449423822} + 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: 6130612940446107804} + 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} + m_AnchoredPosition: {x: 186, y: 1} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6130612940449423818 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612940449423822} + m_CullTransparentMesh: 0 +--- !u!114 &6130612940449423819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612940449423822} + 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: e60e7b809e129404b9dce5d584c9ca57, 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 &6130612940449423816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130612940449423822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6130612940449423819} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab.meta b/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab.meta new file mode 100644 index 00000000..39e59495 --- /dev/null +++ b/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4e3c9875893ec9941bbcf94c8800b80b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab b/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab index d2c706e3..9e63867f 100644 --- a/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab @@ -1013,7 +1013,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} @@ -1083,7 +1083,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 @@ -1334,7 +1334,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 10, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0, y: 0.5} --- !u!222 &9218960045514105109 @@ -1568,6 +1568,7 @@ GameObject: - component: {fileID: 3007624748412546457} - component: {fileID: 3007624748412546459} - component: {fileID: 3007624748412546456} + - component: {fileID: 1205417753606850948} m_Layer: 5 m_Name: AltitudeGraph m_TagString: Untagged @@ -1628,6 +1629,18 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!225 &1205417753606850948 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3007624748412546454} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &3007624748526063403 GameObject: m_ObjectHideFlags: 0 @@ -1973,7 +1986,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3007624748790425457 RectTransform: m_ObjectHideFlags: 0 @@ -3038,6 +3051,7 @@ RectTransform: - {fileID: 145307033547521030} - {fileID: 145307033915764318} - {fileID: 3007624748790425457} + - {fileID: 4701201928324246661} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3410,7 +3424,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3007624749774178323 RectTransform: m_ObjectHideFlags: 0 @@ -3763,7 +3777,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3007624750140628948 RectTransform: m_ObjectHideFlags: 0 @@ -4284,7 +4298,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 10, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4547966394363676322 @@ -4391,7 +4405,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 10, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1116450085117521016 @@ -4641,7 +4655,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 10, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4886094110349649579 @@ -4748,7 +4762,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8640525812794733518 @@ -4855,7 +4869,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8640525813296669078 @@ -5143,3 +5157,95 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8407922557894930437 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4701201928324246661} + - component: {fileID: 7493996602696257833} + - component: {fileID: 4219654698686917511} + - component: {fileID: 7059618734746457030} + m_Layer: 5 + m_Name: Multips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4701201928324246661 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8407922557894930437} + 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: 36 + 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: -156.5, y: -329.21} + m_SizeDelta: {x: 1162.9983, y: 69.57846} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7493996602696257833 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8407922557894930437} + m_CullTransparentMesh: 0 +--- !u!114 &4219654698686917511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8407922557894930437} + 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: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_FontSize: 14 + 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: +--- !u!114 &7059618734746457030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8407922557894930437} + 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/LoadingPanel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab index 2fdf157d..6cad1daf 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab @@ -361,6 +361,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &145307034357954015 GameObject: m_ObjectHideFlags: 0 @@ -452,6 +453,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &184329605262752469 GameObject: m_ObjectHideFlags: 0 @@ -1244,6 +1246,7 @@ GameObject: - component: {fileID: 3007624748412546457} - component: {fileID: 3007624748412546459} - component: {fileID: 3007624748412546456} + - component: {fileID: 2904928259100574873} m_Layer: 5 m_Name: AltitudeGraph m_TagString: Untagged @@ -1304,6 +1307,18 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!225 &2904928259100574873 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3007624748412546454} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &3007624748526063403 GameObject: m_ObjectHideFlags: 0 @@ -2569,6 +2584,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &3007624749485164347 GameObject: m_ObjectHideFlags: 0 @@ -2660,6 +2676,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &3007624749581944590 GameObject: m_ObjectHideFlags: 0 @@ -2723,6 +2740,8 @@ RectTransform: - {fileID: 145307033547521030} - {fileID: 145307033915764318} - {fileID: 3007624748790425457} + - {fileID: 8724855723572369069} + - {fileID: 1099737395000638351} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3096,7 +3115,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3007624749774178323 RectTransform: m_ObjectHideFlags: 0 @@ -3169,6 +3188,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &3007624749816966110 GameObject: m_ObjectHideFlags: 0 @@ -3345,6 +3365,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &3007624750023539789 GameObject: m_ObjectHideFlags: 0 @@ -3461,7 +3482,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3007624750140628948 RectTransform: m_ObjectHideFlags: 0 @@ -3534,6 +3555,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &3007624750146435811 GameObject: m_ObjectHideFlags: 0 @@ -3712,6 +3734,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &3007624750243088062 GameObject: m_ObjectHideFlags: 0 @@ -3970,6 +3993,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &4752272895894060714 GameObject: m_ObjectHideFlags: 0 @@ -4076,6 +4100,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &4752272896060452082 GameObject: m_ObjectHideFlags: 0 @@ -4182,6 +4207,204 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: +--- !u!1 &5635372946248809289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4131203580560256159} + - component: {fileID: 5921965671833874072} + - component: {fileID: 1126882534568575374} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4131203580560256159 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5635372946248809289} + 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: 1099737395000638351} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5921965671833874072 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5635372946248809289} + m_CullTransparentMesh: 0 +--- !u!114 &1126882534568575374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5635372946248809289} + 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: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 160 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: View All +--- !u!1 &6046649886281115850 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1099737395000638351} + - component: {fileID: 319866780811438616} + - component: {fileID: 7099969197448708611} + - component: {fileID: 3313342171471266539} + m_Layer: 5 + m_Name: ViewAll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1099737395000638351 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6046649886281115850} + 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: 4131203580560256159} + m_Father: {fileID: 3007624749581944593} + m_RootOrder: 34 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -125, y: 80} + m_SizeDelta: {x: 110, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &319866780811438616 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6046649886281115850} + m_CullTransparentMesh: 0 +--- !u!114 &7099969197448708611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6046649886281115850} + 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: 0} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, 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 &3313342171471266539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6046649886281115850} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7099969197448708611} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &8110328268474125505 GameObject: m_ObjectHideFlags: 0 @@ -4256,3 +4479,95 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8451213515812577717 +GameObject: + 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 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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/MySelfRankingItem.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/MySelfRankingItem.prefab new file mode 100644 index 00000000..4f6f996d --- /dev/null +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/MySelfRankingItem.prefab @@ -0,0 +1,597 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3944575076546382760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3944575076546382775} + - component: {fileID: 3944575076546382773} + - component: {fileID: 3944575076546382774} + - component: {fileID: 3944575076546382772} + m_Layer: 5 + m_Name: Country + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3944575076546382775 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076546382760} + 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: 3944575076599925981} + m_RootOrder: 1 + 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: 28, y: 0} + m_SizeDelta: {x: 10, y: 10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3944575076546382773 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076546382760} + m_CullTransparentMesh: 0 +--- !u!114 &3944575076546382774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076546382760} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 38b250357a82cd14c9df5129757f2e58, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &3944575076546382772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076546382760} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 5 +--- !u!1 &3944575076599925982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3944575076599925981} + - component: {fileID: 3944575076599925979} + - component: {fileID: 3944575076599925980} + - component: {fileID: 7470444284165639829} + - component: {fileID: 553273351145986002} + m_Layer: 5 + m_Name: MySelfRankingItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3944575076599925981 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076599925982} + 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: 3944575077317612890} + - {fileID: 3944575076546382775} + - {fileID: 3944575077598890095} + - {fileID: 3944575076895843121} + - {fileID: 3944575077743321180} + - {fileID: 7032783027923730492} + 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: 0, y: 0} + m_SizeDelta: {x: 190, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3944575076599925979 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076599925982} + m_CullTransparentMesh: 0 +--- !u!114 &3944575076599925980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076599925982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 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 &7470444284165639829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076599925982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f48cdbeff59981140b430d66a9c53fc6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &553273351145986002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076599925982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Direction: 2 + m_Color1: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 0} + m_Color2: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 0.49803922} + m_Color3: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_Color4: {r: 1, g: 1, b: 1, a: 1} + m_Rotation: 180 + m_Offset1: 0 + m_Offset2: 0 + m_GradientStyle: 1 + m_ColorSpace: -1 + m_IgnoreAspectRatio: 1 +--- !u!1 &3944575076895843122 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3944575076895843121} + - component: {fileID: 3944575076895843135} + - component: {fileID: 3944575076895843120} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3944575076895843121 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076895843122} + 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: 3944575076599925981} + m_RootOrder: 3 + 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: 6, y: 0} + m_SizeDelta: {x: 92, y: 14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3944575076895843135 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076895843122} + m_CullTransparentMesh: 0 +--- !u!114 &3944575076895843120 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076895843122} + 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: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_FontSize: 10 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!1 &3944575077317612891 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3944575077317612890} + - component: {fileID: 3944575077317612888} + - component: {fileID: 3944575077317612889} + m_Layer: 5 + m_Name: Ranking + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3944575077317612890 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077317612891} + 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: 3944575076599925981} + m_RootOrder: 0 + 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: 9.7, y: 0} + m_SizeDelta: {x: 15, y: 17} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3944575077317612888 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077317612891} + m_CullTransparentMesh: 0 +--- !u!114 &3944575077317612889 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077317612891} + 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: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 00 +--- !u!1 &3944575077598890080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3944575077598890095} + - component: {fileID: 3944575077598890093} + - component: {fileID: 3944575077598890094} + - component: {fileID: 3944575077598890092} + m_Layer: 5 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3944575077598890095 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077598890080} + 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: 3944575076599925981} + m_RootOrder: 2 + 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: 42, y: 0} + m_SizeDelta: {x: 18, y: 18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3944575077598890093 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077598890080} + m_CullTransparentMesh: 0 +--- !u!114 &3944575077598890094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077598890080} + 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 &3944575077598890092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077598890080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 9 +--- !u!1 &3944575077743321181 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3944575077743321180} + - component: {fileID: 3944575077743321178} + - component: {fileID: 3944575077743321179} + m_Layer: 5 + m_Name: Timer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3944575077743321180 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077743321181} + 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: 3944575076599925981} + m_RootOrder: 4 + 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: -21, y: 0} + m_SizeDelta: {x: 42, y: 14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3944575077743321178 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077743321181} + m_CullTransparentMesh: 0 +--- !u!114 &3944575077743321179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077743321181} + 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: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 00:00:00 +--- !u!1 &5478792929094444801 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7032783027923730492} + - component: {fileID: 1865429866407938566} + - component: {fileID: 6242592969177318515} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7032783027923730492 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5478792929094444801} + 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: 3944575076599925981} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0.5} + m_SizeDelta: {x: 290, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1865429866407938566 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5478792929094444801} + m_CullTransparentMesh: 0 +--- !u!114 &6242592969177318515 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5478792929094444801} + 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.25490198, g: 0.25882354, b: 0.31764707, 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 diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/MySelfRankingItem.prefab.meta b/Assets/Resources/UI/Prefab/Ride/Mobile/MySelfRankingItem.prefab.meta new file mode 100644 index 00000000..a5515081 --- /dev/null +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/MySelfRankingItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a5c685d3969844848bd7040c94da567e +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 62963f0a..5a1e65e0 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &5886847867519306 +--- !u!1 &195220181344077106 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,10 +8,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8142303644134966952} - - component: {fileID: 7884485170271844939} - - component: {fileID: 1776319753696389405} - - component: {fileID: 2396585753925281098} + - component: {fileID: 6838675856957405650} + - component: {fileID: 3286200949874038542} + - component: {fileID: 3825617332215324456} + - component: {fileID: 3411287482047218279} m_Layer: 5 m_Name: Lines m_TagString: Untagged @@ -19,18 +19,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8142303644134966952 +--- !u!224 &6838675856957405650 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5886847867519306} + 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: 7625499865705319464} + m_Father: {fileID: 3129391810705564163} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -38,33 +38,33 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7884485170271844939 +--- !u!114 &3286200949874038542 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5886847867519306} + m_GameObject: {fileID: 195220181344077106} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!222 &1776319753696389405 +--- !u!222 &3825617332215324456 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5886847867519306} + m_GameObject: {fileID: 195220181344077106} m_CullTransparentMesh: 0 ---- !u!114 &2396585753925281098 +--- !u!114 &3411287482047218279 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5886847867519306} + m_GameObject: {fileID: 195220181344077106} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3} @@ -78,84 +78,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] Thickness: 2 ---- !u!1 &57147568557409725 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8541272499061165792} - - component: {fileID: 5544532908178546371} - - component: {fileID: 8527852191412959687} - - component: {fileID: 7746486061451219890} - m_Layer: 5 - m_Name: Lines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8541272499061165792 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 57147568557409725} - 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: 7625499865705319464} - 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 &5544532908178546371 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 57147568557409725} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &8527852191412959687 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 57147568557409725} - m_CullTransparentMesh: 0 ---- !u!114 &7746486061451219890 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 57147568557409725} - 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 &365549535543084997 GameObject: m_ObjectHideFlags: 0 @@ -449,69 +371,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ---- !u!1 &466444560392468680 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 827351485679412186} - - component: {fileID: 4593846407361576127} - - component: {fileID: 1074501715381111145} - m_Layer: 5 - m_Name: textController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &827351485679412186 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466444560392468680} - 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: 8408197236025588197} - 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 &4593846407361576127 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466444560392468680} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1074501715381111145 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 466444560392468680} - 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 &561507438981283975 GameObject: m_ObjectHideFlags: 0 @@ -1619,98 +1478,6 @@ MonoBehaviour: m_EffectColor: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} m_EffectDistance: {x: 2, y: 2} m_UseGraphicAlpha: 1 ---- !u!1 &765892904934209990 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 765892904934209985} - - component: {fileID: 765892904934209986} - - component: {fileID: 765892904934209987} - - component: {fileID: 765892904934209984} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &765892904934209985 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892904934209990} - 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: 765892905500667676} - m_RootOrder: 0 - 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: 54, y: 0} - m_SizeDelta: {x: 68, y: 18} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &765892904934209986 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892904934209990} - m_CullTransparentMesh: 0 ---- !u!114 &765892904934209987 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892904934209990} - 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: 9428f2aab98e9c34d923a9174035a197, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Share to:' ---- !u!114 &765892904934209984 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892904934209990} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} - m_Name: - m_EditorClassIdentifier: - key: --- !u!1 &765892904934214621 GameObject: m_ObjectHideFlags: 0 @@ -6785,124 +6552,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &765892905350792261 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 765892905350792260} - - component: {fileID: 765892905350792257} - - component: {fileID: 765892905350792262} - - component: {fileID: 765892905350792263} - m_Layer: 5 - m_Name: FaceBookButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &765892905350792260 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892905350792261} - 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: 765892905500667676} - m_RootOrder: 3 - 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: 190, y: 0} - m_SizeDelta: {x: 36, y: 36} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &765892905350792257 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892905350792261} - m_CullTransparentMesh: 0 ---- !u!114 &765892905350792262 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892905350792261} - 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: 7951c34819fbd124b9314983619c205c, 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 &765892905350792263 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892905350792261} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 765892905350792262} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &765892905373252270 GameObject: m_ObjectHideFlags: 0 @@ -8839,217 +8488,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ---- !u!1 &765892905495250510 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 765892905495250505} - - component: {fileID: 765892905495250506} - - component: {fileID: 765892905495250507} - - component: {fileID: 765892905495250504} - m_Layer: 5 - m_Name: AppleButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &765892905495250505 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892905495250510} - 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: 765892905500667676} - 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} - m_AnchoredPosition: {x: 231, y: 0} - m_SizeDelta: {x: 36, y: 36} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &765892905495250506 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892905495250510} - m_CullTransparentMesh: 0 ---- !u!114 &765892905495250507 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892905495250510} - 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: e60e7b809e129404b9dce5d584c9ca57, 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 &765892905495250504 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892905495250510} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 765892905495250507} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &765892905500667677 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 765892905500667676} - - component: {fileID: 765892905500667673} - - component: {fileID: 765892905500667678} - - component: {fileID: 765892905500667679} - m_Layer: 5 - m_Name: ToolBarPanel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &765892905500667676 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892905500667677} - 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: 765892904934209985} - - {fileID: 765892906042699717} - - {fileID: 765892906464421187} - - {fileID: 765892905350792260} - - {fileID: 765892905495250505} - m_Father: {fileID: 765892905839681543} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -666, y: 226} - m_SizeDelta: {x: 262, y: 46} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &765892905500667673 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892905500667677} - m_CullTransparentMesh: 0 ---- !u!114 &765892905500667678 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892905500667677} - 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: 0.8} - 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!114 &765892905500667679 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892905500667677} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} - m_Name: - m_EditorClassIdentifier: - radius: 24 --- !u!1 &765892905503820486 GameObject: m_ObjectHideFlags: 0 @@ -11530,6 +10968,7 @@ RectTransform: - {fileID: 765892906881796986} - {fileID: 765892905500667676} - {fileID: 2385217536517473369} + - {fileID: 1303632357891128829} m_Father: {fileID: 765892906030958096} m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13960,124 +13399,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f34d1e1c66a3f8a418997dd9d78c8f29, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &765892906042699738 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 765892906042699717} - - component: {fileID: 765892906042699718} - - component: {fileID: 765892906042699719} - - component: {fileID: 765892906042699716} - m_Layer: 5 - m_Name: WeChatButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &765892906042699717 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892906042699738} - 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: 765892905500667676} - m_RootOrder: 1 - 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: 108, y: 0} - m_SizeDelta: {x: 36, y: 36} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &765892906042699718 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892906042699738} - m_CullTransparentMesh: 0 ---- !u!114 &765892906042699719 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892906042699738} - 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: 0016d579a79d1324b8c0ab019d7b324e, 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 &765892906042699716 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892906042699738} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 765892906042699719} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &765892906047967984 GameObject: m_ObjectHideFlags: 0 @@ -17564,124 +16885,6 @@ MonoBehaviour: m_MaskInteraction: 85 m_UseStencil: 1 m_RaycastFilter: 0 ---- !u!1 &765892906464421184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 765892906464421187} - - component: {fileID: 765892906464421196} - - component: {fileID: 765892906464421197} - - component: {fileID: 765892906464421186} - m_Layer: 5 - m_Name: GoogleButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &765892906464421187 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892906464421184} - 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: 765892905500667676} - m_RootOrder: 2 - 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: 149, y: 0} - m_SizeDelta: {x: 36, y: 36} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &765892906464421196 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892906464421184} - m_CullTransparentMesh: 0 ---- !u!114 &765892906464421197 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892906464421184} - 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: a52d3365198fe5046ad9d0aa48ce18a6, 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 &765892906464421186 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765892906464421184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 765892906464421197} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &765892906472282518 GameObject: m_ObjectHideFlags: 0 @@ -22182,6 +21385,227 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1284612385650779582 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2123991985786623323} + - component: {fileID: 2714332186128353891} + - component: {fileID: 3334722850507793437} + - component: {fileID: 5532595633963627907} + - component: {fileID: 2058968564014970691} + - component: {fileID: 8370794753187614993} + m_Layer: 5 + m_Name: Tooltips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2123991985786623323 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284612385650779582} + 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: 1317481412553101852} + m_Father: {fileID: 1303632357891128829} + 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: -50} + m_SizeDelta: {x: 40, y: 34} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2714332186128353891 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284612385650779582} + m_CullTransparentMesh: 0 +--- !u!114 &3334722850507793437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284612385650779582} + 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.20784315, g: 0.20784315, b: 0.2627451, a: 0.8} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 96bc99033bf6d1d49b8252599543005d, type: 3} + 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 &5532595633963627907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284612385650779582} + 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!225 &2058968564014970691 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284612385650779582} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &8370794753187614993 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284612385650779582} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 20 + m_Right: 20 + 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 &1510756076438448857 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1054082848925422051} + - component: {fileID: 41876994896384654} + - component: {fileID: 2698160929062277461} + - component: {fileID: 7898492684939141408} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1054082848925422051 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1510756076438448857} + 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: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &41876994896384654 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1510756076438448857} + m_CullTransparentMesh: 0 +--- !u!114 &2698160929062277461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1510756076438448857} + 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, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!114 &7898492684939141408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1510756076438448857} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &1571182371018132363 GameObject: m_ObjectHideFlags: 0 @@ -22256,6 +21680,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1666300374460601100 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1303632357891128829} + - component: {fileID: 1234870971996053184} + - component: {fileID: 1481637540043043783} + - component: {fileID: 1452915710442759551} + - component: {fileID: 7154079148122426033} + m_Layer: 5 + m_Name: ShareButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1303632357891128829 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1666300374460601100} + 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: 1054082848925422051} + - {fileID: 2123991985786623323} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1234870971996053184 +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: 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!114 &1481637540043043783 +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: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1234870971996053184} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &1452915710442759551 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1666300374460601100} + m_CullTransparentMesh: 0 +--- !u!114 &7154079148122426033 +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: cb33d8ce76885d8438909e96ff897bf3, type: 3} + m_Name: + m_EditorClassIdentifier: + mType: 3 + Tooltips: --- !u!1 &2052024789909891574 GameObject: m_ObjectHideFlags: 0 @@ -23607,7 +23166,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 67, y: 39} + m_AnchoredPosition: {x: 120, y: 39} m_SizeDelta: {x: 114, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3340768604647024378 @@ -23858,7 +23417,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2385217536803672695 RectTransform: m_ObjectHideFlags: 0 @@ -24317,7 +23876,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -67.3, y: 39} + m_AnchoredPosition: {x: -120, y: 39} m_SizeDelta: {x: 114, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3340768605458228582 @@ -24582,7 +24141,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 &3232876378760461184 CanvasRenderer: @@ -25706,7 +25265,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8408197236025588197} + - {fileID: 3837090425495172034} - {fileID: 5572785103298013575} m_Father: {fileID: 765892906030958096} m_RootOrder: 3 @@ -25945,9 +25504,9 @@ RectTransform: m_Father: {fileID: 5077741102302251669} 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 &2283558866165199650 @@ -26131,9 +25690,9 @@ RectTransform: m_Father: {fileID: 4961209012868082246} 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 &2098351276423107569 @@ -26495,9 +26054,9 @@ RectTransform: m_Father: {fileID: 4932855251421062737} 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 &7527733694641372725 @@ -26555,6 +26114,69 @@ 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 @@ -27114,6 +26736,84 @@ 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 @@ -27809,7 +27509,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 &6209092356196107112 CanvasRenderer: @@ -27932,9 +27632,9 @@ RectTransform: m_Father: {fileID: 6192553740692896203} 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 &880252244998226044 @@ -29404,7 +29104,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: ---- !u!1 &5512030472687545640 +--- !u!1 &5513125102864309294 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -29412,120 +29112,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8408197236025588197} - - component: {fileID: 6316971424807944698} - 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 &8408197236025588197 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5512030472687545640} - 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: 7625499865705319464} - - {fileID: 827351485679412186} - 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 &6316971424807944698 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5512030472687545640} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &5515285057735857196 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7625499865705319464} - - component: {fileID: 8603209648559467427} - - component: {fileID: 470384501774073346} - - component: {fileID: 165852063626059467} - - component: {fileID: 480613437150409254} + - component: {fileID: 1317481412553101852} + - component: {fileID: 1279786717011360839} + - component: {fileID: 6355895910450854927} + - component: {fileID: 6321015472819078945} m_Layer: 5 - m_Name: RectMask(Clone) + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7625499865705319464 +--- !u!224 &1317481412553101852 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5515285057735857196} + m_GameObject: {fileID: 5513125102864309294} 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: 8541272499061165792} - - {fileID: 8142303644134966952} - m_Father: {fileID: 8408197236025588197} + m_Children: [] + m_Father: {fileID: 2123991985786623323} 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 &8603209648559467427 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5515285057735857196} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!222 &470384501774073346 + 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 &1279786717011360839 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5515285057735857196} + m_GameObject: {fileID: 5513125102864309294} m_CullTransparentMesh: 0 ---- !u!114 &165852063626059467 +--- !u!114 &6355895910450854927 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5515285057735857196} + m_GameObject: {fileID: 5513125102864309294} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -29535,28 +29169,34 @@ MonoBehaviour: 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 &480613437150409254 + m_FontData: + m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!114 &6321015472819078945 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5515285057735857196} + m_GameObject: {fileID: 5513125102864309294} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &5572785103222812767 GameObject: m_ObjectHideFlags: 0 @@ -30550,9 +30190,9 @@ RectTransform: m_Father: {fileID: 951248184629005503} 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 &6121681889495627016 @@ -31363,7 +31003,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 &7293361415421648249 CanvasRenderer: @@ -32334,7 +31974,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 &7465062170937064874 CanvasRenderer: @@ -33304,7 +32944,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 &8367307738007244532 CanvasRenderer: @@ -33699,6 +33339,109 @@ 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 @@ -34069,3 +33812,183 @@ 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 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 765892905839681543} + m_Modifications: + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_SizeDelta.x + value: 174 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_SizeDelta.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 54 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -146 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107805, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_Name + value: ToolBarPanel + objectReference: {fileID: 0} + - target: {fileID: 6130612940446107806, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4e3c9875893ec9941bbcf94c8800b80b, type: 3} +--- !u!224 &765892905500667676 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + m_PrefabInstance: {fileID: 6896330953534203776} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab b/Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab new file mode 100644 index 00000000..990121c2 --- /dev/null +++ b/Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab @@ -0,0 +1,573 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3944575076546382760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3944575076546382775} + - component: {fileID: 3944575076546382773} + - component: {fileID: 3944575076546382774} + - component: {fileID: 3944575076546382772} + m_Layer: 5 + m_Name: Country + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3944575076546382775 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076546382760} + 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: 3944575076599925981} + m_RootOrder: 1 + 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: 10, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3944575076546382773 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076546382760} + m_CullTransparentMesh: 0 +--- !u!114 &3944575076546382774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076546382760} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 38b250357a82cd14c9df5129757f2e58, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &3944575076546382772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076546382760} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 10 +--- !u!1 &3944575076599925982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3944575076599925981} + - component: {fileID: 3944575076599925979} + - component: {fileID: 3944575076599925980} + - component: {fileID: 7470444284165639829} + m_Layer: 5 + m_Name: MySelfRankingItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3944575076599925981 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076599925982} + 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: 3944575077317612890} + - {fileID: 3944575076546382775} + - {fileID: 3944575077598890095} + - {fileID: 3944575076895843121} + - {fileID: 3944575077743321180} + - {fileID: 7032783027923730492} + 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: 0, y: 0} + m_SizeDelta: {x: 290, y: 78} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3944575076599925979 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076599925982} + m_CullTransparentMesh: 0 +--- !u!114 &3944575076599925980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076599925982} + 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: 0} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, 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 &7470444284165639829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076599925982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f48cdbeff59981140b430d66a9c53fc6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &3944575076895843122 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3944575076895843121} + - component: {fileID: 3944575076895843135} + - component: {fileID: 3944575076895843120} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3944575076895843121 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076895843122} + 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: 3944575076599925981} + m_RootOrder: 3 + 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: -1.76, y: 0} + m_SizeDelta: {x: 147.68248, y: 17} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3944575076895843135 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076895843122} + m_CullTransparentMesh: 0 +--- !u!114 &3944575076895843120 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575076895843122} + 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: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!1 &3944575077317612891 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3944575077317612890} + - component: {fileID: 3944575077317612888} + - component: {fileID: 3944575077317612889} + m_Layer: 5 + m_Name: Ranking + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3944575077317612890 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077317612891} + 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: 3944575076599925981} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10.5, y: -17} + m_SizeDelta: {x: 13, y: 14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3944575077317612888 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077317612891} + m_CullTransparentMesh: 0 +--- !u!114 &3944575077317612889 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077317612891} + 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: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!1 &3944575077598890080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3944575077598890095} + - component: {fileID: 3944575077598890093} + - component: {fileID: 3944575077598890094} + - component: {fileID: 3944575077598890092} + m_Layer: 5 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3944575077598890095 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077598890080} + 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: 3944575076599925981} + m_RootOrder: 2 + 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: 42, y: 0} + m_SizeDelta: {x: 36, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3944575077598890093 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077598890080} + m_CullTransparentMesh: 0 +--- !u!114 &3944575077598890094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077598890080} + 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 &3944575077598890092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077598890080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 18 +--- !u!1 &3944575077743321181 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3944575077743321180} + - component: {fileID: 3944575077743321178} + - component: {fileID: 3944575077743321179} + m_Layer: 5 + m_Name: Timer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3944575077743321180 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077743321181} + 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: 3944575076599925981} + m_RootOrder: 4 + 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: -33.5, y: 0} + m_SizeDelta: {x: 67, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3944575077743321178 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077743321181} + m_CullTransparentMesh: 0 +--- !u!114 &3944575077743321179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3944575077743321181} + 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: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 00:00:00 +--- !u!1 &5478792929094444801 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7032783027923730492} + - component: {fileID: 1865429866407938566} + - component: {fileID: 6242592969177318515} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7032783027923730492 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5478792929094444801} + 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: 3944575076599925981} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0.5} + m_SizeDelta: {x: 290, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1865429866407938566 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5478792929094444801} + m_CullTransparentMesh: 0 +--- !u!114 &6242592969177318515 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5478792929094444801} + 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.25490198, g: 0.25882354, b: 0.31764707, 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 diff --git a/Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab.meta b/Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab.meta new file mode 100644 index 00000000..d8540289 --- /dev/null +++ b/Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1fcb82f77486c474fa496925d1c820c8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/Ride/Panel.prefab b/Assets/Resources/UI/Prefab/Ride/Panel.prefab index cd3c22fc..e5fab91e 100644 --- a/Assets/Resources/UI/Prefab/Ride/Panel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Panel.prefab @@ -21500,7 +21500,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: ---- !u!1 &1841772427794494789 +--- !u!1 &1427023245172575862 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -21508,66 +21508,70 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1524692179908514834} - - component: {fileID: 9006575742698204332} - - component: {fileID: 1841187192482496792} - - component: {fileID: 1027710212115017174} + - component: {fileID: 4113790711181373871} + - component: {fileID: 6450463484982418469} + - component: {fileID: 1324473186799037362} + - component: {fileID: 7594547904822167657} + - component: {fileID: 7615240192105119783} m_Layer: 5 - m_Name: Lines + m_Name: RectMask(Clone) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1524692179908514834 +--- !u!224 &4113790711181373871 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841772427794494789} + m_GameObject: {fileID: 1427023245172575862} 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: 3815618195539376836} - m_RootOrder: 1 + m_Children: + - {fileID: 5424118817000444708} + - {fileID: 7264034656573343914} + m_Father: {fileID: 3024542420348446357} + 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 &9006575742698204332 + m_AnchoredPosition: {x: 0, y: 88} + m_SizeDelta: {x: 1542, y: 88} + m_Pivot: {x: 0, y: 1} +--- !u!114 &6450463484982418469 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841772427794494789} + m_GameObject: {fileID: 1427023245172575862} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!222 &1841187192482496792 + m_ShowMaskGraphic: 0 +--- !u!222 &1324473186799037362 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841772427794494789} + m_GameObject: {fileID: 1427023245172575862} m_CullTransparentMesh: 0 ---- !u!114 &1027710212115017174 +--- !u!114 &7594547904822167657 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1841772427794494789} + m_GameObject: {fileID: 1427023245172575862} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -21577,7 +21581,28 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - Thickness: 2 + 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 &7615240192105119783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1427023245172575862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2052024789909891574 GameObject: m_ObjectHideFlags: 0 @@ -22083,6 +22108,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: zhImage: {fileID: 21300000, guid: 3ee17ebca5455ee4ba91dc969e46e7b5, type: 3} + zhDisabledImage: {fileID: 0} + IsDisabled: 0 --- !u!1 &2385217535555903746 GameObject: m_ObjectHideFlags: 0 @@ -22943,7 +22970,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 171, y: 59} + m_AnchoredPosition: {x: 201, y: 59} m_SizeDelta: {x: 140, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3340768604647024378 @@ -23194,7 +23221,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2385217536803672695 RectTransform: m_ObjectHideFlags: 0 @@ -23551,6 +23578,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: zhImage: {fileID: 21300000, guid: 0b7ed26ef0240ac4c8af57aad790f52b, type: 3} + zhDisabledImage: {fileID: 0} + IsDisabled: 0 --- !u!1 &2385217537198970645 GameObject: m_ObjectHideFlags: 0 @@ -23681,7 +23710,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -171, y: 59} + m_AnchoredPosition: {x: -201, y: 59} m_SizeDelta: {x: 140, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3340768605458228582 @@ -24810,6 +24839,69 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &2437625208092975975 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2741385192104591345} + - component: {fileID: 5171774652611130977} + - component: {fileID: 5723101424284070663} + m_Layer: 5 + m_Name: textController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2741385192104591345 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2437625208092975975} + 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: 3024542420348446357} + 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: -771, y: -44} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5171774652611130977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2437625208092975975} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5723101424284070663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2437625208092975975} + 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 &2877296740073624296 GameObject: m_ObjectHideFlags: 0 @@ -24840,7 +24932,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4733454955587414614} + - {fileID: 3024542420348446357} - {fileID: 3591901196367126761} m_Father: {fileID: 765892906030958096} m_RootOrder: 3 @@ -25948,56 +26040,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 16 ---- !u!1 &3734950502015741349 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4733454955587414614} - - component: {fileID: 2232501020190426150} - 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 &4733454955587414614 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3734950502015741349} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.97727275, y: 0.97727275, z: 1} - m_Children: - - {fileID: 3815618195539376836} - - {fileID: 1030815424971078568} - 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: 1542, y: 88} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2232501020190426150 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3734950502015741349} - 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 @@ -26354,109 +26396,6 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 ---- !u!1 &4085229450536673488 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3815618195539376836} - - component: {fileID: 5914428406531824318} - - component: {fileID: 1653408354133244963} - - component: {fileID: 2308215009673906439} - - component: {fileID: 7067212900684240821} - 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 &3815618195539376836 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4085229450536673488} - 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: 5670651471090548523} - - {fileID: 1524692179908514834} - m_Father: {fileID: 4733454955587414614} - 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: 88} - m_SizeDelta: {x: 1542, y: 88} - m_Pivot: {x: 0, y: 1} ---- !u!114 &5914428406531824318 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4085229450536673488} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!222 &1653408354133244963 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4085229450536673488} - m_CullTransparentMesh: 0 ---- !u!114 &2308215009673906439 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4085229450536673488} - 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 &7067212900684240821 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4085229450536673488} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &4192129661743811864 GameObject: m_ObjectHideFlags: 0 @@ -27276,6 +27215,84 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &4763292060387363662 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5424118817000444708} + - component: {fileID: 8987389517874508356} + - component: {fileID: 5728445718189323839} + - component: {fileID: 268192667407689070} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5424118817000444708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4763292060387363662} + 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: 4113790711181373871} + 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 &8987389517874508356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4763292060387363662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &5728445718189323839 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4763292060387363662} + m_CullTransparentMesh: 0 +--- !u!114 &268192667407689070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4763292060387363662} + 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 &5021725234302645678 GameObject: m_ObjectHideFlags: 0 @@ -27354,6 +27371,84 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +--- !u!1 &6037024517355502681 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7264034656573343914} + - component: {fileID: 8109368357043984242} + - component: {fileID: 3386037865908136210} + - component: {fileID: 7191497092522594892} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7264034656573343914 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6037024517355502681} + 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: 4113790711181373871} + 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 &8109368357043984242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6037024517355502681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &3386037865908136210 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6037024517355502681} + m_CullTransparentMesh: 0 +--- !u!114 &7191497092522594892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6037024517355502681} + 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 &6653291467032316143 GameObject: m_ObjectHideFlags: 0 @@ -27487,69 +27582,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 12 ---- !u!1 &6771944074264837671 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1030815424971078568} - - component: {fileID: 7615561039546261438} - - component: {fileID: 6939248899071747073} - m_Layer: 5 - m_Name: textController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1030815424971078568 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6771944074264837671} - 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: 4733454955587414614} - 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: -771, y: -44} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7615561039546261438 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6771944074264837671} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &6939248899071747073 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6771944074264837671} - 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 @@ -27657,7 +27689,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: ---- !u!1 &7121906458166836188 +--- !u!1 &7067156022622667343 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -27665,76 +27697,48 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5670651471090548523} - - component: {fileID: 2423058573687125980} - - component: {fileID: 1000748488954438978} - - component: {fileID: 8311039683991739438} - m_Layer: 5 - m_Name: Lines + - component: {fileID: 3024542420348446357} + - component: {fileID: 158366799836849776} + 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 &5670651471090548523 +--- !u!224 &3024542420348446357 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7121906458166836188} + m_GameObject: {fileID: 7067156022622667343} 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: 3815618195539376836} + m_LocalScale: {x: 0.97727275, y: 0.97727275, z: 1} + m_Children: + - {fileID: 4113790711181373871} + - {fileID: 2741385192104591345} + m_Father: {fileID: 2877296740073624297} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 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: 0, y: 0} + m_SizeDelta: {x: 1542, y: 88} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2423058573687125980 +--- !u!114 &158366799836849776 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7121906458166836188} + m_GameObject: {fileID: 7067156022622667343} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!222 &1000748488954438978 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7121906458166836188} - m_CullTransparentMesh: 0 ---- !u!114 &8311039683991739438 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7121906458166836188} - 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 &7128831287110258232 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/language.json b/Assets/Resources/UI/language.json index e1b1614e..094b77e4 100644 --- a/Assets/Resources/UI/language.json +++ b/Assets/Resources/UI/language.json @@ -164,7 +164,7 @@ "Route Name": "线路名称", "SETTING": "设置", "NOTIFICATION": "通知", - "GO!": "进入!", + "GO!": "开始!", "Go": "进入", "Stay": "忽略", "ALL RACE": "所有赛事", diff --git a/Assets/Scripts/Apis/MapApi.cs b/Assets/Scripts/Apis/MapApi.cs index 960a562c..883c911e 100644 --- a/Assets/Scripts/Apis/MapApi.cs +++ b/Assets/Scripts/Apis/MapApi.cs @@ -16,7 +16,11 @@ namespace Assets.Scripts.Apis { return Get($"Map/GetMapToken?name={name}"); } - + public string GetTipsList() + { + return Get($"Map/GetTipList"); + } + /// /// 获取路线数据 /// @@ -178,9 +182,9 @@ namespace Assets.Scripts.Apis return result; } - public async Task>> GetMapRouteAreaDetailList(int id, int pageIndex, int pageSize) + public async Task> GetMapRouteAreaDetailList(int id, int pageIndex, int pageSize) { - var result = await GetAsync>>($"MapRouteArea/GetRouteList?areaId={id}&pageSize={pageSize}&pageIndex={pageIndex}"); + var result = await GetAsync>($"MapRouteArea/GetRouteList?areaId={id}&pageSize={pageSize}&pageIndex={pageIndex}"); return result; } diff --git a/Assets/Scripts/Apis/Models/MapCompetition.cs b/Assets/Scripts/Apis/Models/MapCompetition.cs index e24d5b72..d8ff8aea 100644 --- a/Assets/Scripts/Apis/Models/MapCompetition.cs +++ b/Assets/Scripts/Apis/Models/MapCompetition.cs @@ -18,7 +18,7 @@ namespace Assets.Scripts.Apis.Models public bool IsOfficial { get; set; } public int MapCompetitionType { get; set; } - public object NickName { get; set; } + public string NickName { get; set; } public int pageCount { get; set; } public int RouteId { get; set; } public string Sponsor { get; set; } diff --git a/Assets/Scripts/Apis/Models/MapRoute.cs b/Assets/Scripts/Apis/Models/MapRoute.cs index 0038475a..7a1636d4 100644 --- a/Assets/Scripts/Apis/Models/MapRoute.cs +++ b/Assets/Scripts/Apis/Models/MapRoute.cs @@ -109,5 +109,7 @@ namespace Assets.Scripts.Apis.Models public string Camera { get; set; } public string MineCountString { get; set; } public int MineCount { get; set; } + + public int[] RouteIds { get; set; } } } diff --git a/Assets/Scripts/Apis/Models/MapRouteArea.cs b/Assets/Scripts/Apis/Models/MapRouteArea.cs index fabc0302..202d0d48 100644 --- a/Assets/Scripts/Apis/Models/MapRouteArea.cs +++ b/Assets/Scripts/Apis/Models/MapRouteArea.cs @@ -138,6 +138,21 @@ namespace Assets.Scripts.Apis.Models public DateTime UpdateTime { get; set; } } + public class MapRouteAreaRouteList + { + /// + /// + /// + public List RouteList + { + get; set; + } + public List RouteIds + { + get; set; + } + + } public class MapMaxRanking { /// diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 944fb26d..be41a54f 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -369,6 +369,7 @@ public class MainController : BaseScene //发送消息 var list = MapUDPService.GetAllOnlineUserList(); + var lang = App.GetLocalLanguage(); foreach (var item in list) { if (item.RouteId > 0) @@ -389,11 +390,11 @@ public class MainController : BaseScene var message = ""; if (item.TotalTicks == 0) { - message = $"发起了对{item.RouteName}的挑战"; + message = lang=="zh"?$"发起了对{item.RouteName}的挑战": $"start a challenge to the{item.RouteName}"; } if (item.IsCompleted) { - message = $"完成了{item.RouteName}的挑战"; + message = lang == "zh" ? $"完成了{item.RouteName}的挑战": $"completed the challenge of the{item.RouteName}"; } if (!string.IsNullOrEmpty(message)) { @@ -405,23 +406,35 @@ public class MainController : BaseScene var message = $"{item.Name}上线了"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.Id}{item.LastActiveTime}{item.Point}"); } - //距离 - if (item.EndDistance > 50) + //距离50 + if (item.EndDistance >= 50) { - var message = $"在骑行过程中突破了{"50KM"}的挑战"; + var message = lang == "zh" ? $"在骑行过程中突破了{"50KM"}的挑战" : $"distance up to {"50KM"} during riding!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}50KM"); } - //速度 - if (item.Speed > 10) + //距离100 + if (item.EndDistance >= 100) { - var message = $"在骑行过程中速度达到了惊人的{item.Speed}KM/H"; - EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}10KM/H"); + var message = lang == "zh" ? $"在骑行过程中突破了{"100KM"}的挑战": $"distance up to {"100KM"} during riding!"; + EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}50KM"); + } + //速度35 + if (item.Speed >= 35) + { + var message = lang == "zh" ? $"在骑行过程中速度达到了惊人的{Math.Round(item.Speed, 2)}KM/H": $"speed up to {Math.Round(item.Speed, 2)}KM/H during riding!"; + EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}35KM/H"); + } + //速度50 + if (item.Speed >= 50) + { + var message = lang == "zh" ? $"在骑行过程中速度达到了惊人的{Math.Round(item.Speed,2)}KM/H" : $"speed up to {Math.Round(item.Speed, 2)}KM/H during riding!"; + EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}50KM/H"); } //功体比 - if (item.WeightKg > 2) + if (item.WeightKg >= 3) { - var message = $"在骑行过程中功体比达到了惊人的{item.WeightKg}w/kg"; - EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}2WeightKg"); + var message = lang == "zh" ? $"在骑行过程中功体比达到了惊人的{Math.Round(item.WeightKg, 2)}w/kg": $"w/kg up to {Math.Round(item.WeightKg, 2)}w/kg during riding!"; + EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}3WeightKg"); } } } diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs index 38e2f45c..f3ddda3e 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs @@ -252,8 +252,7 @@ namespace Assets.Scenes.Ride.Scripts } AddProcess(20); #endregion - - StartCoroutine(HiddenLoading()); + //StartCoroutine(HiddenLoading()); } private int maxShowCout = 9; private void ShowPlayers(List list) diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs index 31c76e4b..68eaecc8 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs @@ -6,6 +6,7 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.SceneManagement; using UnityEngine.UI; +using DG.Tweening; namespace Assets.Scenes.Ride.Scripts { @@ -19,6 +20,11 @@ namespace Assets.Scenes.Ride.Scripts GameObject TitleImage { get; set; } GameObject WatchTitle { get; set; } GameObject RankingPanel { get; set; } + GameObject ShareButton { get; set; } + GameObject ToolBarPanel { get; set; } + GameObject WeChatButton { get; set; } + + RawImage TopHead { get; set; } RawImage SecondHead { get; set; } RawImage ThirdHead { get; set; } @@ -50,8 +56,14 @@ namespace Assets.Scenes.Ride.Scripts WatchTitle = transform.Find("WatchTitle").gameObject; CloseTitle = transform.Find("CloseTitle").GetComponent(); CloseTime = transform.Find("CloseTime").GetComponent(); - - +#if UNITY_IOS || UNITY_ANDROID + 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); +#endif SpriteTop = Resources.Load("Images/Ride/Match/top-1"); SpriteSecond = Resources.Load("Images/Ride/Match/top-2"); SpriteThrid = Resources.Load("Images/Ride/Match/top-3"); @@ -212,5 +224,24 @@ namespace Assets.Scenes.Ride.Scripts SceneManager.LoadScene("MainScene"); App.MainSceneParam["Name"] = "RaceHomePanel"; } + + private void OpenShare(BaseEventData baseEventData) + { + ((RectTransform)ToolBarPanel.transform).pivot = new Vector2(0, ((RectTransform)ToolBarPanel.transform).pivot.y); + ShareButton.SetActive(false); + ToolBarPanel.transform.DOScaleX(1, 1); + } + + private void ShareWechat(BaseEventData baseEventData) + { + if (App.weChatController.IsWeChatAppInstalled()) + { + App.weChatController.ShareWebpageToWX(0, $"{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/Network/MapUDPService.cs b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs index 4aefe67b..2eb9319a 100644 --- a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs +++ b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs @@ -326,12 +326,30 @@ namespace Assets.Scenes.Ride.Scripts public static int GetNearRiderCount() { - return onlineUserHelper.OnlineUsers.Where(c=> (c.Point[0] != 0 && c.Point[1] != 0)|| (c.Point[0] != -1 && c.Point[1] != -1)).Count(); + int count = 0; + try + { + count = onlineUserHelper.OnlineUsers.Where(c => (c.Point[0] != 0 && c.Point[1] != 0) && (c.Point[0] != -1 && c.Point[1] != -1)).Count(); + } + catch (Exception) + { + + } + return count; } public static int GetAllOnlineUserCount() { - return onlineUserHelper.OnlineUsers.Count(); + int count = 0; + try + { + count = onlineUserHelper.OnlineUsers.Count(); + } + catch (Exception) + { + + } + return count; } /// /// 获取附近的人(当前在线的所有人) @@ -340,45 +358,46 @@ namespace Assets.Scenes.Ride.Scripts public static IList GetNearRiderData(int pageIndex, int pageSize = 5, double[] point = null) { if (point == null) return null; - - var dict = new List>(); - var allOnlineUsers = onlineUserHelper.OnlineUsers.Where(c=>c.CompetitionId == 0); - foreach (var item in allOnlineUsers) + try { - if (item.Id == App.CurrentUser.Id) + var dict = new List>(); + var allOnlineUsers = onlineUserHelper.OnlineUsers.Where(c => c.CompetitionId == 0); + foreach (var item in allOnlineUsers) { - dict.Add(new Tuple(0, item)); - continue; + if (item.Id == App.CurrentUser.Id) + { + dict.Add(new Tuple(0, item)); + continue; + } + if (item.Point[0] != 0 && item.Point[1] != 0) + { + var distance = Math.Round(TurfHelper.GetDistances(point, item.Point) / 1000, 2); + dict.Add(new Tuple(distance, item)); + } } - if (item.Point[0] != 0 && item.Point[1] != 0) + var allList = dict.OrderBy(d => d.Item1);//.Select(d=>d.Item2); + var list = allList.Skip((pageIndex - 1) * pageSize).Take(pageSize).ToList(); + + var nearData = list.Select(n => new NearRiderModel() { - var distance = Math.Round(TurfHelper.GetDistances(point, item.Point) / 1000, 2); - dict.Add(new Tuple(distance, item)); - } + Headimage = n.Item2.HeadImage, + Name = n.Item2.Name, + Near = n.Item1, //Math.Round(TurfHelper.GetDistances(point, n.Point) / 1000, 2), + KGWeight = n.Item2.WeightKg.ToString(), + Speed = Math.Round(n.Item2.Speed, 1), + CountryImg = App.Host + $"User/GetCountryImg?userid={n.Item2.Id}", + IsSelf = n.Item2.IsSelf, + Id = n.Item2.Id, + Country = n.Item2.Country, + }).ToList(); + return nearData; } - var allList = dict.OrderBy(d => d.Item1);//.Select(d=>d.Item2); - var list = allList.Skip((pageIndex - 1) * pageSize).Take(pageSize).ToList(); - - var nearData = list.Select(n => new NearRiderModel() + catch (Exception) { - Headimage = n.Item2.HeadImage, - Name = n.Item2.Name, - Near = n.Item1, //Math.Round(TurfHelper.GetDistances(point, n.Point) / 1000, 2), - KGWeight = n.Item2.WeightKg.ToString(), - Speed = Math.Round(n.Item2.Speed, 1), - CountryImg = App.Host + $"User/GetCountryImg?userid={n.Item2.Id}", - IsSelf = n.Item2.IsSelf, - Id = n.Item2.Id, - Country = n.Item2.Country, - }).ToList(); - return nearData; - //return new - //{ - // NearData = nearData, - // PageCount = (int)Math.Ceiling((double)allList.Count() / pageSize) - //}; - } + return null; + } + } private class OnlineUserHelper { diff --git a/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs index fb6bbe35..5ed54937 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs @@ -47,7 +47,7 @@ namespace Assets.Scenes.Ride.Scripts { App.TextureCache.Clear(); mapApi = new MapApi(); - ShowLoading(); + //ShowLoading(); } protected virtual void Update() @@ -144,18 +144,18 @@ namespace Assets.Scenes.Ride.Scripts Utils.DisplayImageAysnc(StartCoroutine, mapRouteImage, url, DowloadCallBack); } } - protected void DowloadCallBack(string url) + protected void DowloadCallBack(string url,RawImage rawImage) { if (!App.TextureCache.ContainsKey(url)) { - App.TextureCache.Add(url, mapRouteImage.texture); + App.TextureCache.Add(url, rawImage?.texture); } else { - App.TextureCache[url] = mapRouteImage.texture; + App.TextureCache[url] = rawImage?.texture; } - var canvasGroup = mapRouteImage.GetComponent(); - canvasGroup.DOFade(1, 1); + var canvasGroup = rawImage.GetComponent(); + canvasGroup?.DOFade(1, 1); } //设定当前loading进度 public virtual void AddProcess(float v) diff --git a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs index 135d3e27..7f084fa1 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs @@ -248,9 +248,10 @@ namespace Assets.Scenes.Ride.Scripts { MoveElevationImage(); BindDataSource(); + MoveCamera(); time += 1f; } - MoveCamera(); + MoveDistance(); } private float cameraX = 0; private float cameraY = 0; @@ -313,7 +314,8 @@ namespace Assets.Scenes.Ride.Scripts //影子骑行按钮控制 if (mainController.mapRouteRankingList == null || mainController.mapRouteRankingList.Count == 0) { - shadowButton.image.sprite = Resources.Load("Images/Ride/Shadow Mode_no"); + var lang = App.GetLocalLanguage(); + shadowButton.image.sprite = lang == "zh"? Resources.Load("Images/Ride/Shadow Mode_PC_d") : Resources.Load("Images/Ride/Shadow Mode_no"); shadowButton.enabled = false; shadowButton.interactable = false; } @@ -347,14 +349,25 @@ namespace Assets.Scenes.Ride.Scripts ChangeView(null); } } - - //移动摄像头和箭头位置 + //移动摄像头 public void MoveCamera() + { + if (target != null && mainController.Is3dView && mainController.RotateLock && mainController.currentPlayer.Speed > 0) + { + Vector3 v = Vector3.zero; + v.y += mainController.currentPlayer.currentRotation.eulerAngles.y + 160f; + if (mainController.RotateLock) + { + target.transform.DOLocalRotate(v, 1f, RotateMode.Fast); + } + } + } + //移动3d人物和箭头位置 + public void MoveDistance() { if (target != null) { - target.transform.position = mainController.currentPlayer.currentPos; //player.transform.position;// new Vector3((float)Math.Round(player.transform.position.x,1), 0, (float)Math.Round(player.transform.position.z,1)); if (!mainController.Is3dView) { Vector3 v = Vector3.zero; @@ -363,17 +376,8 @@ namespace Assets.Scenes.Ride.Scripts //mainController.player.transform.localScale.Set(0.1f, 0.1f, 0.1f); player.transform.localScale = m; } - else - { - //3d视角跟随人物转动 - //CameraVector.x = cameraX; - //CameraVector.y = cameraY; - //CameraVector.z = cameraZ; - //target.transform.eulerAngles = CameraVector; - Vector3 v = Vector3.zero; - v.y += mainController.currentPlayer.currentRotation.eulerAngles.y + 160f; //target.transform.rotation = playerController.transform.rotation;//new Quaternion(playerController.transform.rotation.x, playerController.transform.rotation.y +1f, playerController.transform.rotation.z, playerController.transform.rotation.w); - target.transform.eulerAngles = v; //.Set(0, playerController.currentRotation.eulerAngles.y + 160f, 0);// = new Vector3(0, playerController.transform.eulerAngles.y + 160f, 0); - } + target.transform.position = mainController.currentPlayer.currentPos; + //target.transform.DOLocalMove(mainController.currentPlayer.currentPos, 0.5f); //player.transform.position;// new Vector3((float)Math.Round(player.transform.position.x,1), 0, (float)Math.Round(player.transform.position.z,1)); //控制照片移动 ((RectTransform)arrow.transform).position = Camera.main.WorldToScreenPoint(target.transform.position); if (mainController.currentPlayer.Speed > 0 && mainController.isStart) @@ -386,7 +390,7 @@ namespace Assets.Scenes.Ride.Scripts } } } - //绑定数据源 + public void BindDataSource() { #if UNITY_IOS || UNITY_ANDROID diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index 7d3ee718..526ec552 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs @@ -23,6 +23,8 @@ using ChartAndGraph; using UnityEngine.UI; using System.Diagnostics; using UnityEngine.SceneManagement; +using DG.Tweening; +using System.Timers; public class CyclingController : DeviceServiceMonoBase { @@ -99,6 +101,7 @@ public class CyclingController : DeviceServiceMonoBase void OnDestroy() { //MapUDPService.Dispose(); + TouchKit.removeAllGestureRecognizers(); Resources.UnloadUnusedAssets(); GC.Collect(); } @@ -170,6 +173,9 @@ public class CyclingController : DeviceServiceMonoBase return CompetitionMobileArrow; } + public bool RotateLock = true; + + private bool touchLock = true; private void Start() { @@ -230,6 +236,7 @@ public class CyclingController : DeviceServiceMonoBase SceneManager.activeSceneChanged += SceneManager_activeSceneChanged; + HandleTouchAndInput(); //进入比赛 if (competitionId > 0) { @@ -243,7 +250,10 @@ public class CyclingController : DeviceServiceMonoBase StartCoroutine(Init()); return; } + + } + float timer = 1f; bool clearLock = false; @@ -251,6 +261,94 @@ public class CyclingController : DeviceServiceMonoBase { ClearTempFile(); } + #region 手势移动&PC鼠标的控制 + private void HandleTouchAndInput() + { + var rotationRecognizer = new TKOneFingerRotationRecognizer + { + targetPosition = Camera.main.WorldToScreenPoint(target.position) + }; + rotationRecognizer.gestureRecognizedEvent += (r) => + { + if (Is3dView && IsPointerOverGameObject(r.startTouchLocation())) + { + RotateLock = false; + DOTween.Kill(target); + target.transform.Rotate(new Vector3(0, 1, 0), r.deltaRotation); + } + }; + + var timer = new Timer + { + Interval = 1000 + }; + timer.Elapsed += (s, e) => + { + RotateLock = true; + timer.Stop(); + }; + + rotationRecognizer.gestureCompleteEvent += (r) => { + UnityEngine.Debug.Log("gestureCompleteEvent"); + timer.Start(); + }; + + TouchKit.addGestureRecognizer(rotationRecognizer); + ////单指 + //var touchRecognizer = new TKAnyTouchRecognizer(new TKRect(0, 0, Screen.width, Screen.height)); + //DateTime startTimpStamp = DateTime.Now; + //Vector2 touchLocation = Vector2.down; + //touchRecognizer.onEnteredEvent += (r) => + //{ + // touchLocation = r.startTouchLocation(); + // startTimpStamp = DateTime.Now; + //}; + //touchRecognizer.onExitedEvent += (r) => + //{ + // if (competitionId == 0 && isStart && IsPointerOverGameObject(touchRecognizer.STAR)) + // { + // var timespan = DateTime.Now - startTimpStamp; + // UnityEngine.Debug.Log($"{timespan.TotalMilliseconds}"); + // if (timespan.TotalMilliseconds <= 120) + // { + // singleUIManager?.ClearPanel(null); + // } + // } + //}; + //TouchKit.addGestureRecognizer(touchRecognizer); + //双指 + var PinchRecognizer = new TKPinchRecognizer(); + PinchRecognizer.gestureRecognizedEvent += (r) => + { + if (Is3dView && IsPointerOverGameObject(PinchRecognizer.startTouchLocation())) + { + if (cameraList == null) + { + cameraList = new List(); + cameraList.Add(near); + cameraList.Add(plane); + cameraList.Add(far); + } + var prePos = Camera.main.transform.localPosition; + var nextPos = Camera.main.transform.localPosition; + if (r.deltaScale < 0) + { + nextPos = cameraList.Where(c => c.y > Camera.main.transform.localPosition.y).FirstOrDefault(); + if (nextPos != Vector3.zero) + Camera.main.transform.DOLocalMove(nextPos, 0.5f); + //StartCoroutine(MoveCamera(prePos, nextPos)); + } + if (r.deltaScale > 0) + { + nextPos = cameraList.Where(c => c.y < Camera.main.transform.localPosition.y).LastOrDefault(); + if (nextPos != Vector3.zero) + Camera.main.transform.DOLocalMove(nextPos, 0.5f); + //StartCoroutine(MoveCamera(prePos, nextPos)); + } + } + }; + TouchKit.addGestureRecognizer(PinchRecognizer); + } /// /// 检测是否点击UI /// @@ -273,6 +371,8 @@ public class CyclingController : DeviceServiceMonoBase return false; } } + + #endregion bool _dragStartedOnUI = false; protected override void Update() { @@ -307,23 +407,15 @@ public class CyclingController : DeviceServiceMonoBase float touchTimer = 0.1f; private void FixedUpdate() { - touchTimer -= Time.deltaTime; - if (touchTimer <= 0) - { -#if UNITY_IOS || UNITY_ANDROID - HandleTouch(); -#else + HandleTouch(); HandleMouseScrollWheel(); -#endif - touchTimer += 0.1f; - } } public bool isWatch { get; set; } private Vector3 currentCameraPos { get; set; } - Vector3 far = new Vector3(-25, 73, -70); - Vector3 plane = new Vector3(-15, 43, -40); - Vector3 near = new Vector3(-8, 23, -20); + Vector3 far = new Vector3(-18, 50, -48); + Vector3 plane = new Vector3(-15.1f, 42, -40); + Vector3 near = new Vector3(-11.4f, 31, -30); List cameraList { get; set; } /// @@ -332,8 +424,9 @@ public class CyclingController : DeviceServiceMonoBase private void HandleMouseScrollWheel() { var scrollDelta = Input.GetAxis("Mouse ScrollWheel"); - UnityEngine.Debug.Log($"scrolldelta{scrollDelta}"); - + + if (scrollDelta != 0 && Input.mousePosition != null && !IsPointerOverGameObject(Input.mousePosition)) + return; if (cameraList == null) { cameraList = new List(); @@ -347,16 +440,20 @@ public class CyclingController : DeviceServiceMonoBase { nextPos = cameraList.Where(c => c.y > Camera.main.transform.localPosition.y).FirstOrDefault(); if (nextPos != Vector3.zero) - StartCoroutine(MoveCamera(prePos, nextPos)); + Camera.main.transform.DOLocalMove(nextPos, 0.5f); + //StartCoroutine(MoveCamera(prePos, nextPos)); } if (scrollDelta > 0) { nextPos = cameraList.Where(c => c.y < Camera.main.transform.localPosition.y).LastOrDefault(); if (nextPos != Vector3.zero) - StartCoroutine(MoveCamera(prePos, nextPos)); + Camera.main.transform.DOLocalMove(nextPos, 0.5f); + //StartCoroutine(MoveCamera(prePos, nextPos)); } } + + DateTime startTimpStamp = DateTime.Now; private void HandleTouch() { if (singleUIManager == null) @@ -366,11 +463,19 @@ public class CyclingController : DeviceServiceMonoBase { case 1: { + UnityEngine.Debug.Log(Input.touches[0]); UnityEngine.Debug.Log($"{Input.touches[0]}{Input.touches[0].phase }"); - //单击切换极简模式 - if (Input.touches[0].tapCount==1 && Input.touches[0].phase == TouchPhase.Moved && isStart && singleUIManager.clearLock && competitionId == 0) + if (Input.touches[0].tapCount == 1 && Input.touches[0].phase == TouchPhase.Began && isStart && singleUIManager.clearLock && competitionId == 0) { - if (IsPointerOverGameObject(Input.mousePosition)) + startTimpStamp = DateTime.Now; + } + + //单击切换极简模式 + if (Input.touches[0].tapCount==1 && Input.touches[0].phase == TouchPhase.Ended && isStart && singleUIManager.clearLock && competitionId == 0) + { + var interval = DateTime.Now - startTimpStamp; + UnityEngine.Debug.Log(interval); + if (interval.TotalMilliseconds<=150 && IsPointerOverGameObject(Input.mousePosition)) { singleUIManager?.ClearPanel(null); } @@ -379,6 +484,7 @@ public class CyclingController : DeviceServiceMonoBase break; case 2: { + return; //双手触摸移动摄像机 // Store both touches. Touch touchZero = Input.GetTouch(0); @@ -406,13 +512,15 @@ public class CyclingController : DeviceServiceMonoBase { nextPos = cameraList.Where(c => c.y > Camera.main.transform.localPosition.y).FirstOrDefault(); if (nextPos != Vector3.zero) - StartCoroutine(MoveCamera(prePos, nextPos)); + Camera.main.transform.DOLocalMove(nextPos, 0.5f); + //StartCoroutine(MoveCamera(prePos, nextPos)); } if (offset > 0) { nextPos = cameraList.Where(c => c.y < Camera.main.transform.localPosition.y).LastOrDefault(); if (nextPos != Vector3.zero) - StartCoroutine(MoveCamera(prePos, nextPos)); + Camera.main.transform.DOLocalMove(nextPos, 0.5f); + //StartCoroutine(MoveCamera(prePos, nextPos)); } } break; @@ -439,7 +547,7 @@ public class CyclingController : DeviceServiceMonoBase } private IEnumerator Init() { - yield return new WaitForSeconds(1); + yield return null; //new WaitForSeconds(1); mapRoute = mapApi.GetById(routeId).data; loadingController.Init();//初始化loading页面 loadingController.AddProcess(10); @@ -671,22 +779,12 @@ public class CyclingController : DeviceServiceMonoBase chartDataSourceScript.InitHorizontalScrolling(index); } - private IEnumerator MoveCamera(Vector3 prePos, Vector3 nextPos) - { - float t = 0; - while (t < 0.37f) - { - t += Time.deltaTime; - Vector3 v = Vector3.Lerp(prePos, nextPos, t); - Camera.main.transform.localPosition = v; - yield return new WaitForEndOfFrame(); - } - } //SingleUIManager singleUIManager; public BaseUIManager singleUIManager; public void GameStart() { - StartCoroutine(MoveCamera(far, plane));//初始摄像头 + Camera.main.transform.DOLocalMove(near, 1.5f); + //StartCoroutine(MoveCamera(far, near));//初始摄像头 var check = CheckAnt(); #if UNITY_EDITOR check = true; diff --git a/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs index 79d26d52..602679bf 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs @@ -6,6 +6,7 @@ using Assets.Scripts; using Assets.Scripts.Apis.Models; using System.Collections.Generic; using DG.Tweening; +using System.Linq; namespace Assets.Scenes.Ride.Scripts { @@ -62,6 +63,7 @@ namespace Assets.Scenes.Ride.Scripts altitudeGraph = panel.transform.Find("AltitudeGraph").GetComponent(); mapRanking = panel.transform.Find("MapRanking"); mapId = panel.transform.Find("MapId").GetComponent(); + #if UNITY_STANDALONE_WIN UIManager.RemoveEvent(distance.gameObject); UIManager.RemoveEvent(slope.gameObject); @@ -127,20 +129,30 @@ namespace Assets.Scenes.Ride.Scripts Utils.DisplayImage(head, userList[0].HeadImage);//头像 country.texture = cyclingController.GetCountryImageByCode(route.CountryCode);//上传者国家 mapCountry.texture = cyclingController.GetCountryImageByName(userList[0].Country);//路书国家 - Utils.DisplayImage(altitudeGraph, route.AltitudeGraph);//海拔图 + //Utils.DisplayImage(altitudeGraph, route.AltitudeGraph);//海拔图 + Utils.DisplayImageAysnc(StartCoroutine, altitudeGraph, route.AltitudeGraph, DowloadCallBack); } #endregion //异步请求mapbox画出当前路书路线图 DrawMapRouteAsync(route.Id); AddProcess(10); //查询排行榜 - var list = mapApi.GetRouteRanking(App.RouteIdParam, "1", 0, 10, ""); + var list = mapApi.GetRouteRanking(App.RouteIdParam, "1", 0, 99999, ""); if (list.result) { + if (list.data.list.Count > 10) + { + var ViewAll = panel.transform.Find("ViewAll").gameObject; + ViewAll.SetActive(true); + UIManager.AddEvent(ViewAll, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + Application.OpenURL($"{App.CurrentUser.WebHost}/Routes/{cyclingController.mapRoute.Id}?Token={App.CurrentUser.cookie}"); + }); + } CreateRankingList(list.data.list); AddProcess(10); } - StartCoroutine(HiddenLoading()); + //StartCoroutine(HiddenLoading()); } //创建排行榜 @@ -148,17 +160,20 @@ namespace Assets.Scenes.Ride.Scripts { #if UNITY_IOS || UNITY_ANDROID var prefab = Resources.Load("UI/Prefab/Ride/Mobile/RankingItem"); + var myprefab = Resources.Load("UI/Prefab/Ride/Mobile/MySelfRankingItem"); #else var prefab = Resources.Load("UI/Prefab/Ride/RankingItem"); + var myprefab = Resources.Load("UI/Prefab/Ride/MySelfRankingItem"); #endif var parent = panel.transform.Find("MapRanking"); var title = panel.transform.Find("RankingTitle").gameObject; - if (list.Count == 0) - { - title.SetActive(false); - } + title.SetActive(list.Count != 0); + int index = 0; foreach (var item in list) { + index++; + if (index > 10) + break; GameObject newObj = (GameObject)Instantiate(prefab, parent); var selectPlayerItemScript = newObj.GetComponent(); selectPlayerItemScript.SetRanking(item.RowNumber.ToString()); @@ -168,6 +183,19 @@ namespace Assets.Scenes.Ride.Scripts var texture = cyclingController.GetCountryImageByCode(item.CountryCode); selectPlayerItemScript.SetCountry(texture); } + //如果有自己的记录显示自己的排名 + var myself = list.Where(c => c.MySelf).FirstOrDefault(); + if (myself != null) + { + GameObject newObj = (GameObject)Instantiate(myprefab, parent); + var selectPlayerItemScript = newObj.GetComponent(); + selectPlayerItemScript.SetRanking(myself.RowNumber.ToString()); + selectPlayerItemScript.SetName(myself.NickName); + selectPlayerItemScript.SetTimer(myself.IsDNF ? "DNF" : myself.TotalTime); + selectPlayerItemScript.SetHead(myself.WxHeadImg); + var texture = cyclingController.GetCountryImageByCode(myself.CountryCode); + selectPlayerItemScript.SetCountry(texture); + } } } } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs b/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs index 6df2e014..3604ba79 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/NearByFactory.cs @@ -1,4 +1,5 @@ using Assets.Scenes.Ride.Scripts.Model; +using System; using System.Linq; using UnityEngine; using UnityEngine.EventSystems; @@ -36,6 +37,8 @@ namespace Assets.Scenes.Ride.Scripts OnlineUserNum.text = " "+ MapUDPService.GetNearRiderCount().ToString(); LayoutRebuilder.ForceRebuildLayoutImmediate(OnlineUserNum.rectTransform); var nearList = MapUDPService.GetNearRiderData(pageIndex, pageSize, new double[] { playerController.Currentlatlong.x, playerController.Currentlatlong.y }); + if (nearList == null) + return; var mod = MapUDPService.GetNearRiderCount() % pageSize; var pages = MapUDPService.GetNearRiderCount() / pageSize; totalPages = mod > 0 ? pages + 1 : pages; @@ -89,12 +92,17 @@ namespace Assets.Scenes.Ride.Scripts if (cyclingController.currentPlayer.UserId == item.Id) { nearByItemscript.setHead(item.Headimage); + nearByItemscript.transform.SetAsFirstSibling(); + } + else + { + nearByItemscript.transform.SetSiblingIndex((int)Math.Ceiling(item.Near)); } #if !(UNITY_IOS || UNITY_ANDROID) nearByItemscript.setCountry(cyclingController.GetCountryImageByName(item.Country)); #endif nearByItemscript.setDistance(item.Near.ToString() + "KM"); - nearByItemscript.transform.SetSiblingIndex((int)item.Near); + } } } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs index e0e934a4..cd280c07 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs @@ -26,8 +26,8 @@ namespace Assets.Scenes.Ride.Scripts currentlatlong = mainController.GetCenterCoordinate(); uipanel = mainController.GetUIPanel(); trail = FindObjectOfType(); - trail.startWidth = 1f; - trail.endWidth = 1f; + trail.startWidth = 0.5f; + trail.endWidth = 0.5f; trail.startColor = new Color(0.9764706f, 0.1882353f, 0.5254902f, 1f); trail.endColor = new Color(0.9764706f, 0.1882353f, 0.5254902f, 1f); //var color7 = Resources.Load("UI/Material/color7"); @@ -60,9 +60,9 @@ namespace Assets.Scenes.Ride.Scripts cadance = mainController.UpdateCadence(); weight = App.CurrentUser.Weight; bicycleWeight = App.CurrentUser.BicycleWeight; -#if UNITY_EDITOR - power = 1430; -#endif +//#if UNITY_EDITOR + power = 143; +//#endif mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100); } catch (Exception ex) @@ -132,7 +132,7 @@ namespace Assets.Scenes.Ride.Scripts //上传数据 public override void Upload() { - if (!mainController.cyclingController.recorderData.Saved)//处理重复上传的问题 + if (mainController.cyclingController.recorderData != null&&!mainController.cyclingController.recorderData.Saved)//处理重复上传的问题 { mainController.Save(TotalDistance); } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs index 708514c0..1c49b796 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs @@ -5,6 +5,7 @@ using UnityEngine; using UnityEngine.UI; using System.Linq; using System; +using DG.Tweening; using UnityEngine.EventSystems; using UnityEngine.SceneManagement; @@ -40,6 +41,8 @@ namespace Assets.Scenes.Ride.Scripts GameObject goResultBtn; GameObject cancelBtn; GameObject shareWxBtn; + GameObject shareButton; + Transform toolbar; #endregion CyclingController cyclingController; @@ -68,8 +71,11 @@ namespace Assets.Scenes.Ride.Scripts #endregion goResultBtn = transform.Find("ConFirmButton").gameObject; cancelBtn = transform.Find("CloseButton").gameObject; + toolbar = transform.Find("ToolBarPanel"); +#if UNITY_ANDROID || UNITY_IOS shareWxBtn = transform.Find("ToolBarPanel/WeChatButton").gameObject; - + shareButton = transform.Find("ShareButton").gameObject; +#endif } public void InjectController(CyclingController controller) @@ -78,12 +84,27 @@ namespace Assets.Scenes.Ride.Scripts cyclingController.AddEvent(goResultBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, GoResult); cyclingController.AddEvent(cancelBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Cancel); 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); } private void shareToWx(BaseEventData b) { - var bs = cyclingController.CaptureCamera(); - WeChatController.Instance.ShareImageToWX(0, bs); + if (App.weChatController.IsWeChatAppInstalled()) + { + App.weChatController.ShareWebpageToWX(0, $"{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) diff --git a/Assets/Scripts/Scenes/Ride/Scripts/RouteController.cs b/Assets/Scripts/Scenes/Ride/Scripts/RouteController.cs index b4e710b0..b783b491 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/RouteController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/RouteController.cs @@ -203,13 +203,13 @@ namespace Assets.Scenes.Ride.Scripts lineRender.startColor = new Color(1, 1, 1, 0.65f); //设置宽度 - lineRender.startWidth = 1.5f; - lineRender.endWidth = 1.5f; + lineRender.startWidth = 1f; + lineRender.endWidth = 1f; lineRender.positionCount = dat.Count; lineRender.SetPositions(feat.Points[0].ToArray()); lineRender.loop = false; lineRender.numCapVertices = 10; - //lineRender.numCornerVertices = 30; + lineRender.numCornerVertices = 30; } @@ -231,13 +231,13 @@ namespace Assets.Scenes.Ride.Scripts lineRender.startColor = new Color(0.9764706f, 0.1882353f, 0.5254902f, 0.65f); //设置宽度 - lineRender.startWidth = 1f; - lineRender.endWidth = 1f; + lineRender.startWidth = 0.5f; + lineRender.endWidth = 0.5f; lineRender.positionCount = feat.Count; lineRender.SetPositions(feat.ToArray()); lineRender.loop = false; lineRender.numCapVertices = 10; - //lineRender.numCornerVertices = 10; + lineRender.numCornerVertices = 10; // lineRender.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.Off; lineRender.allowOcclusionWhenDynamic = false; diff --git a/Assets/Scripts/Scenes/Ride/Scripts/SingleUIManager.cs b/Assets/Scripts/Scenes/Ride/Scripts/SingleUIManager.cs index 2de4167f..810ee1ac 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/SingleUIManager.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/SingleUIManager.cs @@ -13,7 +13,6 @@ namespace Assets.Scenes.Ride.Scripts protected override void Start() { base.Start(); - UIManager.AddEvent(startBtn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, StartRide); UIManager.AddEvent(singleButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, SingleRide); UIManager.AddEvent(shadowButton.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShadowRide); @@ -100,7 +99,7 @@ namespace Assets.Scenes.Ride.Scripts timeRemaining = 1.0f; } } - countDownTxt.text = count==0?"GO!": count.ToString(); + countDownTxt.text = count==0?App.GetLocalString("GO!"): count.ToString(); } //重置游戏状态 public void Reset() diff --git a/Assets/Scripts/Scenes/Ride/Scripts/VersionScript.cs b/Assets/Scripts/Scenes/Ride/Scripts/VersionScript.cs index 7f823e6c..9eea247a 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/VersionScript.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/VersionScript.cs @@ -28,7 +28,7 @@ namespace Assets.Scenes.Ride.Scripts _delayTime = App.delayTime; if (_delayTime != -1) { - appVersion.text = $"{_delayTime.ToString("0")}MS\n{"V" + App.AppVersion}"; + appVersion.text = $"{_delayTime.ToString("0")}ms\n{"V" + App.AppVersion}"; } else { diff --git a/Assets/Scripts/UI/Control/PfUIButton.cs b/Assets/Scripts/UI/Control/PfUIButton.cs index 674ccb65..96eb81d0 100644 --- a/Assets/Scripts/UI/Control/PfUIButton.cs +++ b/Assets/Scripts/UI/Control/PfUIButton.cs @@ -8,6 +8,7 @@ using UnityEngine.UI; using UnityEngine.EventSystems; using UnityEngine.Events; using DG.Tweening; +using System.Timers; namespace Assets.Scripts.UI.Control { @@ -119,8 +120,18 @@ namespace Assets.Scripts.UI.Control } } public bool showTooltip { get; set; } + private void BindEvent() { + Timer timer = new Timer(); + timer.Interval = 1000; + var group = tooltips.GetComponent(); + timer.Elapsed += (r, s) => + { + timer.Stop(); + group.DOFade(1, 0.5f); + }; + //鼠标进入 UIManager.AddEvent(this.gameObject, EventTriggerType.PointerEnter, new UnityEngine.Events.UnityAction(e => { @@ -135,7 +146,7 @@ namespace Assets.Scripts.UI.Control #endif tooltips.GetComponent().alpha = 0f; tooltips.SetActive(true); - tooltips.GetComponent().DOFade(1f, 0.2f); + timer.Start(); } switch (mType) { @@ -164,14 +175,17 @@ namespace Assets.Scripts.UI.Control UIManager.AddEvent(this.gameObject, EventTriggerType.PointerExit, new UnityAction(e => { if (!this.isActiveAndEnabled) return; + timer.Stop(); #if !(UNITY_ANDROID || UNITY_IOS) if (!string.IsNullOrWhiteSpace(Tooltips)) { #else if (!string.IsNullOrWhiteSpace(Tooltips) && showTooltip) { -#endif - tooltips.SetActive(false); +#endif + group.DOFade(0, 1f).onComplete += () => { + tooltips.SetActive(false); + }; } //Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto); switch (mType) diff --git a/Assets/Scripts/UI/Prefab/MultiTips.cs b/Assets/Scripts/UI/Prefab/MultiTips.cs new file mode 100644 index 00000000..b0b0b2e5 --- /dev/null +++ b/Assets/Scripts/UI/Prefab/MultiTips.cs @@ -0,0 +1,63 @@ +using System; +using UnityEngine; +using UnityEngine.UI; +using DG.Tweening; +using Assets.Scripts.UI.Control; +using Assets.Scripts; + +public class MultiTips:PFUIText +{ + private Text text; + private Button button; + private string[] tips { get; set; } + private int currentIndex = 0; + + new void Awake() + { + base.Awake(); + text = GetComponent(); + var tiplist = ConfigHelper.mapApi.GetTipsList(); + if (!string.IsNullOrEmpty(tiplist)) + { + tips = tiplist.Split(','); + } + var random = new System.Random(); + currentIndex = random.Next(0, tips.Length); + SetText(); + } + // Start is called before the first frame update + new void Start() + { + base.Awake(); + } + public void SetText() + { + if(text == null) + { + return; + } + if (currentIndex <= tips.Length) + { + text.text = tips[currentIndex]; + if (currentIndex + 1 < tips.Length) + { + currentIndex++; + } + else + { + currentIndex = 0; + } + } + } + float time = 5f; + // Update is called once per frame + void Update() + { + time -= Time.deltaTime; + while (time<0) + { + SetText(); + time += 5f; + } + } +} diff --git a/Assets/Scripts/UI/Prefab/MultiTips.cs.meta b/Assets/Scripts/UI/Prefab/MultiTips.cs.meta new file mode 100644 index 00000000..c0e28af8 --- /dev/null +++ b/Assets/Scripts/UI/Prefab/MultiTips.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 81e6186d0c08df64ba2687b894591e90 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs b/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs index f8a81d73..7e950008 100644 --- a/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs @@ -1,6 +1,8 @@ -using Assets.Scripts; +using Assets.Scenes.Ride.Scripts; +using Assets.Scripts; using Assets.Scripts.Apis.Models; using System; +using System.Linq; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -18,6 +20,8 @@ public class NewRouteDetailController : PFUIPanel {false,Resources.Load("Images/NewDesign/icon_heji_unlike") }, {true,Resources.Load("Images/NewDesign/icon_heji_like") }, }; + List routeIds { get; set; } + protected override void Awake() { caches = new Dictionary(); @@ -85,7 +89,7 @@ public class NewRouteDetailController : PFUIPanel rect.offsetMin = new Vector2(rect.offsetMin.x, 0); BindHeadImage(); } - + float timer = 1f; // Update is called once per frame void Update() { @@ -104,6 +108,18 @@ public class NewRouteDetailController : PFUIPanel OnEndDrag(null); } } + timer -= Time.deltaTime; + while (timer < 0) + { + var list = MapUDPService.GetAllOnlineUserList(); + if (list.Count > 0 && routeIds != null) + { + //当前集合骑行人数 + var currentUserCount = list.Where(c => routeIds.Contains(c.RouteId)).Count(); + Debug.Log($"当前集合骑行人数{currentUserCount}"); + } + timer += 1f; + } } MapRouteAreaItem area; int pageIndex = 0, pageSize = 10; @@ -171,9 +187,10 @@ public class NewRouteDetailController : PFUIPanel var res = await ConfigHelper.mapApi.GetMapRouteAreaDetailList(area.Id, pageIndex, pageSize); if (res.result) { - if (res.data.Count > 0) + if (res.data.RouteList.Count > 0) { - DisplayMaps(res.data); + DisplayMaps(res.data.RouteList); + routeIds = res.data.RouteIds; } else { diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index b93e4c17..b261b9cc 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -925,12 +925,12 @@ public class UIManager : MonoBehaviour { return; } - if (eventTriggerType == EventTriggerType.PointerClick) - { - var audioSource = gameObject.GetComponent(); - if (audioSource != null) - audioSource.PlayOneShot(buttonClip); - } + //if (eventTriggerType == EventTriggerType.PointerClick) + //{ + // var audioSource = gameObject.GetComponent(); + // if (audioSource != null) + // audioSource.PlayOneShot(buttonClip); + //} call(e); }); @@ -942,17 +942,17 @@ public class UIManager : MonoBehaviour { cursor = Resources.Load("Images/PointerButtonHover"); } - //设置点击音效 - if (buttonClip == null) - { - buttonClip = Resources.Load("audio/高科技UI点击触控警告提示反馈APP菜单UI-很酷的应用程序_爱给网_aigei_com"); - } - var audioSource = gameObject.GetComponent(); - if (audioSource == null) - { - audioSource = gameObject.AddComponent(); - } - audioSource.volume = 0.5f; + ////设置点击音效 + //if (buttonClip == null) + //{ + // buttonClip = Resources.Load("audio/高科技UI点击触控警告提示反馈APP菜单UI-很酷的应用程序_爱给网_aigei_com"); + //} + //var audioSource = gameObject.GetComponent(); + //if (audioSource == null) + //{ + // audioSource = gameObject.AddComponent(); + //} + //audioSource.volume = 0.5f; UIManager.AddEvent(gameObject, EventTriggerType.PointerEnter, (e) => { diff --git a/Assets/Scripts/Utils/Utils.cs b/Assets/Scripts/Utils/Utils.cs index e5c3ba92..c2bed53e 100644 --- a/Assets/Scripts/Utils/Utils.cs +++ b/Assets/Scripts/Utils/Utils.cs @@ -415,7 +415,7 @@ namespace Assets.Scripts } - public static void DisplayImageAysnc(StartCoroutine startCoroutine, RawImage img, string url,Action action) + public static void DisplayImageAysnc(StartCoroutine startCoroutine, RawImage img, string url,Action action) { startCoroutine(DownloadImageCallBack(img, url, action)); } @@ -482,7 +482,7 @@ namespace Assets.Scripts _t.name = MediaUrl; return _t; } - static IEnumerator DownloadImageCallBack(RawImage img, string MediaUrl,Action action) + static IEnumerator DownloadImageCallBack(RawImage img, string MediaUrl,Action action) { UnityWebRequest request = UnityWebRequest.Get(MediaUrl); yield return request.SendWebRequest(); @@ -492,7 +492,7 @@ namespace Assets.Scripts { var data = request.downloadHandler.data; img.texture = Utils.GetDownloadTexture(MediaUrl, data); - action.Invoke(MediaUrl); + action.Invoke(MediaUrl, img); } } /*显示网络图片*/ diff --git a/Assets/TouchKit/TouchKit/Recognizers/TKRotationRecognizer.cs b/Assets/TouchKit/TouchKit/Recognizers/TKRotationRecognizer.cs index b1b12354..e57f069c 100644 --- a/Assets/TouchKit/TouchKit/Recognizers/TKRotationRecognizer.cs +++ b/Assets/TouchKit/TouchKit/Recognizers/TKRotationRecognizer.cs @@ -14,6 +14,7 @@ public class TKRotationRecognizer : TKAbstractGestureRecognizer public event Action gestureCompleteEvent; public float deltaRotation = 0; + public float CurrentRotation = 0; public float minimumRotationToRecognize = 0; protected float _previousRotation = 0; @@ -115,6 +116,7 @@ public class TKRotationRecognizer : TKAbstractGestureRecognizer if( state == TKGestureRecognizerState.RecognizedAndStillRecognizing || state == TKGestureRecognizerState.Began ) { var currentRotation = angleBetweenPoints( _trackingTouches[0].position, _trackingTouches[1].position ); + CurrentRotation = currentRotation; deltaRotation = Mathf.DeltaAngle( currentRotation, _previousRotation ); _previousRotation = currentRotation; state = TKGestureRecognizerState.RecognizedAndStillRecognizing;