Merge pull request #392 from SHADE-DP/SP3-20-UI-System

Updated Level 1 UI

Assets/Scenes/Level1.shade

@@ -280,8 +280,8 @@
   Scripts:
     - Type: SHADE_Scripting.Audio.SoundLoopEmitter
       Enabled: true
-      clipHandlerName: "SFXWash65"
+      clipHandlerName: SFXWash65
-      clipPath: "event:/Props/washing_machine_loop"
+      clipPath: event:/Props/washing_machine_loop
       volume: 0.300000012
 - EID: 66
   Name: washingMachineDoor
@@ -426,8 +426,8 @@
   Scripts:
     - Type: SHADE_Scripting.Audio.SoundLoopEmitter
       Enabled: true
-      clipHandlerName: "SFXWash43"
+      clipHandlerName: SFXWash43
-      clipPath: "event:/Props/washing_machine_loop"
+      clipPath: event:/Props/washing_machine_loop
       volume: 0.300000012
 - EID: 44
   Name: washingMachineDoor
@@ -473,8 +473,8 @@
   Scripts:
     - Type: SHADE_Scripting.Audio.SoundLoopEmitter
       Enabled: true
-      clipHandlerName: "SFXWash42"
+      clipHandlerName: SFXWash42
-      clipPath: "event:/Props/washing_machine_loop"
+      clipPath: event:/Props/washing_machine_loop
       volume: 0.300000012
 - EID: 131081
   Name: washingMachineDoor
@@ -2418,7 +2418,7 @@
   Components:
     Transform Component:
       Translate: {x: 0, y: 0, z: 0}
-      Rotate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0.5, y: -299.5, z: 0.5}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
     Renderable Component:
@@ -4116,63 +4116,6 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
-- EID: 199
-  Name: =====Text====
-  IsActive: true
-  NumberOfChildren: 3
-  Components: ~
-  Scripts: ~
-- EID: 237
-  Name: Score
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -800, y: 400, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 60, y: 60, z: 60}
-      IsActive: true
-    Text Renderer Component:
-      Text: "Score: 0"
-      Font: 176667660
-      Color: {x: 1, y: 1, z: 1, w: 1}
-      Text Size: {x: 1, y: 1, z: 1}
-      IsActive: true
-  Scripts: ~
-- EID: 206
-  Name: Timer
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 500, y: 400, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 60, y: 60, z: 60}
-      IsActive: true
-    Text Renderer Component:
-      Text: "Time Left: 200"
-      Font: 176667660
-      Color: {x: 1, y: 1, z: 1, w: 1}
-      Text Size: {x: 1, y: 1, z: 1}
-      IsActive: true
-  Scripts: ~
-- EID: 238
-  Name: Multiplier
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -800, y: 300, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 60, y: 60, z: 60}
-      IsActive: true
-    Text Renderer Component:
-      Text: ""
-      Font: 176667660
-      Color: {x: 1, y: 1, z: 1, w: 1}
-      Text Size: {x: 1, y: 1, z: 1}
-      IsActive: true
-  Scripts: ~
 - EID: 236
   Name: ====GameManager====
   IsActive: true
@@ -4187,9 +4130,9 @@
       totalItemCount: 4
       Score: 0
       timer: 200
-      scoreText: 237
+      scoreText: 449
-      timeText: 206
+      timeText: 520
-      multiplierText: 238
+      multiplierText: 139
       maxMultiplierDuration: 5
       maxMultiplierCombo: 10
       multiplierFont: 60
@@ -5240,7 +5183,7 @@
     Transform Component:
       Translate: {x: 0, y: 100, z: 0}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 300, y: 200, z: 500}
+      Scale: {x: 400, y: 100, z: 500}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
@@ -5256,7 +5199,15 @@
       Hovered: false
       Clicked: false
       IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: SHADE_Scripting.UI.ButtonFX
+      Enabled: true
+      onHoverEnterSound: event:/Music/player_undetected
+      onHoverExitSound: event:/Music/player_undetected
+      onClickSound: event:/Music/player_undetected
+      onReleaseSound: event:/Music/player_undetected
+      hoverScale: 1.10000002
+      clickScale: 0.899999976
 - EID: 456
   Name: QuitButton
   IsActive: true
