diff --git a/Assets/arts/atlas/ui/setting.spriteatlas b/Assets/arts/atlas/ui/setting.spriteatlas index 94fcc23ae..f522a4bb2 100644 --- a/Assets/arts/atlas/ui/setting.spriteatlas +++ b/Assets/arts/atlas/ui/setting.spriteatlas @@ -74,6 +74,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 0f781675af1e19e479d83a29a1663fb1, type: 3} - {fileID: 21300000, guid: 368456a546a98fa41ad5ce68434fe61a, type: 3} - {fileID: 21300000, guid: eddd75c567d69ba45a0daf6d5506ba8c, type: 3} + - {fileID: 21300000, guid: ea65e0362ec2a43cba10fd25ecf62799, type: 3} - {fileID: 21300000, guid: 2f0bac97a25a5df4a876b5b9054751cd, type: 3} - {fileID: 21300000, guid: d6a21578ce07b924382f06dc5c11e0ae, type: 3} - {fileID: 21300000, guid: 5c2496c8a7252a54db6ec04df885e0db, type: 3} @@ -111,6 +112,7 @@ SpriteAtlas: - language_ko - setting_dec_7 - language_id_1 + - setting_bg_3 - setting_twitter - language_cn - language_pt diff --git a/Assets/arts/textures/ui/arena/arena_bar_2.png b/Assets/arts/textures/ui/arena/arena_bar_2.png index 70f62a040..a9b41e0a5 100644 Binary files a/Assets/arts/textures/ui/arena/arena_bar_2.png and b/Assets/arts/textures/ui/arena/arena_bar_2.png differ diff --git a/Assets/arts/textures/ui/main/main_dec_1.png b/Assets/arts/textures/ui/main/main_dec_1.png index d7dee5f69..12ede4008 100644 Binary files a/Assets/arts/textures/ui/main/main_dec_1.png and b/Assets/arts/textures/ui/main/main_dec_1.png differ diff --git a/Assets/arts/textures/ui/setting/setting_bg_3.png b/Assets/arts/textures/ui/setting/setting_bg_3.png new file mode 100644 index 000000000..9445a32a9 Binary files /dev/null and b/Assets/arts/textures/ui/setting/setting_bg_3.png differ diff --git a/Assets/arts/textures/ui/setting/setting_bg_3.png.meta b/Assets/arts/textures/ui/setting/setting_bg_3.png.meta new file mode 100644 index 000000000..b7aabb4bb --- /dev/null +++ b/Assets/arts/textures/ui/setting/setting_bg_3.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: ea65e0362ec2a43cba10fd25ecf62799 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/setting/setting_btn_off.png b/Assets/arts/textures/ui/setting/setting_btn_off.png index 4d0887ece..f4e1cc6f7 100644 Binary files a/Assets/arts/textures/ui/setting/setting_btn_off.png and b/Assets/arts/textures/ui/setting/setting_btn_off.png differ diff --git a/Assets/arts/textures/ui/setting/setting_btn_on.png b/Assets/arts/textures/ui/setting/setting_btn_on.png index 686299bc9..05beabbc5 100644 Binary files a/Assets/arts/textures/ui/setting/setting_btn_on.png and b/Assets/arts/textures/ui/setting/setting_btn_on.png differ diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index 907503c43..6b8fa7176 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/common/comp/act_page_btns_comp.lua.bytes b/Assets/lua/app/ui/activity/common/comp/act_page_btns_comp.lua.bytes index 358289c6b..933d7e57d 100644 Binary files a/Assets/lua/app/ui/activity/common/comp/act_page_btns_comp.lua.bytes and b/Assets/lua/app/ui/activity/common/comp/act_page_btns_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes index 65081b40c..34aa4b120 100644 Binary files a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_revive_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_revive_ui.lua.bytes index fa38bf950..757ebbfd8 100644 Binary files a/Assets/lua/app/ui/battle/battle_revive_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_revive_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/game_setting/select_other_btn_ui.lua.bytes b/Assets/lua/app/ui/game_setting/select_other_btn_ui.lua.bytes index 768cf49e7..12336d9e6 100644 Binary files a/Assets/lua/app/ui/game_setting/select_other_btn_ui.lua.bytes and b/Assets/lua/app/ui/game_setting/select_other_btn_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes b/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes index 6e4ca493b..1ea0af8ef 100644 Binary files a/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes and b/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes index 21db4ec8f..3d531c286 100644 Binary files a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/box_hero_ui.lua.bytes b/Assets/lua/app/ui/shop/box_hero_ui.lua.bytes index 8960dc77e..3dfc7588f 100644 Binary files a/Assets/lua/app/ui/shop/box_hero_ui.lua.bytes and b/Assets/lua/app/ui/shop/box_hero_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/activity/common/comp/act_page_btns_comp.prefab b/Assets/prefabs/ui/activity/common/comp/act_page_btns_comp.prefab index 5fc696570..8ac9035ed 100644 --- a/Assets/prefabs/ui/activity/common/comp/act_page_btns_comp.prefab +++ b/Assets/prefabs/ui/activity/common/comp/act_page_btns_comp.prefab @@ -64,6 +64,10 @@ MonoBehaviour: hashName: 9928203 objectType: 0 gameObject: {fileID: 3615984651817403971} + - name: act_page_btns_comp.scrollrect.viewport.content + hashName: 3049788596 + objectType: 0 + gameObject: {fileID: 1677554853772717491} --- !u!1 &1677554853772717491 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/battle/battle_revive_ui.prefab b/Assets/prefabs/ui/battle/battle_revive_ui.prefab index e6d73dab8..9f0c734ce 100644 --- a/Assets/prefabs/ui/battle/battle_revive_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_revive_ui.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1191049531308350693 +--- !u!1 &1294175480806269387 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,52 +8,130 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8145377054588534212} - - component: {fileID: 5140942428089063260} - - component: {fileID: 2619694772912880662} - - component: {fileID: 154534108371868381} + - component: {fileID: 499168181482708059} + - component: {fileID: 4869304129564343246} + - component: {fileID: 5742180477565426065} m_Layer: 5 - m_Name: tx_1 + m_Name: no_ad_node m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8145377054588534212 +--- !u!224 &499168181482708059 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1191049531308350693} - m_LocalRotation: {x: -0, y: -0, z: -5.201486e-10, w: 1} + m_GameObject: {fileID: 1294175480806269387} + m_LocalRotation: {x: -0, y: -0, z: 0.0000000041611887, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1720958317503014340} + - {fileID: 5580769357617767763} + - {fileID: 2371314921284336736} m_Father: {fileID: 7390582371138297497} 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: 121} - m_SizeDelta: {x: 300, y: 80} + m_AnchoredPosition: {x: 0, y: -327} + m_SizeDelta: {x: 578, y: 205} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5140942428089063260 +--- !u!222 &4869304129564343246 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1191049531308350693} + m_GameObject: {fileID: 1294175480806269387} m_CullTransparentMesh: 1 ---- !u!114 &2619694772912880662 +--- !u!114 &5742180477565426065 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1191049531308350693} + m_GameObject: {fileID: 1294175480806269387} + 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: 666894d917ae1d245806727eead478cd, 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 &3360079529070761707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 336128295794232269} + - component: {fileID: 5797556230217182727} + - component: {fileID: 7411332467490714409} + m_Layer: 5 + m_Name: title_text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &336128295794232269 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3360079529070761707} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1225904108655523618} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 43, y: -40} + m_SizeDelta: {x: 200, y: 40} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &5797556230217182727 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3360079529070761707} + m_CullTransparentMesh: 1 +--- !u!114 &7411332467490714409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3360079529070761707} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -94,14 +172,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34 - m_fontSizeBase: 34 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 - m_fontSizeMax: 46 + m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -110,7 +188,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -136,130 +214,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &154534108371868381 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1191049531308350693} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonGraphic: {fileID: 6838351724553225125} - initializeOnAwake: 1 - boneName: ziti2 - followBoneRotation: 1 - followSkeletonFlip: 1 - followLocalScale: 1 - followParentWorldScale: 0 - followXYPosition: 1 - followZPosition: 0 - maintainedAxisOrientation: 1 ---- !u!1 &1294175480806269387 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 499168181482708059} - - component: {fileID: 4869304129564343246} - - component: {fileID: 5742180477565426065} - - component: {fileID: 1000929518154988027} - m_Layer: 5 - m_Name: no_ad_node - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &499168181482708059 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1294175480806269387} - m_LocalRotation: {x: -0, y: -0, z: 0.0000000041611887, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1720958317503014340} - - {fileID: 5580769357617767763} - - {fileID: 2371314921284336736} - m_Father: {fileID: 7390582371138297497} - 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: -0.000030517578, y: -354.09714} - m_SizeDelta: {x: 496, y: 184} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4869304129564343246 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1294175480806269387} - m_CullTransparentMesh: 1 ---- !u!114 &5742180477565426065 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1294175480806269387} - 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: 666894d917ae1d245806727eead478cd, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1000929518154988027 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1294175480806269387} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonGraphic: {fileID: 6838351724553225125} - initializeOnAwake: 1 - boneName: ka1 - followBoneRotation: 1 - followSkeletonFlip: 1 - followLocalScale: 1 - followParentWorldScale: 0 - followXYPosition: 1 - followZPosition: 0 - maintainedAxisOrientation: 1 --- !u!1 &3763225085194779903 GameObject: m_ObjectHideFlags: 0 @@ -270,7 +224,6 @@ GameObject: m_Component: - component: {fileID: 7394742830113615330} - component: {fileID: 3729858400004760759} - - component: {fileID: 1997731068878777046} - component: {fileID: 7223039143960733783} m_Layer: 5 m_Name: cancel_btn @@ -292,13 +245,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2551437572245792362} - m_Father: {fileID: 7390582371138297497} + m_Father: {fileID: 1225904108655523618} 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: -0.000030517578, y: -194.06055} - m_SizeDelta: {x: 250, y: 100} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -74} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3729858400004760759 CanvasRenderer: @@ -308,28 +261,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3763225085194779903} m_CullTransparentMesh: 1 ---- !u!114 &1997731068878777046 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3763225085194779903} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonGraphic: {fileID: 6838351724553225125} - initializeOnAwake: 1 - boneName: ziti1 - followBoneRotation: 1 - followSkeletonFlip: 1 - followLocalScale: 1 - followParentWorldScale: 0 - followXYPosition: 1 - followZPosition: 0 - maintainedAxisOrientation: 1 --- !u!114 &7223039143960733783 MonoBehaviour: m_ObjectHideFlags: 0 @@ -351,7 +282,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -397,8 +328,8 @@ 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: -150, y: -40} - m_SizeDelta: {x: 160, y: 72} + m_AnchoredPosition: {x: -192, y: -50} + m_SizeDelta: {x: 156, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6054708030769388125 CanvasRenderer: @@ -428,8 +359,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bcc862864e5d18e4a99af0cdf5c45e1e, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -451,6 +382,90 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &3852874692095622887 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1225904108655523618} + - component: {fileID: 6439667282250387980} + - component: {fileID: 3890834756906260386} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1225904108655523618 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3852874692095622887} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9202947082114659747} + - {fileID: 176433844473229623} + - {fileID: 336128295794232269} + - {fileID: 7670275076088267850} + - {fileID: 7613970143298945510} + - {fileID: 2040994209768458647} + - {fileID: 7394742830113615330} + - {fileID: 8338669500368843396} + m_Father: {fileID: 7390582371138297497} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 157} + m_SizeDelta: {x: 620, y: 496} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6439667282250387980 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3852874692095622887} + m_CullTransparentMesh: 1 +--- !u!114 &3890834756906260386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3852874692095622887} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, 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 &4396792886160187391 GameObject: m_ObjectHideFlags: 0 @@ -486,7 +501,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: -60, y: 0} + m_AnchoredPosition: {x: -54, y: 0} m_SizeDelta: {x: 41, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7092068791348971624 @@ -560,11 +575,11 @@ RectTransform: m_Father: {fileID: 499168181482708059} 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: -130, y: 60} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 25, y: 57} m_SizeDelta: {x: 200, y: 60} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &1491552867168207197 CanvasRenderer: m_ObjectHideFlags: 0 @@ -603,7 +618,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4284542719 - m_fontColor: {r: 1, g: 0.93333334, b: 0.3764706, a: 1} + m_fontColor: {r: 0.972549, g: 1, b: 0.5019608, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -620,12 +635,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 30 m_fontSizeBase: 34 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 28 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -662,6 +677,96 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5603691263576567183 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 176433844473229623} + - component: {fileID: 9041271635207686675} + - component: {fileID: 5959815387451711660} + - component: {fileID: 170669255847725698} + m_Layer: 0 + m_Name: close_btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &176433844473229623 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5603691263576567183} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1225904108655523618} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -32, y: -24} + m_SizeDelta: {x: 84, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9041271635207686675 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5603691263576567183} + m_CullTransparentMesh: 1 +--- !u!114 &5959815387451711660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5603691263576567183} + 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: 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: 7372681aea33b7b4099e3685b7ee975e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &170669255847725698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5603691263576567183} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &5881454261792642255 GameObject: m_ObjectHideFlags: 0 @@ -674,7 +779,6 @@ GameObject: - component: {fileID: 2642851711674797591} - component: {fileID: 1780149700537844296} - component: {fileID: 6750090827251271180} - - component: {fileID: 1629369728527757495} m_Layer: 5 m_Name: ad_btn m_TagString: Untagged @@ -696,13 +800,13 @@ RectTransform: m_Children: - {fileID: 436173608376561790} - {fileID: 6574741032279451523} - m_Father: {fileID: 7390582371138297497} + m_Father: {fileID: 1225904108655523618} 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: 144, y: -77.483765} - m_SizeDelta: {x: 250, y: 100} + m_AnchoredPosition: {x: 144, y: -168} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2642851711674797591 CanvasRenderer: @@ -733,7 +837,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: a2d6692a383652f4fad43c69cc9f6d83, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -755,28 +859,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 ---- !u!114 &1629369728527757495 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5881454261792642255} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonGraphic: {fileID: 6838351724553225125} - initializeOnAwake: 1 - boneName: anniu2 - followBoneRotation: 1 - followSkeletonFlip: 1 - followLocalScale: 1 - followParentWorldScale: 0 - followXYPosition: 1 - followZPosition: 0 - maintainedAxisOrientation: 1 --- !u!1 &6152380536317132068 GameObject: m_ObjectHideFlags: 0 @@ -807,12 +889,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7390582371138297497} - m_RootOrder: 8 + m_Father: {fileID: 1225904108655523618} + 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: 144, y: 0} + m_AnchoredPosition: {x: 144, y: -103} m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2651359291134234650 @@ -846,14 +928,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4282662702 + m_fontColor: {r: 0.18039216, g: 0.24705882, b: 0.26666668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -870,10 +952,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 34 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 30 m_fontStyle: 0 @@ -1002,6 +1084,82 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 0 +--- !u!1 &6653410663655482083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9202947082114659747} + - component: {fileID: 6178983531494700201} + - component: {fileID: 555535731378766325} + m_Layer: 5 + m_Name: bg1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9202947082114659747 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6653410663655482083} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1225904108655523618} + 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: 27} + m_SizeDelta: {x: 576, y: 208} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6178983531494700201 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6653410663655482083} + m_CullTransparentMesh: 1 +--- !u!114 &555535731378766325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6653410663655482083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, 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 &6768193678387221288 GameObject: m_ObjectHideFlags: 0 @@ -1014,7 +1172,6 @@ GameObject: - component: {fileID: 1133479596549011132} - component: {fileID: 3704519083279020864} - component: {fileID: 5660984384176588086} - - component: {fileID: 8391562891748125551} m_Layer: 5 m_Name: cost_btn m_TagString: Untagged @@ -1036,13 +1193,13 @@ RectTransform: m_Children: - {fileID: 6563091900227226747} - {fileID: 6525878227844139065} - m_Father: {fileID: 7390582371138297497} + m_Father: {fileID: 1225904108655523618} 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: -144, y: -78.953064} - m_SizeDelta: {x: 250, y: 100} + m_AnchoredPosition: {x: -144, y: -168} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1133479596549011132 CanvasRenderer: @@ -1073,7 +1230,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1095,28 +1252,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 ---- !u!114 &8391562891748125551 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6768193678387221288} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonGraphic: {fileID: 6838351724553225125} - initializeOnAwake: 1 - boneName: anniu1 - followBoneRotation: 1 - followSkeletonFlip: 1 - followLocalScale: 1 - followParentWorldScale: 0 - followXYPosition: 1 - followZPosition: 0 - maintainedAxisOrientation: 1 --- !u!1 &6809139370026768530 GameObject: m_ObjectHideFlags: 0 @@ -1152,7 +1287,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: 45, y: 5} + m_AnchoredPosition: {x: 45, y: 1} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1994406101456502823 @@ -1283,13 +1418,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7390582371138297497} + m_Father: {fileID: 1225904108655523618} 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: 44.78888} - m_SizeDelta: {x: 500, y: 50} + m_AnchoredPosition: {x: 0, y: 27} + m_SizeDelta: {x: 540, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5374621161191418006 CanvasRenderer: @@ -1322,14 +1457,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.18039216, g: 0.24705882, b: 0.26666668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1346,12 +1481,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34 - m_fontSizeBase: 34 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 - m_fontSizeMax: 40 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -1400,7 +1535,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} m_Name: m_EditorClassIdentifier: - skeletonGraphic: {fileID: 6838351724553225125} + skeletonGraphic: {fileID: 0} initializeOnAwake: 1 boneName: ziti3 followBoneRotation: 1 @@ -1443,14 +1578,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7422356032482620043} - - {fileID: 6112640648288543824} - - {fileID: 8145377054588534212} - - {fileID: 7670275076088267850} - - {fileID: 7613970143298945510} - - {fileID: 2040994209768458647} - - {fileID: 7394742830113615330} + - {fileID: 1225904108655523618} - {fileID: 499168181482708059} - - {fileID: 8338669500368843396} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1522,10 +1651,10 @@ MonoBehaviour: hashName: 226574211 objectType: 0 gameObject: {fileID: 6224328355046442545} - - name: battle_revive_ui.bg.tx_1 - hashName: 1414530376 + - name: battle_revive_ui.bg.title_text + hashName: 4035524934 objectType: 0 - gameObject: {fileID: 1191049531308350693} + gameObject: {fileID: 3360079529070761707} - name: battle_revive_ui.bg.tx_desc hashName: 2351910426 objectType: 0 @@ -1582,14 +1711,14 @@ MonoBehaviour: hashName: 2936933930 objectType: 0 gameObject: {fileID: 7818682994893313428} - - name: battle_revive_ui.ui_spine_obj - hashName: 173249735 - objectType: 6 - gameObject: {fileID: 7460088494701585078} - - name: battle_revive_ui.limit_tx - hashName: 422403743 + - name: battle_revive_ui.bg.limit_tx + hashName: 3110366362 objectType: 0 gameObject: {fileID: 6152380536317132068} + - name: battle_revive_ui.bg.close_btn + hashName: 4000190147 + objectType: 0 + gameObject: {fileID: 5603691263576567183} --- !u!1 &7338113111342565137 GameObject: m_ObjectHideFlags: 0 @@ -1701,8 +1830,8 @@ RectTransform: 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: 5} - m_SizeDelta: {x: 0, y: -10} + m_AnchoredPosition: {x: 0, y: 1} + m_SizeDelta: {x: 0, y: -2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1047423126391618040 CanvasRenderer: @@ -1735,7 +1864,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1759,12 +1888,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 30 m_fontSizeBase: 34 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 24 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -1836,7 +1965,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: 40, y: 0} + m_AnchoredPosition: {x: 40, y: 1} m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1218345159239220679 @@ -1972,7 +2101,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: 250, y: 100} + m_SizeDelta: {x: 200, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6072384424386601482 CanvasRenderer: @@ -2012,7 +2141,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 2164260863 - m_fontColor: {r: 1, g: 1, b: 1, a: 0.5019608} + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2029,13 +2158,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 30 m_fontSizeBase: 34 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 24 - m_fontStyle: 4 + m_fontSizeMax: 30 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -2104,11 +2233,11 @@ RectTransform: m_Father: {fileID: 499168181482708059} 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: -130, y: 10} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 25, y: 10.000001} m_SizeDelta: {x: 200, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &7229601762479601127 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2164,8 +2293,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 18 - m_fontSizeBase: 18 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2206,141 +2335,3 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1001 &8945109416349192142 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7390582371138297497} - m_Modifications: - - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_Name - value: ui_spine_obj - objectReference: {fileID: 0} - - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: referenceSize.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: referenceSize.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: skeletonDataAsset - value: - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!224 &6112640648288543824 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 8945109416349192142} - m_PrefabAsset: {fileID: 0} ---- !u!114 &6838351724553225125 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 8945109416349192142} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7460088494701585078} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &7460088494701585078 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 8945109416349192142} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/idle/idle_drop_ui.prefab b/Assets/prefabs/ui/idle/idle_drop_ui.prefab index 47ba4d0b2..b5d7d0cf9 100644 --- a/Assets/prefabs/ui/idle/idle_drop_ui.prefab +++ b/Assets/prefabs/ui/idle/idle_drop_ui.prefab @@ -33,7 +33,7 @@ RectTransform: - {fileID: 7320511982179427509} - {fileID: 5926415606068077162} m_Father: {fileID: 4656524465772686178} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -247,8 +247,6 @@ RectTransform: - {fileID: 5212623028139991644} - {fileID: 1718066751300693337} - {fileID: 4447597203734494548} - - {fileID: 2264869435868761725} - - {fileID: 5959427715613042644} - {fileID: 2134922458473488461} - {fileID: 8932954036638306917} - {fileID: 5786593827281695435} @@ -260,7 +258,6 @@ RectTransform: - {fileID: 1494966898876415850} - {fileID: 7708722960109355659} - {fileID: 3132312611960739963} - - {fileID: 9214872799056387215} - {fileID: 8247381001471523994} - {fileID: 7002103105090880883} m_Father: {fileID: 8461932745927490369} @@ -355,7 +352,7 @@ RectTransform: m_Children: - {fileID: 3871186935308499804} m_Father: {fileID: 4656524465772686178} - m_RootOrder: 15 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -734,7 +731,7 @@ RectTransform: m_Children: - {fileID: 526106132872779894} m_Father: {fileID: 4656524465772686178} - m_RootOrder: 11 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -824,7 +821,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 18 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -958,12 +955,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4656524465772686178} - m_RootOrder: 3 + m_Father: {fileID: 1718066751300693337} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -227, y: -8} + m_AnchoredPosition: {x: -227, y: 143} m_SizeDelta: {x: 42, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5490311891197222929 @@ -1034,12 +1031,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4656524465772686178} - m_RootOrder: 4 + m_Father: {fileID: 1718066751300693337} + m_RootOrder: 6 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: 227, y: -8} + m_AnchoredPosition: {x: 227, y: 143} m_SizeDelta: {x: 42, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8870385258505200731 @@ -1113,7 +1110,7 @@ RectTransform: - {fileID: 232340310814586855} - {fileID: 2329913039171639017} m_Father: {fileID: 4656524465772686178} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1327,7 +1324,7 @@ RectTransform: - {fileID: 7911924621647232817} - {fileID: 8907158968492508645} m_Father: {fileID: 4656524465772686178} - m_RootOrder: 13 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1734,7 +1731,7 @@ RectTransform: m_Children: - {fileID: 2793752031225853009} m_Father: {fileID: 4656524465772686178} - m_RootOrder: 14 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1823,7 +1820,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -2242,7 +2239,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 12 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -2457,6 +2454,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4656524465772686178} + - {fileID: 9214872799056387215} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2584,8 +2582,8 @@ MonoBehaviour: hashName: 513742522 objectType: 0 gameObject: {fileID: 7124235666378851431} - - name: idle_drop_ui.bg.desc_tx - hashName: 3256578782 + - name: idle_drop_ui.desc_tx + hashName: 40116861 objectType: 0 gameObject: {fileID: 6396174228830876835} - name: idle_drop_ui.bg.quick_btn.bg.text @@ -2608,6 +2606,10 @@ MonoBehaviour: hashName: 1154182851 objectType: 0 gameObject: {fileID: 2025978366049346439} + - name: idle_drop_ui.bg + hashName: 1243626970 + objectType: 0 + gameObject: {fileID: 903425365183097773} --- !u!114 &95827517723427497 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2924,12 +2926,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4656524465772686178} - m_RootOrder: 16 + m_Father: {fileID: 8461932745927490369} + m_RootOrder: 1 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: -184} + m_AnchoredPosition: {x: 0, y: 162} m_SizeDelta: {x: 200, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4043074191637828802 @@ -3064,6 +3066,8 @@ RectTransform: - {fileID: 49806406524896630} - {fileID: 5893629568819438930} - {fileID: 7375657260181525069} + - {fileID: 2264869435868761725} + - {fileID: 5959427715613042644} m_Father: {fileID: 4656524465772686178} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3293,7 +3297,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -3426,7 +3430,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -3599,7 +3603,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 17 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -3734,7 +3738,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} diff --git a/Assets/prefabs/ui/main_city/main_comp.prefab b/Assets/prefabs/ui/main_city/main_comp.prefab index d99c65a28..e366d7226 100644 --- a/Assets/prefabs/ui/main_city/main_comp.prefab +++ b/Assets/prefabs/ui/main_city/main_comp.prefab @@ -240,15 +240,15 @@ RectTransform: 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_ConstrainProportionsScale: 0 + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 2491444941992480077} 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: 199, y: 37} - m_SizeDelta: {x: 52, y: 48} + m_AnchoredPosition: {x: 195, y: 46} + m_SizeDelta: {x: 73, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7667804217725488028 CanvasRenderer: diff --git a/Assets/prefabs/ui/main_city/module_unlock_ui.prefab b/Assets/prefabs/ui/main_city/module_unlock_ui.prefab index e0a10b412..88dd83e21 100644 --- a/Assets/prefabs/ui/main_city/module_unlock_ui.prefab +++ b/Assets/prefabs/ui/main_city/module_unlock_ui.prefab @@ -1153,6 +1153,10 @@ PrefabInstance: propertyPath: m_Name value: spine_title objectReference: {fileID: 0} + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: referenceSize.x value: 400 diff --git a/Assets/prefabs/ui/setting/account_bind_ui.prefab b/Assets/prefabs/ui/setting/account_bind_ui.prefab index 78ca80dc2..d9da99f62 100644 --- a/Assets/prefabs/ui/setting/account_bind_ui.prefab +++ b/Assets/prefabs/ui/setting/account_bind_ui.prefab @@ -34,9 +34,9 @@ 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: 144} + m_AnchoredPosition: {x: 0, y: 5} m_SizeDelta: {x: 550, y: 174} - m_Pivot: {x: 0.5, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1376661816950440271 GameObject: m_ObjectHideFlags: 0 @@ -72,7 +72,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: 21} + m_AnchoredPosition: {x: 0, y: 5} m_SizeDelta: {x: 564, y: 260} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8754930572931908129 @@ -151,7 +151,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: -176} + m_AnchoredPosition: {x: 0, y: -182} m_SizeDelta: {x: 286, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2194187823121346196 @@ -243,7 +243,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: -176} + m_AnchoredPosition: {x: 0, y: -182} m_SizeDelta: {x: 286, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3891761016181489168 @@ -743,7 +743,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -910,7 +910,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: 620, y: 516} + m_SizeDelta: {x: 620, y: 496} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &929043086436108139 CanvasRenderer: @@ -1218,9 +1218,9 @@ RectTransform: m_Father: {fileID: 7062665755871776357} m_RootOrder: 0 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: -8} + 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: 510, y: 152} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1112107140792425333 @@ -1254,14 +1254,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4282662702 + m_fontColor: {r: 0.18039216, g: 0.24705882, b: 0.26666668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1278,12 +1278,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 + m_fontSize: 24 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 22 - m_fontSizeMax: 26 + m_fontSizeMax: 24 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 diff --git a/Assets/prefabs/ui/setting/account_delete_ui.prefab b/Assets/prefabs/ui/setting/account_delete_ui.prefab index 8f9122e9d..1fd5b38a4 100644 --- a/Assets/prefabs/ui/setting/account_delete_ui.prefab +++ b/Assets/prefabs/ui/setting/account_delete_ui.prefab @@ -177,7 +177,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: 620, y: 526} + m_SizeDelta: {x: 620, y: 496} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2159883131149097168 CanvasRenderer: @@ -265,7 +265,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: 102} + m_AnchoredPosition: {x: 0, y: 66} m_SizeDelta: {x: 566, y: 108} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8668314952455990914 @@ -299,14 +299,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.9411765, g: 0.1882353, b: 0.32941177, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -492,7 +492,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: -35} + m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: 504, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8069970846450131700 @@ -784,7 +784,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1176,7 +1176,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2097e79c28658fb4e9abc7fe576293e0, type: 3} + m_Sprite: {fileID: 21300000, guid: b7ec10a4771dc744eba18a4cc4491c01, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1383,7 +1383,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: -157} + m_AnchoredPosition: {x: 0, y: -163} m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2481405032920487095 diff --git a/Assets/prefabs/ui/setting/cdkey_ui.prefab b/Assets/prefabs/ui/setting/cdkey_ui.prefab index a3356a048..94c67c342 100644 --- a/Assets/prefabs/ui/setting/cdkey_ui.prefab +++ b/Assets/prefabs/ui/setting/cdkey_ui.prefab @@ -170,7 +170,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: 5} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 196, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8835803605411742729 @@ -314,7 +314,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: 620, y: 526} + m_SizeDelta: {x: 620, y: 496} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2159883131149097168 CanvasRenderer: @@ -493,7 +493,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: -26} + m_AnchoredPosition: {x: 0, y: -82} m_SizeDelta: {x: 480, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4423919870636704327 @@ -527,7 +527,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -628,7 +628,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: 36} + m_AnchoredPosition: {x: 0, y: -20} m_SizeDelta: {x: 480, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8668314952455990914 @@ -662,14 +662,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 0.6431373, g: 0.65882355, b: 0.70980394, a: 1} + m_fontColor: {r: 0.18039216, g: 0.24705882, b: 0.26666668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -855,7 +855,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: 91} + m_AnchoredPosition: {x: 0, y: 45} m_SizeDelta: {x: 504, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8069970846450131700 @@ -1257,8 +1257,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 2063597567 - m_fontColor: {r: 1, g: 1, b: 1, a: 0.47843137} + rgba: 4288054656 + m_fontColor: {r: 0.5019608, g: 0.52156866, b: 0.5882353, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1681,7 +1681,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: -158} + m_AnchoredPosition: {x: 0, y: -163} m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2481405032920487095 diff --git a/Assets/prefabs/ui/setting/game_setting_ui.prefab b/Assets/prefabs/ui/setting/game_setting_ui.prefab index 0f08bbd5d..1dca7df3d 100644 --- a/Assets/prefabs/ui/setting/game_setting_ui.prefab +++ b/Assets/prefabs/ui/setting/game_setting_ui.prefab @@ -1531,7 +1531,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 0.8745098, g: 0.87058824, b: 0.9137255, a: 1} + m_fontColor: {r: 1, g: 0.99607843, b: 0.99607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2573,7 +2573,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4293517023 - m_fontColor: {r: 0.8745098, g: 0.87058824, b: 0.9137255, a: 1} + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2702,14 +2702,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294432288 - m_fontColor: {r: 0.1254902, g: 0.8392157, b: 0.96862745, a: 1} + rgba: 4285681975 + m_fontColor: {r: 0.21568628, g: 0.31764707, b: 0.44705883, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2857,7 +2857,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4293517023 - m_fontColor: {r: 0.8745098, g: 0.87058824, b: 0.9137255, a: 1} + m_fontColor: {r: 1, g: 0.99607843, b: 0.99607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2992,7 +2992,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4293517023 - m_fontColor: {r: 0.8745098, g: 0.87058824, b: 0.9137255, a: 1} + m_fontColor: {r: 1, g: 0.99607843, b: 0.99607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3127,7 +3127,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4293517023 - m_fontColor: {r: 0.8745098, g: 0.87058824, b: 0.9137255, a: 1} + m_fontColor: {r: 1, g: 0.99607843, b: 0.99607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -4220,14 +4220,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294432288 - m_fontColor: {r: 0.1254902, g: 0.8392157, b: 0.96862745, a: 1} + rgba: 4285681975 + m_fontColor: {r: 0.21568628, g: 0.31764707, b: 0.44705883, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -4375,7 +4375,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4293517023 - m_fontColor: {r: 0.8745098, g: 0.87058824, b: 0.9137255, a: 1} + m_fontColor: {r: 1, g: 0.99607843, b: 0.99607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -5083,7 +5083,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4291280314 - m_fontColor: {r: 0.7294118, g: 0.7411765, b: 0.78039217, a: 1} + m_fontColor: {r: 0.45490196, g: 0.52156866, b: 0.5411765, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -5620,7 +5620,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4293517023 - m_fontColor: {r: 0.8745098, g: 0.87058824, b: 0.9137255, a: 1} + m_fontColor: {r: 1, g: 0.99607843, b: 0.99607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -5901,14 +5901,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4282466815 - m_fontColor: {r: 1, g: 0.25490198, b: 0.25490198, a: 1} + rgba: 4278190305 + m_fontColor: {r: 0.88235295, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/prefabs/ui/setting/language_ui.prefab b/Assets/prefabs/ui/setting/language_ui.prefab index 4c40289aa..2ee100b58 100644 --- a/Assets/prefabs/ui/setting/language_ui.prefab +++ b/Assets/prefabs/ui/setting/language_ui.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7437306225081421888 RectTransform: m_ObjectHideFlags: 0 @@ -33,11 +33,11 @@ RectTransform: m_Father: {fileID: 6532261956592226185} m_RootOrder: 0 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: -15} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 43, y: -40} m_SizeDelta: {x: 263, y: 60} - m_Pivot: {x: 0.5, y: 1} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &1572974857966272460 CanvasRenderer: m_ObjectHideFlags: 0 @@ -93,14 +93,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -302,9 +302,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -25} - m_SizeDelta: {x: 560, y: -50} - m_Pivot: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 25} + m_SizeDelta: {x: 560, y: -135} + m_Pivot: {x: 0.5, y: 0} --- !u!114 &7791765319350537533 MonoBehaviour: m_ObjectHideFlags: 0 @@ -432,11 +432,11 @@ RectTransform: m_Father: {fileID: 6532261956592226185} m_RootOrder: 1 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_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -32, y: -24} m_SizeDelta: {x: 84, y: 68} - m_Pivot: {x: 0.5, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1394063912138427145 CanvasRenderer: m_ObjectHideFlags: 0 @@ -465,7 +465,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0068587080dd0488dad9da673f466698, type: 3} + m_Sprite: {fileID: 21300000, guid: 7372681aea33b7b4099e3685b7ee975e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -604,7 +604,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 38} - m_SizeDelta: {x: 606, y: 752} + m_SizeDelta: {x: 620, y: 890} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5192491331257177057 CanvasRenderer: @@ -634,7 +634,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3dd545a09127741f68ada89e6e81ddaa, type: 3} + m_Sprite: {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1