From bcb9e60c7308c33abdfaa6f9562b3b23799340ed Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Fri, 15 Sep 2023 21:00:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../textures/ui/act_pvp/act_pvp_board_11.png | Bin 0 -> 234 bytes .../ui/act_pvp/act_pvp_board_11.png.meta | 132 ++++ .../arts/textures/ui/common/common_dec_28.png | Bin 0 -> 4531 bytes .../textures/ui/common/common_dec_28.png.meta | 132 ++++ .../arts/textures/ui/common/common_dec_29.png | Bin 0 -> 4982 bytes .../textures/ui/common/common_dec_29.png.meta | 132 ++++ .../activity/act_pvp/act_pvp_main_ui.prefab | 696 ++++++++++++++---- .../act_pvp/act_pvp_match_result_ui.prefab | 70 +- .../activity/act_pvp/act_pvp_match_ui.prefab | 2 +- .../activity/act_pvp/act_pvp_select_ui.prefab | 14 +- .../ui/battle/battle_actpvp_result_ui.prefab | 10 +- 11 files changed, 982 insertions(+), 206 deletions(-) create mode 100644 Assets/arts/textures/ui/act_pvp/act_pvp_board_11.png create mode 100644 Assets/arts/textures/ui/act_pvp/act_pvp_board_11.png.meta create mode 100644 Assets/arts/textures/ui/common/common_dec_28.png create mode 100644 Assets/arts/textures/ui/common/common_dec_28.png.meta create mode 100644 Assets/arts/textures/ui/common/common_dec_29.png create mode 100644 Assets/arts/textures/ui/common/common_dec_29.png.meta 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 0000000000000000000000000000000000000000..5a72fe9cdd2f5aef3f006ffc115ea3e50abb1ca2 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^EI|C6gAGVpDt-qENS3%plmzFem6RtIr7}3ChW}O45_&FB+O8#L4n8HX5Mq_nz`|Xq4kUVw3zQPnojAH zt@4!;;&^aiE!!TgyBwD-l*^B8d*}U(XSUme$p&|Q?GqTe&wM!S&RL*p5qj{_^kYog z6YflxS+yXva0bVmHD8yCcW=pC94yM8^`pq1weQSR4*UK973rQwTUVcd*1FAU&!$Mr g9c3$56ml6boNbXg?SIzkFwk8Lp00i_>zopr0I`r*djJ3c literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1a009378688b57155267b5a62be52f0ec7631ac6 GIT binary patch literal 4531 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 RnB4#X002ovPDHLkV1ly8v1UxhRH;W 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 AGXMYp literal 0 HcmV?d00001 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