From 0f8bb5f1f67f6a97793d19e15367bb2c75849c4c Mon Sep 17 00:00:00 2001 From: PopSlime Date: Tue, 15 Nov 2022 13:30:40 +0800 Subject: [PATCH] Fix and add popup. --- Assets/Cryville/Common/Unity/Popup.cs | 11 ++++++++--- Assets/Menu.unity | Bin 133501 -> 134261 bytes 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Assets/Cryville/Common/Unity/Popup.cs b/Assets/Cryville/Common/Unity/Popup.cs index 2cd17f2..bb5fb1b 100644 --- a/Assets/Cryville/Common/Unity/Popup.cs +++ b/Assets/Cryville/Common/Unity/Popup.cs @@ -10,6 +10,11 @@ namespace Cryville.Common.Unity { float timer = 0; + const float DURATION = 5.0f; + const float DURIN = 0.4f; + const float DUROUT = 0.4f; + const float HEIGHT = 50f; + #pragma warning disable IDE0051 void Start() { layout = GetComponent(); @@ -19,9 +24,9 @@ namespace Cryville.Common.Unity { } void Update() { - if (timer <= 0.8f) layout.minHeight = timer * 50; - else if (timer >= 5f) GameObject.Destroy(gameObject); - else if (timer >= 4.2f) layout.minHeight = (300 - timer) * 50; + if (timer <= DURIN) layout.minHeight = timer / DURIN * HEIGHT; + else if (timer >= DURATION) GameObject.Destroy(gameObject); + else if (timer >= DURATION - DUROUT) layout.minHeight = (DURATION - timer) / DUROUT * HEIGHT; timer += Time.deltaTime; } #pragma warning restore IDE0051 diff --git a/Assets/Menu.unity b/Assets/Menu.unity index b81e425a165d1692ff75af32b2c6096e712a1c09..4c700bff0933903ab2173e462033949259c6d24b 100644 GIT binary patch delta 5814 zcmY+H4RBP|702JhR2B#{!KNfYNP@_h2pbf;j7XP{frJpcksyl#*#sy-A#5N(0G-`v z(5-+Zgm@RBkW_(aQ8r@DwjyqTPBX1DU8G77I}-{WGo5xCRA|Op>^b-TPqw`?XYbzM z|J--($GPw0Kl>fG!j8Hh4lO)xap{-5Mb~y=SL^uv57RQIAFepJt?kPE+Yozf!#C&OALH>< zZJIG=@tUftbrowjdrB+Tte}K-=>%D|)GGMH81ewE{-!L&>> z-6B*CCR+p9tBP2TJZ$7! z{$z&U)QDEi zI58^0z2Gv|P2ef2lrEQ%H`{cpp^8`eO6aaBOya7Z}e#&7aREoRlI5=AV*a$%l;)s=EF6BEE95zDrMR6xRGU9GD>FZd<&_1 zmYqwDEXy*zy;$c@lWNzp*T}LZk3jBLH(Bm@!pO2Ek3#mToQFvcKWXG=sp4gEEU(bn zm#&Ifjx9HG2UUDy90)n2YP7t<$g-$w=KOgs6WVW<9VJFCriu^zTF5?ijpRTWvh3K$ z{m<*{^Y~1+T~zUyE`fJ~O9K1}JXmV{YpLSX`3bnA%y3!uoI_tMVB$7BU~QoW2N(?@ ziVm`rW5NBaxEpmO%OWeCbX+HT1Y8bk8MtdTIZ=`8tOD-=Hxmw6)@leXYfJ|jY1fe{ z`Yd#TA0(LvdJR1IQ{x|_iu3I+;O@1C%Yt7A4}(h*++a@eEoZsuAc6mi4&~rYwq<3L zOJ+fVK0l79jK6HnDDXOP*_teH*VD#d0%wEAiF15Q0)KGyjtRh7PNk8IXM7gC30#)+ zLvZf~_D(z=W8e|+I8EROq_=|yH)?l&7zgyz_#6b6-v~0G?N^iZEx`{i1KI)Zs5JgE zx4^Tj4DX~W zmF%`$2VAaytoL4hGjj&Em=29p@lqd$&;c$1PJsKj8vl=|8cNmz?%rm&%4=B3)Yw5E#MOPD{vnl3o1G; z@Bg4De(Pfph9H5H!N#$pzcL8D5M-o>?t4=Y$oZP- zz;{kQeuu%M;CPx@N5Dg`8-F)dS!7M%9pG~P&Opg;R%_Q|`qx@R6$iKqUJf23#xuT? za-LnR@yGesvUZWN|99XKa5)`Ts`2-pVDH4ax4{D`>`6sN4_MB zN#0H1J>ar(o0(I5E6k52Dju@2WL4qB75h0) z^KasK&j*ha=lFe}NO=%KJS8eT;K5}1;I3aWwJbSK3&88ZWk3bsdG8s28PLl7gIk#d z!D+bydT&Y~^g@V{6YsGPJlaMLD&=J3$TIz3Jj3m5j!31EjQ4mHcobZgIt$$QYxYhg zX|_LLE)<0zUn)815PIKqkeQ7Jcb_p_W)}1e(r=N~;BqW$z^xCAzYOSk@Rke+5}+1> z?`+%9dG?LFRZ5}lXuG}8-Z3%h#rajklwE8)+YWEDFHBRxBHNKG-{pLL`R3;T@?HKt z`agiov(dlBzi{2=Dph&NUYx|A`6^Owy9UU+(A~-|v@_J5OZEbzdiL1aD!bB7SFtDU zB-ONte&QGG8G1;@#lO^cwUxhR$0ykR)vQMQ9<}hYJtK+7q=J|2Dt1j$hp*TvZAqQ> H_T2vhnaZOc delta 5505 zcmY+IdvMg%702%n8Q939!HT94LIMZ@Q4$nbD3y(&vLT2Y3AnUE9z-V~k3<1i!0tw{ z4f5I$=nZ0FV|hdeWn(PaT9k$AG&ALo&`#TJv@_w+n&~*x1jX*ysrHrw_i^t1{ld)_*MASV!gt-V_(R2IP{vE9b{6-y=a-zntLfaytE*xYW@k^_rw8qr zGj$@Vr&WhDf9-7@0~fO#y(GgaZa)3dnvS_2zfe7Bk<)p0vNL1oluhJ!H`#`3uVizF zp{e{!HQ5ld=7oRErAjG1YPxgx_Zsgr52}r-p=5_37w96E)%{kUNmT~fn3enUn7DO4 z%L&Nu5#rW4ki)u_<-P~lSE+T5Qg>3F3)!zPvz%FIR3)8H|NRq_n0U2QKyo+aI3e!5 z5OP=-vfMX=7?nD*EV9baPfX@#zpi3A`5-?iB}1!*9Mw%M*K$xQ61xU+L|xkRR()nV@30=l=!5k|`sTx7H1ahx#Ai2ah z*UGI_4JMnvwa@Hf5?p5F0gry)`pa00z+L(ZcNd>$Wf@GdbO$b@So)`VW;fe@VEtdA zio=(KQ%207!6zQJvY#qWu;nSap5@qlD>qTatv4=RZ+i9VR+f_#AAtr6Qon_zS{6Lvc#*6As$yZpe^s$&u^$)sE znfz?gqh^wvUuI=VtMib1brH*fC#)sfX$wXzH?yXUOQ?k?TRa+H&jN{q}! zHU@I7zRYrD8H-9iMV3RBRq?RRAMMN{IkcQbnkO0G0NIf9bs@_wPqL_##GZShyojIk zbrs9KydG3!zvn@Y>n4`{Ken<=Z0J)POnQa&1(q{;OjIOx2IQC?U^%qX%F?=~_-`ir zVmfa&$=+2~mPLIAveIQF2mKYdwyuR72AAc^JM!5g_ViX-|IJi!0*nWbgG-o6;DIXZ z@1bfOS=F?YrA%U$2UP<-a7Wb;Jk>0xFSOO*NpKlZ4S005^_S`Q9-VGdxDWg=$=v@H z@WvYJAE#=l3MzFKg7;}FaGvl*dks7S-a>3R*>!ODGxR`30{60Zt?*m`lhFE;Bm`-VH7RPJstD*?uljbq84+xHq`j3No`dA*d~uOW^X` z%gpuW2A3pS1|A2Oz{|mFU$Fh`r0O2BC&Bx{gS^!I^4wi<+63?h=z)sdWP899;5-Aq z0QZ8oy~y6_QxFF41?L^gB5MNoZDntzYRU3=|Fd1~CU6Xb1ilB{yUqBgZoe_${ouVw z(y`#(_Tx2`q&eV?Ke7GDimpkxmYMvILy(JNtr6%ej?X3)S<+|0T_J;0r)Hh_gAX2L zPtAJp+Lx_=j4Bt|2JqY+^uRG>MA-{MG$ML=vOp!Z65xH{GN3WwVcuLSezMVIW5pj_ z0_T87IC-dW++YU%yj{A&yxtNJWF_7K5B!wf(^v8t@PeONE?FG~SB;i?s2WGs4(;QNOTxQTL0eG*d$OOLp=Q%ThI`BiJ@dR#y zyY{g+MUUU$sgfB*M~Glbq_{L zQSeI~pGR~QLg)?Kz(dtIvIuw_TmmF2-sh`9CBdJjfAjhN1ibQ>tSS{J=8W3gBee^%}b1|P^dsJjV3&Fd<<$Qa= zL+@ID?rsEG33x$=<#L)9fj1K8_^IPm3c3JQ#33nyGz0$JObJI^9#8Av&+ed0cPran^Ny-s9{l{2xDhOh^C#