diff --git a/Assets/arts/textures/background/hero/hero_bg_2.png b/Assets/arts/textures/background/hero/hero_bg_2.png new file mode 100644 index 000000000..64b1dde92 Binary files /dev/null and b/Assets/arts/textures/background/hero/hero_bg_2.png differ diff --git a/Assets/arts/textures/background/hero/hero_bg_2.png.meta b/Assets/arts/textures/background/hero/hero_bg_2.png.meta new file mode 100644 index 000000000..6c105c32e --- /dev/null +++ b/Assets/arts/textures/background/hero/hero_bg_2.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 216f137378bb68143b892ecc1108e70d +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: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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: 45 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_board_106.png.meta b/Assets/arts/textures/ui/common/common_board_106.png.meta index c5dbdce44..89db03a6d 100644 --- a/Assets/arts/textures/ui/common/common_board_106.png.meta +++ b/Assets/arts/textures/ui/common/common_board_106.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 22, y: 19, z: 22, w: 19} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/common/common_board_108.png.meta b/Assets/arts/textures/ui/common/common_board_108.png.meta index 7ba2ef6d3..f1f9c1921 100644 --- a/Assets/arts/textures/ui/common/common_board_108.png.meta +++ b/Assets/arts/textures/ui/common/common_board_108.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 30, y: 28, z: 30, w: 3} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/hero/hero_dec_6.png b/Assets/arts/textures/ui/hero/hero_dec_6.png index b53ecd6b9..04b5de68b 100644 Binary files a/Assets/arts/textures/ui/hero/hero_dec_6.png and b/Assets/arts/textures/ui/hero/hero_dec_6.png differ diff --git a/Assets/lua/app/ui/bounty/bounty_main_ui.lua.bytes b/Assets/lua/app/ui/bounty/bounty_main_ui.lua.bytes index 1e60a3b68..f3a1ee068 100644 Binary files a/Assets/lua/app/ui/bounty/bounty_main_ui.lua.bytes and b/Assets/lua/app/ui/bounty/bounty_main_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/hero/hero_detail_ui.prefab b/Assets/prefabs/ui/hero/hero_detail_ui.prefab index f6b65498a..52151451b 100644 --- a/Assets/prefabs/ui/hero/hero_detail_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_detail_ui.prefab @@ -105,11 +105,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 23 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 228, y: -92} + m_AnchoredPosition: {x: 142, y: -329} m_SizeDelta: {x: 200, y: 36} m_Pivot: {x: 0, y: 1} --- !u!222 &5276734544451298542 @@ -376,11 +376,11 @@ RectTransform: - {fileID: 7895290726229652625} - {fileID: 280581360292912021} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 15 + m_RootOrder: 18 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: -80} + m_AnchoredPosition: {x: 0, y: -137} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &990446035579644994 @@ -443,7 +443,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5829434431374870197} - - component: {fileID: 6876002365988217638} m_Layer: 5 m_Name: spine_node m_TagString: Untagged @@ -467,34 +466,13 @@ RectTransform: - {fileID: 6710246215471342977} - {fileID: 8396702131301176704} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 30 + m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &6876002365988217638 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 765806316508070464} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!1 &936001342816146566 GameObject: m_ObjectHideFlags: 0 @@ -525,11 +503,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 29 + m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 406, y: -398} + m_AnchoredPosition: {x: 146, y: -509} m_SizeDelta: {x: 135, y: 20} m_Pivot: {x: 0, y: 1} --- !u!222 &7231407955239635793 @@ -659,11 +637,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 22 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -6} + m_AnchoredPosition: {x: 0, y: 7} m_SizeDelta: {x: 200, y: 36} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6243960342465554854 @@ -721,8 +699,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 38 - m_fontSizeBase: 38 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -793,11 +771,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 25 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 228, y: -212} + m_AnchoredPosition: {x: 195, y: -359} m_SizeDelta: {x: 320, y: 100} m_Pivot: {x: 0, y: 1} --- !u!222 &6897327628286504274 @@ -930,11 +908,11 @@ RectTransform: - {fileID: 4291897593288585646} - {fileID: 3597170769462245813} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 17 + m_RootOrder: 20 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: 212, y: -80} + m_AnchoredPosition: {x: 212, y: -137} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6354041856930263010 @@ -1021,11 +999,11 @@ RectTransform: - {fileID: 7293583849349973633} - {fileID: 7019497958006880290} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 16 + m_RootOrder: 19 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: 106, y: -80} + m_AnchoredPosition: {x: 106, y: -137} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7445528765640808247 @@ -1112,11 +1090,11 @@ RectTransform: - {fileID: 4673485989299599566} - {fileID: 8912643895431753425} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 13 + m_RootOrder: 16 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: -212, y: -80} + m_AnchoredPosition: {x: -212, y: -137} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4056061354735087138 @@ -1204,8 +1182,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 80, y: -9} - m_SizeDelta: {x: 80, y: 80} + m_AnchoredPosition: {x: 83, y: -14} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8715594860988085385 CanvasRenderer: @@ -1351,11 +1329,11 @@ RectTransform: - {fileID: 6064688861426198179} - {fileID: 3233627241191039800} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 12 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 257, y: -165} + m_AnchoredPosition: {x: 125, y: -406} m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2225766192804288032 @@ -1396,11 +1374,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 26 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -131, y: -346} + m_AnchoredPosition: {x: 142, y: -472} m_SizeDelta: {x: 52, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!222 &9066435098088736521 @@ -1500,6 +1478,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2638776492940545953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8474223097521515840} + - component: {fileID: 1255109160282647786} + - component: {fileID: 191516348497403426} + m_Layer: 5 + m_Name: bg_9 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8474223097521515840 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2638776492940545953} + 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: 3121552964615492639} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 52.8, y: -80.1} + m_SizeDelta: {x: 169.42, y: 51} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1255109160282647786 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2638776492940545953} + m_CullTransparentMesh: 1 +--- !u!114 &191516348497403426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2638776492940545953} + 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: 1a4f780181ba75d4e840fd9a8754eb99, 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 &2979683437027596999 GameObject: m_ObjectHideFlags: 0 @@ -1798,11 +1851,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 66, y: -382} + m_AnchoredPosition: {x: 343, y: -472} m_SizeDelta: {x: 58, y: 51} m_Pivot: {x: 0, y: 1} --- !u!222 &3029645121310562737 @@ -1876,11 +1929,11 @@ RectTransform: - {fileID: 6766321168493007031} - {fileID: 1446882836496066191} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 14 + m_RootOrder: 17 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: -106, y: -80} + m_AnchoredPosition: {x: -106, y: -137} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4356033973048536663 @@ -2042,11 +2095,11 @@ RectTransform: - {fileID: 6641103056862691650} - {fileID: 2344038628239825686} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 19 + m_RootOrder: 22 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: -106, y: -172} + m_AnchoredPosition: {x: -106, y: -228} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9183344317358987470 @@ -2268,7 +2321,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: -9} + m_AnchoredPosition: {x: 22, y: -14} m_SizeDelta: {x: 90, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7607004991587612019 @@ -2398,11 +2451,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 11 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 326, y: 260} + m_AnchoredPosition: {x: 89, y: 357} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1456058682979890450 @@ -2548,11 +2601,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 24 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 354, y: -148} + m_AnchoredPosition: {x: 100, y: -87} m_SizeDelta: {x: 138, y: 36} m_Pivot: {x: 0, y: 1} --- !u!222 &1341048401942300793 @@ -2664,7 +2717,7 @@ GameObject: - component: {fileID: 5725273737647947288} - component: {fileID: 4239615631921642571} m_Layer: 5 - m_Name: bg_2 + m_Name: line_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2682,12 +2735,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 2 + 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: 0} - m_SizeDelta: {x: 580, y: 828} + m_AnchoredPosition: {x: 0, y: -284} + m_SizeDelta: {x: 589, y: 4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5725273737647947288 CanvasRenderer: @@ -2717,8 +2770,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2756,14 +2809,17 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6306019015938117602} - {fileID: 2063158863154154278} - {fileID: 1641418511942259705} - {fileID: 4752038755234961756} + - {fileID: 4969499635735349051} + - {fileID: 8243974960864512853} - {fileID: 6592573833229225066} - {fileID: 8148162193111931924} - - {fileID: 4054665184945516555} - {fileID: 6708055227925792670} - {fileID: 1921541548618611738} + - {fileID: 8474223097521515840} - {fileID: 3130305236544273018} - {fileID: 7517304374616493014} - {fileID: 3440179668503020950} @@ -2793,7 +2849,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: 604, y: 852} + m_SizeDelta: {x: 611, y: 924} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8965026225430654153 CanvasRenderer: @@ -2823,7 +2879,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dd9f53f83308a3a4799e84f5ccc9fd79, type: 3} + m_Sprite: {fileID: 21300000, guid: 3e59dd84e2531004687f4aac9e94a88e, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2845,7 +2901,7 @@ GameObject: - component: {fileID: 3693407373230547367} - component: {fileID: 5461233160516005136} m_Layer: 5 - m_Name: bg_4 + m_Name: bg_5 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2863,12 +2919,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 3 + 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} - m_AnchoredPosition: {x: -133, y: 23} - m_SizeDelta: {x: 236, y: 94} + m_AnchoredPosition: {x: -133, y: -40} + m_SizeDelta: {x: 240, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3693407373230547367 CanvasRenderer: @@ -2898,7 +2954,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dc05a38a7a24b1e46be66fd07ad92ef8, type: 3} + m_Sprite: {fileID: 21300000, guid: 3cef9afc451ec9f4682eca5f161cd556, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2938,12 +2994,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 10 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 17, y: 49} - m_SizeDelta: {x: 115, y: 113} + m_AnchoredPosition: {x: -46, y: 51} + m_SizeDelta: {x: 131, y: 114} m_Pivot: {x: 0, y: 1} --- !u!222 &4541640223369313993 CanvasRenderer: @@ -2983,6 +3039,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5432132850749576144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8243974960864512853} + - component: {fileID: 4230029146921314189} + - component: {fileID: 4777921610921458844} + m_Layer: 5 + m_Name: bg_4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8243974960864512853 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5432132850749576144} + 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: 3121552964615492639} + m_RootOrder: 5 + 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: 11, y: 58} + m_SizeDelta: {x: 525, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4230029146921314189 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5432132850749576144} + m_CullTransparentMesh: 1 +--- !u!114 &4777921610921458844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5432132850749576144} + 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: 3cef9afc451ec9f4682eca5f161cd556, 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 &5440822542148790315 GameObject: m_ObjectHideFlags: 0 @@ -3013,11 +3144,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 28 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 140, y: -398} + m_AnchoredPosition: {x: 416, y: -505} m_SizeDelta: {x: 135, y: 20} m_Pivot: {x: 0, y: 1} --- !u!222 &3931327359180681645 @@ -3148,11 +3279,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 21 + m_RootOrder: 24 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: -518} + m_AnchoredPosition: {x: 0, y: -554} m_SizeDelta: {x: 102, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1115906215498402370 @@ -3206,6 +3337,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &5779856388161367877 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4969499635735349051} + - component: {fileID: 3657267741095896056} + - component: {fileID: 5882537270476154091} + m_Layer: 5 + m_Name: line_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4969499635735349051 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5779856388161367877} + 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: 3121552964615492639} + 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: 0, y: 79} + m_SizeDelta: {x: 589, y: 4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3657267741095896056 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5779856388161367877} + m_CullTransparentMesh: 1 +--- !u!114 &5882537270476154091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5779856388161367877} + 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: 14da6211cc49d5a4a8c31d4e949b3135, 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 &5997397792976241942 GameObject: m_ObjectHideFlags: 0 @@ -4026,11 +4232,11 @@ RectTransform: - {fileID: 8236069155013665049} - {fileID: 5945189979382510167} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 18 + m_RootOrder: 21 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: -212, y: -172} + m_AnchoredPosition: {x: -212, y: -228} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6993429477031457749 @@ -4114,11 +4320,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 332, y: -382} + m_AnchoredPosition: {x: 75, y: -474} m_SizeDelta: {x: 58, y: 51} m_Pivot: {x: 0, y: 1} --- !u!222 &7160582571550089605 @@ -4328,7 +4534,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -53} - m_SizeDelta: {x: 174, y: 34} + m_SizeDelta: {x: 143, y: 42} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6478684018284650667 CanvasRenderer: @@ -4443,6 +4649,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7553371684912354512 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6306019015938117602} + - component: {fileID: 2326150237526586076} + - component: {fileID: 5039050154340744362} + m_Layer: 0 + m_Name: bg_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6306019015938117602 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7553371684912354512} + 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: 3121552964615492639} + 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: 9.5} + m_SizeDelta: {x: 611, y: 905} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2326150237526586076 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7553371684912354512} + m_CullTransparentMesh: 1 +--- !u!114 &5039050154340744362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7553371684912354512} + 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: fdf319adad718e34d90445fc9339fae8, 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 &7635230539258825668 GameObject: m_ObjectHideFlags: 0 @@ -4623,11 +4904,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 27 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 131, y: -346} + m_AnchoredPosition: {x: -133.1, y: -476.1} m_SizeDelta: {x: 52, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4625257942479804799 @@ -4826,12 +5107,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 9 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -2, y: 8} - m_SizeDelta: {x: 614, y: 84} + m_AnchoredPosition: {x: 19, y: 30} + m_SizeDelta: {x: 616, y: 95} m_Pivot: {x: 0, y: 1} --- !u!222 &4959923353717304467 CanvasRenderer: @@ -4946,81 +5227,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8160469726247997755 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4054665184945516555} - - component: {fileID: 4619978621486377381} - - component: {fileID: 813457487214002252} - m_Layer: 5 - m_Name: bg_6 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4054665184945516555 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8160469726247997755} - 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: 3121552964615492639} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 326, y: -144} - m_SizeDelta: {x: 170, y: 44} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4619978621486377381 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8160469726247997755} - m_CullTransparentMesh: 1 ---- !u!114 &813457487214002252 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8160469726247997755} - 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: 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: 89783d5ddc9ab034687ff93732ebdfe0, 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 &8505791158427614884 GameObject: m_ObjectHideFlags: 0 @@ -5051,12 +5257,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 596, y: 198} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -432} + m_SizeDelta: {x: 589, y: 146} m_Pivot: {x: 0.5, y: 0} --- !u!222 &551622607854556888 CanvasRenderer: @@ -5086,7 +5292,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7cc4f1e808d2d6c45a721ee91ea63866, type: 3} + m_Sprite: {fileID: 21300000, guid: c3e22e3f5adf9604295b23ca385609ee, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5129,11 +5335,11 @@ RectTransform: - {fileID: 2340224635711650662} - {fileID: 6129097968792476662} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 8 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 76, y: -266} + m_AnchoredPosition: {x: 281, y: -334} m_SizeDelta: {x: 104, y: 30} m_Pivot: {x: 0, y: 1} --- !u!222 &1318195663565977808 @@ -5184,9 +5390,9 @@ GameObject: m_Component: - component: {fileID: 2063158863154154278} - component: {fileID: 2934882046724420640} - - component: {fileID: 7934685153514865989} + - component: {fileID: 8665726859036569150} m_Layer: 5 - m_Name: bg_1 + m_Name: bg_2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5204,13 +5410,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -324} - m_SizeDelta: {x: 596, y: 326} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 249.5} + m_SizeDelta: {x: 590, y: 337} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2934882046724420640 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5219,7 +5425,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8685228701544159798} m_CullTransparentMesh: 1 ---- !u!114 &7934685153514865989 +--- !u!114 &8665726859036569150 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5228,27 +5434,24 @@ MonoBehaviour: m_GameObject: {fileID: 8685228701544159798} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09f9c16e1cfc25c49a29ff0c74978b2e, 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 + m_Texture: {fileID: 2800000, guid: 216f137378bb68143b892ecc1108e70d, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &8879224837736625582 GameObject: m_ObjectHideFlags: 0 @@ -5395,7 +5598,7 @@ GameObject: - component: {fileID: 8188355070568033250} - component: {fileID: 6525304728551434666} m_Layer: 5 - m_Name: bg_5 + m_Name: bg_6 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5413,12 +5616,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3121552964615492639} - m_RootOrder: 4 + 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} - m_AnchoredPosition: {x: 133, y: 23} - m_SizeDelta: {x: 236, y: 94} + m_AnchoredPosition: {x: 133, y: -40} + m_SizeDelta: {x: 240, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8188355070568033250 CanvasRenderer: @@ -5448,7 +5651,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dc05a38a7a24b1e46be66fd07ad92ef8, type: 3} + m_Sprite: {fileID: 21300000, guid: 3cef9afc451ec9f4682eca5f161cd556, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5494,12 +5697,12 @@ RectTransform: - {fileID: 5946699571563582250} - {fileID: 447667911392970790} m_Father: {fileID: 3121552964615492639} - m_RootOrder: 20 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 109} - m_SizeDelta: {x: 334, y: 122} + m_AnchoredPosition: {x: 0, y: 103} + m_SizeDelta: {x: 258, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5041081450187496077 CanvasRenderer: @@ -5898,11 +6101,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.x - value: -173.7 + value: 22 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y - value: 117.2 + value: 87 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6013,11 +6216,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.x - value: -175 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y - value: 174 + value: 140 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6033,16 +6236,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!1 &5176022063886390118 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 6660836835425271326} - m_PrefabAsset: {fileID: 0} --- !u!224 &8396702131301176704 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 6660836835425271326} m_PrefabAsset: {fileID: 0} +--- !u!1 &5176022063886390118 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 6660836835425271326} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8496193215789059615 PrefabInstance: m_ObjectHideFlags: 0 @@ -6128,11 +6331,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.x - value: -175 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y - value: 174 + value: 147 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/prefabs/ui/setting/game_setting_ui.prefab b/Assets/prefabs/ui/setting/game_setting_ui.prefab index b718f5f73..c5a34361e 100644 --- a/Assets/prefabs/ui/setting/game_setting_ui.prefab +++ b/Assets/prefabs/ui/setting/game_setting_ui.prefab @@ -741,9 +741,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -22} + m_AnchoredPosition: {x: 0, y: -71} m_SizeDelta: {x: 92, y: 98} - m_Pivot: {x: 0.5, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1394063912138427145 CanvasRenderer: m_ObjectHideFlags: 0