From 594e287721cdf307c817bff2c5b32e508abee5ae Mon Sep 17 00:00:00 2001 From: pharan Date: Thu, 13 Dec 2018 05:30:39 +0800 Subject: [PATCH] [unity] Minor formatting. --- .../spine-unity/Editor/SkeletonBakingWindow.cs | 2 +- .../spine-unity/Editor/SpineEditorUtilities.cs | 6 +++--- .../Default Match All Animations.asset | Bin 4196 -> 405 bytes .../Default BlendModeMaterials.asset | Bin 4232 -> 701 bytes .../Shaders/BlendModes/SkeletonPMAAdditive.mat | Bin 4404 -> 938 bytes 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonBakingWindow.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonBakingWindow.cs index 56c0c2497..191424545 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonBakingWindow.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonBakingWindow.cs @@ -1,4 +1,4 @@ -/****************************************************************************** +/****************************************************************************** * Spine Runtimes Software License v2.5 * * Copyright (c) 2013-2016, Esoteric Software diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs index 9904a9da9..02f735b70 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs @@ -188,8 +188,8 @@ namespace Spine.Unity.Editor { Preferences.Load(); - var assets = AssetDatabase.FindAssets("t:script SpineEditorUtilities"); - var assetPath = AssetDatabase.GUIDToAssetPath(assets[0]); + string[] assets = AssetDatabase.FindAssets("t:script SpineEditorUtilities"); + string assetPath = AssetDatabase.GUIDToAssetPath(assets[0]); editorPath = Path.GetDirectoryName(assetPath).Replace("\\", "/"); editorGUIPath = editorPath + "/GUI"; @@ -2121,7 +2121,7 @@ namespace Spine.Unity.Editor { float firstScale = 0.08f * scale; Handles.DrawSolidDisc(pos, normal, firstScale); const float Thickness = 0.03f; - float secondScale = firstScale - (Thickness * SpineHandles.handleScale * scale); + float secondScale = firstScale - (Thickness * SpineHandles.handleScale * scale); if (secondScale > 0f) { Handles.color = new Color(0.3f, 0.3f, 0.3f, 0.5f); diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/AnimationMatchModifier/Default Match All Animations.asset b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/AnimationMatchModifier/Default Match All Animations.asset index 91c8391fa5f0eae86edb78357157ca09af704c80..4f0bab3f74bfbd775ebd667db62cc95818003778 100644 GIT binary patch literal 405 zcmZ{gF>iw~5QTSs#brn*h-`2~@J5?7MJjEicIi|ZY!g?;M8;H#s{Z#HG6X5=4Ib{j z@ARIRA9?uH?Y`x`o<|&L5)-Zjm?^!GU zV|RvCT5t+@I<@182m#QRn2xp{{XETmPQ9J`)}6jAyPfl2YtH+xjs5IG&%QjKzK66$ zbY2n{)SugT@`qIp5N_4V?#=52}axab4$np9?xbozJ1e_1$0%2t__T z0q1k^nWOsa*!NuRI}FZEz!AOvq+}u2_Z{hTL65QT2k5Z>e5=Bj`62^9xiiOwlgKl- zr2Zt0pSYO~|6< zFFtaRt*T;pPNE;%pCplqe@@Ds-Q-&SaQ62*Z|7lxe>~HS1I7X4fN{V$U>q3U>jk7TK}$sCVUEi9#jVutH;dT#Vc#N}Ng+;@@#vK!plH7M9|< zGxyw)j~=J<8^TW5;OJp`MTXsw1X#+hbYa8IiLO?ogfb=vsPSC-+C`fP#%pWY&+`0xKK3*6!*Gub=aHCSh`IzBFoP8-HD=VQh-+4fDj@pAO{r4 zdl@Jkk+7*z622q8jYN{1$7r1o1a-#&_0XBS~M2U9R?< zPyGX~Y9D*|02B6&FXhTc4$g8zd13@Bv}H+}n5?iVGjGOn6P~-(wT&GrBiaZzTp+y~c KH2vYzKdg7xGSzEZ$u>m+1KOP^bB;aqO(O?Wgm1C$JUN|z>T}alxO+0^4%*;=HUhUBmXQ!-Jk=*;A z*1LTe_5>>}>15yx0yrqq;Hw?t3|<7md5v=&ZXCrDr}7c`Mr;FE1rNYi)Yyt+iVsRW zjyijByw08TbZP-`-nu$#qnCCUr zq5MLmfkK`S7m?F-(KUPd7jWMtci%4LR2VuU=ikkl;PSpJ1IXs>v z&`+ww@rDCS5)X3y2(F=gdWiEHgew?(3oDI#eJ=C|T>UM?9f$I4((falB;Kq~_Y;?L zF6(deIfFykKY^9J*^ZS;s}DOk6I}LTr_Y5B?!k2;*ivcL*~MAA&TgLzodS+2pFLQq zwCd3FD0~ZmoKMu};&~W%$1!Z_!OCXs>gi$4u*=oqd$wM(jB@D=6tAB%O#MO{JK4Nl zzz&bwpUK;L)ySI|amTcciaF+yoL;P$I1AQ|s;-yXa9+bbj8VOPqJk=^mRWu&ko@tI zvgBpbZN)VLERM}`LeC7uLeHk>zl@}7_m{q3h59nRtoT>*r+(^oSAS-FC3c|ryKj|V zZGge>o@aw42cezdP&QaHUDs7QM5SAM?+EGrz3&ar!#}s Gr^$a=`pq=} diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/SkeletonPMAAdditive.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/SkeletonPMAAdditive.mat index 32fce15a1a72db00439999ac4185483525e5a17a..f40488ba74ed9748ee9453a24422bef5bb6a88d1 100644 GIT binary patch literal 938 zcmcIjO>f&U487-9sE6)k2UhHS)EEW?>BoZATRH~?hG7Vph<3Euk|E1!vts|fl-vy& z*6VZ-3_gOgkm*F&4v}u7gp;c{&Kg(4iyF-i&zU z&L9JeMnaVi7;F8P{E6ZoO)IrZ*@VLN=F|2&?(BOh@VbJsO1zvVw#L*W0Ayhv=hJ+j3)uJ$AhP%uo!0RuA>v7{=edFXIFP;UfeG$U*ofm;`@>5Zj#bS4?7Z&V?uvg|+dmeGBK^)83x3 zyA=o;3W}77f(8m2K>PzpG)O_Bac3bR(IG{m0vaFBGqX3`obC^xxUpXE%x`C(c|Ue% z*A^KLMUIXOeu>ct(DO#z~AhKikDeq4ONZ zccte#Iv-~w`7zbWcg^qCp?`XQM!I!|40q%r^uLA<{pT7^!fP_lS@=UEr_WA_JgfXX zfotgJA#!C|S;gFUVH_Ve+!1KV42<#8*r0F4dyit8cl&w7aP8+3#`Nc293@fnEk9Ys zetsS$S7!Tpzu~%GH!x;g55U-1$IDo$rurfeD*7M)Fy-ntDQV99-vX!3F&G?PuP~!}BT6;_Of8@5AWl3pl2Js`}nZ`HO~Ut#wZu zp0n0{i5!h}?5^)9VWRzHT%G#9Yz;ht4_VD8= zKX16!83CuxYlaU=x6Xwg-qD#dJfrG$3OcOgG*Q#?^(ql2NQ8M%&ynG;dvD=>y-mrfU$93P0-Qd!}>A+kHQbs!f2){$?%SavO_vca!6Vz`Y5npc%Wtx*u#_cd>2|^VEFU!l{a1 z^{PwD7|*quakzEW3$Vy)%WHYkj3Zof&D~sa8&dU~l&b2r%WkvjHRbKVk9W&a*zlrw zw^H-G7(x|y+pDI~$E2;bYu?U6u$@lV15M*rUo!$sY}@9~rosP4qU$mf6U{j>DJ-gtI@mzd=dEDo_?3jsIMXAE5Ak9_zkIh`fvJS45orG@bNlU z-;kY?>X_j3k)|8JW7k$(Kfrsq!}QUf$5&=Q-638-*NVf94f*-@?P>bHR*55*Ummmd oM$KIg8m(AK^8XF}G*-_zCBCO`+`2Q#{~4^QS3EE2_@Iyf0=q-uq5uE@