diff --git a/Assets/Resources/Images/home/Entrance - MATCH_hover.png b/Assets/Resources/Images/home/Entrance - MATCH_hover.png new file mode 100644 index 00000000..7189e8cb Binary files /dev/null and b/Assets/Resources/Images/home/Entrance - MATCH_hover.png differ diff --git a/Assets/Resources/Images/home/Entrance - MATCH_hover.png.meta b/Assets/Resources/Images/home/Entrance - MATCH_hover.png.meta new file mode 100644 index 00000000..73f4965a --- /dev/null +++ b/Assets/Resources/Images/home/Entrance - MATCH_hover.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: bd4cdb4830bc1f248b6de6abaada3e0a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/home/Entrance - TRAINING_hover.png b/Assets/Resources/Images/home/Entrance - TRAINING_hover.png new file mode 100644 index 00000000..b6626ab1 Binary files /dev/null and b/Assets/Resources/Images/home/Entrance - TRAINING_hover.png differ diff --git a/Assets/Resources/Images/home/Entrance - TRAINING_hover.png.meta b/Assets/Resources/Images/home/Entrance - TRAINING_hover.png.meta new file mode 100644 index 00000000..9cf5782e --- /dev/null +++ b/Assets/Resources/Images/home/Entrance - TRAINING_hover.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: eb15a1b29ba09c14886b07a41640c267 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/home/Entrance - TRAINING_nomal.png b/Assets/Resources/Images/home/Entrance - TRAINING_nomal.png new file mode 100644 index 00000000..c541099d Binary files /dev/null and b/Assets/Resources/Images/home/Entrance - TRAINING_nomal.png differ diff --git a/Assets/Resources/Images/home/Entrance - TRAINING_nomal.png.meta b/Assets/Resources/Images/home/Entrance - TRAINING_nomal.png.meta new file mode 100644 index 00000000..283db135 --- /dev/null +++ b/Assets/Resources/Images/home/Entrance - TRAINING_nomal.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 800df2cff446ac040b4b2cf5c1b2be43 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab b/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab index 9161f618..cdc9d7ac 100644 --- a/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab @@ -64,7 +64,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8d004e6a6e82b544bbab7c3db02cf43c, type: 3} + m_Sprite: {fileID: 21300000, guid: eb15a1b29ba09c14886b07a41640c267, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -327,7 +327,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -776,7 +776,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 66d048b771d02ce44a691f354a213d98, type: 3} + m_Sprite: {fileID: 21300000, guid: bd4cdb4830bc1f248b6de6abaada3e0a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -844,7 +844,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -1374,7 +1374,7 @@ PrefabInstance: - target: {fileID: 8600990077643662720, guid: 652cdefe0475dfd429e5a7e92bc3fa31, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 8600990077643662720, guid: 652cdefe0475dfd429e5a7e92bc3fa31, type: 3} @@ -1484,7 +1484,7 @@ PrefabInstance: - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -1719,7 +1719,7 @@ PrefabInstance: - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -1754,7 +1754,7 @@ PrefabInstance: - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -1779,7 +1779,7 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab index d2b0b7f5..6d7d6a6d 100644 --- a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab @@ -32,6 +32,7 @@ RectTransform: m_Children: - {fileID: 8976674304292884952} - {fileID: 4891852497432372523} + - {fileID: 4745410272457715662} m_Father: {fileID: 1856582807434622599} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -99,7 +100,7 @@ MonoBehaviour: m_ScrollSensitivity: 50 m_Viewport: {fileID: 4891852497432372523} m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 3714912750620550917} m_HorizontalScrollbarVisibility: 0 m_VerticalScrollbarVisibility: 0 m_HorizontalScrollbarSpacing: -3 @@ -2366,7 +2367,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 20, y: 0} - m_SizeDelta: {x: -40, y: 0} + m_SizeDelta: {x: -34, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &4891852497432372524 CanvasRenderer: @@ -2541,6 +2542,80 @@ MonoBehaviour: m_MaskInteraction: 85 m_UseStencil: 1 m_RaycastFilter: 0 +--- !u!1 &5276276116649666566 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4180394555805809794} + - component: {fileID: 2754427459529402935} + - component: {fileID: 7747655051951156966} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4180394555805809794 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5276276116649666566} + 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: 7642792713427571634} + 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: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2754427459529402935 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5276276116649666566} + m_CullTransparentMesh: 0 +--- !u!114 &7747655051951156966 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5276276116649666566} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 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 &7155673232822736578 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2885,6 +2960,130 @@ MonoBehaviour: m_MaskInteraction: 85 m_UseStencil: 1 m_RaycastFilter: 0 +--- !u!1 &6050569855701897417 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4745410272457715662} + - component: {fileID: 5748471796170483597} + - component: {fileID: 5582651108076499812} + - component: {fileID: 3714912750620550917} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4745410272457715662 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6050569855701897417} + 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: 7642792713427571634} + m_Father: {fileID: 465239218947862517} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 6, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!222 &5748471796170483597 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6050569855701897417} + m_CullTransparentMesh: 0 +--- !u!114 &5582651108076499812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6050569855701897417} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.23921569, g: 0.24313726, b: 0.3019608, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 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 &3714912750620550917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6050569855701897417} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 7747655051951156966} + m_HandleRect: {fileID: 4180394555805809794} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!114 &1429559311976359905 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2933,6 +3132,42 @@ MonoBehaviour: m_MaskInteraction: 85 m_UseStencil: 1 m_RaycastFilter: 0 +--- !u!1 &6470237566337987207 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7642792713427571634} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7642792713427571634 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6470237566337987207} + 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: 4180394555805809794} + m_Father: {fileID: 4745410272457715662} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6653062727056844702 GameObject: m_ObjectHideFlags: 0 @@ -5003,15 +5238,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} ---- !u!1 &4628129972378993927 stripped +--- !u!1 &5779092891361109961 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &6398833330297696636 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} @@ -5021,18 +5250,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} ---- !u!1 &3075247155673026290 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} ---- !u!1 &8149286171844735752 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 5321188461237024149} - m_PrefabAsset: {fileID: 0} --- !u!1 &5464789140640568869 stripped GameObject: m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, @@ -5051,9 +5268,27 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} ---- !u!1 &5779092891361109961 stripped +--- !u!1 &4628129972378993927 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!1 &6398833330297696636 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3075247155673026290 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 5321188461237024149} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8149286171844735752 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 5321188461237024149} m_PrefabAsset: {fileID: 0} @@ -5196,21 +5431,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} ---- !u!1 &6423651778393776433 stripped +--- !u!1 &7820744829146851513 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 6073211655158443556} - m_PrefabAsset: {fileID: 0} ---- !u!1 &6216688916544654740 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 6073211655158443556} - m_PrefabAsset: {fileID: 0} ---- !u!1 &4998415483215112909 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} @@ -5220,15 +5443,9 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} ---- !u!224 &185106026378206774 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 6073211655158443556} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7820744829146851513 stripped +--- !u!1 &6423651778393776433 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} @@ -5238,18 +5455,36 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} +--- !u!224 &185106026378206774 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 6073211655158443556} + m_PrefabAsset: {fileID: 0} --- !u!1 &6749386026079657654 stripped GameObject: m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} +--- !u!1 &4998415483215112909 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 6073211655158443556} + m_PrefabAsset: {fileID: 0} --- !u!1 &3745822250017908288 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 6073211655158443556} m_PrefabAsset: {fileID: 0} +--- !u!1 &6216688916544654740 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 6073211655158443556} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6653062728498872177 PrefabInstance: m_ObjectHideFlags: 0 @@ -5374,15 +5609,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} ---- !u!1 &4976321847170018841 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322, - type: 3} - m_PrefabInstance: {fileID: 6653062728498872177} - m_PrefabAsset: {fileID: 0} --- !u!224 &7944455583227005010 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} m_PrefabInstance: {fileID: 6653062728498872177} m_PrefabAsset: {fileID: 0} +--- !u!1 &4976321847170018841 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322, + type: 3} + m_PrefabInstance: {fileID: 6653062728498872177} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/Panel/RaceListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/RaceListPanel.prefab index f44a1184..a4f9df9c 100644 --- a/Assets/Resources/UI/Prefab/Panel/RaceListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/RaceListPanel.prefab @@ -1577,7 +1577,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 20 - m_Right: 0 + m_Right: 14 m_Top: 20 m_Bottom: 0 m_ChildAlignment: 0 @@ -2055,7 +2055,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_SizeDelta: {x: 6, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &6208840624193956598 CanvasRenderer: @@ -2078,7 +2078,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.23921569, g: 0.24313726, b: 0.3019608, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -2335,7 +2335,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/Resources/UI/Prefab/Race/ButtonGroup/BtnContainer-Double-H.prefab b/Assets/Resources/UI/Prefab/Race/ButtonGroup/BtnContainer-Double-H.prefab index 626ca90c..bd6c296f 100644 --- a/Assets/Resources/UI/Prefab/Race/ButtonGroup/BtnContainer-Double-H.prefab +++ b/Assets/Resources/UI/Prefab/Race/ButtonGroup/BtnContainer-Double-H.prefab @@ -33,6 +33,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8871837957621116798} + - {fileID: 1248407718930539659} - {fileID: 948409654087125763} m_Father: {fileID: 0} m_RootOrder: 0 @@ -138,7 +139,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -273,6 +274,166 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2778840482193990051} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4245272705944391211 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1538626007046713480} + m_Modifications: + - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 160 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Name + value: BtnJoin + objectReference: {fileID: 0} + - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Text + value: Join + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: mType + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} +--- !u!224 &1248407718930539659 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + m_PrefabInstance: {fileID: 4245272705944391211} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5811359454055794142 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Race/ButtonGroup/BtnContainer-Double-V.prefab b/Assets/Resources/UI/Prefab/Race/ButtonGroup/BtnContainer-Double-V.prefab index 4fe8d917..de55b2e4 100644 --- a/Assets/Resources/UI/Prefab/Race/ButtonGroup/BtnContainer-Double-V.prefab +++ b/Assets/Resources/UI/Prefab/Race/ButtonGroup/BtnContainer-Double-V.prefab @@ -33,6 +33,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8871837957621116798} + - {fileID: 5218942608295741633} - {fileID: 8552798755745273172} m_Father: {fileID: 0} m_RootOrder: 0 @@ -243,12 +244,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -258,7 +259,7 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -9 objectReference: {fileID: 0} - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -274,6 +275,166 @@ RectTransform: m_PrefabInstance: {fileID: 5811359454055794142} m_PrefabAsset: {fileID: 0} --- !u!1001 &6703788483197435892 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1538626007046713480} + m_Modifications: + - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 160 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Name + value: BtnEnter + objectReference: {fileID: 0} + - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Text + value: Enter + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: mType + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} +--- !u!224 &8552798755745273172 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + m_PrefabInstance: {fileID: 6703788483197435892} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7193490617367896673 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -393,22 +554,22 @@ PrefabInstance: - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_Name - value: BtnEnter + value: BtnJoin objectReference: {fileID: 0} - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_Text - value: Enter + value: Join objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -418,7 +579,7 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -9 objectReference: {fileID: 0} - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -427,9 +588,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} ---- !u!224 &8552798755745273172 stripped +--- !u!224 &5218942608295741633 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} - m_PrefabInstance: {fileID: 6703788483197435892} + m_PrefabInstance: {fileID: 7193490617367896673} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs index f1a73608..e1106f26 100644 --- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs @@ -81,20 +81,20 @@ public class HomeController : PFUIPanel //GetSummary(); dict = new Dictionary { - { - "BtnMatch",new Sprite[] - { - Resources.Load("Images/home/Entrance - MATCH_soon"), - Resources.Load("Images/home/Entrance - MATCH_soon_hover"), - } - }, - { - "BtnTraining",new Sprite[] - { - Resources.Load("Images/home/Entrance - TRAINING_soon"), - Resources.Load("Images/home/Entrance - TRAINING_soon_hover"), - } - }, + //{ + // "BtnMatch",new Sprite[] + // { + // Resources.Load("Images/home/Entrance - MATCH_soon"), + // Resources.Load("Images/home/Entrance - MATCH_soon_hover"), + // } + //}, + //{ + // "BtnTraining",new Sprite[] + // { + // Resources.Load("Images/home/Entrance - TRAINING_soon"), + // Resources.Load("Images/home/Entrance - TRAINING_soon_hover"), + // } + //}, }; } private void GoRide(BaseEventData e) diff --git a/Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs index 4df815bd..0904612c 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs @@ -6,7 +6,7 @@ using UnityEngine.SceneManagement; public class RaceButtonGroupScript : MonoBehaviour { - private Transform BtnEnter, BtnCancel, BtnWatch; + private Transform BtnEnter, BtnCancel, BtnWatch, BtnJoin; public MapCompetition map { get; set; } public Transform parent { get; set; } // Start is called before the first frame update @@ -15,6 +15,7 @@ public class RaceButtonGroupScript : MonoBehaviour BtnEnter = transform.Find("BtnEnter"); BtnCancel = transform.Find("BtnCancel"); BtnWatch = transform.Find("BtnWatch"); + BtnJoin = transform.Find("BtnJoin"); if (BtnEnter != null) { UIManager.AddEvent(BtnEnter.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => GoEnter()); @@ -27,14 +28,21 @@ public class RaceButtonGroupScript : MonoBehaviour { UIManager.AddEvent(BtnWatch.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => GoWatch()); } + if (BtnJoin != null) + { + UIManager.AddEvent(BtnJoin.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => GoJoin()); + } + } + void GoJoin() + { + if (!map.HasJoin) + { + parent.GetComponent().Join(); + } App.RouteIdParam = map.RouteId; } void GoEnter() { - if (!map.HasJoin) - { - parent.GetComponent().Join(); - } - App.RouteIdParam = map.RouteId; + App.RouteIdParam = map.RouteId; App.CompetionId = map.Id; SceneManager.LoadScene("Ride"); } diff --git a/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs index 84f378ef..d03b49b5 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs @@ -92,12 +92,24 @@ public class RaceHomeScript : RaceScript game.transform.SetParent(rightContainer.Find("Container-2")); game.transform.localScale = Vector3.one; } - for (i = 0; i < 3; i++) + for (i = 0; i < activityList.Count; i++) { var activity = activityList[i]; var banner = Instantiate(bannerItem); var dot = Instantiate(dotItem); Utils.DisplayImage(banner.GetComponent(), activity.BannerPreview, true); + //if (i == 0) + //{ + // banner.GetComponent().color = Utils.HexToColorHtml("#ff0000"); + //} + //else if (i == 1) + //{ + // banner.GetComponent().color = Utils.HexToColorHtml("#00ff00"); + //} + //else + //{ + // banner.GetComponent().color = Utils.HexToColorHtml("#0000ff"); + //} UIManager.AddEvent(banner.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => { @@ -141,16 +153,15 @@ public class RaceHomeScript : RaceScript void goLeft() { Debug.Log($"{scroll.horizontalNormalizedPosition}"); - if (scroll.horizontalNormalizedPosition<=0.0001) return; - goMove(-1); + if (scroll.horizontalNormalizedPosition <= 0.0001) goMoveEnd(1- scroll.horizontalNormalizedPosition); + else goMove(-1); } void goRight() { - if (scroll.horizontalNormalizedPosition >= 0.9999) return; + if (scroll.horizontalNormalizedPosition >= 0.9999) goMoveEnd(0 - scroll.horizontalNormalizedPosition); //if ((scroll.horizontalNormalizedPosition + contentSize) >= 1) return; - - goMove(); + else goMove(); } void goMove(int i = 1) { @@ -159,8 +170,20 @@ public class RaceHomeScript : RaceScript start = true; scrollValue = i * contentSize / 20; } + void goMoveEnd(float pos) + { + //doAni(); + if (!startMoveEnd) startPosition = scroll.horizontalNormalizedPosition; + totalScrollValue = 0; + moveEndValue = pos; + scrollValue = pos / 20; + startMoveEnd = true; + + } private bool start = false; private float scrollValue = 0, totalScrollValue = 0, startPosition = 0; + bool startMoveEnd = false; + float moveEndValue = 0; // Update is called once per frame private void FixedUpdate() { @@ -180,8 +203,23 @@ public class RaceHomeScript : RaceScript totalScrollValue = 0; } } - } + if (startMoveEnd) + { + scroll.horizontalNormalizedPosition += scrollValue; + totalScrollValue += scrollValue; + if (System.Math.Abs(totalScrollValue) >= System.Math.Abs(moveEndValue)) + { + scrollValue = 0; + startMoveEnd = false; + scroll.horizontalNormalizedPosition = startPosition + moveEndValue; + handleDotListMoveEnd(totalScrollValue); + Debug.Log(scrollIndex); + //Debug.Log(); + totalScrollValue = 0; + } + } + } private void handleDotList(float totalScrollValue) { scrollIndex = ((scrollIndex + content.childCount) + (totalScrollValue < 0 ? -1 : 1)) % content.childCount; @@ -198,7 +236,22 @@ public class RaceHomeScript : RaceScript } } } - + void handleDotListMoveEnd(float totalScrollValue) + { + var dotList = scroll.transform.Find("DotList"); + scrollIndex = totalScrollValue < 0 ? 0 : dotList.childCount - 1; + for (int i = 0; i < dotList.childCount; i++) + { + if (i == scrollIndex) + { + dotList.GetChild(i).GetComponent().color = Utils.HexToColorHtml("#f93086"); + } + else + { + dotList.GetChild(i).GetComponent().color = Utils.HexToColorHtml("#ffffff"); + } + } + } void Update() { diff --git a/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs index 2d3cf744..8972a23a 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs @@ -51,7 +51,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH private void SetButtonGroup(MapCompetition mapCompetition) { - if (mapCompetition.Status == 1 || mapCompetition.Status == 3 || (mapCompetition.Status == 2 && !mapCompetition.HasJoin)) + if (mapCompetition.Status == 1) { var game = Resources.Load("UI/Prefab/Race/ButtonGroup/BtnContainer-Enter"); var igame = Instantiate(game); @@ -86,11 +86,16 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH igame.name = "BtnContainer"; igame.GetComponent().map = mapCompetition; igame.GetComponent().parent = transform; + igame.transform.Find("BtnJoin").gameObject.SetActive(mapCompetition.CanJoin); + igame.transform.Find("BtnCancel").gameObject.SetActive(mapCompetition.HasJoin); igame.transform.SetParent(transform); igame.transform.localScale = Vector3.one; + igame.transform.GetComponent().anchorMax = new Vector2(0, 0); + igame.transform.GetComponent().anchorMin = new Vector2(1, 0); + igame.transform.GetComponent().pivot = new Vector2(0.5f, 0); var loc = Vector3.zero; - loc.y = -252; - igame.transform.localPosition = loc; + loc.y = 20; + igame.transform.GetComponent().anchoredPosition = loc; } else { @@ -99,11 +104,16 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH igame.name = "BtnContainer"; igame.GetComponent().map = mapCompetition; igame.GetComponent().parent = transform; + igame.transform.Find("BtnJoin").gameObject.SetActive(mapCompetition.CanJoin); + igame.transform.Find("BtnCancel").gameObject.SetActive(mapCompetition.HasJoin); igame.transform.SetParent(transform); igame.transform.localScale = Vector3.one; + igame.transform.GetComponent().anchorMax = new Vector2(0, 0); + igame.transform.GetComponent().anchorMin = new Vector2(1, 0); + igame.transform.GetComponent().pivot = new Vector2(0.5f, 0); var loc = Vector3.zero; - loc.y = -209; - igame.transform.localPosition = loc; + loc.y = 20; + igame.transform.GetComponent().anchoredPosition = loc; } } } @@ -218,12 +228,17 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH if (res.result) { mapCompetition.HasJoin = true; + mapCompetition.CanJoin = false; transform.Find("CountContainer/Text").GetComponent().text = (++mapCompetition.ApplyCount).ToString(); SetStatus(mapCompetition); transform.Find("BtnContainer").gameObject.Destroy(); SetButtonGroup(mapCompetition); Utils.showToast(null, "Successful application!", type: 1); } + else + { + Utils.showToast(null, res.errMsg, type: 0); + } } public void CancelJoin() { @@ -231,11 +246,16 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH if (res.result) { mapCompetition.HasJoin = false; + mapCompetition.CanJoin = true; transform.Find("CountContainer/Text").GetComponent().text = (--mapCompetition.ApplyCount).ToString(); SetStatus(mapCompetition); transform.Find("BtnContainer").gameObject.Destroy(); SetButtonGroup(mapCompetition); Utils.showToast(null, "Successful cancellation application!", type: 1); } + else + { + Utils.showToast(null, res.errMsg, type: 0); + } } }