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

Updated MainMenu and Gameplay UI

Assets/Materials/UI/UIMat_MainMenu.shmat

@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 58181851
+    data.textureIndex: 56004904
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UIMat_MenuBG.shmat

@@ -0,0 +1,8 @@
+- VertexShader: 46580970
+  FragmentShader: 35983630
+  SubPass: UI
+  Properties:
+    data.color: {x: 1, y: 1, z: 1, w: 1}
+    data.textureIndex: 60776650
+    data.alpha: 1
+    data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/UIMat_MenuBG.shmat.shmeta

@@ -0,0 +1,3 @@
+Name: UIMat_MenuBG
+ID: 130823048
+Type: 7

Assets/Scenes/Level1.shade

@@ -6842,6 +6842,7 @@
       timer: 200
       scoreText: 237
       timeText: 525
+      minusTimerText: 65735
       multiplierText: 524
       maxMultiplierDuration: 5
       maxMultiplierCombo: 10
@@ -8044,9 +8045,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -775, y: 325, z: 0.600000024}
+      Translate: {x: -800, y: 365, z: 0.600000024}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 120, y: 120, z: 1}
+      Scale: {x: 100, y: 100, z: 60}
       IsActive: true
     Text Renderer Component:
       Text: My name is Brandon.
@@ -8062,7 +8063,7 @@
   Scripts:
     - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning
       Enabled: true
-      offsetPerDigit: 30
+      offsetPerDigit: 25
     - Type: SHADE_Scripting.UI.SingleScaleBounce
       Enabled: true
       durationUp: 0.150000006
@@ -8071,12 +8072,12 @@
 - EID: 525
   Name: Timer Text
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
-      Translate: {x: 650, y: 350, z: 0.100000001}
+      Translate: {x: 700, y: 400, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 85, y: 85, z: 1}
+      Scale: {x: 60, y: 60, z: 1}
       IsActive: true
     Text Renderer Component:
       Text: My name is Brandon.
@@ -8110,15 +8111,40 @@
       Clicked: false
       IsActive: true
   Scripts: ~
+- EID: 65735
+  Name: Minus Timer Text
+  IsActive: false
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: -0.800000012, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: false
+    Text Renderer Component:
+      Text: -10
+      Font: 174412429
+      Color: {x: 1, y: 0, z: 0, w: 1}
+      Text Size: {x: 1, y: 1, z: 1}
+      IsActive: false
+    UI Component:
+      Canvas ID: 526
+      Hovered: false
+      Clicked: false
+      IsActive: false
+  Scripts:
+    - Type: SHADE_Scripting.UI.MinusTimerText
+      Enabled: true
+      duration: 2
 - EID: 524
   Name: Multiplier Text
   IsActive: true
   NumberOfChildren: 1
   Components:
     Transform Component:
-      Translate: {x: -800, y: 175, z: 0.100000001}
+      Translate: {x: -800, y: 250, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 80, y: 80, z: 1}
+      Scale: {x: 50, y: 50, z: 60}
       IsActive: true
     Text Renderer Component:
       Text: X2
@@ -8143,7 +8169,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0.649999976, y: 0.400000006, z: 0.98999995}
+      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
@@ -8165,9 +8191,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -740, y: 400, z: 59.9999962}
+      Translate: {x: -770, y: 425, z: 59.9999962}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 414, y: 240, z: 1}
+      Scale: {x: 345.600006, y: 200, z: 60}
       IsActive: true
     Renderable Component:
       Mesh: 141771688

Assets/Scenes/Level2.shade

@@ -2878,8 +2878,9 @@
       Score: 0
       timer: 200
       scoreText: 237
-      timeText: 66057
+      timeText: 131278
-      multiplierText: 65675
+      minusTimerText: 131211
+      multiplierText: 66055
       maxMultiplierDuration: 5
       maxMultiplierCombo: 10
       multiplierFont: 60
@@ -14824,7 +14825,7 @@
       FOV: 90
       IsActive: true
   Scripts: ~
-- EID: 65735
+- EID: 131271
   Name: Gameplay Canvas
   IsActive: true
   NumberOfChildren: 4
