diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade index 2a681369..0cce71b4 100644 --- a/Assets/Scenes/Level1.shade +++ b/Assets/Scenes/Level1.shade @@ -7941,9 +7941,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 @@ -7953,10 +7953,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 456 @@ -7986,10 +7986,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 455 @@ -8007,9 +8007,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 @@ -8019,10 +8019,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 454 @@ -8086,7 +8086,7 @@ - EID: 459 Name: Gameplay Canvas IsActive: true - NumberOfChildren: 3 + NumberOfChildren: 4 Components: Canvas Component: Canvas Width: 1920 @@ -8097,7 +8097,7 @@ - EID: 449 Name: Score Text IsActive: true - NumberOfChildren: 1 + NumberOfChildren: 0 Components: Transform Component: Translate: {x: -800, y: 365, z: 0.600000024} @@ -8115,27 +8115,15 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ -- EID: 521 - Name: Score BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.300000012, y: 0.600000024, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - 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: ~ + 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: 520 Name: Timer Text IsActive: true @@ -8225,6 +8213,26 @@ Clicked: false IsActive: true 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 Name: DirectionalLight IsActive: true diff --git a/Assets/Scenes/LoseScene.shade b/Assets/Scenes/LoseScene.shade index 00730785..b74fb117 100644 --- a/Assets/Scenes/LoseScene.shade +++ b/Assets/Scenes/LoseScene.shade @@ -74,10 +74,10 @@ sceneID: 97158628 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 6 @@ -109,10 +109,10 @@ Enabled: true - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 3 diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index b6490a0b..ea770107 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -100,10 +100,10 @@ sceneID: 91947920 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 6 @@ -135,10 +135,10 @@ Enabled: true - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 7 @@ -168,10 +168,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - Type: SHADE_Scripting.UI.ChangeCanvasButton @@ -204,10 +204,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - Type: SHADE_Scripting.UI.ChangeCanvasButton @@ -240,10 +240,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - Type: SHADE_Scripting.UI.ChangeCanvasButton @@ -276,10 +276,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - Type: SHADE_Scripting.UI.ChangeCanvasButton @@ -429,10 +429,10 @@ multiImageList: 15 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 17 @@ -466,10 +466,10 @@ multiImageList: 15 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 18 @@ -502,10 +502,10 @@ canvasToActivate: 0 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 19 @@ -576,10 +576,10 @@ canvasToActivate: 0 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 22 @@ -1263,10 +1263,10 @@ canvasToActivate: 0 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 49 @@ -1372,10 +1372,10 @@ canvasToActivate: 0 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 53 diff --git a/Assets/Scenes/WinScene.shade b/Assets/Scenes/WinScene.shade index a936ac54..c1ba5024 100644 --- a/Assets/Scenes/WinScene.shade +++ b/Assets/Scenes/WinScene.shade @@ -74,10 +74,10 @@ sceneID: 97158628 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 6 @@ -109,10 +109,10 @@ Enabled: true - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 3 diff --git a/Assets/Scripts/Gameplay/SC_GameManager.cs b/Assets/Scripts/Gameplay/SC_GameManager.cs index 8398bb06..78414b26 100644 --- a/Assets/Scripts/Gameplay/SC_GameManager.cs +++ b/Assets/Scripts/Gameplay/SC_GameManager.cs @@ -101,6 +101,8 @@ public class GameManager : Script protected override void update() { + + if (GamePause || !stealFoodPopUpDone) { return; @@ -195,6 +197,13 @@ public class GameManager : Script if (SceneFadeInOut.Instance != null) SceneFadeInOut.Instance.CallFadeIn(); } + + if (Input.GetKeyUp(Input.KeyCode.G)) + { + ItemScored(); + Score += 500; + } + } @@ -219,6 +228,13 @@ public class GameManager : Script fx.ShowMultiplier(currMultiplierCombo, maxMultiplierDuration); } + SingleScaleBounce sb = scoreText.GetScript(); + if(sb) + { + sb.ScaleBounceOnce(); + } + + } } diff --git a/Assets/Scripts/UI/SC_ButtonFX.cs b/Assets/Scripts/UI/SC_ButtonFX.cs index 7ecad2f2..dcfd42c7 100644 --- a/Assets/Scripts/UI/SC_ButtonFX.cs +++ b/Assets/Scripts/UI/SC_ButtonFX.cs @@ -9,10 +9,10 @@ namespace SHADE_Scripting.UI { public class ButtonFX:Script { - public string onHoverEnterSound = "Empty"; + public string onHoverEnterSound = "event:/UI/botton_hover"; public string onHoverExitSound = "Empty"; - public string onClickSound = "event:/UI/mouse_down_element"; - public string onReleaseSound = "Empty"; + public string onClickSound = "event:/UI/button_success"; + public string onReleaseSound = "event:/UI/button_fail"; [NonSerialized] private AudioClipHandler onHoverEnterACHandler; diff --git a/Assets/Scripts/UI/SC_ScoreTextDigitPositioning.cs b/Assets/Scripts/UI/SC_ScoreTextDigitPositioning.cs new file mode 100644 index 00000000..0578ce21 --- /dev/null +++ b/Assets/Scripts/UI/SC_ScoreTextDigitPositioning.cs @@ -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(); + if(trans) + { + defaultPosition = trans.LocalPosition; + } + } + + protected override void update() + { + TextRenderable text = GetComponent(); + Transform trans = GetComponent(); + if (trans && text) + { + String str = text.Text; + + Vector3 offset = new Vector3((str.Length - 1) * offsetPerDigit, 0.0f, 0.0f); + + trans.LocalPosition = defaultPosition - offset; + } + } + + + } +} diff --git a/Assets/Scripts/UI/SC_ScoreTextDigitPositioning.cs.shmeta b/Assets/Scripts/UI/SC_ScoreTextDigitPositioning.cs.shmeta new file mode 100644 index 00000000..69d30960 --- /dev/null +++ b/Assets/Scripts/UI/SC_ScoreTextDigitPositioning.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_ScoreTextDigitPositioning +ID: 166859312 +Type: 9 diff --git a/Assets/Scripts/UI/SC_SingleScaleBounce.cs b/Assets/Scripts/UI/SC_SingleScaleBounce.cs new file mode 100644 index 00000000..d0eb4b66 --- /dev/null +++ b/Assets/Scripts/UI/SC_SingleScaleBounce.cs @@ -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(); + 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(); + if(trans != null) + { + trans.LocalScale = defaultScale * thread.GetValue(); + } + + + } + + + public void ScaleBounceOnce() + { + scaleUp = true; + thread.duration = durationUp; + thread.Reset(1.0f, scaleSize); + } + + + } +} diff --git a/Assets/Scripts/UI/SC_SingleScaleBounce.cs.shmeta b/Assets/Scripts/UI/SC_SingleScaleBounce.cs.shmeta new file mode 100644 index 00000000..63bec3f1 --- /dev/null +++ b/Assets/Scripts/UI/SC_SingleScaleBounce.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_SingleScaleBounce +ID: 151165363 +Type: 9 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 diff --git a/SHADE_Engine/src/Camera/SHCameraSystem.cpp b/SHADE_Engine/src/Camera/SHCameraSystem.cpp index bd4252f3..1686c0dc 100644 --- a/SHADE_Engine/src/Camera/SHCameraSystem.cpp +++ b/SHADE_Engine/src/Camera/SHCameraSystem.cpp @@ -215,7 +215,7 @@ namespace SHADE if (pivot.lookAtCameraOrigin) - CameraLookAt(*camera, camera->position + pivot.GetTargetOffset()); + CameraLookAt(*camera, camera->position + tOffset);