diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 484ac8560..bf6cf8234 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -63,6 +63,7 @@ SpriteAtlas: m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: c19b6240a169be841a2f5d9bfa607302, type: 3} + - {fileID: 21300000, guid: 3b7c1540baf6d4bb98a215e004ee42f1, type: 3} - {fileID: 21300000, guid: bdcabd5093d701f498daa8906bfd6eb3, type: 3} - {fileID: 21300000, guid: bd8ab060d4c962f45b3af7dea9c8ee79, type: 3} - {fileID: 21300000, guid: fab2da6010f11704a98a2f788ba73a34, type: 3} @@ -109,6 +110,7 @@ SpriteAtlas: - {fileID: 21300000, guid: b54627e2f3696db4881f0ba63bb3a0c5, type: 3} - {fileID: 21300000, guid: e3a315f26f48db6489d0176ca4c9aad1, type: 3} - {fileID: 21300000, guid: 403f47f28d24b40bc89e8f21b2dc5a8c, type: 3} + - {fileID: 21300000, guid: 6ef1b543fd626412fa2710c34227ad11, type: 3} - {fileID: 21300000, guid: 792ef1532be4a470aaf22dff9cde4e68, type: 3} - {fileID: 21300000, guid: ba69d1639f9c54fcaa78295c5d38b76e, type: 3} - {fileID: 21300000, guid: 4e52f863d256e2b45aa84ecbf844ee89, type: 3} @@ -325,6 +327,7 @@ SpriteAtlas: - {fileID: 21300000, guid: d4fc31efb520b904dbc964028c78b257, type: 3} m_PackedSpriteNamesToIndex: - common_new + - common_bg_29 - common_board_24 - common_circle_1 - common_title_12 @@ -371,6 +374,7 @@ SpriteAtlas: - common_board_36 - common_dec_27 - common_bg_22 + - common_bg_30 - common_icon_record - common_btn_info - common_board_131 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 18b958e5a..3d92e3ec7 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/prefabs/ui/setting/select_other_btn_ui.prefab b/Assets/prefabs/ui/setting/select_other_btn_ui.prefab index edecfeb0d..15f7b24b4 100644 --- a/Assets/prefabs/ui/setting/select_other_btn_ui.prefab +++ b/Assets/prefabs/ui/setting/select_other_btn_ui.prefab @@ -33,11 +33,11 @@ RectTransform: m_Father: {fileID: 1987694164396694498} 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: 36, y: 4} - m_SizeDelta: {x: 180, y: 50} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -13, y: 0} + m_SizeDelta: {x: 80, y: 24} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &6936893058293274002 CanvasRenderer: m_ObjectHideFlags: 0 @@ -100,7 +100,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 4 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -201,7 +201,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f207b6a8a2b9544ba8cf83c4142496e3, type: 3} + m_Sprite: {fileID: 21300000, guid: 92f0559c7dc7a4f748e4f471741dc664, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -277,7 +277,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 92f0559c7dc7a4f748e4f471741dc664, type: 3} + m_Sprite: {fileID: 21300000, guid: f207b6a8a2b9544ba8cf83c4142496e3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -321,11 +321,11 @@ RectTransform: - {fileID: 7478773028872524474} - {fileID: 1451918511630981069} m_Father: {fileID: 6532261956592226185} - m_RootOrder: 1 + 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: 28} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -36} m_SizeDelta: {x: 144, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7773494474059222933 @@ -413,11 +413,11 @@ RectTransform: - {fileID: 6334354001788662849} - {fileID: 5392157314889844364} m_Father: {fileID: 6532261956592226185} - 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: 87} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -92} m_SizeDelta: {x: 144, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &462833294880461213 @@ -504,11 +504,11 @@ RectTransform: m_Father: {fileID: 3251564394244787417} 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: 36, y: 4} - m_SizeDelta: {x: 180, y: 50} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -13, y: 0} + m_SizeDelta: {x: 80, y: 24} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &2937228301080521382 CanvasRenderer: m_ObjectHideFlags: 0 @@ -571,7 +571,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 4 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -718,9 +718,9 @@ RectTransform: m_Father: {fileID: 6532261956592226185} 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: -28} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -148} m_SizeDelta: {x: 144, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4977715504965362469 @@ -805,8 +805,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2198481086097669730} - {fileID: 3251564394244787417} + - {fileID: 2198481086097669730} - {fileID: 1987694164396694498} - {fileID: 2001377662689540356} m_Father: {fileID: 8461932745927490369} @@ -901,11 +901,11 @@ RectTransform: m_Father: {fileID: 2198481086097669730} 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: 36, y: 4} - m_SizeDelta: {x: 180, y: 50} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -13, y: 0} + m_SizeDelta: {x: 80, y: 24} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &3662780689206770409 CanvasRenderer: m_ObjectHideFlags: 0 @@ -968,7 +968,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 4 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1069,7 +1069,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 80a4cdd0f592b40359159f8ee3c49d0a, type: 3} + m_Sprite: {fileID: 21300000, guid: f207b6a8a2b9544ba8cf83c4142496e3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1197,14 +1197,26 @@ MonoBehaviour: hashName: 3235023218 objectType: 0 gameObject: {fileID: 3275157678371083214} - - name: select_other_btn_ui.mask - hashName: 2659865585 - objectType: 0 - gameObject: {fileID: 0} - name: select_other_btn_ui.bg hashName: 4083209866 objectType: 0 gameObject: {fileID: 4117970956418931131} + - name: select_other_btn_ui.bg.bag_btn + hashName: 1258660417 + objectType: 0 + gameObject: {fileID: 3961971343371962336} + - name: select_other_btn_ui.bg.bag_btn.text + hashName: 3000573114 + objectType: 0 + gameObject: {fileID: 1130102581240483678} + - name: select_other_btn_ui.bg.gm_btn + hashName: 4073920359 + objectType: 0 + gameObject: {fileID: 8025481195902169917} + - name: select_other_btn_ui.bg.gm_btn.text + hashName: 3406098260 + objectType: 0 + gameObject: {fileID: 8936600909121364069} --- !u!114 &838584963112415459 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1287,9 +1299,9 @@ RectTransform: m_Father: {fileID: 6532261956592226185} 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: -87} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -204} m_SizeDelta: {x: 144, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &642128366656363747 @@ -1376,11 +1388,11 @@ RectTransform: m_Father: {fileID: 2001377662689540356} 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: 36, y: 4} - m_SizeDelta: {x: 180, y: 50} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -13, y: 0} + m_SizeDelta: {x: 80, y: 24} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &8402964845939940735 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1443,7 +1455,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 34 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 4 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0