@@ -14841,9 +14842,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -775, y: 325, z: 0.600000024}
+      Translate: {x: -800, y: 365, z: 0.600000024}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 120, y: 120, z: 1}
+      Scale: {x: 100, y: 100, z: 60}
       IsActive: true
     Text Renderer Component:
       Text: My name is Brandon.
@@ -14852,28 +14853,28 @@
       Text Size: {x: 1, y: 1, z: 1}
       IsActive: true
     UI Component:
-      Canvas ID: 65735
+      Canvas ID: 131271
       Hovered: false
       Clicked: false
       IsActive: true
   Scripts:
     - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning
       Enabled: true
-      offsetPerDigit: 30
+      offsetPerDigit: 25
     - Type: SHADE_Scripting.UI.SingleScaleBounce
       Enabled: true
       durationUp: 0.150000006
       durationDown: 0.300000012
       scaleSize: 1.20000005
-- EID: 66057
+- EID: 131278
   Name: Timer Text
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
-      Translate: {x: 650, y: 350, z: 0.100000001}
+      Translate: {x: 700, y: 400, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 85, y: 85, z: 1}
+      Scale: {x: 60, y: 60, z: 1}
       IsActive: true
     Text Renderer Component:
       Text: My name is Brandon.
@@ -14882,7 +14883,7 @@
       Text Size: {x: 1, y: 1, z: 1}
       IsActive: true
     UI Component:
-      Canvas ID: 65735
+      Canvas ID: 131271
       Hovered: false
       Clicked: false
       IsActive: true
@@ -14902,20 +14903,45 @@
       Material: 126220632
       IsActive: true
     UI Component:
-      Canvas ID: 65735
+      Canvas ID: 131271
       Hovered: false
       Clicked: false
       IsActive: true
   Scripts: ~
-- EID: 65675
+- EID: 131211
+  Name: Minus Timer Text
+  IsActive: false
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: -0.800000012, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: false
+    Text Renderer Component:
+      Text: -10
+      Font: 174412429
+      Color: {x: 1, y: 0, z: 0, w: 1}
+      Text Size: {x: 1, y: 1, z: 1}
+      IsActive: false
+    UI Component:
+      Canvas ID: 131271
+      Hovered: false
+      Clicked: false
+      IsActive: false
+  Scripts:
+    - Type: SHADE_Scripting.UI.MinusTimerText
+      Enabled: true
+      duration: 2
+- EID: 66055
   Name: Multiplier Text
   IsActive: true
   NumberOfChildren: 1
   Components:
     Transform Component:
-      Translate: {x: -800, y: 175, z: 0.100000001}
+      Translate: {x: -800, y: 250, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 80, y: 80, z: 1}
+      Scale: {x: 50, y: 50, z: 60}
       IsActive: true
     Text Renderer Component:
       Text: X2
@@ -14924,7 +14950,7 @@
       Text Size: {x: 1, y: 1, z: 1}
       IsActive: true
     UI Component:
-      Canvas ID: 65735
+      Canvas ID: 131271
       Hovered: false
       Clicked: false
       IsActive: true
@@ -14934,13 +14960,13 @@
       maxSize: 1
       minSize: 0.300000012
       minAlpha: 0.300000012
-- EID: 519
+- EID: 131593
   Name: Multiplier BG
   IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0.649999976, y: 0.400000006, z: 0.98999995}
+      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
@@ -14949,29 +14975,29 @@
       Material: 133784677
       IsActive: true
     UI Component:
-      Canvas ID: 65735
+      Canvas ID: 131271
       Hovered: false
       Clicked: false
       IsActive: true
   Scripts:
     - Type: FixRotation
       Enabled: true
-- EID: 65742
+- EID: 568
   Name: Score BG
   IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -740, y: 400, z: 59.9999962}
+      Translate: {x: -770, y: 425, z: 59.9999962}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 414, y: 240, z: 1}
+      Scale: {x: 345.600006, y: 200, z: 60}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
       Material: 127527215
       IsActive: true
     UI Component:
