From 88159964d4f3ef36b9ffcac636025451a4f52d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B5=B7?= <1464576565@qq.com> Date: Wed, 19 Nov 2025 13:05:11 +0800 Subject: [PATCH] 1 --- .../Bundles/UI/UILoadUpdateWindow.prefab | 53 +++++++-- .../UI/Generate/ui_UILoadUpdateWindow.cs | 8 ++ .../Startup/Procedure/ProcedureEntry.cs | 1 - Client/Assets/Test/GameBase.dll.bytes | Bin 5120 -> 5120 bytes Client/Assets/Test/GameBase.pdb.bytes | Bin 18496 -> 18520 bytes Client/Assets/Test/GameLib.dll.bytes | Bin 5120 -> 5120 bytes Client/Assets/Test/GameLib.pdb.bytes | Bin 18408 -> 18432 bytes Client/Assets/Test/GameLogic.dll.bytes | Bin 54784 -> 56320 bytes Client/Assets/Test/GameLogic.pdb.bytes | Bin 24564 -> 25364 bytes Client/Assets/Test/GameProto.dll.bytes | Bin 4608 -> 4608 bytes Client/Assets/Test/GameProto.pdb.bytes | Bin 18344 -> 18372 bytes Client/Packages/com.alicizax.unity.framework | 2 +- Client/UserSettings/Layouts/default-2022.dwlt | 108 +++++++++--------- 13 files changed, 109 insertions(+), 63 deletions(-) diff --git a/Client/Assets/Bundles/UI/UILoadUpdateWindow.prefab b/Client/Assets/Bundles/UI/UILoadUpdateWindow.prefab index 69e607f..168988b 100644 --- a/Client/Assets/Bundles/UI/UILoadUpdateWindow.prefab +++ b/Client/Assets/Bundles/UI/UILoadUpdateWindow.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 4801502739230327379} - component: {fileID: 1839643559262572090} - component: {fileID: 1590262444720639052} - - component: {fileID: 2636909633397487000} + - component: {fileID: 8270483239104722155} m_Layer: 5 m_Name: UILoadUpdateWindow m_TagString: Untagged @@ -40,6 +40,7 @@ RectTransform: - {fileID: 6056289203651508232} - {fileID: 8277505350050533328} - {fileID: 434786077437263718} + - {fileID: 8914933720877746316} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -100,7 +101,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: hotButtons: [] ---- !u!114 &2636909633397487000 +--- !u!114 &8270483239104722155 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -116,6 +117,12 @@ MonoBehaviour: mBtnTest: {fileID: 8242433937099588481} mTextTitl: {fileID: 7423448528652229462} mTextGameTitle: {fileID: 4229038960500937347} + mObjTestList: + - {fileID: 2580813499182288580} + - {fileID: 5217023009503673661} + - {fileID: 2070341851612434847} + - {fileID: 3075848250350631692} + - {fileID: 6906437026743455523} mImgTestList: - {fileID: 4753672883913794088} - {fileID: 19703495912376014} @@ -128,6 +135,7 @@ MonoBehaviour: - {fileID: 4563810544014715074} - {fileID: 2060993977344163427} - {fileID: 2080853874740608963} + mObjLobb: {fileID: 5770000422433218588} --- !u!1 &2070341851612434847 GameObject: m_ObjectHideFlags: 0 @@ -141,7 +149,7 @@ GameObject: - component: {fileID: 4185039174538723206} - component: {fileID: 4563810544014715074} m_Layer: 5 - m_Name: '*Img#CanvasGroup@Test*2' + m_Name: '*Obj#Img#CanvasGroup@Test*2' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -404,7 +412,7 @@ GameObject: - component: {fileID: 4753672883913794088} - component: {fileID: 8659972988376294145} m_Layer: 5 - m_Name: '*Img#CanvasGroup@Test*0' + m_Name: '*Obj#Img#CanvasGroup@Test*0' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -655,7 +663,7 @@ GameObject: - component: {fileID: 1057851142068418248} - component: {fileID: 2060993977344163427} m_Layer: 5 - m_Name: '*Img#CanvasGroup@Test*3' + m_Name: '*Obj#Img#CanvasGroup@Test*3' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -782,7 +790,7 @@ GameObject: - component: {fileID: 19703495912376014} - component: {fileID: 188176691515685520} m_Layer: 5 - m_Name: '*Img#CanvasGroup@Test*1' + m_Name: '*Obj#Img#CanvasGroup@Test*1' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -896,6 +904,37 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &5770000422433218588 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8914933720877746316} + m_Layer: 0 + m_Name: Obj@Lobb + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8914933720877746316 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5770000422433218588} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.1347046, y: -12.957336, z: -1.5050803} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2553447206821208227} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5796037856908370449 GameObject: m_ObjectHideFlags: 0 @@ -984,7 +1023,7 @@ GameObject: - component: {fileID: 6926886040523368586} - component: {fileID: 2080853874740608963} m_Layer: 5 - m_Name: '*Img#CanvasGroup@Test*4' + m_Name: '*Obj#Img#CanvasGroup@Test*4' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs index f6e927c..61c24de 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs @@ -27,6 +27,10 @@ namespace Game.UI private UXTextMeshPro mTextGameTitle; public UXTextMeshPro TextGameTitle => mTextGameTitle; + [SerializeField] + private GameObject[] mObjTestList = new GameObject[5]; + public GameObject[] ObjTestList => mObjTestList; + [SerializeField] private UXImage[] mImgTestList = new UXImage[5]; public UXImage[] ImgTestList => mImgTestList; @@ -35,6 +39,10 @@ namespace Game.UI private CanvasGroup[] mCanvasGroupTestList = new CanvasGroup[5]; public CanvasGroup[] CanvasGroupTestList => mCanvasGroupTestList; + [SerializeField] + private GameObject mObjLobb; + public GameObject ObjLobb => mObjLobb; + #endregion } } diff --git a/Client/Assets/Scripts/Startup/Procedure/ProcedureEntry.cs b/Client/Assets/Scripts/Startup/Procedure/ProcedureEntry.cs index 8fa06f6..d227f24 100644 --- a/Client/Assets/Scripts/Startup/Procedure/ProcedureEntry.cs +++ b/Client/Assets/Scripts/Startup/Procedure/ProcedureEntry.cs @@ -12,7 +12,6 @@ namespace Unity.Startup.Procedure private async UniTaskVoid Start() { await UniTask.WaitUntil(() => YooAsset.YooAssets.Initialized); - GameApp.Procedure.InitializeProcedure( new List { diff --git a/Client/Assets/Test/GameBase.dll.bytes b/Client/Assets/Test/GameBase.dll.bytes index c3f666079b8f7a5777af854b9aee570e4f130564..9d32ec1c3fcbe57f58ed3a7bf138c9d25a5d502c 100644 GIT binary patch delta 590 zcmZqBXwaC@!Sd(DipLXsWEj^?Tp7+7GntW5owY)ffgxnFB9qSKNJe!g2JXpCjCFz& zv>3p^14uG4urgejEXZUpsl=qg#lXPD0Fo3oU}1;^(u@oYf((;Wn1Y45wHes8;7Wk1 zxEMAcX4=Y_d5giA(U;*K0~>=J<0Bv`0w$+0KLfHm!Q@lsmka?4K+_o7ButsvfQH6^ zc#IPnE;7FX@(zM{aJf@p-b9AoOdo-AXA!)~4_TaJH5t?yv>DVG^%%GrzB1@B2s8Wx zlF|&ajL8hfK=EV-YX)r~>C9ll*udZo6j=Z!4})bnfNrt^n#u>Xj{`^>18GhMC59b9 zKQl6XnB2&!E^5eN4fHhw0}F_N0>jOFS&dl)76=%e4XroxnYF!}?e^;YN0YdeSlQT_ z1Z5_xa{XjtXPm6S?Ps`QKi^CSM&AG?px#U%J_C$_Gu$wfz(ERhH3QHe3=F0~drc=V z!l>7$G9ivraC1Sr|K1?BrybgI2xIn zF+eq3GJ|RWS}S>DZ=2cG!Y^u$r6BWf6CrmEm(d7EC%Amj?0FvCi Zf+vh|GauhCW~L2Rn+1j5Gfp&M2LSvfe!&0$ delta 561 zcmZqBXwaC@!LqyPWcS1#8OB8uSB5kCPG)3OXU)-MU=J;{zZm0w$+0KLN5k!Q@ls=L`V~AY0lbOqtn$hDCsQj1w6yGQR@y zc7S+rxdUL{M26i=?}2iM5WLB6S)60l8PplH8B`ec7`PceGw3l0GyDOP(hSm!$qdFo z@ni;T22CL8%wWXWz~BuOSpX&vgJn5@Zn6NH$_KQM14tVKX-)KIw5YM>2CJQu_d@IFvU zvz)5%uoN1HAlLST*a{OB#TXkWxAJIm0(t*c859@wf$_!!#t9}dPZ$^&lBT@M!ycGeXfVS8AiDu1?;h&u z0;C<77#JknfPAN%{3IaXK)zzJ=qeMZZM_DI8;W8cZ`jW_bK-;?M)rw+H6z!!0#z_D zGaPhfVfgII#K6SB2!tRI3B)W6Y;Zo%R0dWCE)+gU9Y{4J!wXktAPsURE11tcxt>v+ zL08{_lI5}dO(ALnea zbqNbOd52*E14EDR{mcu6ZI07zg1m!z^nbf2=B5S|<(K5^6{V)>rR3xQEzRc-@E#Lo!~ s7bb?uzugtI&oUlhaJ>Q+7JvwIhvsFLRJ!J+XXd4Hfn@)Kl`t>>0GV@n5&!@I delta 464 zcmcaHf$_iu#t9}d4;UC2lBT@M!w#5OXfVSbAiDr0?;h&u z0;F}A7#Kv{fPAN%{3IZM^P1SXSpn5Pb2AP<+48T6r&P}9(ZmTkjBFGCYDOM(1*%|R zW;o%>!tm9ViGhiM5ePvb1c+G}*x-DSC@TXO3Lm5nB+kh2%9R;NgPh3<=5tK0XB208 zAvAd&qtfJkj76Irm|n9n{+X=9IZGtJpd>RlvnsJ9Ge3`^C^aWFu{d?}QO-u&`m|-m zOBoh0Ff5$H{Cw(f7034fu@nAgzw>lY%uNj_$}h>+D@sk%OUcOrT6t1_>SmDIAHCs+ zELg*RS9ROzym^zZ5}KD;Qt6tKS(0C*7wUy(jEDnYHkY z%X^51y!6bx$w%G!)ujAouQMnxF_i7vCu|(^&1;L&WoO!F}}p78*K>ou^5ASXA%oK!B5#2>IM0|3|{f+YX| diff --git a/Client/Assets/Test/GameLib.dll.bytes b/Client/Assets/Test/GameLib.dll.bytes index ffc642ed34673cec7267a8dc143273df28ab0c9b..ac70fbb90094fdfb3567fa24f75892f1702931d6 100644 GIT binary patch delta 541 zcmZqBXwaC@!LqVif5yZf8OBu;SB5i&PiACPXD!iWUPK~GTBQiF==oyFmN$|B!vxF7$Si*BLjmV!{ijEU}0`;26ipD5}+zB zhRuhWwlZekVlZaB%y5r^jX{p_5s(xClarXA0om{L$Lt{WZ z#)%B)nco0;2SGfz+$k_`BEv4Gk3hMz2;Ss}EY7i-4C)Np3~G#e4BQM~8T1&08U6uD zX$D!wWCmlPcrt@EgEo+KW-wuFVDJWtEC7>-!Ll4cH(3Eq(A z85s^tZe&##HDquG`kH}(1w=rB;pV-p`YZyun-h*kZDDj@>>=#c&&_H#`46WOD;qnL zpv+`NuAfZojFV-!{X`i9HostC^bKGFYR&-S6TlcaF}aajoYeqmjltx(+{yw9YunZ> z=``_N>#KFt{>rJPFuNqBPZr>jFoH^+gh_%7T$y-aPa)&lrJ@rftLi~91O+oe lY=w!6VvOCB3wbm*&*VvE+|0-Ki?AZ-YwIT@4~761c*kzvE+URHHc zeFkTsZy6X^Km-)%Z$8PY&mzEi=5eX=T@mkOCMJf- zTHJo(3=9G1f8S$Z^bKGFYEA{>J-|@kGr5;roK+EMjpF2$+{yytO`l@4>aTdWiFZEO z&tZ3B@*Qr6$?`lBMo@{>ZcquJVR4rOC-4X<{kZbb?)Q}fXmo)b)&*iKOjHzOteM=v gqq%t%PYUB?2S$O-e0;x{ndVq+78H8VIMIL|0CrY-GXMYp diff --git a/Client/Assets/Test/GameLib.pdb.bytes b/Client/Assets/Test/GameLib.pdb.bytes index 0c0741c2e83ac09d376eef51751372363480ec19..ccb7fff82ee5561a1c591e2c4836122130c3e4ee 100644 GIT binary patch delta 437 zcmaFS&)6`5ae_(A69xtbg<8q9D2$Zi11yN7zZ z0BHv%28IK!K)zE>eiD$cu(oa8l1>xPwZ2+M?XR3#%^0xx#l#6YjO-KtYDNYF6*4d| zGi123FwAmgVqjum1VRvq1Y#BjHaH(>Dg!G67YZMw4y2lqq2HAmNQ0co3g&N`T+b-Z zaY4v|frBB%b@B{GrOA633j|gK#g`tPxX*RV4uz?OPlNVu)?s?V#`t`)DCexrM>yMU z>pi45{bqQ;z>v0arfS=|SihYnn=9Y(@%{+S%PgsM%}dYBOVtbY)GJC&(@V+80op7x zspKYu0uzIM)BB5i@5p-YF>AOe?L09;0O&48O-@EO7AB4`21dS0W(F}vZjjsfIe}he zVqgodEG|jS6?V+YOwO!Ii~t!MWL}zAl9`*z#dv_hwFE>|gS7}iv~VN20<2^iSP9Tj E0DU8BlK=n! delta 382 zcmZpe!1$t{ae_(A0|o{LeiD!`-t;L(tNx02n|SAg{Ty~D0?z-wH*rD^BiqEknvoemg$xYL z4Ee4s40BwW7?>Csfe-{jfS84W4bBINvNCX?@ImT8;*1OvU73M2$eFBQ{`$%FjN(jB zg(lBqRGPexv1qdc(+f7nKa({%XNlw&lw{^+Rwb5X=I1dKrRJn27N>4L#MxmR9_i$9 zgW&-KL-L{dvVIJ`-V^qn%vyNH<$Y*gW=W-MUV3I;s$Qt4UQueAUP?|5&|WEj+3O4n zOblha_6ZxueDm6(blI8r#N1XkMg}$(EnYT|TLd^KZ*f;pD`Pys;93h75#;1XGLZ`; Ku^24NzyJUTdtP$@ diff --git a/Client/Assets/Test/GameLogic.dll.bytes b/Client/Assets/Test/GameLogic.dll.bytes index ed7b80be1723f3825fd3dcdbff46387388bac966..66cfce329fe531e5b7ff67a8689091dfc625d3ca 100644 GIT binary patch delta 12960 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 delta 4076 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 TgNig#%zwW11&rjs%O3g{#=dgJ diff --git a/Client/Assets/Test/GameProto.dll.bytes b/Client/Assets/Test/GameProto.dll.bytes index 56999f57ea4c4cb5ebf55ac0b48ec11e7a2b74db..45c38f6a134e52958370c1a9dca4188f83cc0212 100644 GIT binary patch delta 469 zcmZorX;7Ka!NNR4>FvZG8OCc9SB5h-PG)3OXPu+Yzz{N7kx6HAB%?axoym=i^@3Y9 z7{I^-NHQ_7GOU>_$mGoF2;?y`FbFbCj$yJE=GJCl*HU8A;9_9lV$cGk&5N0m8T~IY zurXLNfXEe0*MQ_)FnNpVCPRP%$b^Xu*O=}A4Vnw$F|<)D$gvCl<-cq`{V_$W$lk+4)JciKG}jpiIt6=Nl;{R zEXPYGcE-sboPMISn;u_cVDt@O0_x2I;t#+O`!IPer#NdAFr1<$pX5{);AoEB-)Q^a ztJ~aj?wiok>68C(IxxE=rBAluk}`ryuHuGDf(#T&+P*jTuHWP*c4@CxLW3LRw!FbGbLWwPecl4H`~VqoCXV$)*VyqYPQ(f|&~nV1+R z2XXotGce5lx&i1W-vB0{-gF>-0Su`ZoCwo^VF7d&0|QW)!5jsZKmr|XLCfhHZ%);g1u9uRS9^;;vn;KA*Uy`p^kdnj@?BQr+YQ_Ln&S3*p4zjdA zy)C3)dP`Sl=ERrtpiu#`cE{vCE@{S9lUH$RZ@$K5!8p-?XEPtqFJ`7Q7MleH-UIpU E09p8VqW}N^ diff --git a/Client/Assets/Test/GameProto.pdb.bytes b/Client/Assets/Test/GameProto.pdb.bytes index 048a6fccc327edaeb26ea7e488844a2d1ae1dcf4..87b66de7986de7964067973bbedf42ec538558d5 100644 GIT binary patch delta 560 zcmZ3{&v>Mtae_(A9R>yleiD$+(Hy(K(e}Srx4GxsH=(7|XE!~*G;u--BiqEUs`chTg$xYL z3_h+b40W!I3``7+KnMbkU~x7$A80Dj8C)oQkUEfRMuuWnX0SX111p$6&6OQUa{w_X z5GydSGkCbF1LX?Y)EU?qqJ+YLW+^e2O`gmsI(ZpmlE8|f_|l^j_qlG_p)j@ZY0%!y z985)QjL#=mbIjVT#o1t69~N@*4#NTlh92MhnHLJ%9H-j^c?b3A|Mn?OO3c#>D$Og& z%uUrRN=?&C$;kn_DDR$TKf?nC2Bo~nch`2vI&~ck`OdzNVQXk!W=W-MN@huZkzS}L zk_HdyO}{}J(l*XiZCe-Xx6@>Eau`-^+;$a?NE zYq%)wJTXE57$l5poQ!NNOdNI$jC_^M3}TGjz+hnH=LCi>69ZdtWpPPruCQZHW^!g# mVg$%os1LXp4=}h!fQWdo4grV`Zb^tUz^(wR=>n?(8VUf3+m12- delta 511 zcmX@o&$yzWae_(A6$SRcL#Zn>Se}7_70jRP$_}JCfS41A z)q$dgZ0Zbb4EaJ~KvR?$%YY;w%e2Y!8Tlt~U`*Joz*NM>_-FEDj#(o41tpoenN^7; znfZAPMX5QdiN&d#bvPSs>(iDMFJ)N3z_4%%^Yf{{RUF&@$4>a0{m#>;G$}DpFQ_yR zs4-QqC^bzlB_{{ysyOlUvlt#QFdWOi+aU97h0B&~v#vugKXr!YWtLRBrev1n7wLt1 zB58aoZJv2!6tHnB-+8U3=9DA CUWac0 diff --git a/Client/Packages/com.alicizax.unity.framework b/Client/Packages/com.alicizax.unity.framework index 9583640..33922c9 160000 --- a/Client/Packages/com.alicizax.unity.framework +++ b/Client/Packages/com.alicizax.unity.framework @@ -1 +1 @@ -Subproject commit 958364080f889abb03729db844a2b0d0d1052e5e +Subproject commit 33922c9521ea1cc3552a50750cc7ce3762d11383 diff --git a/Client/UserSettings/Layouts/default-2022.dwlt b/Client/UserSettings/Layouts/default-2022.dwlt index 7819c66..fbaf439 100644 --- a/Client/UserSettings/Layouts/default-2022.dwlt +++ b/Client/UserSettings/Layouts/default-2022.dwlt @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 43 + x: -455 + y: 546 width: 1920 height: 997 m_ShowMode: 4 @@ -23,7 +23,7 @@ MonoBehaviour: m_RootView: {fileID: 4} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -41,7 +41,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 349 - width: 297 + width: 248 height: 598 m_MinSize: {x: 50, y: 50} m_MaxSize: {x: 4000, y: 4000} @@ -69,12 +69,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 297 + width: 248 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 26 + controlID: 25 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -173,7 +173,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 142 + controlID: 101 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -192,10 +192,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 297 + width: 248 height: 349 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 15} @@ -219,14 +219,14 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 297 + x: 248 y: 0 - width: 357 + width: 413 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 71 + controlID: 70 draggingID: 0 --- !u!114 &10 MonoBehaviour: @@ -245,7 +245,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 357 + width: 413 height: 454 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -271,10 +271,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 454 - width: 357 + width: 413 height: 493 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -295,9 +295,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 654 + x: 661 y: 0 - width: 420 + width: 692 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -321,9 +321,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1074 + x: 1353 y: 0 - width: 846 + width: 567 height: 947 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} @@ -353,8 +353,8 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 422 - width: 296 + y: 368 + width: 247 height: 577 m_SerializedDataModeController: m_DataMode: 0 @@ -408,10 +408,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 296 + width: 247 height: 556 - m_Scale: {x: 0.15416667, y: 0.15416667} - m_Translation: {x: 148, y: 278} + m_Scale: {x: 0.12864584, y: 0.12864584} + m_Translation: {x: 123.5, y: 278} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -419,12 +419,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -960 - y: -1803.2432 + y: -2160.9717 width: 1920 - height: 3606.4863 + height: 4321.9434 m_MinimalGUI: 1 - m_defaultScale: 0.15416667 - m_LastWindowPixelSize: {x: 296, y: 577} + m_defaultScale: 0.12864584 + m_LastWindowPixelSize: {x: 247, y: 577} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -521,8 +521,8 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 296 + y: 19 + width: 247 height: 328 m_SerializedDataModeController: m_DataMode: 0 @@ -1137,9 +1137,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 297 - y: 73 - width: 355 + x: 1 + y: 19 + width: 411 height: 433 m_SerializedDataModeController: m_DataMode: 0 @@ -1154,9 +1154,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 46760000 + m_SelectedIDs: 02120000 m_LastClickedID: 0 - m_ExpandedIDs: 00acffff02acffffa2e0ffffaae0fffface0ffffc6f9ffffc8f9ffff + m_ExpandedIDs: 04fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1172,7 +1172,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1200,9 +1200,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 297 - y: 527 - width: 355 + x: 1 + y: 473 + width: 411 height: 472 m_SerializedDataModeController: m_DataMode: 0 @@ -1234,9 +1234,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 654 - y: 73 - width: 418 + x: -31339 + y: -31970 + width: 690 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1259,7 +1259,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Plugins/Sirenix + - Assets/Scripts/Hotfix/GameProto/Config/Extension m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1275,7 +1275,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: e48c0000 m_LastClickedID: 36068 - m_ExpandedIDs: 00000000fe72000000730000027300000473000006730000087300000a7300000c7300000e73000010730000127300001473000016730000187300001a7300001c7300001e73000020730000227300002473000026730000287300002a7300002c7300002e73000030730000327300003473000036730000387300003a7300003c7300003e73000040730000427300004473000046730000487300004a7300004c7300004e73000050730000527300005473000056730000587300005a7300005c7300005e73000060730000627300006473000066730000687300006a7300006c7300006e73000070730000727300007473000076730000787300007a7300007c7300007e73000080730000827300008473000086730000887300008a7300008c7300008e73000090730000927300009473000096730000987300009a7300009c7300009e730000a0730000a2730000a4730000a6730000a8730000aa730000ac730000ae730000b0730000b2730000b4730000b6730000b8730000ba730000bc730000be730000c0730000c2730000c4730000c6730000c8730000ca730000cc730000ce730000d0730000d2730000d4730000d6730000d8730000da730000dc730000de730000e0730000e2730000e4730000e6730000e8730000ea730000ec730000ee730000f0730000f2730000f4730000f6730000f8730000fa730000fc730000fe73000000740000027400000474000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e74000020740000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e74000040740000427400004474000046740000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e7400009074000092740000 + m_ExpandedIDs: 00000000ce0d00009a6e00009c6e00009e6e0000a06e0000a26e0000a46e0000a66e0000a86e0000aa6e0000ac6e0000ae6e0000b06e0000b26e0000b46e0000b66e0000b86e0000ba6e0000bc6e0000be6e0000c06e0000c26e0000c46e0000c66e0000c86e0000ca6e0000cc6e0000ce6e0000d06e0000d26e0000d46e0000d66e0000d86e0000da6e0000dc6e0000de6e0000e06e0000e26e0000e46e0000e66e0000e86e0000ea6e0000ec6e0000ee6e0000f06e0000f26e0000f46e0000f66e0000f86e0000fa6e0000fc6e0000fe6e0000006f0000026f0000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000186f00001a6f00001c6f00001e6f0000206f0000226f0000246f0000266f0000286f00002a6f00002c6f00002e6f0000306f0000326f0000346f0000366f0000386f00003a6f00003c6f00003e6f0000406f0000426f0000446f0000466f0000486f00004a6f00004c6f00004e6f0000506f0000526f0000546f0000566f0000586f00005a6f00005c6f00005e6f0000606f0000626f0000646f0000666f0000686f00006a6f00006c6f00006e6f0000706f0000726f0000746f0000766f0000786f00007a6f00007c6f00007e6f0000806f0000826f0000846f0000866f0000886f00008a6f00008c6f00008e6f0000906f0000926f0000946f0000966f0000986f00009a6f00009c6f00009e6f0000a06f0000a26f0000a46f0000a66f0000a86f0000aa6f0000ac6f0000ae6f0000b06f0000b26f0000b46f0000b66f0000b86f0000ba6f0000bc6f0000be6f0000c06f0000c26f0000c46f0000c66f0000c86f0000ca6f0000cc6f0000ce6f0000d06f0000d26f0000d46f0000d66f0000d86f0000da6f0000dc6f0000de6f0000e06f0000e26f0000e46f0000e66f0000e86f0000ea6f0000ec6f0000ee6f0000f06f0000f26f0000f46f0000f66f0000f86f0000fa6f0000fc6f0000fe6f000000700000027000000470000006700000087000000a7000000c7000000e70000010700000127000001470000016700000187000001a7000001c7000001e70000020700000227000002470000026700000287000002a7000002c7000002e70000030700000327000003470000036700000387000003a7000003c7000003e700000407000004270000044700000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1303,18 +1303,18 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000920e0000fe72000000730000027300000473000006730000087300000a7300000e73000010730000127300001473000016730000187300001a7300001c7300001e73000020730000227300002473000026730000287300002a7300002c7300002e73000030730000327300003473000036730000387300003a7300003c7300003e73000040730000427300004473000046730000487300004c7300004e73000050730000527300005473000056730000587300005a7300005c7300005e73000060730000627300006473000066730000687300006a7300006c7300006e73000070730000727300007473000076730000787300007a7300007e73000080730000827300008473000086730000887300008a7300008c7300008e73000090730000927300009473000096730000987300009a7300009c730000a0730000a2730000a4730000a6730000a8730000aa730000ac730000ae730000b0730000b2730000b4730000b6730000b8730000ba730000bc730000be730000c0730000c2730000c4730000c6730000c8730000ca730000cc730000ce730000d0730000d2730000d4730000d6730000d8730000da730000dc730000de730000e0730000e2730000e4730000e6730000e8730000ea730000ec730000ee730000f0730000f2730000f4730000f6730000f8730000fa730000fc730000fe73000000740000027400000474000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e74000020740000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e74000040740000427400004474000046740000487400004a7400004c7400004e74000050740000527400005474000056740000587400005a7400005c7400005e740000607400006274000064740000667400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e74000090740000927400009c740000de7400009075000092750000b4750000ea75000046760000187700001e7700002277000098770000ac770000b8770000c6770000c8770000de770000 + m_ExpandedIDs: ffffffff000000009a6e00009c6e00009e6e0000a06e0000a26e0000a46e0000a66e0000a86e0000ac6e0000ae6e0000b06e0000b26e0000b46e0000b66e0000b86e0000ba6e0000bc6e0000be6e0000c06e0000c26e0000c46e0000c66e0000c86e0000ca6e0000cc6e0000ce6e0000d06e0000d26e0000d46e0000d66e0000d86e0000da6e0000dc6e0000de6e0000e06e0000e26e0000e46e0000e66e0000e86e0000ea6e0000ec6e0000ee6e0000f06e0000f26e0000f46e0000f66e0000f86e0000fa6e0000fc6e0000fe6e0000006f0000026f0000046f0000066f0000086f00000a6f00000c6f00000e6f0000106f0000126f0000146f0000166f0000186f00001a6f00001c6f00001e6f0000206f0000226f0000246f0000266f0000286f00002a6f00002c6f00002e6f0000306f0000326f0000346f0000386f00003a6f00003c6f00003e6f0000406f0000426f0000446f0000466f0000486f00004a6f00004c6f00004e6f0000506f0000526f0000546f0000566f0000586f00005a6f00005c6f00005e6f0000606f0000626f0000646f0000666f0000686f00006a6f00006c6f00006e6f0000706f0000726f0000746f0000766f0000786f00007a6f00007c6f00007e6f0000806f0000826f0000846f0000866f0000886f00008a6f00008c6f00008e6f0000906f0000926f0000946f0000966f0000986f00009a6f00009c6f00009e6f0000a06f0000a26f0000a46f0000a66f0000a86f0000aa6f0000ac6f0000ae6f0000b06f0000b26f0000b46f0000b66f0000b86f0000ba6f0000bc6f0000be6f0000c06f0000c26f0000c46f0000c66f0000c86f0000ca6f0000cc6f0000ce6f0000d06f0000d26f0000d46f0000d66f0000d86f0000da6f0000dc6f0000de6f0000e06f0000e26f0000e46f0000e66f0000e86f0000ea6f0000ec6f0000ee6f0000f26f0000f46f0000f66f0000f86f0000fa6f0000fc6f0000fe6f000000700000027000000470000006700000087000000a7000000c7000000e70000010700000127000001470000016700000187000001a7000001c7000001e7000002070000022700000247000002c700000307000003270000034700000387000003a7000003c7000003e7000004070000042700000447000000e720000287200002a7200003a720000507200005a7200005c7200005e7200006272000070720000ec7300003e75000028760000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Sirenix - m_OriginalName: Sirenix + m_Name: Entry + m_OriginalName: Entry m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 30278 + m_UserData: 28102 m_IsWaitingForDelay: 0 m_IsRenaming: 0 m_OriginalEventType: 0 @@ -1379,9 +1379,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1074 - y: 73 - width: 845 + x: 1354 + y: 19 + width: 566 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1396,7 +1396,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 469 + m_CachedPref: 254 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1