Updated ScoreText UI. Updated Button SFX #421

Merged
maverickdgg merged 8 commits from SP3-20-UI-System into main 2023-03-10 19:52:38 +08:00
34 changed files with 253 additions and 99 deletions

View File

@ -7933,9 +7933,9 @@
Material: 129340704 Material: 129340704
IsActive: true IsActive: true
Button Component: Button Component:
Default Texture: 63979907 Default Texture: 63738242
Hovered Texture: 51379325 Hovered Texture: 58455648
Clicked Texture: 66788278 Clicked Texture: 66776217
IsActive: true IsActive: true
UI Component: UI Component:
Canvas ID: 458 Canvas ID: 458
@ -7945,10 +7945,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 456 - EID: 456
@ -7978,10 +7978,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 455 - EID: 455
@ -7999,9 +7999,9 @@
Material: 129340704 Material: 129340704
IsActive: true IsActive: true
Button Component: Button Component:
Default Texture: 64806384 Default Texture: 64995894
Hovered Texture: 58347825 Hovered Texture: 58109178
Clicked Texture: 63234380 Clicked Texture: 60429179
IsActive: true IsActive: true
UI Component: UI Component:
Canvas ID: 458 Canvas ID: 458
@ -8011,10 +8011,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 454 - EID: 454
@ -8078,7 +8078,7 @@
- EID: 459 - EID: 459
Name: Gameplay Canvas Name: Gameplay Canvas
IsActive: true IsActive: true
NumberOfChildren: 3 NumberOfChildren: 4
Components: Components:
Canvas Component: Canvas Component:
Canvas Width: 1920 Canvas Width: 1920
@ -8089,7 +8089,7 @@
- EID: 449 - EID: 449
Name: Score Text Name: Score Text
IsActive: true IsActive: true
NumberOfChildren: 1 NumberOfChildren: 0
Components: Components:
Transform Component: Transform Component:
Translate: {x: -800, y: 365, z: 0.600000024} Translate: {x: -800, y: 365, z: 0.600000024}
@ -8107,27 +8107,15 @@
Hovered: false Hovered: false
Clicked: false Clicked: false
IsActive: true IsActive: true
Scripts: ~ Scripts:
- EID: 521 - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning
Name: Score BG Enabled: true
IsActive: true offsetPerDigit: 25
NumberOfChildren: 0 - Type: SHADE_Scripting.UI.SingleScaleBounce
Components: Enabled: true
Transform Component: durationUp: 0.150000006
Translate: {x: 0.300000012, y: 0.600000024, z: 0.98999995} durationDown: 0.300000012
Rotate: {x: 0, y: 0, z: 0} scaleSize: 1.20000005
Scale: {x: 3.45600009, y: 2, z: 1}
IsActive: true
Renderable Component:
Mesh: 141771688
Material: 127527215
IsActive: true
UI Component:
Canvas ID: 459
Hovered: false
Clicked: false
IsActive: true
Scripts: ~
- EID: 520 - EID: 520
Name: Timer Text Name: Timer Text
IsActive: true IsActive: true
@ -8217,6 +8205,26 @@
Clicked: false Clicked: false
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- 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: 459
Hovered: false
Clicked: false
IsActive: true
Scripts: ~
- EID: 503 - EID: 503
Name: DirectionalLight Name: DirectionalLight
IsActive: true IsActive: true

View File

@ -74,10 +74,10 @@
sceneID: 97158628 sceneID: 97158628
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 6 - EID: 6
@ -109,10 +109,10 @@
Enabled: true Enabled: true
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 3 - EID: 3

View File

@ -100,10 +100,10 @@
sceneID: 91947920 sceneID: 91947920
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 6 - EID: 6
@ -135,10 +135,10 @@
Enabled: true Enabled: true
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 7 - EID: 7
@ -168,10 +168,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- Type: SHADE_Scripting.UI.ChangeCanvasButton - Type: SHADE_Scripting.UI.ChangeCanvasButton
@ -204,10 +204,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- Type: SHADE_Scripting.UI.ChangeCanvasButton - Type: SHADE_Scripting.UI.ChangeCanvasButton
@ -240,10 +240,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- Type: SHADE_Scripting.UI.ChangeCanvasButton - Type: SHADE_Scripting.UI.ChangeCanvasButton
@ -276,10 +276,10 @@
Scripts: Scripts:
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- Type: SHADE_Scripting.UI.ChangeCanvasButton - Type: SHADE_Scripting.UI.ChangeCanvasButton
@ -429,10 +429,10 @@
multiImageList: 15 multiImageList: 15
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 17 - EID: 17
@ -466,10 +466,10 @@
multiImageList: 15 multiImageList: 15
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 18 - EID: 18
@ -502,10 +502,10 @@
canvasToActivate: 0 canvasToActivate: 0
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 19 - EID: 19
@ -576,10 +576,10 @@
canvasToActivate: 0 canvasToActivate: 0
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 22 - EID: 22
@ -1263,10 +1263,10 @@
canvasToActivate: 0 canvasToActivate: 0
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 49 - EID: 49
@ -1372,10 +1372,10 @@
canvasToActivate: 0 canvasToActivate: 0
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 53 - EID: 53

View File