-      Canvas ID: 65735
+      Canvas ID: 131271
       Hovered: false
       Clicked: false
       IsActive: true

Assets/Scenes/Level3.shade

@@ -8657,18 +8657,18 @@
   Scripts: ~
 - EID: 542
   Name: ====AI=====
-  IsActive: false
+  IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
       Translate: {x: 0.892607987, y: 0, z: 1.50168896}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
-      IsActive: false
+      IsActive: true
     Renderable Component:
       Mesh: 140697366
       Material: 129495479
-      IsActive: false
+      IsActive: true
     RigidBody Component:
       Type: Dynamic
       Drag: 0.00999999978
@@ -8683,7 +8683,7 @@
       Freeze Rotation X: true
       Freeze Rotation Y: false
       Freeze Rotation Z: true
-      IsActive: false
+      IsActive: true
     Collider Component:
       Colliders:
         - Is Trigger: false
@@ -8695,7 +8695,7 @@
           Density: 1
           Position Offset: {x: 0, y: 0.899999976, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: false
+      IsActive: true
   Scripts:
     - Type: Homeowner1
       Enabled: true
@@ -8814,158 +8814,6 @@
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
   Scripts: ~
-- EID: 526
-  Name: Gameplay Canvas
-  IsActive: true
-  NumberOfChildren: 4
-  Components:
-    Canvas Component:
-      Canvas Width: 1920
-      Canvas Height: 1080
-      Scale by canvas width: false
-      IsActive: true
-  Scripts: ~
-- EID: 237
-  Name: Score Text
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -775, y: 325, z: 0.600000024}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 120, y: 120, z: 1}
-      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: 526
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts:
-    - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning
-      Enabled: true
-      offsetPerDigit: 30
-    - Type: SHADE_Scripting.UI.SingleScaleBounce
-      Enabled: true
-      durationUp: 0.150000006
-      durationDown: 0.300000012
-      scaleSize: 1.20000005
-- EID: 525
-  Name: Timer Text
-  IsActive: true
-  NumberOfChildren: 1
-  Components:
-    Transform Component:
-      Translate: {x: 650, y: 350, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 85, y: 85, z: 1}
-      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: 526
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
-- EID: 520
-  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: 526
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
-- EID: 524
-  Name: Multiplier Text
-  IsActive: true
-  NumberOfChildren: 1
-  Components:
-    Transform Component:
-      Translate: {x: -800, y: 175, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 80, y: 80, z: 1}
-      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: 526
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts:
-    - Type: SHADE_Scripting.UI.MultiplierTextFx
-      Enabled: true
-      maxSize: 1
-      minSize: 0.300000012
-      minAlpha: 0.300000012
-- EID: 519
-  Name: Multiplier BG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0.649999976, 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: 526
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts:
-    - Type: FixRotation
-      Enabled: true
-- EID: 521
-  Name: Score BG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -740, y: 400, z: 59.9999962}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 414, y: 240, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 127527215
-      IsActive: true
-    UI Component:
-      Canvas ID: 526
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
 - EID: 238
   Name: ====GameManager====
   IsActive: true
@@ -8982,6 +8830,7 @@
       timer: 200
       scoreText: 237
       timeText: 525
+      minusTimerText: 524
       multiplierText: 524
       maxMultiplierDuration: 5
       maxMultiplierCombo: 10
@@ -14776,3 +14625,180 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 526
+  Name: Gameplay Canvas
+  IsActive: true
+  NumberOfChildren: 4
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: true
+  Scripts: ~
+- EID: 237
+  Name: Score Text
+  IsActive: true
+  NumberOfChildren: 0
+  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: 526
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  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: 525
+  Name: Timer Text
+  IsActive: true
+  NumberOfChildren: 2
+  Components:
+    Transform Component:
+      Translate: {x: 700, y: 400, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 60, y: 60, z: 1}
+      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: 526
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 520
+  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: 526
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 524
+  Name: Minus Timer Text
+  IsActive: false
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: -0.800000012, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: false
+    Text Renderer Component:
+      Text: -10
+      Font: 174412429
+      Color: {x: 1, y: 0, z: 0, w: 1}
+      Text Size: {x: 1, y: 1, z: 1}
+      IsActive: false
+    UI Component:
+      Canvas ID: 526
+      Hovered: false
+      Clicked: false
+      IsActive: false
+  Scripts:
+    - Type: SHADE_Scripting.UI.MinusTimerText
+      Enabled: true
+      duration: 2
+- EID: 521
+  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: 526
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: SHADE_Scripting.UI.MultiplierTextFx
+      Enabled: true
+      maxSize: 1
+      minSize: 0.300000012
+      minAlpha: 0.300000012
+- EID: 519
+  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: 526
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: FixRotation
+      Enabled: true
+- EID: 599
+  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: 526
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~

