From d9ddc699c9007782e970886fdcabe88c3d5cd7b3 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Mon, 11 Aug 2025 10:18:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/arts/atlas/ui/common.spriteatlas | 4 + .../select_other_btn_ui.lua.bytes | Bin 3095 -> 3903 bytes .../ui/setting/select_other_btn_ui.prefab | 104 ++++++++++-------- 3 files changed, 62 insertions(+), 46 deletions(-) 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 18b958e5abe0bf26a4ed62a6b67ab35b35c99163..3d92e3ec774c3005693d85bf6efcb9b753c753c9 100644 GIT binary patch literal 3903 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 I(Xi3-Z@H?&>;M1& literal 3095 zcmai$OH5l=8ppxG28`nvFm@<0wnL1KF>tTn*I)zXVPEh~?0{_^2J^CwaRR=6z%>xq zw2OI3qiQs}EJm70eawPRLKUWqS)@|iMP{U_Ds?pvO(V65W*SH{qMcdH|2mL~s%WzO z>HnSY{LgpJ`OaBL#Nw-q*B~oy;MPQf4tLfOZ{mtL%ie6emUsmZXv(-t-U8V+nm|8H>iK#x>Mq#o6y1kxn*79 z^{0`PGdD1Jzzrat9v@T5UK?G{E2DB#M7>G5LT4 z!U$~I4G%g4^hCE@jSOH|T0EFCiub24Fh&!X6v5}Ul|H%#QTpuB2YIUflt zgwx`n+8q;`MIk}8mQndIzyGR@&!5Noc9Gx81W0gm_Q4DFVp9~>??L@mP(PbME}Z4- zQ9P|D2Y;)G_gPbR)YpuB^7x>0md5(|dO!0|Z6UrFyag_vj3+#fsFK$cr}M=SpFq8b zsLc`hlVH5^q+Yz=$z)I}*PWNvaemwAFhkyGI*TefO`JIEG_0oEl`SrNjHm5@OY&}+Rp(q|#DYVzf z)A%gnHxNIK@w4!o0na(2@-9AK@O1qq%-4ndB)j`}_&HN_(%hq`jD3&IEOOZgXDBC~ zd+#aJOzg35Le~_JeYtdjX~^ucI_K^9+eMBJwD0>H2$Jo*dplnB-2okVWb=PU`z$L3 zCd3lC_yL*x$a(CO8Tb7WlFcNkCrdvra-;vtM<(ZvPx9^M4{LB9rVchgy^Zmovqbg* zWls!kZPSIXN#-+imVNvC^?09)qc@iKnSZftVS{5I+{660jrq%eCT-c}&GoqO!)!vi~ev5}$DHk)IoF{t_QJ5}zEqN6e`lGn;i3zHwRO z_dfLaZ@-iCt(y-s_lxjD6+eBxo+6q2*vZlSdj3L~Gpm$2K5&;B&7wXH%$zMA zEmb+G(Jvm_7(08I=|uiBcYi<1z5DpeFGvS_t9U0N==RXLub_i5i+&U%>0%r{F-{4&|rV+()$dH^K;!(DXE^Q zV#vm+i>=ljg(PgLHf+i?6X(2!9_z9|GOiR638gzK_0|!C>dp(nXq9fHp3#YeZMD(! zb%K18f`}?i!)pz=Z}K`-QdMh;iWOn?be(=ORxeekD>_2@_C6uGstu{+Vtk{s-rA8lAb_dVJFKQ=+=SAW6 zdEczcosb4q?n$-qy0yMslU8*sRYY4_Th5;Jlk^IIzmTsGpH@}1g%yg>xs{#ZyI+0v z_*aj9y5-*J4vMC_9SiaXD$-O#xMyD0AG&PK7i4AQ9hF2R><-rV(^CU-p?gML+t)*K z5*;~U3kmJQh^)eJT}Ae-QDRT5UMAd9)i{{#fueD{{Ok_VW9r$xbe2`=2BqF=%b={V z7E{(L=Kj!;K`Cd8xsIu8&y_c?9od$ z-L?$YN5WrxusZ|)1pMDX{|=*n?^J)AHs7x!ZoL1D`S*#0{=A97=DxRn?t=~*sp1D0-OcUg2zvI7d!@zfUiO4ISjrE zUIlN0Q{Zdh0N4vogV(@gFYqcj1n!4^9eV17`@q-0%iwY7Jg*3_*r2!HD|F{R;ONLY`W2CZ%Fyg%Z z4d>5XwS@R@p!W@*^wU9%mtj057?#*i`=cE3y@>A?$W{KPnwBkzK85@C1@6}h;`Ei*)$+*|4ygC;9f_pp3_TETtxoD=PIdb)PB8d(qGi->ny aboyj>yKLL2F6b?|&x^Q^ImDOl*M9*(-@PXQ 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