From 6565e05d5afdbb2b4e474f11f9fa48f6026f16b1 Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Thu, 6 Nov 2025 20:12:34 +0800 Subject: [PATCH] fix bug --- .../formation/formation_manager.lua.bytes | Bin 2190 -> 2233 bytes .../lua/app/ui/company/company_comp.lua.bytes | Bin 1470 -> 1470 bytes Assets/prefabs/ui/company/company_comp.prefab | 131 +++++++++++++++++- 3 files changed, 127 insertions(+), 4 deletions(-) diff --git a/Assets/lua/app/module/formation/formation_manager.lua.bytes b/Assets/lua/app/module/formation/formation_manager.lua.bytes index 8a035e76a9ba9af613c1992ffa6dd8ba38606ee6..ee0c214d459021bf495afb0126f5be05ad337c61 100644 GIT binary patch delta 1485 zcmZwHPf!|n6bJAHL@A;HL~&ID5kUlki?FZ@EZ~^<7g7NM6_FSrQK{`NATDaUhs2rY zU}sv}doMk-ht_Elqlcu^HoYX%W+sPDr-vSz$-#CyjnUY8$V?wLX`M`upZERkEbqPF z@~&)Kwh`rv7(5v6Vv1wyNj}Q+tuOLBxUWfa;JRrs@beQJ{T-W2KOotGr`baALwbY$ znAl8zR4Vn~`R&HNA8GpF5wZ8^`$P7@9noY-v%faeSIFD_d!{FWu$7_L;Q1?u z+XFvj@nGNyz5Dr=GxN^j?f(3y`@wqat^6O`&dfKgckueJ`E#2zlYgCf%Fm?MWr9V{ z8dAy0xDatrxy}SSYSxdPRL|oIv10_Kk`)QLw|9X%5l2M2piDn*A0bKmin4N0U4acN z+p~hR183t3p({|wKgB8CW8&^MYSKoy0!YU1ayMb6DV=+=sj(_$tJXz%R8rJC(3eIV zt0K+STDHM3D(~jntUcH%jb{mSPKcXAYU>$kNvlBPh|G_R^nL2f22IM#Q+XJPhAQ$H za!IZ_ud`57ts1}0TX|7mK$|%qJxk;=XJCHz1k9OYm{}Zb2VXp9CpZK4LhgY4$Q%@W zP;f%Q0SD4x4cGwg055}E!6vW~%!0N5V>9Gt$lr!s2l?q^)`KnJPRLgvZwGgREnx1| zLiwiH-~h!#3@JE}6$ZmtQ6L$rdJTKoAzm+4ja`C{H?lYH%W39dht2O)u%+L*8(DkRLu~K)PANCN%ChJ1 z4(DK9E^nRL%Kh@~GP{On@f|sqi_dQ5-h>ec-QsT27HP8Zl8Cq_Ssf%gM@ZXcsalj$ zD*aBczPECObf?s~C{Q;wF{z>!&|$5O5eh{KRBIZlH~9JE+L*6iaU$8mYYwS6ccL}q zjTssgsuF@2M?L0nZK6Yw610c{&0-@}aD{{+#M#4_)+UQHiXkPH(DxcE2Y8BkyIpA- z!Cetcg7Dd=Px)qCh$E(QEuej7(**@GZ$ujGtk^s*&bMlkQXvv=Ngv%2m{7P4Cai}Q zpd5^N2ntdtG?okCL9h&rf*W7B4%`fG0{27ysuhsCAoo<8M{6L*GR!QoP_KiI`_6;Q zFC@!(yJU&Nvtf)$!ip}P;e2zj!!LsGW4Ejw#LdT7i7&71&l%Uk*0*-EThB79B z)*>5!S`Ear$3kNN+QM8{U>z&cCKsMwC4HiU+4pL~U2$fIVBt=z_(N!)+?uLa%=>V? zDPB!sQ?wf4v=-MJnyJ9tY4M`v;>j2xP&BU8$v7QVsEMja5Zk1*K{8m(@?+w*sCuH+ zQ;-Tp9#&!;mWX<56XuvtDpZZhYGG&ptn9xX9yx+Rhew}bxgj}BAO?=Y4@w>LICvPW zf_xP61P6r>6k1*ujyVYjXz*oMs44;hJ7*U=n`~v7CtMhofcI5 E4Wfw3%m4rY delta 1455 zcmZvbTTEJa9LGVRIz)6M|aaD|jjY~?FDnIFvs=UH-z{D9h_J}G@M|535%cy@$+`zv+w_aUA; zJUB0X|13#=_daEyKihjc|JM1Jjz5zpt}z`=y<5lv?>m1<8c5d(b^3Y16n%UDD@Sho zFS6luH+Nh#MW5sSBTuxs(WexhdlNs4PQmxkS+`A*scWeTuWa>j;tUqyG*`J~e64l4 zCn)uIbp%@E#{1lvk%+_+;19G}r*4Um@s&lDkKg8%hg3vH%1-q(u+W4+GcL@j6k!pM zHPNiDNeC=h#wcWCbM0(Tv#@(YUNy-NU>$+Fid1(;P4`5-Vp6cwst;B1SV4B1m|7p0 zX>v0*wwJd&y=pNjof6CKjM-|n^UQ(~M2nH@BjM{h`;Fz+eq&yxlckhWI%BIwW(m|v zTW=0QGZ-{KhKA`l&O`^z%fLAB`X#miGr;TMSHQpK4d6U5(+7b~2+Tnt0R=Vi9PsoN zoCL1~9|gYv{=p@V0jGc!;A7zDfz!aPSMVZu8vI6|hp8Ng03D9w*;!+#n()hCca&$h zlTtr)xB#94KP_7~%CS87dYX=#vne-BfH^XdKT$gRkGNF7!s9 z@8gcWn@g^jJ2ch0m;LRtc*6}MQK2Nw77y?K8z!GvUbBfvI{gAh5#;FxlwNs5 zTbSM0K7~MJSk)0BDufTJ8vy?+mU0420)pkNuS3Cpl- z$!3}onXZk;b5ea5m@2Ncq#iaw^(?% z`ziL$qZ2Cq7|*SJ!&piO*tX#q0-49=vqNs7aImYzzJ5egD~spZ*`c*np<&y=uRqKE z+=)~6!To|AZo(P#ayZ5y!d6-tVV)c8@4(hDOTucBCAwtj+(J`r4pa3Js}iMy(A?(h z1{ys)QCpyy+Zy7Nech8bn}^qQ&1d8?sDIra=7r4lcf|54VuOp4Qf=hFo&9fz<}7r0 z@$AYSO~3@~z!~_VV#C3|IqP1TL>24lI3@FZ_FSaC3z&!qX_0 S5hCcw1RW*dSs89&>hwPy^Tp!; diff --git a/Assets/lua/app/ui/company/company_comp.lua.bytes b/Assets/lua/app/ui/company/company_comp.lua.bytes index dec8bbe2b10aa1a70de902805b3ad2549c04ec75..549970737c1acb5f657d6eebde3be01c071b8ff5 100644 GIT binary patch delta 29 lcmdnTy^njtWfnnUlWbGpAcMlBo5y=+?LOANZSoVATL7`a4UPZ+ delta 29 lcmdnTy^njtWfs9wlWbGpAcMjrON*jZ7t0FI$xm2r0RW#Z3h@8{ diff --git a/Assets/prefabs/ui/company/company_comp.prefab b/Assets/prefabs/ui/company/company_comp.prefab index 42ae897c0..4d78a9790 100644 --- a/Assets/prefabs/ui/company/company_comp.prefab +++ b/Assets/prefabs/ui/company/company_comp.prefab @@ -31,6 +31,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 518189435595440470} + - {fileID: 3748356801568085408} - {fileID: 8781750618573105550} - {fileID: 3709384738731649921} - {fileID: 210727915012937842} @@ -258,7 +259,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5232304874814648913} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -404,7 +405,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5232304874814648913} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -851,7 +852,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5232304874814648913} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -924,7 +925,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5232304874814648913} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -1210,6 +1211,128 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 2085965106981912127} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2086232538065829438 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5232304874814648913} + m_Modifications: + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Name + value: ui_spine_obj + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingLoop + value: 1 + 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: 11400000, guid: 8c24ea04d5e35e748b3b2201a804d6af, type: 2} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingAnimation + value: 1 + 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 &3748356801568085408 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 2086232538065829438} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2538947509396611601 PrefabInstance: m_ObjectHideFlags: 0