Assets/Scenes/MainMenu.shade

@@ -35,9 +35,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -700, y: 350, z: 0.300000012}
+      Translate: {x: 0, y: 100, z: 0.300000012}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 355.756439, y: 355.756439, z: 1.18585491}
+      Scale: {x: 600, y: 600, z: 1.18585491}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
@@ -60,9 +60,9 @@
   NumberOfChildren: 6
   Components:
     Transform Component:
-      Translate: {x: -60, y: 0, z: 0}
+      Translate: {x: 0, y: -400, z: 0}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 0.899999976, y: 0.899999976, z: 1}
+      Scale: {x: 0.800000012, y: 0.800000012, z: 1}
       IsActive: true
     UI Component:
       Canvas ID: 0
@@ -76,9 +76,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -700, y: 100, z: 0.400000006}
+      Translate: {x: 0, y: 0, z: 0.400000006}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 450, y: 100, z: 1}
+      Scale: {x: 400, y: 100, z: 1}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
@@ -95,9 +95,6 @@
       Clicked: false
       IsActive: true
   Scripts:
-    - Type: ChangeSceneButton
-      Enabled: true
-      sceneID: 91947920
     - Type: SHADE_Scripting.UI.ButtonFX
       Enabled: true
       onHoverEnterSound: event:/UI/botton_hover
@@ -106,15 +103,18 @@
       onReleaseSound: event:/UI/button_fail
       hoverScale: 1.10000002
       clickScale: 0.899999976
+    - Type: SHADE_Scripting.UI.ChangeCanvasButton
+      Enabled: true
+      canvasToActivate: 50
 - EID: 6
   Name: Quit Game Button
   IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -700, y: -525, z: 0.400000006}
+      Translate: {x: 900, y: 0, z: 0.400000006}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 450, y: 100, z: 1}
+      Scale: {x: 400, y: 100, z: 1}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
@@ -143,28 +143,28 @@
       clickScale: 0.899999976
 - EID: 7
   Name: Level Select Button
-  IsActive: true
+  IsActive: false
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -700, y: -25, z: 0.400000006}
+      Translate: {x: 0, y: 0, z: 0.400000006}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 450, y: 100, z: 1}
+      Scale: {x: 400, y: 100, z: 1}
-      IsActive: true
+      IsActive: false
     Renderable Component:
       Mesh: 141771688
       Material: 129340704
-      IsActive: true
+      IsActive: false
     Button Component:
       Default Texture: 66852025
       Hovered Texture: 65992947
       Clicked Texture: 57197441
-      IsActive: true
+      IsActive: false
     UI Component:
       Canvas ID: 0
       Hovered: false
       Clicked: false
-      IsActive: true
+      IsActive: false
   Scripts:
     - Type: SHADE_Scripting.UI.ButtonFX
       Enabled: true
@@ -183,9 +183,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -700, y: -150, z: 0.400000006}
+      Translate: {x: -450, y: 0, z: 0.400000006}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 450, y: 100, z: 1}
+      Scale: {x: 400, y: 100, z: 1}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
@@ -219,9 +219,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -700, y: -275, z: 0.400000006}
+      Translate: {x: -900, y: 0, z: 0.400000006}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 450, y: 100, z: 1}
+      Scale: {x: 400, y: 100, z: 1}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
@@ -255,9 +255,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -700, y: -400, z: 0.400000006}
+      Translate: {x: 450, y: 0, z: 0.400000006}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 450, y: 100, z: 1}
+      Scale: {x: 400, y: 100, z: 1}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
@@ -343,7 +343,7 @@
 - EID: 13
   Name: How To Play Canvas
   IsActive: false
