From 12bbce33e86e3aa8dcc221cdc9461da0feb07779 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Thu, 30 Mar 2023 16:56:41 +0800 Subject: [PATCH 1/6] Slider WIP --- Assets/Materials/UIMat_SliderBG.shmat | 8 ++ Assets/Materials/UIMat_SliderBG.shmat.shmeta | 3 + Assets/Materials/UIMat_Slider_SFX.shmat | 11 +++ .../Materials/UIMat_Slider_SFX.shmat.shmeta | 3 + Assets/Materials/UIMat_Slider_Textured.shmat | 6 +- Assets/Scenes/MainMenu.shade | 78 +++++++++++++----- Assets/Shaders/UI_Slider_Textured_FS.glsl | 18 ++-- .../Shaders/UI_Slider_Textured_FS.shshaderb | Bin 2717 -> 3225 bytes Assets/Texture/UI/slider_bg.dds | Bin 0 -> 87696 bytes Assets/Texture/UI/slider_bg.shtex | Bin 0 -> 87632 bytes Assets/Texture/UI/slider_bg.shtex.shmeta | 3 + Assets/Texture/UI/slider_fill_black.dds | Bin 0 -> 48320 bytes Assets/Texture/UI/slider_fill_black.shtex | Bin 0 -> 48216 bytes .../Texture/UI/slider_fill_black.shtex.shmeta | 3 + 14 files changed, 104 insertions(+), 29 deletions(-) create mode 100644 Assets/Materials/UIMat_SliderBG.shmat create mode 100644 Assets/Materials/UIMat_SliderBG.shmat.shmeta create mode 100644 Assets/Materials/UIMat_Slider_SFX.shmat create mode 100644 Assets/Materials/UIMat_Slider_SFX.shmat.shmeta create mode 100644 Assets/Texture/UI/slider_bg.dds create mode 100644 Assets/Texture/UI/slider_bg.shtex create mode 100644 Assets/Texture/UI/slider_bg.shtex.shmeta create mode 100644 Assets/Texture/UI/slider_fill_black.dds create mode 100644 Assets/Texture/UI/slider_fill_black.shtex create mode 100644 Assets/Texture/UI/slider_fill_black.shtex.shmeta diff --git a/Assets/Materials/UIMat_SliderBG.shmat b/Assets/Materials/UIMat_SliderBG.shmat new file mode 100644 index 00000000..2b41f3b3 --- /dev/null +++ b/Assets/Materials/UIMat_SliderBG.shmat @@ -0,0 +1,8 @@ +- VertexShader: 46580970 + FragmentShader: 35983630 + SubPass: UI + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 64816540 + data.alpha: 1 + data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UIMat_SliderBG.shmat.shmeta b/Assets/Materials/UIMat_SliderBG.shmat.shmeta new file mode 100644 index 00000000..bd447de8 --- /dev/null +++ b/Assets/Materials/UIMat_SliderBG.shmat.shmeta @@ -0,0 +1,3 @@ +Name: UIMat_SliderBG +ID: 117587364 +Type: 7 diff --git a/Assets/Materials/UIMat_Slider_SFX.shmat b/Assets/Materials/UIMat_Slider_SFX.shmat new file mode 100644 index 00000000..a3f3b506 --- /dev/null +++ b/Assets/Materials/UIMat_Slider_SFX.shmat @@ -0,0 +1,11 @@ +- VertexShader: 46580970 + FragmentShader: 43211183 + SubPass: UI + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 50370514 + data.alpha: 1 + data.beta: {x: 1, y: 1, z: 1} + data.sliderThreshold: 1 + data.sliderStartColor: {x: 0.949000001, y: 0.689999998, z: 0.211999997, w: 1} + data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1} \ No newline at end of file diff --git a/Assets/Materials/UIMat_Slider_SFX.shmat.shmeta b/Assets/Materials/UIMat_Slider_SFX.shmat.shmeta new file mode 100644 index 00000000..b6e88495 --- /dev/null +++ b/Assets/Materials/UIMat_Slider_SFX.shmat.shmeta @@ -0,0 +1,3 @@ +Name: UIMat_Slider_SFX +ID: 122820018 +Type: 7 diff --git a/Assets/Materials/UIMat_Slider_Textured.shmat b/Assets/Materials/UIMat_Slider_Textured.shmat index cb09a99e..ba0cc52e 100644 --- a/Assets/Materials/UIMat_Slider_Textured.shmat +++ b/Assets/Materials/UIMat_Slider_Textured.shmat @@ -3,7 +3,9 @@ SubPass: UI Properties: data.color: {x: 1, y: 1, z: 1, w: 1} - data.textureIndex: 51995224 + data.textureIndex: 50370514 data.alpha: 1 data.beta: {x: 1, y: 1, z: 1} - data.sliderThreshold: 1 \ No newline at end of file + data.sliderThreshold: 1 + data.sliderStartColor: {x: 0.254901886, y: 0.321500003, z: 0.909799993, w: 1} + data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1} \ No newline at end of file diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index c85eee83..708089eb 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -1,14 +1,14 @@ - NavData: 0 - EID: 0 Name: Main Menu Canvas - IsActive: true + IsActive: false NumberOfChildren: 3 Components: Canvas Component: Canvas Width: 1920 Canvas Height: 1080 Scale by canvas width: false - IsActive: true + IsActive: false Scripts: ~ - EID: 1 Name: BackGround @@ -38,7 +38,7 @@ Transform Component: Translate: {x: 0, y: 100, z: 0.300000012} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 600, y: 600, z: 1.18585491} + Scale: {x: 631.577454, y: 631.577454, z: 1.24826539} IsActive: true Renderable Component: Mesh: 141771688 @@ -258,7 +258,7 @@ Transform Component: Translate: {x: 450, y: 0, z: 0.400000006} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 400, y: 100, z: 1} + Scale: {x: 389.627228, y: 97.4068069, z: 0.974068105} IsActive: true Renderable Component: Mesh: 141771688 @@ -533,14 +533,14 @@ Enabled: true - EID: 19 Name: Options Canvas - IsActive: false + IsActive: true NumberOfChildren: 12 Components: Canvas Component: Canvas Width: 1920 Canvas Height: 1080 Scale by canvas width: false - IsActive: false + IsActive: true Scripts: - Type: SHADE_Scripting.UI.Options Enabled: true @@ -749,16 +749,16 @@ - EID: 29 Name: Master Volume Slider IsActive: true - NumberOfChildren: 0 + NumberOfChildren: 1 Components: Transform Component: Translate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1000, y: 75, z: 1} + Scale: {x: 1024, y: 64, z: 1} IsActive: true Renderable Component: Mesh: 141771688 - Material: 128676209 + Material: 127128823 IsActive: true Slider Component: Slider Value: 1 @@ -771,19 +771,39 @@ Clicked: false IsActive: true Scripts: ~ -- EID: 30 - Name: SFX Volume Slider +- EID: 437 + Name: Slider BG IsActive: true NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: -100, z: 0} + Translate: {x: 0, y: 0, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1000, y: 75, z: 1} + Scale: {x: 1.01999998, y: 1.20000005, z: 1} IsActive: true Renderable Component: Mesh: 141771688 - Material: 128676209 + Material: 117587364 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 30 + Name: SFX Volume Slider + IsActive: true + NumberOfChildren: 1 + Components: + Transform Component: + Translate: {x: 0, y: -100, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1024, y: 64, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 122820018 IsActive: true Slider Component: Slider Value: 1 @@ -796,6 +816,26 @@ Clicked: false IsActive: true Scripts: ~ +- EID: 436 + Name: Slider BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1.01999998, y: 1.20000005, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 117587364 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ - EID: 31 Name: BGM Volume Slider IsActive: true @@ -956,7 +996,7 @@ Material: 128676209 IsActive: true Slider Component: - Slider Value: 1 + Slider Value: 0.889483869 Min Value: 30 Max Value: 120 IsActive: true @@ -1142,7 +1182,7 @@ Scale: {x: 75, y: 75, z: 1} IsActive: true Text Renderer Component: - Text: 100 + Text: 60 Font: 174412429 Color: {x: 0, y: 0, z: 0, w: 1} Text Size: {x: 1, y: 1, z: 1} @@ -1504,14 +1544,14 @@ sceneID: 88928066 - EID: 450 Name: TransitionCanvas - IsActive: true + IsActive: false NumberOfChildren: 1 Components: Canvas Component: Canvas Width: 1920 Canvas Height: 1080 Scale by canvas width: false - IsActive: true + IsActive: false Scripts: ~ - EID: 65982 Name: Transition @@ -1535,6 +1575,6 @@ Scripts: - Type: SHADE_Scripting.UI.SceneFadeInOut Enabled: true - alphaValue: 1 + alphaValue: 0 fadeInTime: 0.5 fadeOutTime: 0.5 \ No newline at end of file diff --git a/Assets/Shaders/UI_Slider_Textured_FS.glsl b/Assets/Shaders/UI_Slider_Textured_FS.glsl index 9f7945ce..cddf57d9 100644 --- a/Assets/Shaders/UI_Slider_Textured_FS.glsl +++ b/Assets/Shaders/UI_Slider_Textured_FS.glsl @@ -42,19 +42,21 @@ layout(location = 1) out uint outEntityID; void main() { //fragColor = texture(textures[nonuniformEXT(MatProp.data[In2.materialIndex].textureIndex)], In.uv); - - if (In.uv.x > MatProp.data[In2.materialIndex].sliderThreshold) - fragColor = MatProp.data[In2.materialIndex].sliderBarColor; - else - //fragColor = (1.0f - In.uv.x) * MatProp.data[In2.materialIndex].sliderStartColor + In.uv.x * MatProp.data[In2.materialIndex].sliderEndColor; - fragColor = texture(textures[nonuniformEXT(MatProp.data[In2.materialIndex].textureIndex)], In.uv); - - + fragColor = texture(textures[nonuniformEXT(MatProp.data[In2.materialIndex].textureIndex)], In.uv); if (fragColor.a < 0.01f) { discard; } + if (In.uv.x > MatProp.data[In2.materialIndex].sliderThreshold) + fragColor = MatProp.data[In2.materialIndex].sliderBarColor; + + if (fragColor.xyz == vec3(0.0f, 0.0f, 0.0f)) + fragColor.xyz = MatProp.data[In2.materialIndex].sliderStartColor.xyz; + + + + fragColor.a = MatProp.data[In2.materialIndex].alpha; // fragColor.a = 1.0f; diff --git a/Assets/Shaders/UI_Slider_Textured_FS.shshaderb b/Assets/Shaders/UI_Slider_Textured_FS.shshaderb index db7f7c704737aea741a2ec4077088ba0b2eba44e..6b024f23be8fb76ec046b2747fb6350997024498 100644 GIT binary patch literal 3225 zcmZ9MZF3V<6vvk)Eu{z)pc-k5j9iwnp*?hOg? za{lAVg8$_Bui|6gsJFRs+h4o8Xc_&H7v~YtAiR zm?!m7uas9H_c8B~R~CnMf+)doNHi&$6}3g<^2e?QC6&~b=l!POvOKGGfBDvm-wV4z z8f2m0YX{9R^*aw9hK;QEe;=9DmLCU6s~@yNe{o^H8#Ep%&nS5qBk3glB--wzJN|e5 zAda@9FqM4_dv$%iT3_=U-LBuu_Ttcwqa^g3QL0MOZb+>>kMoO?M%-@>It=_jurmwt`|qz(NUf9=?rn6cf!%uB1LF#P7 z>hXEu>N`xMAg1{+%_63vM{JxX1L?3IJu912ddWMDL5Dgf@3?$6@QC8DF>e?#PvOg~ zanx#O^1}I`?}v*PiLq(y4P@IqY6%oR4AH!MF#*=ml(a0OKCP z$YXxQfK>)C?hI^RL|@0nM?^~^;_QC#;Z!v%SSgo_yJ8M{AfCHp4i3KTnOU(Rvx6eG zl=tyO0r-)_WNH<1Ip6Ex-qTiJU-GJRnqCpz~9 zM$H$UT+C3`>_t7(r=@e)1$%#0oSEo}ntWHx1`a3Z>*D0cMosithuIu&I352tolFkw z^!~PpyTd-`Wa?svzbhL1edh8>b+X`a;yw^@h`T6G9~Q?4(?Vkwa+reIS zcIIOCPsQ=2FYDumWX^e6uzxNBGa_zXIz3t(ecT?<>HD6DUTuC~vh~@LOe}uv6P@qH z_7h1a7W@0^o;bb>4nBVhVWwsMa^Gh}yaC?Q6?xLnOCs=P-6C&*Z;`i$54J(ySEOU# zbg>o5VC0_`KP%$Rg>^NgOP(b z@s0?Lw?Yo?hW|V8pXI~O-*Xu650tPgCwd-`DSH4%2(Ir?9!VYT4q`{u#dz25vLnk!&+!-8_&yDVh*5FW+}V1a9xJDcN>|&AvnC3Psqhr)|mf#CJx0 cbbPQ!;txgCvmE>nJ#skyZKwaMsV|ED1M%n+mH+?% literal 2717 zcmZ9M>2e!I5XUExlsF1;9C8stj2v?ZOfXIe03y8qqN_iEw0x+zZO`0`0(j+weSV?HY(bIu$WVv75R z3+4TzyMNJLH*==9{dv&(awizraX*Vjd71@LGO$mhWY3&7CyMv&Zm+vC&Ic=Nw{GHk z-c*VR_&#e+nW}DRKa3I-r$tvquZcbtEyy0d5)@ZaR>u6Q$5p*;cZ24WjbLm?VHV~# z7!SjN&4To+uWdgc|KCO`r4__svNs9$Y_PU^a}@T!k)JvIP)3p_lO)XO{dh8%HK@sAw$7SrIi*@S zCroY1AJ{D4PRGKikf|6mIrz_p`V*xX#zwCyMZY@gTus08(mf9I?JON_hIuF-Cksrl z$?em8lGzUPK_({l_z&aJFf6dro*3geQZILgnH>+)cp&?^!k+1sx?Ub;`NK3$GeOf> z)L80U$-rrS9<`}%Bg~wxrW`K{SKc;@!kFaMg2-xq0M8iY1x1F zHJ#+GB#-jL&ZcQACi}dIfzBhnqvxFE@|t4g1xEk89l3$c&0zE&Y+(lD4On9aqt{@3 zbmXB=Ry7;5F2cX>D>j_AY6hzmeA(mc;>m&c^n6Lg!Iu8a7kstgsnNgX+x0c`mR{kD z<7IqNGrm61{k;-|zc<6*pYqk>zW|@SIj^k9Yf1LRguf(?`Wm9kipl>4GQB~jhsfA2 zs(!vLY{0o2vf=L#|LE>InfZZTl>ChDhLdkN`HYj%(+~6<^vGum3A|d&3}582=)Na> zB17ci>6+?cX6(zNcxHo)pG&%_1B^V8nGcxH>pAfpYGv<OA|3&tsz5 zBJMNP;ic({}mDX2a3tgApfZt#3vRpeXLvJ zkH)$!44hcZ`i{uQLO0u=_np4y`o(_`82;G{{)gBdaPnhE_&);2hF$qkNBr6uv2f_MaQBX2s)rMFZ=q~se@u7-TeGp$vNvvNl zLblanh2mBbp-@QmAs`5rD%c%wDnyH44i~(1k?lfbbjQS|*MGLwm`Wuy*7RP#O+GSd%WjlL9-p$=r2lEW ze#|vx4VgmUq)j}~1Ag#8fDiDI{NU|Cek4DVAIXm%2;@idBl*$Wp(XRT1)wXZ_BcyhrQpSn`3cHD|iS?cukjz8~GOF8zO%VyQ8@ z{mj?8#l{q+zHgjqy3KFN_~Rdc_&9!QBl;I!5D8U?2l2=vfF9rjeDpXVUn&sD4_*-P z5k24sZwL5z8TeQ~WhY&P_2aGCn!De0CfD1`kuig>YQ28#L{_htFZTREy8iikzc#+< z_nD-`7u4&p1bFYlkG@ra=m9-s5l}gx2QLTsfFAGz`N0DLK9V2EkKPXCNAe^2@e=39 z+V~r@UnQpqjEN&-((CvC{d|CoFW8-58z<)z!axfCOT2x29{h6=pg%-^2p%{$=owq| zfF96;ivWIr2k^kTf&2gu-~l|iI3AQ5wb>(svx7>HIEtj6Ph8|@Qt!X_>e%iZba}BD zhV@g7=XViKg2ed`7Y^zZ6$E-f4_O4@1Ac%99tY$H@&oyi{(%Pq`H}oce)M*@BKfg# zX8!#Gg~s8n6EE-lUhDmGIgX?Hi_gyd(wNb>}$K*GtTVy;yR2pf1Zf9zViO>)FSxP@FPppDp zBm(dPUcdu*;35DI-~l{vZXiFx19$)rmKP67hwbE`J=ddKrT!eRH*5O0PWTnS;@8v* z_yHckLwE=e;h~EFJb(xAz`23`0X%>Qt;U1#x}EIFEUfyKwzbp4$t&m?J-3>k+1|{| z@(cgsU;Ka{Tm;|&Jb(wz4dh3701x0nd-EWv_w7`dMnQQ{8kw%!bJYJX9{58ekxt|b z@&$fyZlM1N58wejfCnxD@Bkjb1Lp?%2k>C|^FYS`Pu1*SU8-6=Ue>HF_|>VE{EJ`lD?ES)E&}iX9>4?V2Koo^03Jm3!I|%RW{#^Hn7G!@N{w@kzaM_Kk-VGn0DPY<-)EZ` z$oU7p`EYQ4OsR=KydaV!LOh5^76J4CAK;_M0r^saKz{IofRE_ma{ED`)4AcuE4L^0 zyj<^JSnn@vSND!SF)_MhLf>DkR4NC?WiY@u&;69FZ@53;avv`~-{X;dNxr1NK!3>t zf&LQxCGw-U1No8sNPZ+gdLWP=$&XU6+pfWZWPHDj@Q;UHJG{fy^JS^$7uNerwTE7t ze?CBxPHaA{ewdvPD5m2JxL-g`i2v{({ZpTg@Ph(@{)ra^d_)iU!P@~o!bkE0`OyP` z{78OWDnF+8=i4q7jq0T&BlWl6d0%q9Uh4gFb?^VH_m?^!uyDCG-PO-}_ayfdn6Ofb z>b7QAJ(+D!P$`Y*mJZ+Lwm1F$f#Dg~UTS|?u8~S7_y8a9gL4Dt+u#8_fCuovMF1Ya z19;%vK>q+9EPo!P^{`#7s@3C_*2}f)TswL3gSXQ9+C-H?W6cA{v+?;RzWD3;3+wlV z?WU1pe(dHox;2$zAkPaJd!{od&ke}7@6c@jl>V&~`da?_A|Iq$MX&f3UcsxC#zT8B z&a18+-)yim_pRyh?P<;D1H0}`@_9Lu>y7&E^OG+Ba_pUgE-!{*V7J`7QJ1>UTWRrP zf5?X}0*MQ_{_Mg*e_jQF9?(M;ftA1qyX8o(Uv@-yN%u$U`ybc8luMomP>$os1|Ju4 zH^qKA`uFmOhbkC&=mnwSARay(_yaxQhZf_bHP!saq3aH)i&eh%U=W)*=l9_od~*>{ zeV_*yjnps1gLt?I;1BrFYCJeJYbR^=T#ss4^?PV`x^8Eh>d@6Y(y?)qT=(_El)&6g`J9^!Wy|8vy_ zw|~~$T3s{tZuWe!Ak^h1SK$2K3O)WSP0#F)Iys###H+;5ro%sfU!eBN{R7$a`sMop zZGN&pkS7S~CtPTK;+q9`g~Z3^_vMe7RsML}yxC}OEXea7IsWaSe>vW!f9Op={^y0? zj@9gR`+OhA3%?DX?y*z;d8;Q*His2_^Ynii+b2%i$*wt{fBMhn8r9vL|NpP;(|^hp i**WiT&dy)IIXi#(S=+a2?)%T$_1g6R@2u^Z*Zv2;GTUtc literal 0 HcmV?d00001 diff --git a/Assets/Texture/UI/slider_bg.shtex b/Assets/Texture/UI/slider_bg.shtex new file mode 100644 index 0000000000000000000000000000000000000000..184df4ae6ffb89bd3fd75f9077e30de4e25da65f GIT binary patch literal 87632 zcmeI5Z-^ZA8OMLKdlT(R%|_gch}?>ymlr~lH$g$U@l8p%Dg)gueR&tqxdFxDciJB1i`)Y65LDf`tx~a=J|PdkzOSn zxxM`i%qG8^o!yydp6}=TduDz!Tlq!g+<{BHzGG7^BI}{ zCG)(@PS=g?{l&lEvt8*-ADY|$;-}urS2SYh-ND;_E+3V(<>PBpzg+aiq~9>xK5I=` zL#8-1X%i3f0X+mDzz6teWWDs(Rw?*?)rVB`hW5jsqd!`-Iae|qgv}sKYr;$-D2me zQr~wjb#3!|GXCf%96pYp3XuLqNC*uF@d)8SALIjifR6zP@DYE&AA=n5NBj|g++=@j zU-S#6I88V29w|NK2D9t!^~AaH=e1t{;apL#*Eg!~*Duf4|F+(5&F=qlIV4>O06c&P@W9ltIsJpy>`Ne?CCQ7aT3`O0)9`aisSLZ0`2*`NY>EfIr|5@W9ltIsQO=iLXTf-ojgWU}}K3 z@BkjbgYCtGTBo&gW_)E_>6Rvm)bp9j!;94WuRlL?^mbidt;TWtBIEfj1F|4-{=>q- zcn3`g@_~FPA^;!I13U;gz#s4j{E_}a00RDqKjM!;4mZRfJD1kpFHq^6eq`?VM?TSd zzg|z%r2V@mmOtw(Yg?}OM;xykd%TE0@wW)zpZF&{Fg2({kq_hp`Ct)15AXmUm>Td0 zcmNMJ;(>Qb>3&z!-Yue7~in#}$}K9kSAmd|W&A!hjp{i0v=fF3LY@Bkjb z15*S32oK-^Jm_y8Wc9vZ9MUK#4{B3OZGV;e-{OHjG!prQU*H$$!PG$i5gxz;cmNM9 z0`LGHzynhQ{R4Qg^?4xU{})^S>mkirJzn1Js+9IMv)}uZ$N$CX89iGB(DT;UGkUdb z#edN&dW8q@z#;$--~l`^HPAnR2k;pa=9|YQP`h0X%>Q@W3Jf58wejFg0wA{z3abqVu-SSL=nU>T^W2ZKdS0&gudnylx0}bOADf## zG^g*cHX4mLW@RwIM^FAITi+AiE+7mCVJs%*Zle)h)|6H68sOIAf zxL-g;i2l$Y{nKDa=s|%%|0E;?d?X*xLy!Y}gpc?G{uqFOKjM!Y`D1>6z8})0(R``N zNd3ou@?dtoUh4gN^Z51E`x~7PSiju6;pV#sk7f50xVX_s+P>v?{HoZVs8O5JEuGwF z+nfLXz~r*EH`-s8YoziCKEMa`U~1re8$5sq@BkiI1mFQYfCr`q`Umh}>+>M5hy6{O zwR*hrdbxG0wX;9I^>SWcyQER+?0ooKF+Sg=-~W34`ucr+yX&NwpSg3VZcU>a$@2nc zemhu_=LQtpcWPy9QU9+K`L*@)3qQznm3&37@CsgSHy-+vX<75y_~xS{rGL1A&|XqM zKm6<@lu5y(`)^=AtQ{dr9Y z@_~FPBCs9!;18TBjmeJaF6sVAegE&>&y=#~0o2np@zFb#(j947PX34VhliRl@GvBV zhJ$#7aG($J0X_5>AH8dq_fFjUhN@W8*Po11x9a>pe1mTm0nHEc!J?7tg?JDTivaq7 z552~NQ!9R<<*$xt4r~6NT3KrQW$xd%c=X!wWPA0<LksJKnm1R6&uHUZv!O_D9 zPh|HOL~&g82jrNRn~^Q=wf$pz;j={mKEr2tU}~Vh){i{M{M_xh&-{GJjs0c#(foNm ziTnWYwf6%oG*8&`e4=VY`U^GpcJp0ZU(X*n*BrDq`a)k8fqv8%`EN%beiGbEROZLi=&SnWc8iDTUB>_1yvO#>yL*~DXI?9wFBZkR z+?6Vv-`l3gf4k)~`=d(Er|;rbre`-0p1&_pd+wpb#q;{*_W^x*VJwm-2P|7_1+mMgNW-rrqWyMA|N?eZ&r UbjRxVU-7%O8NTm|A6V1=22yq05dZ)H literal 0 HcmV?d00001 diff --git a/Assets/Texture/UI/slider_bg.shtex.shmeta b/Assets/Texture/UI/slider_bg.shtex.shmeta new file mode 100644 index 00000000..833cf676 --- /dev/null +++ b/Assets/Texture/UI/slider_bg.shtex.shmeta @@ -0,0 +1,3 @@ +Name: slider_bg +ID: 64816540 +Type: 3 diff --git a/Assets/Texture/UI/slider_fill_black.dds b/Assets/Texture/UI/slider_fill_black.dds new file mode 100644 index 0000000000000000000000000000000000000000..2d6c96c048d037c03dd81e3834a9fed092b9197c GIT binary patch literal 48320 zcmeI4O=}ZT6o#kT+HQ&$U5a#E6a_)tv>O*utV$7Ax)4;FW^L*pP*Q(E>MzK`MK?mL zi+~_ZS5gp+J1bdS7XcB3X{ky}Kd$%Q$(fmksAvD@L} zAPD-^Kybl6emfcjm*3b8d+V|H@mp7JT(kG_t2h0=Km7>p!CreGyL)G3*XOBS_V#t` z>!_8kmz(v;^YSbe*UK;78I#s?#Z_Z(QtNopm1!OH`I1@$LJ#@_f4~EHkSG8T;UPSP zhwu;{It9oB^56jHfo_=dV`BTX4gC?(Md3z0nW-oC5f%tpNG$ z4M9K94_*QMfFH;Q@=*c-9>4>501tk{0~OD1Ett)ZayX3EBC}OPFA)TO!cX`K58y$f z06c_;@DLutLwM*EAP>j`@}O&Zpytg=#cUJ=zq++X|IvS4>pyt!?S|e0Ao3sn!e4j* z4-y67Av}bK@DLutL#u#}&5rN4o0%gQgJZdW98X@57vu$bL0*s-P66_OJRlFq1M+}8 zAP>kx&Ih`BJ}{$=DVX&k!LN!os^XT0|2b-Dy(k;JXf?n10dggw* zm-XrD`f$GNGk8=KTBynt(_gJo9V0IgA?Sy_6O(xe)(8GF*JV0 z&+rT$z=K2qcnA;SAv}bK@X#snk9ja1dz|)5J1K2ePd>}8pNGTq<^22|bj;^_t&7oU zHoV(6wV$uAj>wzaN8K{j%-nW|`}=aosnLUe$Qc5Ez=vErz(@E9A9IF)kMJ?q4)75^ o!pEE;;NySANBjTWO*)L*Wm0pdb|SZ2DmwEpz4-0+?{Oag1sSeH&Hw-a literal 0 HcmV?d00001 diff --git a/Assets/Texture/UI/slider_fill_black.shtex b/Assets/Texture/UI/slider_fill_black.shtex new file mode 100644 index 0000000000000000000000000000000000000000..eb0ebf6e2e1002bd10ab7dc8554eb81770ef63a6 GIT binary patch literal 48216 zcmeI5PiqrF7{<41)Jt*Dqe$07Q4qw7y?BTxzl2KDoK5`%l6v%%_z80G;6-Tl5D&+~hBvPpaMRTOg7<-XfryFj}=cwdIW)TQI@CW&T z2k;^Hw-7>h|5u`qzBBo$dPi!lpbv zI$%9MxjnYeKfh4z$@5j`V=H_;^5oPg_6K^P2Yw(A!b^An58wejfCpm*SbupS;s^ZT z6(A4f!73m;P`cbN2eVy&&vqY<)@A$T`n-~zKffW{mEPz$L1pIn)2V?T_+hL7yd@9t zfPN4l!UK2!58wej$P|Ew@DLsznun@W-)aT=`Omk%D9*pz_4@Ls*Xf?%hV{9R+oAPF zKlF17kf*T%^tTTLe!vf20rEf|=m+{y3IQI#19$)re!&BkJ{_%_;d|K}C)HIkSPEU;UPSPhwu;{ItAzh`hY%|S|6x2)32M|vfx+uw(%eSo0|XNy^kAu z3xMc<_zQpG0X)bQfQRr99>PO-2oJ3SIyL*g-)@@6u0ASdAv}bK@DLtOg@;XTOxf(riQFpLZJ4+B`Tn{HLLbpb^bvgo52n&beBQ?6 zmb{TS^5zua_>1E&j=$&w`oJp?C+6E+eb^B>RC;T9uu#1%GrZ*Z$ti#z#tLx!-~)jl z@Pk)?Jdg+afqs-ifCumZ9>4>5kSTD)JY3X`2Opl#c17OF|Lnd;|M>B zAV<7Ecz*KX?Vm19`9tz=MC22X@DvzWnaVrDFf) zx3U|h{c}9uUh1}M`FdXIoilsitNFa5U0fQ&{8{kB2||9v5cmNASdAv}bK z@DLutL#F_J@L%`AO6q_8Q-TAf&EVYQ;{16$zg7#^-;?Lle|N4V3&rByzNr0tedD^k zxc#YnrcuDz-r@WiY-dIf{160!e87jm4)75^!p9&G@DV-+c7TuY5k3ZifRBF^AMM|B fH~C`R?k2TrT4#gZrIL&H@{`~0{)zMD2hBeK$mc&< literal 0 HcmV?d00001 diff --git a/Assets/Texture/UI/slider_fill_black.shtex.shmeta b/Assets/Texture/UI/slider_fill_black.shtex.shmeta new file mode 100644 index 00000000..4f9bc718 --- /dev/null +++ b/Assets/Texture/UI/slider_fill_black.shtex.shmeta @@ -0,0 +1,3 @@ +Name: slider_fill_black +ID: 50370514 +Type: 3 From c2a8c86483fe86f6544d17f10728d6bb3b1e3303 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Thu, 30 Mar 2023 17:09:18 +0800 Subject: [PATCH 2/6] Slider textures updated --- Assets/Materials/UIMat_Slider_BGM.shmat | 11 ++++ .../Materials/UIMat_Slider_BGM.shmat.shmeta | 3 + Assets/Materials/UIMat_Slider_FOV.shmat | 11 ++++ .../Materials/UIMat_Slider_FOV.shmat.shmeta | 3 + Assets/Scenes/MainMenu.shade | 64 +++++++++++++++---- 5 files changed, 80 insertions(+), 12 deletions(-) create mode 100644 Assets/Materials/UIMat_Slider_BGM.shmat create mode 100644 Assets/Materials/UIMat_Slider_BGM.shmat.shmeta create mode 100644 Assets/Materials/UIMat_Slider_FOV.shmat create mode 100644 Assets/Materials/UIMat_Slider_FOV.shmat.shmeta diff --git a/Assets/Materials/UIMat_Slider_BGM.shmat b/Assets/Materials/UIMat_Slider_BGM.shmat new file mode 100644 index 00000000..5ca73ad4 --- /dev/null +++ b/Assets/Materials/UIMat_Slider_BGM.shmat @@ -0,0 +1,11 @@ +- VertexShader: 46580970 + FragmentShader: 43211183 + SubPass: UI + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 50370514 + data.alpha: 1 + data.beta: {x: 1, y: 1, z: 1} + data.sliderThreshold: 1 + data.sliderStartColor: {x: 0.36500001, y: 0.783999979, z: 0.878000021, w: 1} + data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1} \ No newline at end of file diff --git a/Assets/Materials/UIMat_Slider_BGM.shmat.shmeta b/Assets/Materials/UIMat_Slider_BGM.shmat.shmeta new file mode 100644 index 00000000..bca563e0 --- /dev/null +++ b/Assets/Materials/UIMat_Slider_BGM.shmat.shmeta @@ -0,0 +1,3 @@ +Name: UIMat_Slider_BGM +ID: 129354037 +Type: 7 diff --git a/Assets/Materials/UIMat_Slider_FOV.shmat b/Assets/Materials/UIMat_Slider_FOV.shmat new file mode 100644 index 00000000..bc121a46 --- /dev/null +++ b/Assets/Materials/UIMat_Slider_FOV.shmat @@ -0,0 +1,11 @@ +- VertexShader: 46580970 + FragmentShader: 43211183 + SubPass: UI + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 50370514 + data.alpha: 1 + data.beta: {x: 1, y: 1, z: 1} + data.sliderThreshold: 1 + data.sliderStartColor: {x: 0.624000013, y: 0.211999997, z: 0.949000001, w: 1} + data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1} \ No newline at end of file diff --git a/Assets/Materials/UIMat_Slider_FOV.shmat.shmeta b/Assets/Materials/UIMat_Slider_FOV.shmat.shmeta new file mode 100644 index 00000000..86114830 --- /dev/null +++ b/Assets/Materials/UIMat_Slider_FOV.shmat.shmeta @@ -0,0 +1,3 @@ +Name: UIMat_Slider_FOV +ID: 117651669 +Type: 7 diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index 708089eb..64904465 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -1,14 +1,14 @@ - NavData: 0 - EID: 0 Name: Main Menu Canvas - IsActive: false + IsActive: true NumberOfChildren: 3 Components: Canvas Component: Canvas Width: 1920 Canvas Height: 1080 Scale by canvas width: false - IsActive: false + IsActive: true Scripts: ~ - EID: 1 Name: BackGround @@ -533,14 +533,14 @@ Enabled: true - EID: 19 Name: Options Canvas - IsActive: true + IsActive: false NumberOfChildren: 12 Components: Canvas Component: Canvas Width: 1920 Canvas Height: 1080 Scale by canvas width: false - IsActive: true + IsActive: false Scripts: - Type: SHADE_Scripting.UI.Options Enabled: true @@ -779,7 +779,7 @@ Transform Component: Translate: {x: 0, y: 0, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1.01999998, y: 1.20000005, z: 1} + Scale: {x: 1.02499998, y: 1.25, z: 1} IsActive: true Renderable Component: Mesh: 141771688 @@ -824,7 +824,7 @@ Transform Component: Translate: {x: 0, y: 0, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1.01999998, y: 1.20000005, z: 1} + Scale: {x: 1.02499998, y: 1.25, z: 1} IsActive: true Renderable Component: Mesh: 141771688 @@ -839,16 +839,16 @@ - EID: 31 Name: BGM Volume Slider IsActive: true - NumberOfChildren: 0 + NumberOfChildren: 1 Components: Transform Component: Translate: {x: 0, y: -200, z: 0} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1000, y: 75, z: 1} + Scale: {x: 1024, y: 64, z: 1} IsActive: true Renderable Component: Mesh: 141771688 - Material: 128676209 + Material: 129354037 IsActive: true Slider Component: Slider Value: 1 @@ -861,6 +861,26 @@ Clicked: false IsActive: true Scripts: ~ +- EID: 435 + Name: Slider BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1.02499998, y: 1.25, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 117587364 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ - EID: 32 Name: Camera Title Text IsActive: true @@ -984,16 +1004,16 @@ - EID: 37 Name: FOV Slider IsActive: true - NumberOfChildren: 0 + NumberOfChildren: 1 Components: Transform Component: Translate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1000, y: 75, z: 1} + Scale: {x: 1024, y: 64, z: 1} IsActive: true Renderable Component: Mesh: 141771688 - Material: 128676209 + Material: 117651669 IsActive: true Slider Component: Slider Value: 0.889483869 @@ -1006,6 +1026,26 @@ Clicked: false IsActive: true Scripts: ~ +- EID: 434 + Name: Slider BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1.02499998, y: 1.25, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 117587364 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ - EID: 448 Name: Invert X Toggle Button IsActive: true From b123cd83f85416bfe7f1d6ee2b16ca896d3266f1 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Fri, 31 Mar 2023 14:14:44 +0800 Subject: [PATCH 3/6] Updated Main menu with correct slider scale and added fx for buttons --- Assets/Scenes/MainMenu.shade | 56 ++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 8 deletions(-) diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index 64904465..7e624cd3 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -754,7 +754,7 @@ Transform Component: Translate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1024, y: 64, z: 1} + Scale: {x: 1004, y: 46, z: 1} IsActive: true Renderable Component: Mesh: 141771688 @@ -779,7 +779,7 @@ Transform Component: Translate: {x: 0, y: 0, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1.02499998, y: 1.25, z: 1} + Scale: {x: 1.01992035, y: 1.39130437, z: 1} IsActive: true Renderable Component: Mesh: 141771688 @@ -799,7 +799,7 @@ Transform Component: Translate: {x: 0, y: -100, z: 0} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1024, y: 64, z: 1} + Scale: {x: 1004, y: 46, z: 1} IsActive: true Renderable Component: Mesh: 141771688 @@ -824,7 +824,7 @@ Transform Component: Translate: {x: 0, y: 0, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1.02499998, y: 1.25, z: 1} + Scale: {x: 1.01992035, y: 1.39130437, z: 1} IsActive: true Renderable Component: Mesh: 141771688 @@ -844,7 +844,7 @@ Transform Component: Translate: {x: 0, y: -200, z: 0} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1024, y: 64, z: 1} + Scale: {x: 1004, y: 46, z: 1} IsActive: true Renderable Component: Mesh: 141771688 @@ -869,7 +869,7 @@ Transform Component: Translate: {x: 0, y: 0, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1.02499998, y: 1.25, z: 1} + Scale: {x: 1.01992035, y: 1.39130437, z: 1} IsActive: true Renderable Component: Mesh: 141771688 @@ -1009,7 +1009,7 @@ Transform Component: Translate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1024, y: 64, z: 1} + Scale: {x: 1004, y: 46, z: 1} IsActive: true Renderable Component: Mesh: 141771688 @@ -1034,7 +1034,7 @@ Transform Component: Translate: {x: 0, y: 0, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1.02499998, y: 1.25, z: 1} + Scale: {x: 1.01992035, y: 1.39130437, z: 1} IsActive: true Renderable Component: Mesh: 141771688 @@ -1075,6 +1075,14 @@ Enabled: true inverseX: true inverseY: false + - Type: SHADE_Scripting.UI.ButtonFX + Enabled: true + onHoverEnterSound: event:/UI/botton_hover + onHoverExitSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail + hoverScale: 1.25 + clickScale: 0.899999976 - EID: 445 Name: Invert Y Toggle Button IsActive: true @@ -1104,6 +1112,14 @@ Enabled: true inverseX: false inverseY: true + - Type: SHADE_Scripting.UI.ButtonFX + Enabled: true + onHoverEnterSound: event:/UI/botton_hover + onHoverExitSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail + hoverScale: 1.25 + clickScale: 0.899999976 - EID: 39 Name: Audio Slider Text Group IsActive: true @@ -1526,6 +1542,14 @@ - Type: ChangeSceneButton Enabled: true sceneID: 91947920 + - Type: SHADE_Scripting.UI.ButtonFX + Enabled: true + onHoverEnterSound: event:/UI/botton_hover + onHoverExitSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail + hoverScale: 1.10000002 + clickScale: 0.899999976 - EID: 439 Name: Level 2 Button IsActive: true @@ -1554,6 +1578,14 @@ - Type: ChangeSceneButton Enabled: true sceneID: 86098106 + - Type: SHADE_Scripting.UI.ButtonFX + Enabled: true + onHoverEnterSound: event:/UI/botton_hover + onHoverExitSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail + hoverScale: 1.10000002 + clickScale: 0.899999976 - EID: 438 Name: Level 3 Button IsActive: true @@ -1582,6 +1614,14 @@ - Type: ChangeSceneButton Enabled: true sceneID: 88928066 + - Type: SHADE_Scripting.UI.ButtonFX + Enabled: true + onHoverEnterSound: event:/UI/botton_hover + onHoverExitSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail + hoverScale: 1.10000002 + clickScale: 0.899999976 - EID: 450 Name: TransitionCanvas IsActive: false From 6ee619d26e2c8851996b698dcb043a2331c487e5 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Fri, 31 Mar 2023 14:18:09 +0800 Subject: [PATCH 4/6] Added Slider SFX --- Assets/Scenes/MainMenu.shade | 24 +++++++-- Assets/Scripts/UI/SC_SliderFX.cs | 70 +++++++++++++++++++++++++ Assets/Scripts/UI/SC_SliderFX.cs.shmeta | 3 ++ 3 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 Assets/Scripts/UI/SC_SliderFX.cs create mode 100644 Assets/Scripts/UI/SC_SliderFX.cs.shmeta diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index 7e624cd3..d3ddd940 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -770,7 +770,11 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ + Scripts: + - Type: SHADE_Scripting.UI.SliderFX + Enabled: true + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail - EID: 437 Name: Slider BG IsActive: true @@ -815,7 +819,11 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ + Scripts: + - Type: SHADE_Scripting.UI.SliderFX + Enabled: true + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail - EID: 436 Name: Slider BG IsActive: true @@ -860,7 +868,11 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ + Scripts: + - Type: SHADE_Scripting.UI.SliderFX + Enabled: true + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail - EID: 435 Name: Slider BG IsActive: true @@ -1025,7 +1037,11 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ + Scripts: + - Type: SHADE_Scripting.UI.SliderFX + Enabled: true + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail - EID: 434 Name: Slider BG IsActive: true diff --git a/Assets/Scripts/UI/SC_SliderFX.cs b/Assets/Scripts/UI/SC_SliderFX.cs new file mode 100644 index 00000000..f2c20dcd --- /dev/null +++ b/Assets/Scripts/UI/SC_SliderFX.cs @@ -0,0 +1,70 @@ +using SHADE; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SHADE_Scripting.UI +{ + public class SliderFX : Script + { + + public string onClickSound = "event:/UI/button_success"; + public string onReleaseSound = "event:/UI/button_fail"; + + + [NonSerialized] + private AudioClipHandler onClickACHandler; + [NonSerialized] + private AudioClipHandler onReleaseACHandler; + + + + protected override void awake() + { + + + if (onClickSound != "Empty") + onClickACHandler = SHADE.Audio.CreateAudioClip(onClickSound); + if (onReleaseSound != "Empty") + onReleaseACHandler = SHADE.Audio.CreateAudioClip(onReleaseSound); + } + + protected override void start() + { + + + Transform transform = GetComponent(); + if (transform == null) + return; + + UIElement ui = GetComponent(); + if (ui == null) + return; + + + ui.OnClick.RegisterAction(() => + { + if (onClickSound != "Empty") + onClickACHandler.Play(); + + }); + + ui.OnRelease.RegisterAction(() => + { + if (onReleaseSound != "Empty") + onReleaseACHandler.Play(); + + }); + + } + + protected override void update() + { + + } + + + } +} diff --git a/Assets/Scripts/UI/SC_SliderFX.cs.shmeta b/Assets/Scripts/UI/SC_SliderFX.cs.shmeta new file mode 100644 index 00000000..fdb814d0 --- /dev/null +++ b/Assets/Scripts/UI/SC_SliderFX.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_SliderFX +ID: 157251414 +Type: 9 From af9e523da95ad41753fb8970d3d7433d45e16665 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Fri, 31 Mar 2023 14:50:25 +0800 Subject: [PATCH 5/6] Gameplay UI Update --- Assets/Scenes/Level2.shade | 213 +++++++++++++++++++++- Assets/Scripts/Gameplay/SC_GameManager.cs | 2 +- Assets/Scripts/UI/SC_GameTimer.cs | 57 ++++++ Assets/Scripts/UI/SC_GameTimer.cs.shmeta | 3 + Assets/Scripts/UI/SC_MultiplierTextFx.cs | 88 +++------ Assets/Scripts/UI/SC_ScaleBounce.cs | 4 +- 6 files changed, 299 insertions(+), 68 deletions(-) create mode 100644 Assets/Scripts/UI/SC_GameTimer.cs create mode 100644 Assets/Scripts/UI/SC_GameTimer.cs.shmeta diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade index 4355b33e..7a131e4b 100644 --- a/Assets/Scenes/Level2.shade +++ b/Assets/Scenes/Level2.shade @@ -122,8 +122,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -193,8 +197,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -264,8 +272,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.977993011, y: 1, z: 0.286343634, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -335,8 +347,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.977993011, y: 1, z: 0.286343634, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -406,8 +422,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -477,8 +497,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -548,8 +572,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -619,8 +647,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 1, y: 1, z: 1, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.00999999978, z: 0} IsActive: true Scripts: @@ -863,8 +895,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -934,8 +970,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -1005,8 +1045,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -1076,8 +1120,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -1147,8 +1195,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.977993011, y: 1, z: 0.286343634, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -1218,8 +1270,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -1289,8 +1345,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -1360,8 +1420,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -1431,8 +1495,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -1502,8 +1570,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -1573,8 +1645,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -1644,8 +1720,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -1715,8 +1795,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -1786,8 +1870,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -1857,8 +1945,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -1928,8 +2020,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.977993011, y: 1, z: 0.286343634, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -1999,8 +2095,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -2070,8 +2170,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -2141,8 +2245,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -2212,8 +2320,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -2288,8 +2400,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -2359,8 +2475,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -2430,8 +2550,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -2501,8 +2625,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -2572,8 +2700,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -2643,8 +2775,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -2719,8 +2855,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -2790,8 +2930,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -2861,8 +3005,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -2932,8 +3080,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -3003,8 +3155,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -3074,8 +3230,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 1, y: 1, z: 1, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.00999999978, z: 0} IsActive: true Scripts: @@ -3318,8 +3478,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 1, y: 1, z: 1, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.00999999978, z: 0} IsActive: true Scripts: @@ -3601,8 +3765,12 @@ Rotation Speed: 0.0500000007 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 37407233 Color Tint: {x: 0, y: 0, z: 0, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0299999993, z: 0} IsActive: true Scripts: ~ @@ -3695,8 +3863,12 @@ Rotation Speed: 0.0500000007 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 37407233 Color Tint: {x: 0, y: 0, z: 0, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0299999993, z: 0} IsActive: true Scripts: ~ @@ -3980,8 +4152,12 @@ Rotation Speed: 0.805999994 Rotation Decay: 0 Texture Asset ID: 56224060 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 42141152 Color Tint: {x: 1, y: 1, z: 1, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0.0500000007, z: 0} IsActive: true Scripts: ~ @@ -4010,8 +4186,12 @@ Rotation Speed: 0.805999994 Rotation Decay: 0 Texture Asset ID: 56224060 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 42141152 Color Tint: {x: 1, y: 1, z: 1, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0.0500000007, z: 0} IsActive: true Scripts: ~ @@ -17034,14 +17214,24 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ + Scripts: + - Type: SHADE_Scripting.UI.GameTimer + Enabled: true + criticalTime: 30 + timer: 0 + - Type: SHADE_Scripting.UI.ScaleBounce + Enabled: true + minScale: 1 + maxScale: 1.20000005 + duration: 1 + isActive: false - EID: 520 Name: Timer BG IsActive: true NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0.5, y: 0.300000012, z: 0.98999995} + Translate: {x: 0, y: 0.300000012, z: 0.98999995} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 5, y: 2, z: 1} IsActive: true @@ -17086,7 +17276,7 @@ NumberOfChildren: 1 Components: Transform Component: - Translate: {x: -800, y: 250, z: 0.100000001} + Translate: {x: -800, y: 200, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 50, y: 50, z: 60} IsActive: true @@ -17104,9 +17294,8 @@ Scripts: - Type: SHADE_Scripting.UI.MultiplierTextFx Enabled: true - maxSize: 1 - minSize: 0.300000012 - minAlpha: 0.300000012 + maxSize: 1.5 + minSize: 1 - EID: 131593 Name: Multiplier BG IsActive: true @@ -17180,8 +17369,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.899999976, z: 0} IsActive: true Scripts: ~ @@ -17210,8 +17403,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0.100000001, z: 0} IsActive: true Scripts: ~ @@ -17240,8 +17437,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.100000001, z: 0} IsActive: true Scripts: ~ diff --git a/Assets/Scripts/Gameplay/SC_GameManager.cs b/Assets/Scripts/Gameplay/SC_GameManager.cs index b4e17d29..0579abd9 100644 --- a/Assets/Scripts/Gameplay/SC_GameManager.cs +++ b/Assets/Scripts/Gameplay/SC_GameManager.cs @@ -136,7 +136,7 @@ public class GameManager : Script if(scoreText) scoreText.GetComponent().Text = $"{Score}"; if(timeText) - timeText.GetComponent().Text = $"{timer.ToString("0.00")}"; + timeText.GetComponent().Text = $"{timer.ToString("0")}"; if (itemScored) { diff --git a/Assets/Scripts/UI/SC_GameTimer.cs b/Assets/Scripts/UI/SC_GameTimer.cs new file mode 100644 index 00000000..86247f88 --- /dev/null +++ b/Assets/Scripts/UI/SC_GameTimer.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SHADE; + +namespace SHADE_Scripting.UI +{ + public class GameTimer: Script + { + private ScaleBounce scaleBounce; + private TextRenderable text; + public float criticalTime = 30; + + public float timer; + + + protected override void awake() + { + text = GetComponent(); + if(!text) + { + Debug.Log("GameTimer: No text renderable found"); + } + + scaleBounce = GetScript(); + if(!scaleBounce) + { + Debug.Log("GameTimer: No Scalebounce found in children"); + } + else + { + scaleBounce.isActive = false; + } + + } + + + protected override void update() + { + timer = GameManager.Instance.timer; + + if (timer <= criticalTime) + { + scaleBounce.isActive = true; + text.TextColor = new Color(1.0f, 0.0f, 0.0f, 1.0f); + } + + + + } + + + + } +} diff --git a/Assets/Scripts/UI/SC_GameTimer.cs.shmeta b/Assets/Scripts/UI/SC_GameTimer.cs.shmeta new file mode 100644 index 00000000..ed4b185f --- /dev/null +++ b/Assets/Scripts/UI/SC_GameTimer.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_GameTimer +ID: 158823052 +Type: 9 diff --git a/Assets/Scripts/UI/SC_MultiplierTextFx.cs b/Assets/Scripts/UI/SC_MultiplierTextFx.cs index ccd2a4a8..d49eddf4 100644 --- a/Assets/Scripts/UI/SC_MultiplierTextFx.cs +++ b/Assets/Scripts/UI/SC_MultiplierTextFx.cs @@ -12,98 +12,66 @@ namespace SHADE_Scripting.UI [NonSerialized] private TweenThread sizeThread; private TweenThread sizeInvertThread; - private TweenThread alphaThread; + public float maxSize = 1.0f; public float minSize = 0.3f; - public float minAlpha = 0.3f; - - private bool showMultiplier = false; const float sizeUpDuration = 0.1f; [NonSerialized] private Vector3 defaultScale; + private bool tweenUp = false; + protected override void start() { - sizeThread = TweenManager.CreateTweenThread(0.0f, maxSize, minSize, EASING_METHOD.EASE_IN_SINE); + sizeThread = TweenManager.CreateTweenThread(0.01f, maxSize, minSize, EASING_METHOD.EASE_IN_SINE); sizeInvertThread = TweenManager.CreateTweenThread(sizeUpDuration, minSize, maxSize, EASING_METHOD.EASE_IN_SINE); - alphaThread = TweenManager.CreateTweenThread(0.0f, 1.0f, minAlpha, EASING_METHOD.EASE_OUT_SINE); + Transform transform = GetComponent(); if (transform != null) { defaultScale = transform.LocalScale; transform.LocalScale = Vector3.Zero; } - - - showMultiplier = false; - } - protected override void update() + protected override void update() + { + Transform transform = GetComponent(); + + + if (transform != null) + { + if (tweenUp == false) { - Transform transform = GetComponent(); - - - if (transform != null && showMultiplier == true) - { - if(!sizeInvertThread.IsCompleted()) - { - transform.LocalScale = defaultScale * sizeInvertThread.GetValue(); - - Renderable rend = GetComponentInChildren(); - if(rend) - { - rend.Material.SetProperty("data.alpha", 1.0f); - } - - TextRenderable text = GetComponent(); - if (text) - { - Color clr = text.TextColor; - text.TextColor = new Color(clr.r, clr.g, clr.b, 1.0f); - } - return; - } - - if(sizeThread.IsCompleted()) - { - transform.LocalScale = Vector3.Zero; - showMultiplier = false; - } - else - { - transform.LocalScale = defaultScale * sizeThread.GetValue(); - - Renderable rend = GetComponentInChildren(); - if (rend) - { - rend.Material.SetProperty("data.alpha", alphaThread.GetValue()); - } - TextRenderable text = GetComponent(); - if(text) - { - Color clr = text.TextColor; - text.TextColor = new Color(clr.r,clr.g,clr.b,alphaThread.GetValue() * 1.3f); - } - } - } + transform.LocalScale = defaultScale * sizeThread.GetValue(); } + else + { + if (sizeInvertThread.IsCompleted()) + { + tweenUp = false; + sizeThread.Reset(); + } + + transform.LocalScale = defaultScale * sizeInvertThread.GetValue(); + + } + } + } public void ShowMultiplier(int multiplier, float duration) { GetComponent().Text = $"X {multiplier}"; sizeThread.duration = duration + sizeUpDuration; - alphaThread.duration = duration + sizeUpDuration; sizeInvertThread.Reset(); sizeThread.Reset(); - alphaThread.Reset(); - showMultiplier = true; + tweenUp = true; } diff --git a/Assets/Scripts/UI/SC_ScaleBounce.cs b/Assets/Scripts/UI/SC_ScaleBounce.cs index 0d5ca381..31b43671 100644 --- a/Assets/Scripts/UI/SC_ScaleBounce.cs +++ b/Assets/Scripts/UI/SC_ScaleBounce.cs @@ -19,6 +19,8 @@ namespace SHADE_Scripting.UI private Vector3 defaultScale; + public bool isActive = true; + protected override void start() { thread = TweenManager.CreateTweenThread(duration, minScale, maxScale, EASING_METHOD.EASE_IN_SINE); @@ -32,7 +34,7 @@ namespace SHADE_Scripting.UI protected override void update() { Transform trans = GetComponent(); - if(trans != null) + if(trans != null && isActive) { trans.LocalScale = defaultScale * thread.GetValue(); } From c335f587025d4ff343bc6b8b4ca29b5f40aecc6a Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Fri, 31 Mar 2023 15:02:31 +0800 Subject: [PATCH 6/6] Updated Gameplay UI --- Assets/Scenes/Level1.shade | 427 ++++++++++++--------- Assets/Scenes/Level3.shade | 563 +++++++++++++++++++--------- Assets/Scripts/UI/SC_ScaleBounce.cs | 27 +- 3 files changed, 646 insertions(+), 371 deletions(-) diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade index ab3f995a..e03d2dfc 100644 --- a/Assets/Scenes/Level1.shade +++ b/Assets/Scenes/Level1.shade @@ -7600,9 +7600,9 @@ Score: 0 timer: 200 scoreText: 237 - timeText: 525 - minusTimerText: 65735 - multiplierText: 524 + timeText: 131278 + minusTimerText: 131211 + multiplierText: 66055 maxMultiplierDuration: 5 maxMultiplierCombo: 10 multiplierFont: 60 @@ -7724,8 +7724,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -7795,8 +7799,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.977993011, y: 1, z: 0.286343634, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -7866,8 +7874,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -7937,8 +7949,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -8047,8 +8063,12 @@ Rotation Speed: 0.0500000007 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 37407233 Color Tint: {x: 0, y: 0, z: 0, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0299999993, z: 0} IsActive: true Scripts: ~ @@ -8141,8 +8161,12 @@ Rotation Speed: 0.0500000007 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 37407233 Color Tint: {x: 0, y: 0, z: 0, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0299999993, z: 0} IsActive: true Scripts: ~ @@ -8235,8 +8259,12 @@ Rotation Speed: 0.0500000007 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 37407233 Color Tint: {x: 0, y: 0, z: 0, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0299999993, z: 0} IsActive: true Scripts: ~ @@ -8329,8 +8357,12 @@ Rotation Speed: 0.0500000007 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 37407233 Color Tint: {x: 0, y: 0, z: 0, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0299999993, z: 0} IsActive: true Scripts: ~ @@ -8423,8 +8455,12 @@ Rotation Speed: 0.0500000007 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 37407233 Color Tint: {x: 0, y: 0, z: 0, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0299999993, z: 0} IsActive: true Scripts: ~ @@ -8685,8 +8721,12 @@ Rotation Speed: 0.805999994 Rotation Decay: 0 Texture Asset ID: 56224060 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 42141152 Color Tint: {x: 1, y: 1, z: 1, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0.0500000007, z: 0} IsActive: true Scripts: ~ @@ -8715,8 +8755,12 @@ Rotation Speed: 0.805999994 Rotation Decay: 0 Texture Asset ID: 56224060 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 42141152 Color Tint: {x: 1, y: 1, z: 1, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0.0500000007, z: 0} IsActive: true Scripts: ~ @@ -9046,183 +9090,6 @@ Casting Shadows: true IsActive: true Scripts: ~ -- EID: 526 - Name: Gameplay Canvas - IsActive: true - NumberOfChildren: 4 - Components: - Canvas Component: - Canvas Width: 1920 - Canvas Height: 1080 - Scale by canvas width: false - IsActive: true - Scripts: ~ -- EID: 237 - Name: Score Text - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -800, y: 365, z: 0.600000024} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 100, y: 100, z: 60} - IsActive: true - Text Renderer Component: - Text: My name is Brandon. - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning - Enabled: true - offsetPerDigit: 25 - - Type: SHADE_Scripting.UI.SingleScaleBounce - Enabled: true - durationUp: 0.150000006 - durationDown: 0.300000012 - scaleSize: 1.20000005 -- EID: 525 - Name: Timer Text - IsActive: true - NumberOfChildren: 2 - Components: - Transform Component: - Translate: {x: 700, y: 400, z: 0.600000024} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 60, y: 60, z: 1} - IsActive: true - Text Renderer Component: - Text: My name is Brandon. - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ -- EID: 520 - Name: Timer BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.5, y: 0.300000012, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 5, y: 2, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 126220632 - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ -- EID: 65735 - Name: Minus Timer Text - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0, y: -0.800000012, z: 0.100000001} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Text Renderer Component: - Text: -10 - Font: 174412429 - Color: {x: 1, y: 0, z: 0, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: false - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: false - Scripts: - - Type: SHADE_Scripting.UI.MinusTimerText - Enabled: true - duration: 2 -- EID: 524 - Name: Multiplier Text - IsActive: true - NumberOfChildren: 1 - Components: - Transform Component: - Translate: {x: -800, y: 250, z: 0.100000001} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 50, y: 50, z: 60} - IsActive: true - Text Renderer Component: - Text: X2 - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: SHADE_Scripting.UI.MultiplierTextFx - Enabled: true - maxSize: 1 - minSize: 0.300000012 - minAlpha: 0.300000012 -- EID: 519 - Name: Multiplier BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 4.26499987, y: 2, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 133784677 - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: FixRotation - Enabled: true -- EID: 521 - Name: Score BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -770, y: 425, z: 59.9999962} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 345.600006, y: 200, z: 60} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 127527215 - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ - EID: 66150 Name: ParticlesDeco IsActive: true @@ -9254,8 +9121,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.899999976, z: 0} IsActive: true Scripts: ~ @@ -9284,8 +9155,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0.100000001, z: 0} IsActive: true Scripts: ~ @@ -9314,8 +9189,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.100000001, z: 0} IsActive: true Scripts: ~ @@ -9440,4 +9319,190 @@ Scripts: - Type: SHADE_Scripting.Gameplay.AIBehaviour.AIRework.HomeOwnerAttackHitbox Enabled: true - aiGO: 65771 \ No newline at end of file + aiGO: 65771 +- EID: 131271 + Name: Gameplay Canvas + IsActive: true + NumberOfChildren: 4 + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + Scale by canvas width: false + IsActive: true + Scripts: ~ +- EID: 237 + Name: Score Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -800, y: 365, z: 0.600000024} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 100, y: 100, z: 60} + IsActive: true + Text Renderer Component: + Text: My name is Brandon. + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 131271 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning + Enabled: true + offsetPerDigit: 25 + - Type: SHADE_Scripting.UI.SingleScaleBounce + Enabled: true + durationUp: 0.150000006 + durationDown: 0.300000012 + scaleSize: 1.20000005 +- EID: 131278 + Name: Timer Text + IsActive: true + NumberOfChildren: 2 + Components: + Transform Component: + Translate: {x: 700, y: 400, z: 0.600000024} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 60, y: 60, z: 1} + IsActive: true + Text Renderer Component: + Text: My name is Brandon. + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 131271 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.GameTimer + Enabled: true + criticalTime: 30 + timer: 0 + - Type: SHADE_Scripting.UI.ScaleBounce + Enabled: true + minScale: 1 + maxScale: 1.20000005 + duration: 1 + isActive: false +- EID: 520 + Name: Timer BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0.300000012, z: 0.98999995} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 5, y: 2, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 126220632 + IsActive: true + UI Component: + Canvas ID: 131271 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 131211 + Name: Minus Timer Text + IsActive: false + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -0.800000012, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: false + Text Renderer Component: + Text: -10 + Font: 174412429 + Color: {x: 1, y: 0, z: 0, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: false + UI Component: + Canvas ID: 131271 + Hovered: false + Clicked: false + IsActive: false + Scripts: + - Type: SHADE_Scripting.UI.MinusTimerText + Enabled: true + duration: 2 +- EID: 66055 + Name: Multiplier Text + IsActive: true + NumberOfChildren: 1 + Components: + Transform Component: + Translate: {x: -800, y: 200, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 50, y: 50, z: 60} + IsActive: true + Text Renderer Component: + Text: X2 + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 131271 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.MultiplierTextFx + Enabled: true + maxSize: 1.5 + minSize: 1 +- EID: 131593 + Name: Multiplier BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 4.26499987, y: 2, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 133784677 + IsActive: true + UI Component: + Canvas ID: 131271 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: FixRotation + Enabled: true +- EID: 568 + Name: Score BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -770, y: 425, z: 59.9999962} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 345.600006, y: 200, z: 60} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 127527215 + IsActive: true + UI Component: + Canvas ID: 131271 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ \ No newline at end of file diff --git a/Assets/Scenes/Level3.shade b/Assets/Scenes/Level3.shade index 8abc90a3..394523f4 100644 --- a/Assets/Scenes/Level3.shade +++ b/Assets/Scenes/Level3.shade @@ -9059,9 +9059,9 @@ Score: 0 timer: 200 scoreText: 237 - timeText: 525 - minusTimerText: 524 - multiplierText: 521 + timeText: 66135 + minusTimerText: 66057 + multiplierText: 66055 maxMultiplierDuration: 5 maxMultiplierCombo: 10 multiplierFont: 60 @@ -9166,8 +9166,12 @@ Rotation Speed: 0.0500000007 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 37407233 Color Tint: {x: 0, y: 0, z: 0, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0299999993, z: 0} IsActive: true Scripts: ~ @@ -9260,8 +9264,12 @@ Rotation Speed: 0.0500000007 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 37407233 Color Tint: {x: 0, y: 0, z: 0, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0299999993, z: 0} IsActive: true Scripts: ~ @@ -9354,8 +9362,12 @@ Rotation Speed: 0.0500000007 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 37407233 Color Tint: {x: 0, y: 0, z: 0, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0299999993, z: 0} IsActive: true Scripts: ~ @@ -9501,8 +9513,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -9572,8 +9588,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -9643,8 +9663,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -9714,8 +9738,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -9785,8 +9813,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -9856,8 +9888,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -9927,8 +9963,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.876652002, y: 0.485357881, z: 0.166061834, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -9998,8 +10038,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -10069,8 +10113,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -10140,8 +10188,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -10211,8 +10263,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -10282,8 +10338,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -10353,8 +10413,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -10424,8 +10488,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -10495,8 +10563,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.279913902, y: 0.845814943, z: 0.0856993049, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -10566,8 +10638,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.977993011, y: 1, z: 0.286343634, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -10637,8 +10713,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.977993011, y: 1, z: 0.286343634, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -10708,8 +10788,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.977993011, y: 1, z: 0.286343634, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -10779,8 +10863,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.977993011, y: 1, z: 0.286343634, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.0199999996, z: 0} IsActive: true Scripts: @@ -10850,8 +10938,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 1, y: 1, z: 1, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.00999999978, z: 0} IsActive: true Scripts: @@ -11094,8 +11186,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -11170,8 +11266,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -11241,8 +11341,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -11312,8 +11416,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -11383,8 +11491,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -11454,8 +11566,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -11525,8 +11641,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -11601,8 +11721,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -11672,8 +11796,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -11743,8 +11871,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -11814,8 +11946,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -11885,8 +12021,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.290321946, y: 0.823788524, z: 0.323222876, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -11983,8 +12123,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 1, y: 1, z: 1, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.00999999978, z: 0} IsActive: true Scripts: @@ -12227,8 +12371,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 1, y: 1, z: 1, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.00999999978, z: 0} IsActive: true Scripts: @@ -12471,8 +12619,12 @@ Rotation Speed: 0.100000001 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 1, y: 1, z: 1, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.00999999978, z: 0} IsActive: true Scripts: @@ -12912,8 +13064,12 @@ Rotation Speed: 0.805999994 Rotation Decay: 0 Texture Asset ID: 56224060 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 42141152 Color Tint: {x: 1, y: 1, z: 1, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0.0500000007, z: 0} IsActive: true Scripts: ~ @@ -12942,8 +13098,12 @@ Rotation Speed: 0.805999994 Rotation Decay: 0 Texture Asset ID: 56224060 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 42141152 Color Tint: {x: 1, y: 1, z: 1, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0.0500000007, z: 0} IsActive: true Scripts: ~ @@ -15064,183 +15224,6 @@ Rotation Offset: {x: 0, y: 0, z: 0} IsActive: true Scripts: ~ -- EID: 526 - Name: Gameplay Canvas - IsActive: true - NumberOfChildren: 4 - Components: - Canvas Component: - Canvas Width: 1920 - Canvas Height: 1080 - Scale by canvas width: false - IsActive: true - Scripts: ~ -- EID: 237 - Name: Score Text - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -800, y: 365, z: 0.600000024} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 100, y: 100, z: 60} - IsActive: true - Text Renderer Component: - Text: My name is Brandon. - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning - Enabled: true - offsetPerDigit: 25 - - Type: SHADE_Scripting.UI.SingleScaleBounce - Enabled: true - durationUp: 0.150000006 - durationDown: 0.300000012 - scaleSize: 1.20000005 -- EID: 525 - Name: Timer Text - IsActive: true - NumberOfChildren: 2 - Components: - Transform Component: - Translate: {x: 700, y: 400, z: 0.600000024} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 60, y: 60, z: 1} - IsActive: true - Text Renderer Component: - Text: My name is Brandon. - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ -- EID: 520 - Name: Timer BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.5, y: 0.300000012, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 5, y: 2, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 126220632 - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ -- EID: 524 - Name: Minus Timer Text - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0, y: -0.800000012, z: 0.100000001} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Text Renderer Component: - Text: -10 - Font: 174412429 - Color: {x: 1, y: 0, z: 0, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: false - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: false - Scripts: - - Type: SHADE_Scripting.UI.MinusTimerText - Enabled: true - duration: 2 -- EID: 521 - Name: Multiplier Text - IsActive: true - NumberOfChildren: 1 - Components: - Transform Component: - Translate: {x: -800, y: 250, z: 0.100000001} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 50, y: 50, z: 60} - IsActive: true - Text Renderer Component: - Text: X2 - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: SHADE_Scripting.UI.MultiplierTextFx - Enabled: true - maxSize: 1 - minSize: 0.300000012 - minAlpha: 0.300000012 -- EID: 519 - Name: Multiplier BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 4.26499987, y: 2, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 133784677 - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: FixRotation - Enabled: true -- EID: 599 - Name: Score BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -770, y: 425, z: 59.9999962} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 345.600006, y: 200, z: 60} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 127527215 - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ - EID: 66150 Name: ParticlesDeco IsActive: true @@ -15272,8 +15255,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.832599103, y: 0.757529616, z: 0.0916959345, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.100000001, z: 0} IsActive: true Scripts: ~ @@ -15302,8 +15289,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.832599103, y: 0.757529616, z: 0.0916959345, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.100000001, z: 0} IsActive: true Scripts: ~ @@ -15332,8 +15323,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.832599103, y: 0.757529616, z: 0.0916959345, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.100000001, z: 0} IsActive: true Scripts: ~ @@ -15362,8 +15357,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.832599103, y: 0.757529616, z: 0.0916959345, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.100000001, z: 0} IsActive: true Scripts: ~ @@ -15392,8 +15391,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.100000001, z: 0} IsActive: true Scripts: ~ @@ -15422,8 +15425,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.832599103, y: 0.757529616, z: 0.0916959345, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.100000001, z: 0} IsActive: true Scripts: ~ @@ -15452,8 +15459,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: -0.899999976, z: 0} IsActive: true Scripts: ~ @@ -15482,8 +15493,12 @@ Rotation Speed: 0 Rotation Decay: 0 Texture Asset ID: 0 + Custom Vertex Shader Asset ID: 0 + Custom Fragment Shader Asset ID: 0 Custom Update Shader Asset ID: 0 Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1} + Color Tint Range: {x: 0, y: 0, z: 0, w: 0} + Color Decay: {x: 0, y: 0, z: 0, w: 0} Acceleration: {x: 0, y: 0.100000001, z: 0} IsActive: true Scripts: ~ @@ -15608,4 +15623,190 @@ Scripts: - Type: SHADE_Scripting.Gameplay.AIBehaviour.AIRework.HomeOwnerAttackHitbox Enabled: true - aiGO: 66078 \ No newline at end of file + aiGO: 66078 +- EID: 66062 + Name: Gameplay Canvas + IsActive: true + NumberOfChildren: 4 + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + Scale by canvas width: false + IsActive: true + Scripts: ~ +- EID: 237 + Name: Score Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -800, y: 365, z: 0.600000024} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 100, y: 100, z: 60} + IsActive: true + Text Renderer Component: + Text: My name is Brandon. + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 66062 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning + Enabled: true + offsetPerDigit: 25 + - Type: SHADE_Scripting.UI.SingleScaleBounce + Enabled: true + durationUp: 0.150000006 + durationDown: 0.300000012 + scaleSize: 1.20000005 +- EID: 66135 + Name: Timer Text + IsActive: true + NumberOfChildren: 2 + Components: + Transform Component: + Translate: {x: 700, y: 400, z: 0.600000024} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 60, y: 60, z: 1} + IsActive: true + Text Renderer Component: + Text: My name is Brandon. + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 66062 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.GameTimer + Enabled: true + criticalTime: 30 + timer: 0 + - Type: SHADE_Scripting.UI.ScaleBounce + Enabled: true + minScale: 1 + maxScale: 1.20000005 + duration: 1 + isActive: false +- EID: 520 + Name: Timer BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0.300000012, z: 0.98999995} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 5, y: 2, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 126220632 + IsActive: true + UI Component: + Canvas ID: 66062 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 66057 + Name: Minus Timer Text + IsActive: false + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -0.800000012, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: false + Text Renderer Component: + Text: -10 + Font: 174412429 + Color: {x: 1, y: 0, z: 0, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: false + UI Component: + Canvas ID: 66062 + Hovered: false + Clicked: false + IsActive: false + Scripts: + - Type: SHADE_Scripting.UI.MinusTimerText + Enabled: true + duration: 2 +- EID: 66055 + Name: Multiplier Text + IsActive: true + NumberOfChildren: 1 + Components: + Transform Component: + Translate: {x: -800, y: 200, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 50, y: 50, z: 60} + IsActive: true + Text Renderer Component: + Text: X2 + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 66062 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.MultiplierTextFx + Enabled: true + maxSize: 1.5 + minSize: 1 +- EID: 66061 + Name: Multiplier BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 4.26499987, y: 2, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 133784677 + IsActive: true + UI Component: + Canvas ID: 66062 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: FixRotation + Enabled: true +- EID: 66060 + Name: Score BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -770, y: 425, z: 59.9999962} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 345.600006, y: 200, z: 60} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 127527215 + IsActive: true + UI Component: + Canvas ID: 66062 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ \ No newline at end of file diff --git a/Assets/Scripts/UI/SC_ScaleBounce.cs b/Assets/Scripts/UI/SC_ScaleBounce.cs index 31b43671..d6ec4792 100644 --- a/Assets/Scripts/UI/SC_ScaleBounce.cs +++ b/Assets/Scripts/UI/SC_ScaleBounce.cs @@ -7,19 +7,21 @@ using System.Threading.Tasks; namespace SHADE_Scripting.UI { - public class ScaleBounce:Script - { - [NonSerialized] - private TweenThread thread; + public class ScaleBounce : Script + { + [NonSerialized] + private TweenThread thread; - public float minScale = 1.0f; - public float maxScale = 1.2f; - public float duration = 1.0f; + public float minScale = 1.0f; + public float maxScale = 1.2f; + public float duration = 1.0f; - private Vector3 defaultScale; + private Vector3 defaultScale; - public bool isActive = true; + public bool isActive = false; + + private bool lastActive = false; protected override void start() { @@ -33,6 +35,13 @@ namespace SHADE_Scripting.UI protected override void update() { + + if(isActive != lastActive && isActive == true) + { + thread.Reset(); + } + lastActive = isActive; + Transform trans = GetComponent(); if(trans != null && isActive) {