@ -74,10 +74,10 @@
sceneID: 97158628 sceneID: 97158628
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 6 - EID: 6
@ -109,10 +109,10 @@
Enabled: true Enabled: true
- Type: SHADE_Scripting.UI.ButtonFX - Type: SHADE_Scripting.UI.ButtonFX
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: event:/UI/botton_hover
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: event:/UI/button_fail
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
- EID: 3 - EID: 3

View File

@ -101,6 +101,8 @@ public class GameManager : Script
protected override void update() protected override void update()
{ {
if (GamePause || !stealFoodPopUpDone) if (GamePause || !stealFoodPopUpDone)
{ {
return; return;
@ -195,6 +197,13 @@ public class GameManager : Script
if (SceneFadeInOut.Instance != null) if (SceneFadeInOut.Instance != null)
SceneFadeInOut.Instance.CallFadeIn(); SceneFadeInOut.Instance.CallFadeIn();
} }
if (Input.GetKeyUp(Input.KeyCode.G))
{
ItemScored();
Score += 500;
}
} }
@ -219,6 +228,13 @@ public class GameManager : Script
fx.ShowMultiplier(currMultiplierCombo, maxMultiplierDuration); fx.ShowMultiplier(currMultiplierCombo, maxMultiplierDuration);
} }
SingleScaleBounce sb = scoreText.GetScript<SingleScaleBounce>();
if(sb)
{
sb.ScaleBounceOnce();
}
} }
} }

View File

@ -9,10 +9,10 @@ namespace SHADE_Scripting.UI
{ {
public class ButtonFX:Script public class ButtonFX:Script
{ {
public string onHoverEnterSound = "Empty"; public string onHoverEnterSound = "event:/UI/botton_hover";
public string onHoverExitSound = "Empty"; public string onHoverExitSound = "Empty";
public string onClickSound = "event:/UI/mouse_down_element"; public string onClickSound = "event:/UI/button_success";
public string onReleaseSound = "Empty"; public string onReleaseSound = "event:/UI/button_fail";
[NonSerialized] [NonSerialized]
private AudioClipHandler onHoverEnterACHandler; private AudioClipHandler onHoverEnterACHandler;

View File

@ -0,0 +1,42 @@
using SHADE;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SHADE_Scripting.UI
{
public class ScoreTextDigitPositioning:Script
{
[NonSerialized]
Vector3 defaultPosition;
public float offsetPerDigit = 0.0f;
protected override void awake()
{
Transform trans = GetComponent<Transform>();
if(trans)
{
defaultPosition = trans.LocalPosition;
}
}
protected override void update()
{
TextRenderable text = GetComponent<TextRenderable>();
Transform trans = GetComponent<Transform>();
if (trans && text)
{
String str = text.Text;
Vector3 offset = new Vector3((str.Length - 1) * offsetPerDigit, 0.0f, 0.0f);
trans.LocalPosition = defaultPosition - offset;
}
}
}
}

View File

@ -0,0 +1,3 @@
Name: SC_ScoreTextDigitPositioning
ID: 166859312
Type: 9

View File

@ -0,0 +1,73 @@
using SHADE;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SHADE_Scripting.UI
{
public class SingleScaleBounce: Script
{
[NonSerialized]
TweenThread thread;
[NonSerialized]
Vector3 defaultScale;
public float durationUp = 0.15f;
public float durationDown = 0.3f;
public float scaleSize = 1.2f;
[NonSerialized]
private bool scaleUp = false;
protected override void awake()
{
Transform trans = GetComponent<Transform>();
if(trans != null)
{
defaultScale = trans.LocalScale;
}
}
protected override void start()
{
thread = TweenManager.CreateTweenThread(0.0f,1.0f,1.0f,EASING_METHOD.EASE_IN_SINE);
}
protected override void update()
{
if(scaleUp)
{
if(thread.IsCompleted())
{
scaleUp = false;
thread.duration = durationDown;
thread.ResetInvert();
}
}
Transform trans = GetComponent<Transform>();
if(trans != null)
{
trans.LocalScale = defaultScale * thread.GetValue();
}
}
public void ScaleBounceOnce()
{
scaleUp = true;
thread.duration = durationUp;
thread.Reset(1.0f, scaleSize);
}
}
}

View File

@ -0,0 +1,3 @@
Name: SC_SingleScaleBounce
ID: 151165363
Type: 9

View File

@ -0,0 +1,3 @@
Name: Button_Resume_Clicked
ID: 66776217
Type: 3

View File

@ -0,0 +1,3 @@
Name: Button_Resume_Default
ID: 63738242
Type: 3

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Button_Resume_Hovered
ID: 58455648
Type: 3

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Button_Retry_Clicked
ID: 60429179
Type: 3

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Button_Retry_Default
ID: 64995894
Type: 3

View File

@ -1,3 +0,0 @@
Name: Button_Retry_Hover
ID: 58347825
Type: 3

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,3 @@
Name: Button_Retry_Hovered
ID: 58109178
Type: 3

View File

@ -1,3 +0,0 @@
Name: Button_Retry_Idle
ID: 64806384
Type: 3

View File

@ -1,3 +0,0 @@
Name: Button_Retry_Pressed
ID: 63234380
Type: 3

View File

@ -215,7 +215,7 @@ namespace SHADE
if (pivot.lookAtCameraOrigin) if (pivot.lookAtCameraOrigin)
CameraLookAt(*camera, camera->position + pivot.GetTargetOffset()); CameraLookAt(*camera, camera->position + tOffset);