-  NumberOfChildren: 5
+  NumberOfChildren: 6
   Components:
     Canvas Component:
       Canvas Width: 1920
@@ -479,17 +479,17 @@
   Components:
     Transform Component:
       Translate: {x: -800, y: 450, z: 0}
-      Rotate: {x: 0, y: 0, z: 3.14159274}
+      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 100, y: 100, z: 1}
+      Scale: {x: 273, y: 100, z: 1}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
       Material: 129340704
       IsActive: true
     Button Component:
-      Default Texture: 55358401
+      Default Texture: 59813125
-      Hovered Texture: 59400474
+      Hovered Texture: 59813125
-      Clicked Texture: 52333376
+      Clicked Texture: 59813125
       IsActive: true
     UI Component:
       Canvas ID: 13
@@ -508,24 +508,40 @@
       onReleaseSound: event:/UI/button_fail
       hoverScale: 1.10000002
       clickScale: 0.899999976
+- EID: 444
+  Name: SubMenuBackGround
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 2}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1920, y: 1080, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 130823048
+      IsActive: true
+    UI Component:
+      Canvas ID: 13
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: SHADE_Scripting.UI.FadeInOnActive
+      Enabled: true
+      alpha: 0
 - EID: 19
   Name: Options Canvas
   IsActive: false
-  NumberOfChildren: 11
+  NumberOfChildren: 12
   Components:
     Canvas Component:
       Canvas Width: 1920
       Canvas Height: 1080
       Scale by canvas width: false
       IsActive: false
-  Scripts:
+  Scripts: ~
-    - Type: SHADE_Scripting.UI.Options
-      Enabled: true
-      masterVolSlider: 29
-      sfxVolSlider: 30
-      bgmVolSlider: 31
-      fovSlider: 37
-      sensitivitySlider: 38
 - EID: 20
   Name: BackGround
   IsActive: true
@@ -553,17 +569,17 @@
   Components:
     Transform Component:
       Translate: {x: -800, y: 450, z: 0}
-      Rotate: {x: 0, y: 0, z: 3.14159274}
+      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 100, y: 100, z: 1}
+      Scale: {x: 273, y: 100, z: 1}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
       Material: 129340704
       IsActive: true
     Button Component:
-      Default Texture: 55358401
+      Default Texture: 59813125
-      Hovered Texture: 59400474
+      Hovered Texture: 59813125
-      Clicked Texture: 52333376
+      Clicked Texture: 59813125
       IsActive: true
     UI Component:
       Canvas ID: 19
@@ -1198,6 +1214,29 @@
     - Type: SHADE_Scripting.UI.SliderText
       Enabled: true
       sliderObj: 38
+- EID: 443
+  Name: SubMenuBackGround
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 1}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1920, y: 1080, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 130823048
+      IsActive: true
+    UI Component:
+      Canvas ID: 19
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: SHADE_Scripting.UI.FadeInOnActive
+      Enabled: true
+      alpha: 0
 - EID: 46
   Name: Credits Canvas
   IsActive: false
@@ -1231,8 +1270,8 @@
   Scripts:
     - Type: SHADE_Scripting.UI.ScrollingCredits
       Enabled: true
-      endY: 4000
+      endY: 4500
-      duration: 20
+      duration: 32
 - EID: 48
   Name: BackButton
   IsActive: true
@@ -1240,17 +1279,17 @@
   Components:
     Transform Component:
       Translate: {x: -800, y: 450, z: 0}
-      Rotate: {x: 0, y: 0, z: 3.14159274}
+      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 100, y: 100, z: 1}
+      Scale: {x: 273, y: 100, z: 1}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
       Material: 129340704
       IsActive: true
     Button Component:
