xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

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
Conversation 0 Commits 8 Files Changed 34 +54 -32
26 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 82a20e49f7 - Show all commits

32
Assets/Scenes/Level1.shade
View File

@ -10,6 +10,7 @@
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 1, y: 1, z: 1, w: 1}
Layer: 4294967295 Layer: 4294967295
Strength: 1 Strength: 1
Casting Shadows: false
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- EID: 85 - EID: 85
@ -4160,6 +4161,7 @@
Type: Dynamic Type: Dynamic
Drag: 0.00999999978 Drag: 0.00999999978
Angular Drag: 0.100000001 Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true Use Gravity: true
Interpolate: true Interpolate: true
Sleeping Enabled: true Sleeping Enabled: true
@ -4269,6 +4271,7 @@
Type: Dynamic Type: Dynamic
Drag: 0.00999999978 Drag: 0.00999999978
Angular Drag: 0.100000001 Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true Use Gravity: true
Interpolate: false Interpolate: false
Sleeping Enabled: true Sleeping Enabled: true
@ -4320,6 +4323,7 @@
Type: Dynamic Type: Dynamic
Drag: 0.00999999978 Drag: 0.00999999978
Angular Drag: 0.100000001 Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true Use Gravity: true
Interpolate: false Interpolate: false
Sleeping Enabled: true Sleeping Enabled: true
@ -4371,6 +4375,7 @@
Type: Dynamic Type: Dynamic
Drag: 0.00999999978 Drag: 0.00999999978
Angular Drag: 0.100000001 Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true Use Gravity: true
Interpolate: false Interpolate: false
Sleeping Enabled: true Sleeping Enabled: true
@ -4422,6 +4427,7 @@
Type: Dynamic Type: Dynamic
Drag: 0.00999999978 Drag: 0.00999999978
Angular Drag: 0.100000001 Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true Use Gravity: true
Interpolate: false Interpolate: false
Sleeping Enabled: true Sleeping Enabled: true
@ -4475,6 +4481,7 @@
Type: Dynamic Type: Dynamic
Drag: 0.00999999978 Drag: 0.00999999978
Angular Drag: 0.100000001 Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true Use Gravity: true
Interpolate: true Interpolate: true
Sleeping Enabled: true Sleeping Enabled: true
@ -4537,6 +4544,7 @@
Type: Dynamic Type: Dynamic
Drag: 0.00999999978 Drag: 0.00999999978
Angular Drag: 0.100000001 Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true Use Gravity: true
Interpolate: true Interpolate: true
Sleeping Enabled: true Sleeping Enabled: true
@ -4599,6 +4607,7 @@
Type: Dynamic Type: Dynamic
Drag: 0.00999999978 Drag: 0.00999999978
Angular Drag: 0.100000001 Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true Use Gravity: true
Interpolate: true Interpolate: true
Sleeping Enabled: true Sleeping Enabled: true
@ -4661,6 +4670,7 @@
Type: Dynamic Type: Dynamic
Drag: 0.00999999978 Drag: 0.00999999978
Angular Drag: 0.100000001 Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true Use Gravity: true
Interpolate: true Interpolate: true
Sleeping Enabled: true Sleeping Enabled: true
@ -4723,6 +4733,7 @@
Type: Dynamic Type: Dynamic
Drag: 0.00999999978 Drag: 0.00999999978
Angular Drag: 0.100000001 Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: true Use Gravity: true
Interpolate: true Interpolate: true
Sleeping Enabled: true Sleeping Enabled: true
@ -4793,7 +4804,7 @@
IsActive: true IsActive: true
Animator Component: Animator Component:
Rig: 72178939 Rig: 72178939
Clip: 72178939 AnimationController: 0
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- EID: 219 - EID: 219
@ -4812,7 +4823,7 @@
IsActive: true IsActive: true
Animator Component: Animator Component:
Rig: 80728853 Rig: 80728853
Clip: 80728853 AnimationController: 0
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- EID: 218 - EID: 218
@ -4831,7 +4842,7 @@
IsActive: true IsActive: true
Animator Component: Animator Component:
Rig: 80500944 Rig: 80500944
Clip: 80500944 AnimationController: 0
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- EID: 220 - EID: 220
@ -4850,7 +4861,7 @@
IsActive: true IsActive: true
Animator Component: Animator Component:
Rig: 76715962 Rig: 76715962
Clip: 76715962 AnimationController: 0
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- EID: 198 - EID: 198
@ -4877,6 +4888,7 @@
Type: Dynamic Type: Dynamic
Drag: 0.00999999978 Drag: 0.00999999978
Angular Drag: 0.100000001 Angular Drag: 0.100000001
Gravity Scale: 1
Use Gravity: false Use Gravity: false
Interpolate: false Interpolate: false
Sleeping Enabled: true Sleeping Enabled: true
@ -5191,9 +5203,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
@ -5257,9 +5269,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

