diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade index e565b531..fa1c1ed6 100644 --- a/Assets/Scenes/Level1.shade +++ b/Assets/Scenes/Level1.shade @@ -10,6 +10,7 @@ Color: {x: 1, y: 1, z: 1, w: 1} Layer: 4294967295 Strength: 1 + Casting Shadows: false IsActive: true Scripts: ~ - EID: 85 @@ -4160,6 +4161,7 @@ Type: Dynamic Drag: 0.00999999978 Angular Drag: 0.100000001 + Gravity Scale: 1 Use Gravity: true Interpolate: true Sleeping Enabled: true @@ -4269,6 +4271,7 @@ Type: Dynamic Drag: 0.00999999978 Angular Drag: 0.100000001 + Gravity Scale: 1 Use Gravity: true Interpolate: false Sleeping Enabled: true @@ -4320,6 +4323,7 @@ Type: Dynamic Drag: 0.00999999978 Angular Drag: 0.100000001 + Gravity Scale: 1 Use Gravity: true Interpolate: false Sleeping Enabled: true @@ -4371,6 +4375,7 @@ Type: Dynamic Drag: 0.00999999978 Angular Drag: 0.100000001 + Gravity Scale: 1 Use Gravity: true Interpolate: false Sleeping Enabled: true @@ -4422,6 +4427,7 @@ Type: Dynamic Drag: 0.00999999978 Angular Drag: 0.100000001 + Gravity Scale: 1 Use Gravity: true Interpolate: false Sleeping Enabled: true @@ -4475,6 +4481,7 @@ Type: Dynamic Drag: 0.00999999978 Angular Drag: 0.100000001 + Gravity Scale: 1 Use Gravity: true Interpolate: true Sleeping Enabled: true @@ -4537,6 +4544,7 @@ Type: Dynamic Drag: 0.00999999978 Angular Drag: 0.100000001 + Gravity Scale: 1 Use Gravity: true Interpolate: true Sleeping Enabled: true @@ -4599,6 +4607,7 @@ Type: Dynamic Drag: 0.00999999978 Angular Drag: 0.100000001 + Gravity Scale: 1 Use Gravity: true Interpolate: true Sleeping Enabled: true @@ -4661,6 +4670,7 @@ Type: Dynamic Drag: 0.00999999978 Angular Drag: 0.100000001 + Gravity Scale: 1 Use Gravity: true Interpolate: true Sleeping Enabled: true @@ -4723,6 +4733,7 @@ Type: Dynamic Drag: 0.00999999978 Angular Drag: 0.100000001 + Gravity Scale: 1 Use Gravity: true Interpolate: true Sleeping Enabled: true @@ -4793,7 +4804,7 @@ IsActive: true Animator Component: Rig: 72178939 - Clip: 72178939 + AnimationController: 0 IsActive: true Scripts: ~ - EID: 219 @@ -4812,7 +4823,7 @@ IsActive: true Animator Component: Rig: 80728853 - Clip: 80728853 + AnimationController: 0 IsActive: true Scripts: ~ - EID: 218 @@ -4831,7 +4842,7 @@ IsActive: true Animator Component: Rig: 80500944 - Clip: 80500944 + AnimationController: 0 IsActive: true Scripts: ~ - EID: 220 @@ -4850,7 +4861,7 @@ IsActive: true Animator Component: Rig: 76715962 - Clip: 76715962 + AnimationController: 0 IsActive: true Scripts: ~ - EID: 198 @@ -4877,6 +4888,7 @@ Type: Dynamic Drag: 0.00999999978 Angular Drag: 0.100000001 + Gravity Scale: 1 Use Gravity: false Interpolate: false Sleeping Enabled: true @@ -5191,9 +5203,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 63979907 - Hovered Texture: 51379325 - Clicked Texture: 66788278 + Default Texture: 63738242 + Hovered Texture: 58455648 + Clicked Texture: 66776217 IsActive: true UI Component: Canvas ID: 458 @@ -5257,9 +5269,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 64806384 - Hovered Texture: 58347825 - Clicked Texture: 63234380 + Default Texture: 64995894 + Hovered Texture: 58109178 + Clicked Texture: 60429179 IsActive: true UI Component: Canvas ID: 458 diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index 197de206..704ecffd 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -102,7 +102,7 @@ Enabled: true onHoverEnterSound: Empty onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element + onClickSound: event:/UI/button_success onReleaseSound: Empty hoverScale: 1.10000002 clickScale: 0.899999976 @@ -137,7 +137,7 @@ Enabled: true onHoverEnterSound: Empty onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element + onClickSound: event:/UI/button_success onReleaseSound: Empty hoverScale: 1.10000002 clickScale: 0.899999976 @@ -170,7 +170,7 @@ Enabled: true onHoverEnterSound: Empty onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element + onClickSound: event:/UI/button_success onReleaseSound: Empty hoverScale: 1.10000002 clickScale: 0.899999976 @@ -206,7 +206,7 @@ Enabled: true onHoverEnterSound: Empty onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element + onClickSound: event:/UI/button_success onReleaseSound: Empty hoverScale: 1.10000002 clickScale: 0.899999976 @@ -242,7 +242,7 @@ Enabled: true onHoverEnterSound: Empty onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element + onClickSound: event:/UI/button_success onReleaseSound: Empty hoverScale: 1.10000002 clickScale: 0.899999976 @@ -278,7 +278,7 @@ Enabled: true onHoverEnterSound: Empty onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element + onClickSound: event:/UI/button_success onReleaseSound: Empty hoverScale: 1.10000002 clickScale: 0.899999976 @@ -297,6 +297,7 @@ Color: {x: 1, y: 1, z: 1, w: 1} Layer: 4294967295 Strength: 0 + Casting Shadows: false IsActive: true Scripts: ~ - EID: 3 @@ -430,7 +431,7 @@ Enabled: true onHoverEnterSound: Empty onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element + onClickSound: event:/UI/button_success onReleaseSound: Empty hoverScale: 1.10000002 clickScale: 0.899999976 @@ -467,7 +468,7 @@ Enabled: true onHoverEnterSound: Empty onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element + onClickSound: event:/UI/button_success onReleaseSound: Empty hoverScale: 1.10000002 clickScale: 0.899999976 @@ -503,7 +504,7 @@ Enabled: true onHoverEnterSound: Empty onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element + onClickSound: event:/UI/button_success onReleaseSound: Empty hoverScale: 1.10000002 clickScale: 0.899999976 @@ -577,7 +578,7 @@ Enabled: true onHoverEnterSound: Empty onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element + onClickSound: event:/UI/button_success onReleaseSound: Empty hoverScale: 1.10000002 clickScale: 0.899999976 @@ -1264,7 +1265,7 @@ Enabled: true onHoverEnterSound: Empty onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element + onClickSound: event:/UI/button_success onReleaseSound: Empty hoverScale: 1.10000002 clickScale: 0.899999976 @@ -1373,7 +1374,7 @@ Enabled: true onHoverEnterSound: Empty onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element + onClickSound: event:/UI/button_success onReleaseSound: Empty hoverScale: 1.10000002 clickScale: 0.899999976 diff --git a/Assets/Scripts/UI/SC_ButtonFX.cs b/Assets/Scripts/UI/SC_ButtonFX.cs index 7ecad2f2..78b7b686 100644 --- a/Assets/Scripts/UI/SC_ButtonFX.cs +++ b/Assets/Scripts/UI/SC_ButtonFX.cs @@ -11,7 +11,7 @@ namespace SHADE_Scripting.UI { public string onHoverEnterSound = "Empty"; public string onHoverExitSound = "Empty"; - public string onClickSound = "event:/UI/mouse_down_element"; + public string onClickSound = "event:/UI/button_success"; public string onReleaseSound = "Empty"; [NonSerialized] diff --git a/Assets/Texture/Buttons/Button_Retry_Pressed.dds b/Assets/Texture/Buttons/Button_Resume_Clicked.dds similarity index 76% rename from Assets/Texture/Buttons/Button_Retry_Pressed.dds rename to Assets/Texture/Buttons/Button_Resume_Clicked.dds index a7a5c125..fcecfa1f 100644 Binary files a/Assets/Texture/Buttons/Button_Retry_Pressed.dds and b/Assets/Texture/Buttons/Button_Resume_Clicked.dds differ diff --git a/Assets/Texture/Buttons/Button_Retry_Pressed.shtex b/Assets/Texture/Buttons/Button_Resume_Clicked.shtex similarity index 76% rename from Assets/Texture/Buttons/Button_Retry_Pressed.shtex rename to Assets/Texture/Buttons/Button_Resume_Clicked.shtex index a3b7dce9..60b033da 100644 Binary files a/Assets/Texture/Buttons/Button_Retry_Pressed.shtex and b/Assets/Texture/Buttons/Button_Resume_Clicked.shtex differ diff --git a/Assets/Texture/Buttons/Button_Resume_Clicked.shtex.shmeta b/Assets/Texture/Buttons/Button_Resume_Clicked.shtex.shmeta new file mode 100644 index 00000000..2e0027f3 --- /dev/null +++ b/Assets/Texture/Buttons/Button_Resume_Clicked.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Button_Resume_Clicked +ID: 66776217 +Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Idle.dds b/Assets/Texture/Buttons/Button_Resume_Default.dds similarity index 69% rename from Assets/Texture/Buttons/Button_Retry_Idle.dds rename to Assets/Texture/Buttons/Button_Resume_Default.dds index 09ad55f3..d73e485a 100644 Binary files a/Assets/Texture/Buttons/Button_Retry_Idle.dds and b/Assets/Texture/Buttons/Button_Resume_Default.dds differ diff --git a/Assets/Texture/Buttons/Button_Retry_Idle.shtex b/Assets/Texture/Buttons/Button_Resume_Default.shtex similarity index 69% rename from Assets/Texture/Buttons/Button_Retry_Idle.shtex rename to Assets/Texture/Buttons/Button_Resume_Default.shtex index 00592238..fe6035fa 100644 Binary files a/Assets/Texture/Buttons/Button_Retry_Idle.shtex and b/Assets/Texture/Buttons/Button_Resume_Default.shtex differ diff --git a/Assets/Texture/Buttons/Button_Resume_Default.shtex.shmeta b/Assets/Texture/Buttons/Button_Resume_Default.shtex.shmeta new file mode 100644 index 00000000..d61c38a2 --- /dev/null +++ b/Assets/Texture/Buttons/Button_Resume_Default.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Button_Resume_Default +ID: 63738242 +Type: 3 diff --git a/Assets/Texture/Buttons/Button_Resume_Hovered.dds b/Assets/Texture/Buttons/Button_Resume_Hovered.dds new file mode 100644 index 00000000..d81df8ab Binary files /dev/null and b/Assets/Texture/Buttons/Button_Resume_Hovered.dds differ diff --git a/Assets/Texture/Buttons/Button_Resume_Hovered.shtex b/Assets/Texture/Buttons/Button_Resume_Hovered.shtex new file mode 100644 index 00000000..7f55eb04 Binary files /dev/null and b/Assets/Texture/Buttons/Button_Resume_Hovered.shtex differ diff --git a/Assets/Texture/Buttons/Button_Resume_Hovered.shtex.shmeta b/Assets/Texture/Buttons/Button_Resume_Hovered.shtex.shmeta new file mode 100644 index 00000000..720d8c47 --- /dev/null +++ b/Assets/Texture/Buttons/Button_Resume_Hovered.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Button_Resume_Hovered +ID: 58455648 +Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Clicked.dds b/Assets/Texture/Buttons/Button_Retry_Clicked.dds new file mode 100644 index 00000000..6ca0270e Binary files /dev/null and b/Assets/Texture/Buttons/Button_Retry_Clicked.dds differ diff --git a/Assets/Texture/Buttons/Button_Retry_Clicked.shtex b/Assets/Texture/Buttons/Button_Retry_Clicked.shtex new file mode 100644 index 00000000..25b089be Binary files /dev/null and b/Assets/Texture/Buttons/Button_Retry_Clicked.shtex differ diff --git a/Assets/Texture/Buttons/Button_Retry_Clicked.shtex.shmeta b/Assets/Texture/Buttons/Button_Retry_Clicked.shtex.shmeta new file mode 100644 index 00000000..496f0c1b --- /dev/null +++ b/Assets/Texture/Buttons/Button_Retry_Clicked.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Button_Retry_Clicked +ID: 60429179 +Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Default.dds b/Assets/Texture/Buttons/Button_Retry_Default.dds new file mode 100644 index 00000000..8ad235cd Binary files /dev/null and b/Assets/Texture/Buttons/Button_Retry_Default.dds differ diff --git a/Assets/Texture/Buttons/Button_Retry_Default.shtex b/Assets/Texture/Buttons/Button_Retry_Default.shtex new file mode 100644 index 00000000..42573a5d Binary files /dev/null and b/Assets/Texture/Buttons/Button_Retry_Default.shtex differ diff --git a/Assets/Texture/Buttons/Button_Retry_Default.shtex.shmeta b/Assets/Texture/Buttons/Button_Retry_Default.shtex.shmeta new file mode 100644 index 00000000..2627554c --- /dev/null +++ b/Assets/Texture/Buttons/Button_Retry_Default.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Button_Retry_Default +ID: 64995894 +Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Hover.dds b/Assets/Texture/Buttons/Button_Retry_Hover.dds deleted file mode 100644 index 5eb05b41..00000000 Binary files a/Assets/Texture/Buttons/Button_Retry_Hover.dds and /dev/null differ diff --git a/Assets/Texture/Buttons/Button_Retry_Hover.shtex b/Assets/Texture/Buttons/Button_Retry_Hover.shtex deleted file mode 100644 index a6cee8ed..00000000 Binary files a/Assets/Texture/Buttons/Button_Retry_Hover.shtex and /dev/null differ diff --git a/Assets/Texture/Buttons/Button_Retry_Hover.shtex.shmeta b/Assets/Texture/Buttons/Button_Retry_Hover.shtex.shmeta deleted file mode 100644 index 28928eda..00000000 --- a/Assets/Texture/Buttons/Button_Retry_Hover.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: Button_Retry_Hover -ID: 58347825 -Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Hovered.dds b/Assets/Texture/Buttons/Button_Retry_Hovered.dds new file mode 100644 index 00000000..ab974c20 Binary files /dev/null and b/Assets/Texture/Buttons/Button_Retry_Hovered.dds differ diff --git a/Assets/Texture/Buttons/Button_Retry_Hovered.shtex b/Assets/Texture/Buttons/Button_Retry_Hovered.shtex new file mode 100644 index 00000000..597fe430 Binary files /dev/null and b/Assets/Texture/Buttons/Button_Retry_Hovered.shtex differ diff --git a/Assets/Texture/Buttons/Button_Retry_Hovered.shtex.shmeta b/Assets/Texture/Buttons/Button_Retry_Hovered.shtex.shmeta new file mode 100644 index 00000000..2c5cdd4f --- /dev/null +++ b/Assets/Texture/Buttons/Button_Retry_Hovered.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Button_Retry_Hovered +ID: 58109178 +Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Idle.shtex.shmeta b/Assets/Texture/Buttons/Button_Retry_Idle.shtex.shmeta deleted file mode 100644 index 7f2cf050..00000000 --- a/Assets/Texture/Buttons/Button_Retry_Idle.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: Button_Retry_Idle -ID: 64806384 -Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Pressed.shtex.shmeta b/Assets/Texture/Buttons/Button_Retry_Pressed.shtex.shmeta deleted file mode 100644 index d4064d14..00000000 --- a/Assets/Texture/Buttons/Button_Retry_Pressed.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: Button_Retry_Pressed -ID: 63234380 -Type: 3