-      Default Texture: 55358401
+      Default Texture: 59813125
-      Hovered Texture: 59400474
+      Hovered Texture: 59813125
-      Clicked Texture: 52333376
+      Clicked Texture: 59813125
       IsActive: true
     UI Component:
       Canvas ID: 46
@@ -1314,7 +1353,7 @@
 - EID: 50
   Name: Level Select Canvas
   IsActive: false
-  NumberOfChildren: 3
+  NumberOfChildren: 5
   Components:
     Canvas Component:
       Canvas Width: 1920
@@ -1349,17 +1388,17 @@
   Components:
     Transform Component:
       Translate: {x: -800, y: 450, z: 0}
-      Rotate: {x: 0, y: 0, z: 3.14159274}
+      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 100, y: 100, z: 1}
+      Scale: {x: 273, y: 100, z: 1}
       IsActive: true
     Renderable Component:
       Mesh: 141771688
       Material: 129340704
       IsActive: true
     Button Component:
-      Default Texture: 55358401
+      Default Texture: 59813125
-      Hovered Texture: 59400474
+      Hovered Texture: 59813125
-      Clicked Texture: 52333376
+      Clicked Texture: 59813125
       IsActive: true
     UI Component:
       Canvas ID: 50
@@ -1400,6 +1439,129 @@
       Clicked: false
       IsActive: true
   Scripts: ~
+- EID: 442
+  Name: SubMenuBackGround
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.5}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1920, y: 1080, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 130823048
+      IsActive: true
+    UI Component:
+      Canvas ID: 50
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: SHADE_Scripting.UI.FadeInOnActive
+      Enabled: true
+      alpha: 0
+- EID: 441
+  Name: Level Select Buttons
+  IsActive: true
+  NumberOfChildren: 3
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: -75, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    UI Component:
+      Canvas ID: 50
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 440
+  Name: Level 1 Button
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -600, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 380, y: 879, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 129340704
+      IsActive: true
+    Button Component:
+      Default Texture: 52916516
+      Hovered Texture: 52916516
+      Clicked Texture: 52916516
+      IsActive: true
+    UI Component:
+      Canvas ID: 50
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: ChangeSceneButton
+      Enabled: true
+      sceneID: 91947920
+- EID: 439
+  Name: Level 2 Button
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 380, y: 879, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 129340704
+      IsActive: true
+    Button Component:
+      Default Texture: 55380564
+      Hovered Texture: 55380564
+      Clicked Texture: 55380564
+      IsActive: true
+    UI Component:
+      Canvas ID: 50
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: ChangeSceneButton
+      Enabled: true
+      sceneID: 86098106
+- EID: 438
+  Name: Level 3 Button
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 600, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 380, y: 879, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 129340704
+      IsActive: true
+    Button Component:
+      Default Texture: 53392159
+      Hovered Texture: 53392159
+      Clicked Texture: 53392159
+      IsActive: true
+    UI Component:
+      Canvas ID: 50
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: ChangeSceneButton
+      Enabled: true
+      sceneID: 88928066
 - EID: 450
   Name: TransitionCanvas
   IsActive: true

Assets/Scripts/Gameplay/Player/SC_PlayerController.cs

@@ -476,6 +476,8 @@ public class PlayerController : Script
         stateMachine.SetState(typeof(PlayerIdleState));
       tranform.LocalPosition = respawnPoint.GetComponent<Transform>().LocalPosition;
 
+       GameManager.Instance.RacoonCaught();
+
       if (pat && pat.item)
       {
         if (holdItem)

Assets/Scripts/Gameplay/SC_GameManager.cs

@@ -3,6 +3,7 @@ using SHADE_Scripting.Audio;
 using SHADE_Scripting.UI;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.Contracts;
 
 public class GameManager : Script
 {
@@ -27,6 +28,7 @@ public class GameManager : Script
 
   public GameObject scoreText;
   public GameObject timeText;
+  public GameObject minusTimerText;
 
   //mulitpler info
   public GameObject multiplierText;
@@ -184,6 +186,19 @@ public class GameManager : Script
     }
   }
 