@@ -5265,7 +5216,7 @@
     Transform Component:
       Translate: {x: 0, y: -300, z: 0}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 300, y: 200, z: 500}
+      Scale: {x: 400, y: 100, z: 500}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
@@ -5281,7 +5232,15 @@
       Hovered: false
       Clicked: false
       IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: SHADE_Scripting.UI.ButtonFX
+      Enabled: true
+      onHoverEnterSound: event:/Music/player_undetected
+      onHoverExitSound: event:/Music/player_undetected
+      onClickSound: event:/Music/player_undetected
+      onReleaseSound: event:/Music/player_undetected
+      hoverScale: 1.10000002
+      clickScale: 0.899999976
 - EID: 455
   Name: RetryButton
   IsActive: true
@@ -5290,7 +5249,7 @@
     Transform Component:
       Translate: {x: 0, y: -100, z: 0}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 300, y: 200, z: 500}
+      Scale: {x: 400, y: 100, z: 500}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
@@ -5306,7 +5265,15 @@
       Hovered: false
       Clicked: false
       IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: SHADE_Scripting.UI.ButtonFX
+      Enabled: true
+      onHoverEnterSound: event:/Music/player_undetected
+      onHoverExitSound: event:/Music/player_undetected
+      onClickSound: event:/Music/player_undetected
+      onReleaseSound: event:/Music/player_undetected
+      hoverScale: 1.10000002
+      clickScale: 0.899999976
 - EID: 454
   Name: GamePauseText
   IsActive: true
@@ -5319,7 +5286,7 @@
       IsActive: true
     Text Renderer Component:
       Text: Game Pause
-      Font: 176667660
+      Font: 174412429
       Color: {x: 1, y: 1, z: 1, w: 1}
       Text Size: {x: 1, y: 1, z: 1}
       IsActive: false
@@ -5364,4 +5331,146 @@
       Enabled: true
       alphaValue: 1
       fadeInTime: 0.5
-      fadeOutTime: 0.5
+      fadeOutTime: 0.5
+- EID: 459
+  Name: Gameplay Canvas
+  IsActive: true
+  NumberOfChildren: 3
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: true
+  Scripts: ~
+- EID: 449
+  Name: Score Text
+  IsActive: true
+  NumberOfChildren: 1
+  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: 459
+      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: ~
+- EID: 520
+  Name: Timer Text
+  IsActive: true
+  NumberOfChildren: 1
+  Components:
+    Transform Component:
+      Translate: {x: 700, y: 400, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 60, y: 60, 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: 459
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 519
+  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: 459
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 139
+  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: 459
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: SHADE_Scripting.UI.MultiplierTextFx
+      Enabled: true
+      maxSize: 1
+      minSize: 0.300000012
+      minAlpha: 0.300000012
+- EID: 518
+  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: 459
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~

Assets/Scenes/Level2.shade

@@ -6168,7 +6168,7 @@
   Components:
     Transform Component:
       Translate: {x: 0, y: -300, z: 0}
-      Rotate: {x: 3.25, y: 0.5, z: 4.5}
+      Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 400, y: 100, z: 500}
       IsActive: true
     Renderable Component:
@@ -6233,13 +6233,13 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -250, y: 300, z: 0}
+      Translate: {x: -250, y: 300, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 100, y: 100, z: 100}
       IsActive: true
     Text Renderer Component:
       Text: Game Pause
-      Font: 176667660
+      Font: 174412429
       Color: {x: 1, y: 1, z: 1, w: 1}
       Text Size: {x: 1, y: 1, z: 1}
       IsActive: false

Assets/Scripts/UI/SC_EndScene.cs

@@ -17,8 +17,8 @@ public class EndScene : Script
   protected override void start()
   {
     Debug.Log("EndScene::Start():");
-    //Input.SetMouseCentering(false);
+    Input.SetMouseCentering(false);
-    //Application.IsCursorVisible = true;
+    Application.IsCursorVisible = true;
     SceneFadeInOut.Instance.CallFadeOut();
   }