diff --git a/Assets/arts/textures/background/idle/idle_bg_1.png b/Assets/arts/textures/background/idle/idle_bg_1.png index 7613a43b1..c1e7a2123 100644 Binary files a/Assets/arts/textures/background/idle/idle_bg_1.png and b/Assets/arts/textures/background/idle/idle_bg_1.png differ diff --git a/Assets/arts/textures/background/idle/idle_bg_1.png.meta b/Assets/arts/textures/background/idle/idle_bg_1.png.meta index ba2b5f412..8ddeef4e8 100644 --- a/Assets/arts/textures/background/idle/idle_bg_1.png.meta +++ b/Assets/arts/textures/background/idle/idle_bg_1.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 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 @@ -101,6 +89,18 @@ TextureImporter: 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: Standalone maxTextureSize: 2048 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/background/idle/idle_bg_1.png.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/idle/idle_bg_1.png b/Assets/arts/textures/ui/idle/idle_bg_1.png index 7613a43b1..b692188fb 100644 Binary files a/Assets/arts/textures/ui/idle/idle_bg_1.png and b/Assets/arts/textures/ui/idle/idle_bg_1.png differ diff --git a/Assets/arts/textures/ui/idle/idle_bg_1.png.meta b/Assets/arts/textures/ui/idle/idle_bg_1.png.meta index 66f624425..8eccf5424 100644 --- a/Assets/arts/textures/ui/idle/idle_bg_1.png.meta +++ b/Assets/arts/textures/ui/idle/idle_bg_1.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 35, z: 0, w: 385} + spriteBorder: {x: 0, y: 22, z: 0, w: 74} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/prefabs/ui/idle/idle_drop_ui.prefab b/Assets/prefabs/ui/idle/idle_drop_ui.prefab index 0a3211a5d..797544d35 100644 --- a/Assets/prefabs/ui/idle/idle_drop_ui.prefab +++ b/Assets/prefabs/ui/idle/idle_drop_ui.prefab @@ -33,11 +33,11 @@ RectTransform: - {fileID: 7320511982179427509} - {fileID: 5926415606068077162} m_Father: {fileID: 4656524465772686178} - m_RootOrder: 8 + m_RootOrder: 9 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: -42} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -106, y: 352} m_SizeDelta: {x: 178, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6552867063905318727 @@ -244,6 +244,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 5212623028139991644} - {fileID: 1718066751300693337} - {fileID: 4447597203734494548} - {fileID: 2264869435868761725} @@ -267,8 +268,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: 0, y: 100} - m_SizeDelta: {x: 578, y: 788} + m_AnchoredPosition: {x: 0, y: -55} + m_SizeDelta: {x: 578, y: 478} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5685410845323470072 CanvasRenderer: @@ -354,11 +355,11 @@ RectTransform: m_Children: - {fileID: 3871186935308499804} m_Father: {fileID: 4656524465772686178} - m_RootOrder: 14 + m_RootOrder: 15 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: -202, y: -325} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -202, y: 69} m_SizeDelta: {x: 122, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4596195134810301633 @@ -733,11 +734,11 @@ RectTransform: m_Children: - {fileID: 526106132872779894} m_Father: {fileID: 4656524465772686178} - m_RootOrder: 10 + m_RootOrder: 11 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: -170} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 224} m_SizeDelta: {x: 500, y: 170} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5130123506895133120 @@ -823,11 +824,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 17 + 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: -15, y: -277} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -15, y: 117} m_SizeDelta: {x: 180, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1347359819858997780 @@ -958,11 +959,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - 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: -227, y: -402} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -227, y: -8} m_SizeDelta: {x: 42, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5490311891197222929 @@ -1034,11 +1035,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 3 + 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: 227, y: -402} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 227, y: -8} m_SizeDelta: {x: 42, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8870385258505200731 @@ -1112,11 +1113,11 @@ RectTransform: - {fileID: 232340310814586855} - {fileID: 2329913039171639017} m_Father: {fileID: 4656524465772686178} - m_RootOrder: 9 + m_RootOrder: 10 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: -42} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 106, y: 352} m_SizeDelta: {x: 178, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7165569897298718251 @@ -1326,11 +1327,11 @@ RectTransform: - {fileID: 7911924621647232817} - {fileID: 8907158968492508645} m_Father: {fileID: 4656524465772686178} - m_RootOrder: 12 + m_RootOrder: 13 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: -15, y: -325} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -15, y: 69} m_SizeDelta: {x: 194, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5560039714779898781 @@ -1598,9 +1599,9 @@ RectTransform: m_Father: {fileID: 7708722960109355659} 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: 2} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 36} m_SizeDelta: {x: 196, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7937977896418252309 @@ -1733,11 +1734,11 @@ RectTransform: m_Children: - {fileID: 2793752031225853009} m_Father: {fileID: 4656524465772686178} - m_RootOrder: 13 + m_RootOrder: 14 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: 187, y: -325} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 187, y: 69} m_SizeDelta: {x: 156, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &238441500098194066 @@ -1822,11 +1823,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 6 + 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, y: 2} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 396} m_SizeDelta: {x: 548, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8155127487110914316 @@ -2092,11 +2093,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 1 + 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: -170} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 224} m_SizeDelta: {x: 530, y: 170} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2476148597122174150 @@ -2137,6 +2138,79 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4818413081634042235 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5212623028139991644} + - component: {fileID: 8442073195897134240} + - component: {fileID: 489406138348156429} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5212623028139991644 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4818413081634042235} + 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: 4656524465772686178} + 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: 0} + m_SizeDelta: {x: 578, y: 312} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &8442073195897134240 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4818413081634042235} + m_CullTransparentMesh: 1 +--- !u!114 &489406138348156429 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4818413081634042235} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 2b070194b62cd044c8a5fa3352254800, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &4942979108008416920 GameObject: m_ObjectHideFlags: 0 @@ -2168,11 +2242,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 11 + m_RootOrder: 12 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: -170} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 224} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6848581845443191176 @@ -2851,7 +2925,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -2991,11 +3065,11 @@ RectTransform: - {fileID: 5893629568819438930} - {fileID: 7375657260181525069} m_Father: {fileID: 4656524465772686178} - m_RootOrder: 0 + 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: -478} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -84} m_SizeDelta: {x: 578, y: 134} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1987547987984159348 @@ -3219,11 +3293,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 4 + 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: 0, y: 52} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 446} m_SizeDelta: {x: 200, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8144507241992321707 @@ -3352,11 +3426,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 5 + 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, y: 120} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 524} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8393883470758287776 @@ -3525,11 +3599,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 16 + 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: -202, y: -277} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -202, y: 117} m_SizeDelta: {x: 160, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1613840346406158233 @@ -3660,11 +3734,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4656524465772686178} - m_RootOrder: 7 + m_RootOrder: 8 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: 187, y: -277} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 187, y: 117} m_SizeDelta: {x: 180, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4548870878236080045