+  public void RacoonCaught()
+    {
+        timer -= 10.0f;
+        if(minusTimerText != GameObject.Null)
+        {
+            MinusTimerText text =minusTimerText.GetScript<MinusTimerText>();
+            if(text)
+            {
+                text.Reset();
+            }
+        }
+    }
+
   private void Cheat()
   {
     if (Input.GetKeyUp(Input.KeyCode.F1))

Assets/Scripts/UI/EasingHelper.cs

@@ -10,7 +10,8 @@ using System.Threading.Tasks;
         EASE_OUT_SINE,
         EASE_OUT_BOUNCE,
         EASE_IN_BOUNCE,
-        EASE_INOUT_BOUNCE
+        EASE_INOUT_BOUNCE,
+        LINEAR
     }
 
 public static class EasingHelper
@@ -24,27 +25,32 @@ public static class EasingHelper
         {
           return EaseInSine(value);
         }
-        break;
+        
       case EASING_METHOD.EASE_OUT_SINE:
         {
           return EaseOutSine(value);
         }
-        break;
+        
       case EASING_METHOD.EASE_OUT_BOUNCE:
         {
           return EaseOutBounce(value);
         }
-        break;
+        
       case EASING_METHOD.EASE_IN_BOUNCE:
         {
           return EaseInBounce(value);
         }
-        break;
+        
       case EASING_METHOD.EASE_INOUT_BOUNCE:
         {
           return EaseInOutBounce(value);
         }
-        break;
+        
+      case EASING_METHOD.LINEAR:
+          {
+              return value;
+          }
+          
             default:
         return 0.0f;
     }

Assets/Scripts/UI/SC_FadeInOnActive.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SHADE;
+
+
+namespace SHADE_Scripting.UI
+{
+    public class FadeInOnActive: Script
+    {
+        [NonSerialized]
+        TweenThread thread;
+
+
+        protected override void start()
+        {
+            thread = TweenManager.CreateTweenThread(0.5f, 0.0f, 1.0f, EASING_METHOD.LINEAR);
+            thread.SetResetOnInactive(GameObject);
+        }
+
+        protected override void update()
+        {
+            if(thread != null)
+            {
+                Renderable renderable = GetComponent<Renderable>();
+                if(renderable)
+                {
+                    renderable.Material.SetProperty<float>("data.alpha", thread.GetValue());
+                }
+            }
+        }
+
+
+
+
+    }
+}

Assets/Scripts/UI/SC_FadeInOnActive.cs.shmeta

@@ -0,0 +1,3 @@
+Name: SC_FadeInOnActive
+ID: 163833605
+Type: 9

Assets/Scripts/UI/SC_MinusTimerText.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SHADE;
+
+namespace SHADE_Scripting.UI
+{
+    public class MinusTimerText: Script
+    {
+        public float duration = 0.5f;
+
+
+        private Vector3 startPos;
+
+        [NonSerialized]
+        TweenThread thread;
+
+        protected override void awake()
+        {
+            Transform transform = GetComponent<Transform>();
+            if(transform)
+            {
+                startPos = transform.LocalPosition;
+            }
+
+
+        }
+
+        protected override void start()
+        {
+            thread = TweenManager.CreateTweenThread(duration, 1.0f, 0.0f, EASING_METHOD.LINEAR);
+            thread.SetResetOnInactive(GameObject);
+        }
+
+
+        protected override void update()
+        {
+            if(thread != null)
+            {
+                TextRenderable text = GetComponent<TextRenderable>();
+                if (text)
+                {
+                    Color temp = text.TextColor;
+                    temp.a = thread.GetValue();
+                    text.TextColor = temp;
+                }
+                if(thread.IsCompleted())
+                {
+                    GameObject.SetActive(false);
+                }
+            }
+
+            Transform transform = GetComponent<Transform>();
+            if(transform)
+            {
+                Vector3 temp = transform.LocalPosition;
+                temp.y -= (float)Time.DeltaTime;
+                transform.LocalPosition = temp;
+            }
+
+        }
+
+        public void Reset()
+        {
+            GameObject.SetActive(true);
+            thread.Reset();
+            Transform transform = GetComponent<Transform>();
+            if (transform)
+            {
+                transform.LocalPosition = startPos;
+            }
+        }
+
+
+    }
+}

