diff --git a/Assets/arts/textures/ui/act_pvp/act_pvp_board_11.png b/Assets/arts/textures/ui/act_pvp/act_pvp_board_11.png new file mode 100644 index 000000000..5a72fe9cd Binary files /dev/null and b/Assets/arts/textures/ui/act_pvp/act_pvp_board_11.png differ diff --git a/Assets/arts/textures/ui/act_pvp/act_pvp_board_11.png.meta b/Assets/arts/textures/ui/act_pvp/act_pvp_board_11.png.meta new file mode 100644 index 000000000..7681e18ea --- /dev/null +++ b/Assets/arts/textures/ui/act_pvp/act_pvp_board_11.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 05f6298e9139dfa4eb15ca031e594e1b +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + 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: arts/textures/ui/dungeon_equip.ab + assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_dec_28.png b/Assets/arts/textures/ui/common/common_dec_28.png new file mode 100644 index 000000000..1a0093786 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_dec_28.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_28.png.meta b/Assets/arts/textures/ui/common/common_dec_28.png.meta new file mode 100644 index 000000000..3cc1997f8 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_dec_28.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: cedbda28baac029408a0e0160c351ad7 +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + 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/arts/textures/ui/common/common_dec_29.png b/Assets/arts/textures/ui/common/common_dec_29.png new file mode 100644 index 000000000..825aec271 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_dec_29.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_29.png.meta b/Assets/arts/textures/ui/common/common_dec_29.png.meta new file mode 100644 index 000000000..ac3e8d021 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_dec_29.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 458ccc47b228bdc46a1ce6b15a037f5c +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + 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/prefabs/ui/activity/act_pvp/act_pvp_main_ui.prefab b/Assets/prefabs/ui/activity/act_pvp/act_pvp_main_ui.prefab index 92215c5e7..8c981958a 100644 --- a/Assets/prefabs/ui/activity/act_pvp/act_pvp_main_ui.prefab +++ b/Assets/prefabs/ui/activity/act_pvp/act_pvp_main_ui.prefab @@ -835,6 +835,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &1608564566275054922 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8255525005081549889} + - component: {fileID: 2506430942667462711} + - component: {fileID: 6480955858776865775} + m_Layer: 0 + m_Name: img_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8255525005081549889 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1608564566275054922} + 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: 5983911017831994353} + 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: -140, y: -9} + m_SizeDelta: {x: 130, y: 193} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2506430942667462711 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1608564566275054922} + m_CullTransparentMesh: 1 +--- !u!114 &6480955858776865775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1608564566275054922} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 0, g: 0, b: 0, a: 0.8} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b07e73b9fc9a6a24dab9f8d9d3a46cba, 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!1 &1611860435192979967 GameObject: m_ObjectHideFlags: 0 @@ -1123,7 +1198,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7466131106039494145} + - {fileID: 5983911017831994353} + - {fileID: 6112524406724755908} + - {fileID: 3997333936836421156} + - {fileID: 4460697164254696797} + - {fileID: 1687701295210826811} + - {fileID: 8159805790479767894} - {fileID: 2003697278586492503} - {fileID: 5347093002384380731} m_Father: {fileID: 1164488007620484532} @@ -1606,6 +1686,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &3218153955411221495 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4829755007660213685} + - component: {fileID: 8819012723348018048} + - component: {fileID: 3664783899548707721} + m_Layer: 0 + m_Name: img_5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4829755007660213685 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3218153955411221495} + 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: 5983911017831994353} + m_RootOrder: 4 + 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: 280, y: -9} + m_SizeDelta: {x: 130, y: 193} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8819012723348018048 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3218153955411221495} + m_CullTransparentMesh: 1 +--- !u!114 &3664783899548707721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3218153955411221495} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 0, g: 0, b: 0, a: 0.8} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b07e73b9fc9a6a24dab9f8d9d3a46cba, 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!1 &3322032728876051195 GameObject: m_ObjectHideFlags: 0 @@ -2481,7 +2636,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4226237696773862998 +--- !u!1 &4252729568386361364 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2489,70 +2644,65 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7466131106039494145} - - component: {fileID: 509735494842439064} - - component: {fileID: 6375983457919743565} - m_Layer: 5 - m_Name: hero_formation_comp + - component: {fileID: 251126188805535500} + - component: {fileID: 3733278571595555825} + - component: {fileID: 2447220262568407993} + m_Layer: 0 + m_Name: img_4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7466131106039494145 +--- !u!224 &251126188805535500 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4226237696773862998} + m_GameObject: {fileID: 4252729568386361364} 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: 6112524406724755908} - - {fileID: 3997333936836421156} - - {fileID: 4460697164254696797} - - {fileID: 1687701295210826811} - - {fileID: 8159805790479767894} - m_Father: {fileID: 2878882577378170695} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 5983911017831994353} + 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: 0, y: 166.5} - m_SizeDelta: {x: 720, y: 231} + m_AnchoredPosition: {x: 140, y: -9} + m_SizeDelta: {x: 130, y: 193} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &509735494842439064 +--- !u!222 &3733278571595555825 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4226237696773862998} + m_GameObject: {fileID: 4252729568386361364} m_CullTransparentMesh: 1 ---- !u!114 &6375983457919743565 +--- !u!114 &2447220262568407993 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4226237696773862998} + m_GameObject: {fileID: 4252729568386361364} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.8} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7d656d72ffffe924f844232f6bd2656c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: b07e73b9fc9a6a24dab9f8d9d3a46cba, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2845,6 +2995,86 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5131303160671856429 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5983911017831994353} + - component: {fileID: 3370121409572802410} + - component: {fileID: 8141547912421634245} + m_Layer: 0 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5983911017831994353 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5131303160671856429} + 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: 1442918821349866904} + - {fileID: 8255525005081549889} + - {fileID: 7422059651906408993} + - {fileID: 251126188805535500} + - {fileID: 4829755007660213685} + m_Father: {fileID: 2878882577378170695} + 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: 165} + m_SizeDelta: {x: 720, y: 231} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3370121409572802410 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5131303160671856429} + m_CullTransparentMesh: 1 +--- !u!114 &8141547912421634245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5131303160671856429} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 05f6298e9139dfa4eb15ca031e594e1b, 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 &5330591426040881882 GameObject: m_ObjectHideFlags: 0 @@ -3184,6 +3414,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &5758173112283371704 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1442918821349866904} + - component: {fileID: 7798252696523128421} + - component: {fileID: 1325880802867520057} + m_Layer: 0 + m_Name: img_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1442918821349866904 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5758173112283371704} + 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: 5983911017831994353} + 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: -280, y: -9} + m_SizeDelta: {x: 130, y: 193} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7798252696523128421 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5758173112283371704} + m_CullTransparentMesh: 1 +--- !u!114 &1325880802867520057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5758173112283371704} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 0, g: 0, b: 0, a: 0.8} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b07e73b9fc9a6a24dab9f8d9d3a46cba, 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!1 &6062832427841938462 GameObject: m_ObjectHideFlags: 0 @@ -3604,7 +3909,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2878882577378170695} - m_RootOrder: 2 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4115,7 +4420,7 @@ RectTransform: m_Children: - {fileID: 7034481628200669052} m_Father: {fileID: 2878882577378170695} - m_RootOrder: 1 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4525,6 +4830,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8125502268674311948 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7422059651906408993} + - component: {fileID: 1270553147431113348} + - component: {fileID: 8690071437306848710} + m_Layer: 0 + m_Name: img_3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7422059651906408993 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8125502268674311948} + 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: 5983911017831994353} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -9} + m_SizeDelta: {x: 130, y: 193} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1270553147431113348 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8125502268674311948} + m_CullTransparentMesh: 1 +--- !u!114 &8690071437306848710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8125502268674311948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 0, g: 0, b: 0, a: 0.8} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b07e73b9fc9a6a24dab9f8d9d3a46cba, 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!1 &8308948137431861394 GameObject: m_ObjectHideFlags: 0 @@ -4766,114 +5146,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7466131106039494145} - m_Modifications: - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_SizeDelta.x - value: 130 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_SizeDelta.y - value: 193 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_AnchoredPosition.x - value: -140 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - propertyPath: m_Name - value: simple_hero_cell_2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 32d673812711ede43b9cfa580cff095f, type: 3} ---- !u!224 &3997333936836421156 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - m_PrefabInstance: {fileID: 404037146719488732} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3735136512005200052 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - m_PrefabInstance: {fileID: 404037146719488732} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1082442544623057317 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7466131106039494145} + m_TransformParent: {fileID: 2878882577378170695} m_Modifications: - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_Pivot.x @@ -4941,11 +5214,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -140 objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 155.2 objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4961,26 +5234,26 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_Name - value: simple_hero_cell_3 + value: simple_hero_cell_2 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32d673812711ede43b9cfa580cff095f, type: 3} ---- !u!224 &4460697164254696797 stripped +--- !u!224 &3997333936836421156 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - m_PrefabInstance: {fileID: 1082442544623057317} + m_PrefabInstance: {fileID: 404037146719488732} m_PrefabAsset: {fileID: 0} ---- !u!1 &4128438257206209485 stripped +--- !u!1 &3735136512005200052 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - m_PrefabInstance: {fileID: 1082442544623057317} + m_PrefabInstance: {fileID: 404037146719488732} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2704944630465208515 +--- !u!1001 &1082442544623057317 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7466131106039494145} + m_TransformParent: {fileID: 2878882577378170695} m_Modifications: - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_Pivot.x @@ -5048,11 +5321,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_AnchoredPosition.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 155.2 objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5068,26 +5341,26 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_Name - value: simple_hero_cell_4 + value: simple_hero_cell_3 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32d673812711ede43b9cfa580cff095f, type: 3} ---- !u!1 &1425204244336931499 stripped +--- !u!1 &4128438257206209485 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - m_PrefabInstance: {fileID: 2704944630465208515} + m_PrefabInstance: {fileID: 1082442544623057317} m_PrefabAsset: {fileID: 0} ---- !u!224 &1687701295210826811 stripped +--- !u!224 &4460697164254696797 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} - m_PrefabInstance: {fileID: 2704944630465208515} + m_PrefabInstance: {fileID: 1082442544623057317} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4890763577918518702 +--- !u!1001 &2704944630465208515 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7466131106039494145} + m_TransformParent: {fileID: 2878882577378170695} m_Modifications: - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_Pivot.x @@ -5153,13 +5426,120 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_AnchoredPosition.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_AnchoredPosition.y + value: 155.2 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_Name + value: simple_hero_cell_4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 32d673812711ede43b9cfa580cff095f, type: 3} +--- !u!224 &1687701295210826811 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + m_PrefabInstance: {fileID: 2704944630465208515} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1425204244336931499 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3913262466421641832, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + m_PrefabInstance: {fileID: 2704944630465208515} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4890763577918518702 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2878882577378170695} + m_Modifications: + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_SizeDelta.x + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_SizeDelta.y + value: 193 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_AnchoredPosition.x value: 280 objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 155.2 objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5194,7 +5574,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7466131106039494145} + m_TransformParent: {fileID: 2878882577378170695} m_Modifications: - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_Pivot.x @@ -5206,7 +5586,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_AnchorMax.x @@ -5266,7 +5646,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 155.2 objectReference: {fileID: 0} - target: {fileID: 3666510284617985272, guid: 32d673812711ede43b9cfa580cff095f, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/prefabs/ui/activity/act_pvp/act_pvp_match_result_ui.prefab b/Assets/prefabs/ui/activity/act_pvp/act_pvp_match_result_ui.prefab index efbe254cb..26f960cee 100644 --- a/Assets/prefabs/ui/activity/act_pvp/act_pvp_match_result_ui.prefab +++ b/Assets/prefabs/ui/activity/act_pvp/act_pvp_match_result_ui.prefab @@ -265,11 +265,11 @@ RectTransform: m_Father: {fileID: 4605764889789527791} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 223, y: -64} - m_SizeDelta: {x: 300, y: 50} - m_Pivot: {x: 1, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 351.5, y: -22.5} + m_SizeDelta: {x: 131, y: 21} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4248051254041601372 CanvasRenderer: m_ObjectHideFlags: 0 @@ -332,8 +332,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 24 m_fontStyle: 0 - m_HorizontalAlignment: 4 - m_VerticalAlignment: 512 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 1024 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -399,11 +399,11 @@ RectTransform: m_Father: {fileID: 4605764889789527791} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 223, y: -100} - m_SizeDelta: {x: 300, y: 50} - m_Pivot: {x: 1, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 351, y: -51} + m_SizeDelta: {x: 62, y: 18} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1219500282789497795 CanvasRenderer: m_ObjectHideFlags: 0 @@ -441,8 +441,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4287035647 + m_fontColor: {r: 1, g: 0.972549, b: 0.5254902, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -466,7 +466,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 20 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -745,12 +745,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 + m_fontSize: 36 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 30 + m_fontSizeMax: 50 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -852,7 +852,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: bcd86080dcb56c5458e09aa3a3a2cda0, type: 3} + m_Texture: {fileID: 2800000, guid: 4c71bef7dd9347a46a08639c0662902c, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -884,18 +884,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2893822121905993399} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 360821232978557741} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -442, y: -55} - m_SizeDelta: {x: 300, y: 50} - m_Pivot: {x: 1, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -351.5, y: -22.5} + m_SizeDelta: {x: 131, y: 21} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8692729389117746431 CanvasRenderer: m_ObjectHideFlags: 0 @@ -958,8 +958,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 24 m_fontStyle: 0 - m_HorizontalAlignment: 4 - m_VerticalAlignment: 512 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 1024 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -1367,18 +1367,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4963833669237430747} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 360821232978557741} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -442, y: -91} - m_SizeDelta: {x: 300, y: 50} - m_Pivot: {x: 1, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -351, y: -51} + m_SizeDelta: {x: 62, y: 18} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4332836454929731090 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1416,8 +1416,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4287035647 + m_fontColor: {r: 1, g: 0.972549, b: 0.5254902, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1441,7 +1441,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 20 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 diff --git a/Assets/prefabs/ui/activity/act_pvp/act_pvp_match_ui.prefab b/Assets/prefabs/ui/activity/act_pvp/act_pvp_match_ui.prefab index 97e0b20eb..dbf185d04 100644 --- a/Assets/prefabs/ui/activity/act_pvp/act_pvp_match_ui.prefab +++ b/Assets/prefabs/ui/activity/act_pvp/act_pvp_match_ui.prefab @@ -199,7 +199,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: bcd86080dcb56c5458e09aa3a3a2cda0, type: 3} + m_Texture: {fileID: 2800000, guid: 4c71bef7dd9347a46a08639c0662902c, type: 3} m_UVRect: serializedVersion: 2 x: 0 diff --git a/Assets/prefabs/ui/activity/act_pvp/act_pvp_select_ui.prefab b/Assets/prefabs/ui/activity/act_pvp/act_pvp_select_ui.prefab index 088e05f13..6928154a6 100644 --- a/Assets/prefabs/ui/activity/act_pvp/act_pvp_select_ui.prefab +++ b/Assets/prefabs/ui/activity/act_pvp/act_pvp_select_ui.prefab @@ -140,7 +140,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.8} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1590,7 +1590,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.8} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2900,7 +2900,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.8} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3239,7 +3239,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 1600} + m_SizeDelta: {x: 1280, y: 1800} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &769264697541272840 CanvasRenderer: @@ -3409,7 +3409,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.8} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4067,7 +4067,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.8} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4791,7 +4791,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} + m_Sprite: {fileID: 21300000, guid: 05f6298e9139dfa4eb15ca031e594e1b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/battle/battle_actpvp_result_ui.prefab b/Assets/prefabs/ui/battle/battle_actpvp_result_ui.prefab index 356f8032e..71fc2856b 100644 --- a/Assets/prefabs/ui/battle/battle_actpvp_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_actpvp_result_ui.prefab @@ -1739,7 +1739,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 112} - m_SizeDelta: {x: 420, y: 74} + m_SizeDelta: {x: 460, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1105495610083196996 CanvasRenderer: @@ -2211,7 +2211,7 @@ RectTransform: 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: -364} + m_AnchoredPosition: {x: 0, y: -404.5} m_SizeDelta: {x: 549, y: 113} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5287820198550774767 @@ -4868,7 +4868,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 112} - m_SizeDelta: {x: 420, y: 74} + m_SizeDelta: {x: 460, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1159346813050732172 CanvasRenderer: @@ -4891,14 +4891,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 0.5882353} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4c8f9db6b4c3d474ebacc7496c8a9693, type: 3} + m_Sprite: {fileID: 21300000, guid: 3cef9afc451ec9f4682eca5f161cd556, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1