25
Assets/Scenes/MainMenu.shade
View File

@ -102,7 +102,7 @@
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: Empty
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
@ -137,7 +137,7 @@
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: Empty
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
@ -170,7 +170,7 @@
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: Empty
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
@ -206,7 +206,7 @@
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: Empty
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
@ -242,7 +242,7 @@
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: Empty
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
@ -278,7 +278,7 @@
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: Empty
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
@ -297,6 +297,7 @@
Color: {x: 1, y: 1, z: 1, w: 1} Color: {x: 1, y: 1, z: 1, w: 1}
Layer: 4294967295 Layer: 4294967295
Strength: 0 Strength: 0
Casting Shadows: false
IsActive: true IsActive: true
Scripts: ~ Scripts: ~
- EID: 3 - EID: 3
@ -430,7 +431,7 @@
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: Empty
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
@ -467,7 +468,7 @@
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: Empty
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
@ -503,7 +504,7 @@
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: Empty
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
@ -577,7 +578,7 @@
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: Empty
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
@ -1264,7 +1265,7 @@
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: Empty
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976
@ -1373,7 +1374,7 @@
Enabled: true Enabled: true
onHoverEnterSound: Empty onHoverEnterSound: Empty
onHoverExitSound: Empty onHoverExitSound: Empty
onClickSound: event:/UI/mouse_down_element onClickSound: event:/UI/button_success
onReleaseSound: Empty onReleaseSound: Empty
hoverScale: 1.10000002 hoverScale: 1.10000002
clickScale: 0.899999976 clickScale: 0.899999976

2
Assets/Scripts/UI/SC_ButtonFX.cs
View File

@ -11,7 +11,7 @@ namespace SHADE_Scripting.UI
{ {
public string onHoverEnterSound = "Empty"; public string onHoverEnterSound = "Empty";
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 = "Empty";
[NonSerialized] [NonSerialized]

BIN
Assets/Texture/Buttons/Button_Retry_Pressed.dds → Assets/Texture/Buttons/Button_Resume_Clicked.dds
View File

Binary file not shown.

BIN
Assets/Texture/Buttons/Button_Retry_Pressed.shtex → Assets/Texture/Buttons/Button_Resume_Clicked.shtex
View File

Binary file not shown.

3
Assets/Texture/Buttons/Button_Resume_Clicked.shtex.shmeta Normal file
View File

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

BIN
Assets/Texture/Buttons/Button_Retry_Idle.dds → Assets/Texture/Buttons/Button_Resume_Default.dds
View File

Binary file not shown.

BIN
Assets/Texture/Buttons/Button_Retry_Idle.shtex → Assets/Texture/Buttons/Button_Resume_Default.shtex
View File

Binary file not shown.

3
Assets/Texture/Buttons/Button_Resume_Default.shtex.shmeta Normal file
View File

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

BIN
Assets/Texture/Buttons/Button_Resume_Hovered.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/Buttons/Button_Resume_Hovered.shtex Normal file
View File

Binary file not shown.

3
Assets/Texture/Buttons/Button_Resume_Hovered.shtex.shmeta Normal file
View File

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

BIN
Assets/Texture/Buttons/Button_Retry_Clicked.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/Buttons/Button_Retry_Clicked.shtex Normal file
View File

Binary file not shown.

3
Assets/Texture/Buttons/Button_Retry_Clicked.shtex.shmeta Normal file
View File

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

BIN
Assets/Texture/Buttons/Button_Retry_Default.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/Buttons/Button_Retry_Default.shtex Normal file
View File

Binary file not shown.

3
Assets/Texture/Buttons/Button_Retry_Default.shtex.shmeta Normal file
View File

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

BIN
Assets/Texture/Buttons/Button_Retry_Hover.dds
View File

Binary file not shown.

BIN
Assets/Texture/Buttons/Button_Retry_Hover.shtex
View File

Binary file not shown.

3
Assets/Texture/Buttons/Button_Retry_Hover.shtex.shmeta
View File

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

BIN
Assets/Texture/Buttons/Button_Retry_Hovered.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/Buttons/Button_Retry_Hovered.shtex Normal file
View File

Binary file not shown.

3
Assets/Texture/Buttons/Button_Retry_Hovered.shtex.shmeta Normal file
View File

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

3
Assets/Texture/Buttons/Button_Retry_Idle.shtex.shmeta
View File

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

3
Assets/Texture/Buttons/Button_Retry_Pressed.shtex.shmeta
View File

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