Assets/Scripts/UI/SC_MinusTimerText.cs.shmeta

@@ -0,0 +1,3 @@
+Name: SC_MinusTimerText
+ID: 154875718
+Type: 9

Assets/Scripts/UI/SC_ScrollingCredits.cs

@@ -30,7 +30,8 @@ namespace SHADE_Scripting.UI
             Transform transform = GetComponent<Transform>();
             if(transform != null)
             {
-                thread = TweenManager.CreateTweenThread(duration, transform.LocalPosition.y, endY, EASING_METHOD.EASE_IN_SINE);
+                thread = TweenManager.CreateTweenThread(duration, transform.LocalPosition.y, endY, EASING_METHOD.LINEAR);
+                thread.SetResetOnInactive(GameObject);
             }
         }
 

Assets/Scripts/UI/SC_TweenManager.cs

@@ -12,6 +12,8 @@ public class TweenThread
   private float value = 0.0f;
   public float startValue = 0.0f;
   public float endValue = 1.0f;
+
+  private GameObject goToCheckActive = GameObject.Null;
   public TweenThread(float duration, float startValue, float endValue, EASING_METHOD method)
   {
     this.duration = duration;
@@ -21,6 +23,15 @@ public class TweenThread
   }
   public void Update(float deltaTime)
   {
+    if (goToCheckActive != GameObject.Null)
+    {
+        if (goToCheckActive.IsActiveInHierarchy == false)
+        {
+            Reset();
+            
+            return;
+        }
+    }
     if (timer >= duration)
       return;
 
@@ -56,6 +67,11 @@ public class TweenThread
   {
     return value;
   }
+
+  public void SetResetOnInactive(GameObject go)
+  {
+      goToCheckActive = go;
+  }
 }
 
 
@@ -67,6 +83,9 @@ public class TweenThreadVec3
   private Vector3 value = Vector3.Zero;
   public Vector3 startValue = Vector3.Zero;
   public Vector3 endValue = Vector3.Zero;
+
+  private GameObject goToCheckActive = GameObject.Null;
+
   public TweenThreadVec3(float duration, Vector3 startValue, Vector3 endValue, EASING_METHOD method)
   {
     this.duration = duration;
@@ -76,6 +95,16 @@ public class TweenThreadVec3
   }
   public void Update(float deltaTime)
   {
+    if(goToCheckActive != GameObject.Null)
+    {
+      if(goToCheckActive.IsActiveInHierarchy == false)
+      {
+          Reset();
+        
+          return;
+      }
+    }
+
     if (timer >= duration)
       return;
 
@@ -111,6 +140,11 @@ public class TweenThreadVec3
   {
     return value;
   }
+
+  public void SetResetOnInactive(GameObject go)
+  {
+      this.goToCheckActive = go;
+  }
 }
 
 

Assets/Texture/Buttons/TX_Button_Back.shtex.shmeta

@@ -0,0 +1,3 @@
+Name: TX_Button_Back
+ID: 59813125
+Type: 3

Assets/Texture/UI/Level Select/TX_Button_Level1.shtex.shmeta

@@ -0,0 +1,3 @@
+Name: TX_Button_Level1
+ID: 52916516
+Type: 3

Assets/Texture/UI/Level Select/TX_Button_Level2_1.shtex.shmeta

@@ -0,0 +1,3 @@
+Name: TX_Button_Level2_1
+ID: 55380564
+Type: 3

Assets/Texture/UI/Level Select/TX_Button_Level3_1.shtex.shmeta

@@ -0,0 +1,3 @@
+Name: TX_Button_Level3_1
+ID: 53392159
+Type: 3

Assets/Texture/UI/TX_BG_MainMenu.shtex.shmeta

@@ -0,0 +1,3 @@
+Name: TX_BG_MainMenu
+ID: 56004904
+Type: 3

Assets/Texture/UI/TX_BG_SubMenus.shtex.shmeta

@@ -0,0 +1,3 @@
+Name: TX_BG_SubMenus
+ID: 60776650
+Type: 3