Fix adaptive bgm not changing on alert

AI fix
Merge pull request #456 from SHADE-DP/Navigation
2023-04-02 18:16:25 +08:00 · 2023-04-02 13:32:21 +08:00 · 2023-04-02 12:48:39 +08:00 · 2023-04-02 12:34:47 +08:00 · 2023-04-01 21:30:18 +08:00 · 2023-04-01 21:06:12 +08:00
47 changed files with 1010 additions and 254 deletions
--- a/Assets/Audio/SFX.bank
+++ b/Assets/Audio/SFX.bank
--- a/Assets/Materials/UIMat_Transistion.shmat
+++ b/Assets/Materials/UIMat_Transistion.shmat
@ -0,0 +1,8 @@
+- VertexShader: 46580970
+  FragmentShader: 40208610
+  SubPass: UI
+  Properties:
+    data.color: {x: 1, y: 1, z: 1, w: 1}
+    data.textureIndex: 50770098
+    data.alpha: 1
+    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/UIMat_Transistion.shmat.shmeta
+++ b/Assets/Materials/UIMat_Transistion.shmat.shmeta
@ -0,0 +1,3 @@
+Name: UIMat_Transistion
+ID: 132131066
+Type: 7
--- a/Data/Level3_NavData.shnav
+++ b/Data/Level3_NavData.shnav
--- a/Data/Level3_NavData.shnav.shmeta
+++ b/Data/Level3_NavData.shnav.shmeta
@ -1,3 +1,3 @@
 Name: Level3_NavData
-ID: 263362242
+ID: 252819653
 Type: 15
--- a/Assets/Scenes/CreditsScene.shade
+++ b/Assets/Scenes/CreditsScene.shade
@ -56,6 +56,7 @@
      Enabled: true
      endY: 4300
      duration: 27
+      levelTransition: 619
    - Type: SHADE_Scripting.UI.TransitToMainMenu
      Enabled: true
      timeToTransit: 27
@ -110,3 +111,64 @@
  Scripts:
    - Type: TweenManager
      Enabled: true
+- EID: 619
+  Name: LevelTransistionCanvas
+  IsActive: true
+  NumberOfChildren: 2
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: true
+  Scripts:
+    - Type: LevelTransistion
+      Enabled: true
+      logo: 618
+      bg: 617
+      duration: 0.5
+      bgEndPositionX: 3000
+      logoEndPositionX: 3000
+      rotAndScale: false
+      rotationAmt: 360
+      scaleAmt: 631
+- EID: 618
+  Name: LevelTransistionLogo
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 631, y: 631, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 126117259
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 617
+  Name: LevelTransistionBG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.200000003}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 4000, y: 4000, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 132131066
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
--- a/Assets/Scenes/CutSceneEnd.shade
+++ b/Assets/Scenes/CutSceneEnd.shade
@ -1,3 +1,4 @@
+- NavData: 0
 - EID: 1
  Name: Canvas4
  IsActive: true
@ -152,7 +153,7 @@
  Scripts:
    - Type: CutsceneEnd
      Enabled: true
-      nextScene: 92009475
+      nextScene: 97376761
      duration: 1
      skipDuration: 0.100000001
      cutscene4Points: 4
@ -161,6 +162,7 @@
      cutscene5Pics: 15
      canvas4: 1
      canvas5: 14
+      levelTransition: 619
 - EID: 4
  Name: CutScene4Points
  IsActive: true
@ -288,7 +290,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 250, y: -500, z: 0.100000001}
+      Translate: {x: 250, y: -500, z: 0.300000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 50, y: 50, z: 50}
      IsActive: true
@ -332,3 +334,72 @@
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
  Scripts: ~
+- EID: 619
+  Name: LevelTransistionCanvas
+  IsActive: true
+  NumberOfChildren: 2
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: true
+  Scripts:
+    - Type: LevelTransistion
+      Enabled: true
+      logo: 618
+      bg: 617
+      duration: 0.5
+      bgEndPositionX: 3000
+      logoEndPositionX: 3000
+      rotAndScale: false
+      rotationAmt: 360
+      scaleAmt: 631
+- EID: 618
+  Name: LevelTransistionLogo
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 631, y: 631, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 126117259
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 617
+  Name: LevelTransistionBG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.200000003}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 4000, y: 4000, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 132131066
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 616
+  Name: TweenManager
+  IsActive: true
+  NumberOfChildren: 0
+  Components: ~
+  Scripts:
+    - Type: TweenManager
+      Enabled: true
--- a/Assets/Scenes/CutSceneIntro.shade
+++ b/Assets/Scenes/CutSceneIntro.shade
@ -1,3 +1,4 @@
+- NavData: 0
 - EID: 1
  Name: Canvas1
  IsActive: true
@ -164,6 +165,7 @@
      canvas1: 1
      canvas2: 13
      canvas3: 24
+      levelTransition: 619
 - EID: 4
  Name: CutScene1Points
  IsActive: true
@ -177,7 +179,7 @@
  Components:
    Transform Component:
      Translate: {x: -550, y: 0, z: 0.5}
-      Rotate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 500.5, y: -274.5, z: 0.600000024}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
  Scripts: ~
@ -394,7 +396,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -1375, y: 250, z: 0.5}
+      Translate: {x: -1375, y: 250, z: 0.899999976}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 982, y: 527, z: 1}
      IsActive: true
@ -414,7 +416,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 200, y: 1200, z: 0.400000006}
+      Translate: {x: 200, y: 1200, z: 0.800000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 625, y: 579, z: 1}
      IsActive: true
@ -434,7 +436,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 1700, y: 200, z: 0.300000012}
+      Translate: {x: 1700, y: 200, z: 0.699999988}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 529, y: 670, z: 1}
      IsActive: true
@ -454,7 +456,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -1600, y: -200, z: 0.5}
+      Translate: {x: -1600, y: -200, z: 0.899999976}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1299, y: 575, z: 1}
      IsActive: true
@ -474,7 +476,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 500, y: -1275, z: 0.5}
+      Translate: {x: 500, y: -1275, z: 0.899999976}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 866, y: 483, z: 1}
      IsActive: true
@ -494,7 +496,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.699999988}
+      Translate: {x: 0, y: 0, z: 0.99000001}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1920, y: 1080, z: 1}
      IsActive: true
@ -514,7 +516,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 250, y: -500, z: 0.100000001}
+      Translate: {x: 250, y: -500, z: 0.400000006}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 50, y: 50, z: 50}
      IsActive: true
@ -542,7 +544,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -375, y: 250, z: 0.5}
+      Translate: {x: -375, y: 250, z: 0.899999976}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -553,7 +555,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 200, y: 200, z: 0.400000006}
+      Translate: {x: 200, y: 200, z: 0.800000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -564,7 +566,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 700, y: 200, z: 0.300000012}
+      Translate: {x: 700, y: 200, z: 0.699999988}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -575,7 +577,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -225, y: -200, z: 0.200000003}
+      Translate: {x: -225, y: -200, z: 0.600000024}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -586,8 +588,77 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 500, y: -275, z: 0.100000001}
+      Translate: {x: 500, y: -275, z: 0.5}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
  Scripts: ~
+- EID: 619
+  Name: LevelTransistionCanvas
+  IsActive: true
+  NumberOfChildren: 2
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: true
+  Scripts:
+    - Type: LevelTransistion
+      Enabled: true
+      logo: 618
+      bg: 617
+      duration: 0.5
+      bgEndPositionX: 3000
+      logoEndPositionX: 3000
+      rotAndScale: false
+      rotationAmt: 360
+      scaleAmt: 631
+- EID: 618
+  Name: LevelTransistionLogo
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 631, y: 631, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 126117259
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 617
+  Name: LevelTransistionBG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.200000003}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 4000, y: 4000, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 132131066
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 616
+  Name: TweenManager
+  IsActive: true
+  NumberOfChildren: 0
+  Components: ~
+  Scripts:
+    - Type: TweenManager
+      Enabled: true
--- a/Assets/Scenes/Level1.shade
+++ b/Assets/Scenes/Level1.shade
@ -6864,7 +6864,7 @@
          Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
          Friction: 0.400000006
          Bounciness: 0
-          Density: 1
+          Density: 2
          Position Offset: {x: 0, y: 0.100000001, z: 0}
          Rotation Offset: {x: 0, y: 0, z: 0}
      IsActive: true
@ -6906,7 +6906,7 @@
          Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
          Friction: 0.400000006
          Bounciness: 0
-          Density: 1
+          Density: 2
          Position Offset: {x: 0, y: 0.100000001, z: 0}
          Rotation Offset: {x: 0, y: 0, z: 0}
      IsActive: true
@ -6948,7 +6948,7 @@
          Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
          Friction: 0.400000006
          Bounciness: 0
-          Density: 1
+          Density: 2
          Position Offset: {x: 0, y: 0.100000001, z: 0}
          Rotation Offset: {x: 0, y: 0, z: 0}
      IsActive: true
@ -6990,7 +6990,7 @@
          Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
          Friction: 0.400000006
          Bounciness: 0
-          Density: 1
+          Density: 2
          Position Offset: {x: 0, y: 0.100000001, z: 0}
          Rotation Offset: {x: 0, y: 0, z: 0}
      IsActive: true
@ -8812,7 +8812,7 @@
      popInDuration: 0.5
      popOutDuration: 0.075000003
      stayDuration: 1
-      rotationAmt: 1800
+      rotationAmt: 360
      scaleAmtX: 538
      scaleAmtY: 377
 - EID: 463
@ -8831,11 +8831,12 @@
  Scripts:
    - Type: SHADE_Scripting.UI.PreviewLevel
      Enabled: true
-      endPoint1: [-5.5, 1.5, -2]
+      levelTransistion: 619
+      endPoint1: [-5.5, 1.20000005, -2]
      endPoint2: [1, 1.5, -7.5]
      endPoint3: [2.5, 1.5, -3]
      playerCamera: 65730
-      gameplayCanvas: 459
+      gameplayCanvas: 131271
      duration: 3
 - EID: 453
  Name: PreviewLevel1
@ -8843,7 +8844,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -7.5, y: 1.5, z: -2}
+      Translate: {x: -7.5, y: 1.20000005, z: -2}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -9413,7 +9414,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0, y: 0.300000012, z: 0.98999995}
+      Translate: {x: 0, y: 0.300000012, z: 0.699999988}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 5, y: 2, z: 1}
      IsActive: true
@ -9433,7 +9434,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0, y: -0.800000012, z: 0.100000001}
+      Translate: {x: 0, y: -0.800000012, z: 0.600000024}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: false
@ -9458,12 +9459,12 @@
  NumberOfChildren: 1
  Components:
    Transform Component:
-      Translate: {x: -800, y: 200, z: 0.100000001}
+      Translate: {x: -800, y: 200, z: 0.600000024}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 50, y: 50, z: 60}
      IsActive: true
    Text Renderer Component:
-      Text: X2
+      Text: X0
      Font: 174412429
      Color: {x: 1, y: 1, z: 1, w: 1}
      Text Size: {x: 1, y: 1, z: 1}
@ -9484,7 +9485,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995}
+      Translate: {x: 0.800000012, y: 0.400000006, z: 0.699999988}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 4.26499987, y: 2, z: 1}
      IsActive: true
@ -9506,7 +9507,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -770, y: 425, z: 59.9999962}
+      Translate: {x: -770, y: 425, z: 0.699999988}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 345.600006, y: 200, z: 60}
      IsActive: true
@ -9519,7 +9520,12 @@
      Hovered: false
      Clicked: false
      IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: SHADE_Scripting.UI.SingleScaleBounce
+      Enabled: true
+      durationUp: 0.150000006
+      durationDown: 0.300000012
+      scaleSize: 1.20000005
 - EID: 626
  Name: Result Canvas
  IsActive: false
@ -9538,6 +9544,7 @@
      maxCombo: 621
      finalScore: 620
      contiuneBtn: 624
+      levelTransition: 619
      nextScene: 86098106
      scoreTweenDur: 2
 - EID: 624
@ -9681,3 +9688,64 @@
      Clicked: false
      IsActive: true
  Scripts: ~
+- EID: 619
+  Name: LevelTransistionCanvas
+  IsActive: true
+  NumberOfChildren: 2
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: true
+  Scripts:
+    - Type: LevelTransistion
+      Enabled: true
+      logo: 618
+      bg: 617
+      duration: 0.5
+      bgEndPositionX: 3000
+      logoEndPositionX: 3000
+      rotAndScale: false
+      rotationAmt: 360
+      scaleAmt: 631
+- EID: 618
+  Name: LevelTransistionLogo
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 631, y: 631, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 126117259
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 617
+  Name: LevelTransistionBG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.200000003}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 4000, y: 4000, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 132131066
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
--- a/Assets/Scenes/Level2.shade
+++ b/Assets/Scenes/Level2.shade
@ -15957,7 +15957,7 @@
          Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
          Friction: 0.400000006
          Bounciness: 0
-          Density: 1
+          Density: 2
          Position Offset: {x: 0, y: 0.100000001, z: 0}
          Rotation Offset: {x: 0, y: 0, z: 0}
      IsActive: true
@ -16125,7 +16125,7 @@
          Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
          Friction: 0.400000006
          Bounciness: 0
-          Density: 1
+          Density: 2
          Position Offset: {x: 0, y: 0.100000001, z: 0}
          Rotation Offset: {x: 0, y: 0, z: 0}
      IsActive: true
@ -17027,7 +17027,7 @@
      popInDuration: 0.5
      popOutDuration: 0.075000003
      stayDuration: 1
-      rotationAmt: 1800
+      rotationAmt: 360
      scaleAmtX: 538
      scaleAmtY: 377
 - EID: 551
@ -17082,11 +17082,12 @@
  Scripts:
    - Type: SHADE_Scripting.UI.PreviewLevel
      Enabled: true
+      levelTransistion: 608
      endPoint1: [-3.5, 1.5, -4.5]
      endPoint2: [0, 2, 4.5]
      endPoint3: [1.14999998, 2.20000005, 2]
      playerCamera: 4
-      gameplayCanvas: 199
+      gameplayCanvas: 131271
      duration: 3
 - EID: 555
  Name: PreviewLevel1
@ -17094,7 +17095,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -5, y: 1.5, z: -3}
+      Translate: {x: -4.5, y: 1.5, z: -3.5}
      Rotate: {x: 0, y: -2.3561945, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -17233,7 +17234,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0, y: 0.300000012, z: 0.98999995}
+      Translate: {x: 0, y: 0.300000012, z: 0.699999988}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 5, y: 2, z: 1}
      IsActive: true
@ -17253,7 +17254,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0, y: -0.800000012, z: 0.100000001}
+      Translate: {x: 0, y: -0.800000012, z: 0.600000024}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: false
@ -17278,12 +17279,12 @@
  NumberOfChildren: 1
  Components:
    Transform Component:
-      Translate: {x: -800, y: 200, z: 0.100000001}
+      Translate: {x: -800, y: 200, z: 0.600000024}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 50, y: 50, z: 60}
      IsActive: true
    Text Renderer Component:
-      Text: X2
+      Text: X0
      Font: 174412429
      Color: {x: 1, y: 1, z: 1, w: 1}
      Text Size: {x: 1, y: 1, z: 1}
@ -17304,7 +17305,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995}
+      Translate: {x: 0.800000012, y: 0.400000006, z: 0.699999988}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 4.26499987, y: 2, z: 1}
      IsActive: true
@ -17326,7 +17327,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -770, y: 425, z: 59.9999962}
+      Translate: {x: -770, y: 425, z: 0.699999988}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 345.600006, y: 200, z: 60}
      IsActive: true
@ -17486,8 +17487,8 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0, y: 0, z: -0.329473495}
-      Rotate: {x: -0, y: 0, z: -0}
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
  Scripts: ~
@ -17509,6 +17510,7 @@
      maxCombo: 612
      finalScore: 610
      contiuneBtn: 623
+      levelTransition: 608
      nextScene: 88928066
      scoreTweenDur: 2
 - EID: 623
@ -17652,3 +17654,64 @@
      Clicked: false
      IsActive: true
  Scripts: ~
+- EID: 608
+  Name: LevelTransistionCanvas
+  IsActive: true
+  NumberOfChildren: 2
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: true
+  Scripts:
+    - Type: LevelTransistion
+      Enabled: true
+      logo: 607
+      bg: 606
+      duration: 0.5
+      bgEndPositionX: 3000
+      logoEndPositionX: 3000
+      rotAndScale: false
+      rotationAmt: 360
+      scaleAmt: 631
+- EID: 607
+  Name: LevelTransistionLogo
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 631, y: 631, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 126117259
+      IsActive: true
+    UI Component:
+      Canvas ID: 608
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 606
+  Name: LevelTransistionBG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.200000003}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 4000, y: 4000, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 132131066
+      IsActive: true
+    UI Component:
+      Canvas ID: 608
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
--- a/Assets/Scenes/Level3.shade
+++ b/Assets/Scenes/Level3.shade
@ -1,4 +1,4 @@
- NavData: 263362242
+- NavData: 252819653
 - EID: 0
  Name: Light_Direction
  IsActive: true
@ -6,7 +6,7 @@
  Components:
    Transform Component:
      Translate: {x: -4.64838362, y: 2.94342947, z: 0.209690213}
-      Rotate: {x: 6.41686916, y: 0.727440596, z: 2.90124035}
+      Rotate: {x: 2.99841309, y: 1.61244416, z: -0.287879944}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
    Light Component:
@ -3626,7 +3626,7 @@
  Components:
    Transform Component:
      Translate: {x: 2.75, y: 0, z: 6.25}
-      Rotate: {x: 0, y: 0, z: 0}
+      Rotate: {x: -0, y: 0, z: -0}
      Scale: {x: 0.75, y: 0.75, z: 0.75}
      IsActive: true
    Renderable Component:
@ -5367,7 +5367,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 3.25, y: 0, z: 7.55967045}
+      Translate: {x: 3.47301221, y: 0, z: 8.17157459}
      Rotate: {x: -0, y: 0, z: -0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -8802,7 +8802,7 @@
      popInDuration: 0.5
      popOutDuration: 0.075000003
      stayDuration: 1
-      rotationAmt: 1800
+      rotationAmt: 360
      scaleAmtX: 538
      scaleAmtY: 377
 - EID: 547
@ -9380,11 +9380,12 @@
  Scripts:
    - Type: SHADE_Scripting.UI.PreviewLevel
      Enabled: true
+      levelTransistion: 229
      endPoint1: [-1.79999995, 1.5, 0.5]
      endPoint2: [5, 3.5, 0.5]
-      endPoint3: [-0.5, 1.5, 3.5]
+      endPoint3: [0.5, 1.5, 0.5]
      playerCamera: 66063
-      gameplayCanvas: 526
+      gameplayCanvas: 66062
      duration: 3
 - EID: 555
  Name: PreviewLevel1
@ -9436,14 +9437,14 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 3.5, y: 1.5, z: 0}
-      Rotate: {x: 0, y: 2.26892805, z: 0}
+      Translate: {x: 5.5, y: 1.5, z: 0.5}
+      Rotate: {x: 0, y: 1.57079637, z: 0}
      Scale: {x: 0.999999821, y: 1, z: 0.999999821}
      IsActive: true
    Camera Component:
      Position: {x: 2.5, y: 1.5, z: -7.5}
      Pitch: 0
-      Yaw: 130
+      Yaw: 90
      Roll: 0
      Width: 1920
      Near: 0.00999999978
@ -10589,7 +10590,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 2.91941047, y: 0.527999997, z: 7.41522264}
+      Translate: {x: 2.91941047, y: 0.527999997, z: 8.10036278}
      Rotate: {x: -0, y: 0, z: -0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -12824,7 +12825,7 @@
  NumberOfChildren: 8
  Components:
    Transform Component:
-      Translate: {x: 5.5, y: 0.300000012, z: 10}
+      Translate: {x: 5.5, y: 0.0124755427, z: 10}
      Rotate: {x: -0, y: -3.1415925, z: 0}
      Scale: {x: 0.999999404, y: 1, z: 0.999999404}
      IsActive: true
@ -14464,7 +14465,7 @@
          Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
          Friction: 0.400000006
          Bounciness: 0
-          Density: 1
+          Density: 2
          Position Offset: {x: 0, y: 0.100000001, z: 0}
          Rotation Offset: {x: 0, y: 0, z: 0}
      IsActive: true
@ -14506,7 +14507,7 @@
          Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
          Friction: 0.400000006
          Bounciness: 0
-          Density: 1
+          Density: 2
          Position Offset: {x: 0, y: 0.100000001, z: 0}
          Rotation Offset: {x: 0, y: 0, z: 0}
      IsActive: true
@ -14548,7 +14549,7 @@
          Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
          Friction: 0.400000006
          Bounciness: 0
-          Density: 1
+          Density: 2
          Position Offset: {x: 0, y: 0.100000001, z: 0}
          Rotation Offset: {x: 0, y: 0, z: 0}
      IsActive: true
@ -14590,7 +14591,7 @@
          Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
          Friction: 0.400000006
          Bounciness: 0
-          Density: 1
+          Density: 2
          Position Offset: {x: 0, y: 0.100000001, z: 0}
          Rotation Offset: {x: 0, y: 0, z: 0}
      IsActive: true
@ -14793,8 +14794,8 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 3.65231538, y: 0.438600183, z: 7.60280371}
-      Rotate: {x: 0, y: 0, z: 0}
+      Translate: {x: 3.65231538, y: 0.438600183, z: 8.16182518}
+      Rotate: {x: -0, y: 0, z: -0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
    Renderable Component:
@ -14824,7 +14825,7 @@
          Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
          Friction: 0.400000006
          Bounciness: 0
-          Density: 1
+          Density: 2
          Position Offset: {x: 0, y: 0.100000001, z: 0}
          Rotation Offset: {x: 0, y: 0, z: 0}
      IsActive: true
@ -14866,7 +14867,7 @@
          Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
          Friction: 0.400000006
          Bounciness: 0
-          Density: 1
+          Density: 2
          Position Offset: {x: 0, y: 0.100000001, z: 0}
          Rotation Offset: {x: 0, y: 0, z: 0}
      IsActive: true
@ -14908,7 +14909,7 @@
          Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003}
          Friction: 0.400000006
          Bounciness: 0
-          Density: 1
+          Density: 2
          Position Offset: {x: 0, y: 0.100000001, z: 0}
          Rotation Offset: {x: 0, y: 0, z: 0}
      IsActive: true
@ -15264,7 +15265,13 @@
      Color Decay: {x: 0, y: 0, z: 0, w: 0}
      Acceleration: {x: 0, y: -0.100000001, z: 0}
      IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: DecorationAudio
+      Enabled: true
+      name: spark1
+      audio: event:/Props/sparks
+      loop: false
+      timeDruation: 2.29999995
 - EID: 608
  Name: Light particles
  IsActive: true
@ -15298,7 +15305,13 @@
      Color Decay: {x: 0, y: 0, z: 0, w: 0}
      Acceleration: {x: 0, y: -0.100000001, z: 0}
      IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: DecorationAudio
+      Enabled: true
+      name: spark2
+      audio: event:/Props/sparks
+      loop: false
+      timeDruation: 3.20000005
 - EID: 609
  Name: Light particles
  IsActive: true
@ -15332,7 +15345,13 @@
      Color Decay: {x: 0, y: 0, z: 0, w: 0}
      Acceleration: {x: 0, y: -0.100000001, z: 0}
      IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: DecorationAudio
+      Enabled: true
+      name: spark3
+      audio: event:/Props/sparks
+      loop: false
+      timeDruation: 2.5
 - EID: 610
  Name: Light particles
  IsActive: true
@ -15366,7 +15385,13 @@
      Color Decay: {x: 0, y: 0, z: 0, w: 0}
      Acceleration: {x: 0, y: -0.100000001, z: 0}
      IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: DecorationAudio
+      Enabled: true
+      name: spark4
+      audio: event:/Props/sparks
+      loop: false
+      timeDruation: 3.29999995
 - EID: 611
  Name: Water particles
  IsActive: true
@ -15434,7 +15459,13 @@
      Color Decay: {x: 0, y: 0, z: 0, w: 0}
      Acceleration: {x: 0, y: -0.100000001, z: 0}
      IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: DecorationAudio
+      Enabled: true
+      name: spark5
+      audio: event:/Props/sparks
+      loop: false
+      timeDruation: 2.29999995
 - EID: 613
  Name: Water particles
  IsActive: true
@ -15468,7 +15499,13 @@
      Color Decay: {x: 0, y: 0, z: 0, w: 0}
      Acceleration: {x: 0, y: -0.899999976, z: 0}
      IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: DecorationAudio
+      Enabled: true
+      name: water2
+      audio: event:/Props/tap_loop
+      loop: true
+      timeDruation: 0.5
 - EID: 615
  Name: Water particles
  IsActive: true
@ -15633,8 +15670,8 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0, y: 0, z: -0.329473495}
-      Rotate: {x: -0, y: 0, z: -0}
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
  Scripts: ~
@ -15762,12 +15799,12 @@
  NumberOfChildren: 1
  Components:
    Transform Component:
-      Translate: {x: -800, y: 200, z: 0.100000001}
+      Translate: {x: -800, y: 200, z: 0.600000024}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 50, y: 50, z: 60}
      IsActive: true
    Text Renderer Component:
-      Text: X2
+      Text: X0
      Font: 174412429
      Color: {x: 1, y: 1, z: 1, w: 1}
      Text Size: {x: 1, y: 1, z: 1}
@ -15788,7 +15825,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995}
+      Translate: {x: 0.800000012, y: 0.400000006, z: 0.98999995}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 4.26499987, y: 2, z: 1}
      IsActive: true
@ -15823,7 +15860,12 @@
      Hovered: false
      Clicked: false
      IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: SHADE_Scripting.UI.SingleScaleBounce
+      Enabled: true
+      durationUp: 0.150000006
+      durationDown: 0.300000012
+      scaleSize: 1.20000005
 - EID: 505
  Name: Result Canvas
  IsActive: false
@ -15842,6 +15884,7 @@
      maxCombo: 484
      finalScore: 274
      contiuneBtn: 488
+      levelTransition: 229
      nextScene: 84606951
      scoreTweenDur: 2
 - EID: 488
@ -15985,3 +16028,64 @@
      Clicked: false
      IsActive: true
  Scripts: ~
+- EID: 229
+  Name: LevelTransistionCanvas
+  IsActive: true
+  NumberOfChildren: 2
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: true
+  Scripts:
+    - Type: LevelTransistion
+      Enabled: true
+      logo: 228
+      bg: 227
+      duration: 0.5
+      bgEndPositionX: 3000
+      logoEndPositionX: 3000
+      rotAndScale: false
+      rotationAmt: 360
+      scaleAmt: 631
+- EID: 228
+  Name: LevelTransistionLogo
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 631, y: 631, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 126117259
+      IsActive: true
+    UI Component:
+      Canvas ID: 229
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 227
+  Name: LevelTransistionBG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.200000003}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 4000, y: 4000, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 132131066
+      IsActive: true
+    UI Component:
+      Canvas ID: 229
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
--- a/Assets/Scenes/MainMenu.shade
+++ b/Assets/Scenes/MainMenu.shade
@ -55,6 +55,7 @@
      minScale: 1
      maxScale: 1.20000005
      duration: 1.5
+      isActive: true
 - EID: 54
  Name: Main Menu Button Group
  IsActive: true
@ -1440,7 +1441,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -800, y: 450, z: 0}
+      Translate: {x: -800, y: 450, z: 0.300000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 273, y: 100, z: 1}
      IsActive: true
@ -1476,7 +1477,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -250, y: 400, z: 0.100000001}
+      Translate: {x: -250, y: 400, z: 0.300000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 100, y: 100, z: 1}
      IsActive: true
@ -1536,7 +1537,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -600, y: 0, z: 0}
+      Translate: {x: -600, y: 0, z: 0.300000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 345, y: 800, z: 1}
      IsActive: true
@ -1558,6 +1559,7 @@
    - Type: ChangeSceneButton
      Enabled: true
      sceneID: 91947920
+      levelTransistion: 433
    - Type: SHADE_Scripting.UI.ButtonFX
      Enabled: true
      onHoverEnterSound: event:/UI/botton_hover
@ -1572,7 +1574,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0, y: 0, z: 0}
+      Translate: {x: 0, y: 0, z: 0.300000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 345, y: 800, z: 1}
      IsActive: true
@ -1594,6 +1596,7 @@
    - Type: ChangeSceneButton
      Enabled: true
      sceneID: 86098106
+      levelTransistion: 433
    - Type: SHADE_Scripting.UI.ButtonFX
      Enabled: true
      onHoverEnterSound: event:/UI/botton_hover
@ -1608,7 +1611,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 600, y: 0, z: 0}
+      Translate: {x: 600, y: 0, z: 0.300000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 345, y: 800, z: 1}
      IsActive: true
@ -1630,6 +1633,7 @@
    - Type: ChangeSceneButton
      Enabled: true
      sceneID: 88928066
+      levelTransistion: 433
    - Type: SHADE_Scripting.UI.ButtonFX
      Enabled: true
      onHoverEnterSound: event:/UI/botton_hover
@ -1640,14 +1644,14 @@
      clickScale: 0.899999976
 - EID: 450
  Name: TransitionCanvas
-  IsActive: false
+  IsActive: true
  NumberOfChildren: 1
  Components:
    Canvas Component:
      Canvas Width: 1920
      Canvas Height: 1080
      Scale by canvas width: false
-      IsActive: false
+      IsActive: true
  Scripts: ~
 - EID: 65982
  Name: Transition
@ -1674,3 +1678,64 @@
      alphaValue: 0
      fadeInTime: 0.5
      fadeOutTime: 0.5
+- EID: 433
+  Name: LevelTransistionCanvas
+  IsActive: false
+  NumberOfChildren: 2
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: false
+  Scripts:
+    - Type: LevelTransistion
+      Enabled: true
+      logo: 431
+      bg: 432
+      duration: 0.800000012
+      bgEndPositionX: 0
+      logoEndPositionX: 0
+      rotAndScale: true
+      rotationAmt: 360
+      scaleAmt: 631
+- EID: 431
+  Name: LevelTransistionLogo
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 0, y: 0, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 126117259
+      IsActive: true
+    UI Component:
+      Canvas ID: 433
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 432
+  Name: LevelTransistionBG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -2500, y: 0, z: 0.200000003}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 4000, y: 4000, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 132131066
+      IsActive: true
+    UI Component:
+      Canvas ID: 433
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAttackHitbox.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAttackHitbox.cs
@ -50,13 +50,15 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework

    protected override void onTriggerStay(CollisionInfo info)
    {
-      if(info.GameObject.GetScript<PlayerController>())
+      if (info.GameObject.GetScript<PlayerController>())
+      { 
        pc = info.GameObject.GetScript<PlayerController>();
        if (ai && ai.atk && pc)
        {
          raccoonFound = true;
        }
      }
+    }


  }
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AlertState.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AlertState.cs
@ -52,7 +52,7 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States
 				}
 				
 			}
-      
+      SHADE.Audio.SetParameterWithLabel("PlayerDetection", "Detected");

 		}
    public override void OnExit()
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AttackState.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AttackState.cs
@ -88,10 +88,11 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States

    public override void update()
    {
-      if (ai.hitboxScript.raccoonFound)
+      if (ai.hitboxScript.raccoonFound && machine.GetScript<HomeOwnerAI>().atk)
      {
        raccoonCaught = true;
 				Transform pcTransform = ai.player.GetComponent<Transform>();
+        ai.player.GetScript<PlayerController>().Caught();
        Transform netTransform = ai.attackHitbox.GetComponentInChildren<Transform>();
 				if (pcTransform && netTransform)
 				{
@ -127,7 +128,7 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States
      else if (seq)
      {

-        if (timer <= 1.0f / 30.0f)
+        if (timer <= seqTime  * 0.5f)
        {
          //ai.attackHitbox.SetActive(true);
          machine.GetScript<HomeOwnerAI>().atk = true; 
--- a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs
+++ b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs
@ -22,6 +22,7 @@ public class PlayerController : Script
  public Transform tranform { get; set; }
  public Camera cam { get; set; }
  public CameraArm camArm { get; set; }
+  public Collider collider { get; set; }

  [NonSerialized]
  public PickAndThrow pat;
@ -124,6 +125,10 @@ public class PlayerController : Script
    if(!tranform)
      Debug.LogError("tranform is MISSING!");

+    collider = GetComponent<Collider>();
+    if (!collider)
+      Debug.LogError("collider is MISSING!");
+
    stateMachine = AddScript<StateMachine>();
    Dictionary<Type, BaseState> dictionary = new Dictionary<Type, BaseState>();
    dictionary.Add(typeof(PlayerIdleState), new PlayerIdleState(stateMachine));
@ -435,11 +440,14 @@ public class PlayerController : Script
    }

    if (!isGrounded && rb != null && (rb.LinearVelocity.y < 0.0f || Input.GetKeyUp(Input.KeyCode.Space)))
+    {
+      if (currentState != RaccoonStates.CAUGHT)
      {
        currentState = RaccoonStates.FALLING;
        if (stateMachine && !stateMachine.IsState(typeof(PlayerFallState)))
          stateMachine.SetState(typeof(PlayerFallState));
      }
+    }
   
  }

@ -463,6 +471,9 @@ public class PlayerController : Script

  private void Gravity()
  {
+    if (currentState == RaccoonStates.CAUGHT)
+      return;
+
    if (rb != null)
    {
      //check player vel.y if its close to zero its on the ground
@ -517,7 +528,6 @@ public class PlayerController : Script

  public void Caught()
  {
-    //Debug.Log("PlayerController: Raccoon Caught");
    currentState = RaccoonStates.CAUGHT;
    if (stateMachine && !stateMachine.IsState(typeof(PlayerCaughtState)))
      stateMachine.SetState(typeof(PlayerCaughtState));
@ -540,19 +550,26 @@ public class PlayerController : Script
        camArm.ArmLength = pat.tpc.armLength;
      }
    }
+
+    landedOnJumpPad = false;
+    jumpPadDrop = false;
+    rb.ClearForces();
+    rb.ClearTorque();
+    rb.LinearVelocity = Vector3.Zero;
+    rb.AngularVelocity = Vector3.Zero;
+    collider.GetCollisionShape(0).IsTrigger = true;
  }

  public void Reset()
  {
-    //Debug.Log("PlayerController: Raccon Reset " + currentState);
-
-    if (currentState == RaccoonStates.CAUGHT && tranform && respawnPoint)
+    if (tranform && respawnPoint)
    {
-			//Debug.Log("PlayerController: Raccon Reset inside if " + currentState);
+
      currentState = RaccoonStates.IDLE;
      if (stateMachine && !stateMachine.IsState(typeof(PlayerIdleState)))
        stateMachine.SetState(typeof(PlayerIdleState));

+      collider.GetCollisionShape(0).IsTrigger = false;
      tranform.GlobalPosition = respawnPoint.GetComponent<Transform>().GlobalPosition;

      GameManager.Instance.RacoonCaught();
--- a/Assets/Scripts/Gameplay/SC_DecorationAudio.cs
+++ b/Assets/Scripts/Gameplay/SC_DecorationAudio.cs
@ -0,0 +1,47 @@
+using SHADE;
+using SHADE_Scripting.Audio;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+public class DecorationAudio : Script
+{
+  public string name = "REPLACETHIS";
+  public string audio = "event:/UI/botton_hover";
+  public bool loop = true;
+  public float timeDruation = 0.5f;
+  private float timer = 0.0f;
+
+  protected override void awake()
+  {
+    if (audio != "Empty")
+    {
+      AudioHandler.audioClipHandlers[name] = Audio.CreateAudioClip(audio);
+      Audio.AttachAudioClipToObject(AudioHandler.audioClipHandlers[name], GameObject.EntityId);
+    }
+  }
+
+  protected override void start()
+  {
+    if (loop)
+      AudioHandler.audioClipHandlers[name].Play();
+
+  }
+
+  protected override void update()
+  {
+    if (!loop)
+    {
+      timer += Time.DeltaTimeF;
+      if (timer > timeDruation)
+      {
+        timer = 0.0f;
+        AudioHandler.audioClipHandlers[name].Play();
+      }
+    }
+  }
+
+}
+
--- a/Assets/Scripts/Gameplay/SC_DecorationAudio.cs.shmeta
+++ b/Assets/Scripts/Gameplay/SC_DecorationAudio.cs.shmeta
@ -0,0 +1,3 @@
+Name: SC_DecorationAudio
+ID: 166447267
+Type: 9
--- a/Assets/Scripts/Gameplay/SC_GameManager.cs
+++ b/Assets/Scripts/Gameplay/SC_GameManager.cs
@ -68,7 +68,7 @@ public class GameManager : Script
    Score = 0;
    currGameState = GameState.START;
    itemScored = false;
-    currMultiplierCombo = 1;
+    currMultiplierCombo = 0;
    currMultiplierDuration = 0;
    itemShatter = false;
    GamePause = false;
@ -109,9 +109,6 @@ public class GameManager : Script
    AudioHandler.audioClipHandlers["KitchenAmbience"] = Audio.CreateAudioClip("event:/Ambience/roomtone_kitchen");
    AudioHandler.audioClipHandlers["KitchenAmbience"].Play();

-    if (SceneFadeInOut.Instance != null)
-      SceneFadeInOut.Instance.CallFadeOut();
-
    GamePause = false;
  }

@ -146,7 +143,7 @@ public class GameManager : Script
        if (currMultiplierDuration >= maxMultiplierDuration)
        {
          itemScored = false;
-          currMultiplierCombo = 1;
+          currMultiplierCombo = 0;
          currMultiplierDuration = 0;
        }
      }
@ -240,9 +237,9 @@ public class GameManager : Script



-
-    //if (textBounce)
-    //  textBounce.ScaleBounceOnce();
+/*
+    if (textBounce)
+      textBounce.ScaleBounceOnce();*/

    if (textBGBounce)
      textBGBounce.ScaleBounceOnce();
--- a/Assets/Scripts/Gameplay/SC_PreviewLevel.cs
+++ b/Assets/Scripts/Gameplay/SC_PreviewLevel.cs
@ -9,6 +9,7 @@ namespace SHADE_Scripting.UI
  public class PreviewLevel : Script
  {
    private List<Camera> listOfCamera;
+    public GameObject levelTransistion;

    public Vector3 endPoint1;
    public Vector3 endPoint2;
@ -56,7 +57,7 @@ namespace SHADE_Scripting.UI

    protected override void update()
    {
-      if (SceneFadeInOut.Instance && !SceneFadeInOut.Instance.FadeOutFinished() && !point1Done)
+      if (SceneFadeInOut.Instance && !levelTransistion.GetScript<LevelTransistion>().complete && !point1Done)
      {
        moveToEndPoint1.Reset();
        return;
--- a/Assets/Scripts/Gameplay/SC_ScoringZone.cs
+++ b/Assets/Scripts/Gameplay/SC_ScoringZone.cs
@ -22,7 +22,11 @@ public class ScoringZone : Script
  {
    if (GameManager.Instance && info.GameObject.GetScript<Item>() && info.GameObject.IsActiveSelf && !info.GameObject.GetComponent<Collider>().GetCollisionShape(0).IsTrigger )
    {
+      if (GameManager.Instance.currMultiplierCombo > 1)
        GameManager.Instance.Score += info.GameObject.GetScript<Item>().Score * GameManager.Instance.currMultiplierCombo;
+      else
+        GameManager.Instance.Score += info.GameObject.GetScript<Item>().Score;
+
      GameManager.Instance.ItemScored();
      particle.EmissionCount = startingParticleCount * GameManager.Instance.currMultiplierCombo;
      particle.Emit();
--- a/Assets/Scripts/UI/EasingHelper.cs
+++ b/Assets/Scripts/UI/EasingHelper.cs
@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;

-    public enum EASING_METHOD
-    {
+public enum EASING_METHOD
+{
  EASE_IN_SINE,
  EASE_OUT_SINE,
  EASE_OUT_BOUNCE,
@ -14,7 +14,7 @@ using System.Threading.Tasks;
  EASE_OUT_CIRCLE,
  EASE_OUT_BACK,
  LINEAR
-    }
+}

 public static class EasingHelper
 {
--- a/Assets/Scripts/UI/SC_ButtonFX.cs
+++ b/Assets/Scripts/UI/SC_ButtonFX.cs
@ -54,7 +54,7 @@ namespace SHADE_Scripting.UI

        protected override void start()
        {
-            thread = TweenManager.CreateTweenThread(0.1f, 0.9f, 1.0f, EASING_METHOD.EASE_IN_SINE);
+            thread = TweenManager.CreateTweenThread(0.1f, 0.9f, 1.0f, EASING_METHOD.EASE_OUT_BACK);
            

            Transform transform = GetComponent<Transform>();
--- a/Assets/Scripts/UI/SC_ChangeSceneButton.cs
+++ b/Assets/Scripts/UI/SC_ChangeSceneButton.cs
@ -7,7 +7,8 @@ public class ChangeSceneButton : Script
 {
  public uint sceneID = 0;

-    //Whether the scene changing button has been clicked
+  public GameObject levelTransistion;
+
  private bool clickedFlag;

  protected override void awake()
@ -26,9 +27,8 @@ public class ChangeSceneButton : Script
        {
          Audio.PlaySFXOnce2D("event:/UI/success");
          Audio.StopAllSounds();
-                  if (SceneFadeInOut.Instance != null)
-                    SceneFadeInOut.Instance.CallFadeIn();
          clickedFlag = true;
+          levelTransistion.SetActive(true);
        }
      });
    }
@ -39,7 +39,7 @@ public class ChangeSceneButton : Script
  }
  protected override void update()
  {
-        if (clickedFlag && sceneID != 0 && SceneFadeInOut.Instance.FadeInFinished())
+    if (levelTransistion.GetScript<LevelTransistion>().complete && clickedFlag)
    {
      SceneManager.ChangeScene(sceneID);
    }
--- a/Assets/Scripts/UI/SC_CutSceneEnd.cs
+++ b/Assets/Scripts/UI/SC_CutSceneEnd.cs
@ -54,6 +54,9 @@ public class CutsceneEnd : Script
  private bool cutscene4Done = false;
  private bool cutscene5Done = false;

+  public GameObject levelTransition;
+  private bool waiting = false;
+
  protected override void awake()
  {
    initCutscene4();
@ -73,6 +76,9 @@ public class CutsceneEnd : Script

  protected override void update()
  {
+    if (!levelTransition.GetScript<LevelTransistion>().complete)
+      return;
+
    Canvas4();
    Canvas5();

@ -98,8 +104,12 @@ public class CutsceneEnd : Script

    if (Input.GetKeyUp(Input.KeyCode.Space) && cutscene5Done && canvas5.IsActiveSelf)
    {
-      SceneManager.ChangeScene(nextScene);
+      levelTransition.GetScript<LevelTransistion>().resetToLeft();
+      waiting = true;
    }
+
+    if (levelTransition.GetScript<LevelTransistion>().complete && waiting)
+      SceneManager.ChangeScene(nextScene);
  }

  private void Canvas4()
--- a/Assets/Scripts/UI/SC_CutsceneIntro.cs
+++ b/Assets/Scripts/UI/SC_CutsceneIntro.cs
@ -82,6 +82,9 @@ public class CutsceneIntro : Script
  private bool cutscene2Done = false;
  private bool cutscene3Done = false;

+  public GameObject levelTransition;
+  private bool waiting = false;
+
  protected override void awake()
  {
    initCutscene1();
@ -109,6 +112,9 @@ public class CutsceneIntro : Script

  protected override void update()
  {
+    if (!levelTransition.GetScript<LevelTransistion>().complete)
+      return;
+
    Canvas1();
    Canvas2();
    Canvas3();
@ -148,8 +154,12 @@ public class CutsceneIntro : Script

    if (Input.GetKeyUp(Input.KeyCode.Space) && cutscene3Done && canvas3.IsActiveSelf)
    {
-      SceneManager.ChangeScene(nextScene);
+      levelTransition.GetScript<LevelTransistion>().resetToLeft();
+      waiting = true;
    }
+
+    if (levelTransition.GetScript<LevelTransistion>().complete && waiting)
+      SceneManager.ChangeScene(nextScene);
  }

  private void Canvas1()
--- a/Assets/Scripts/UI/SC_LevelTransistion.cs
+++ b/Assets/Scripts/UI/SC_LevelTransistion.cs
@ -0,0 +1,91 @@
+using SHADE;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+
+public class LevelTransistion : Script
+{
+
+  public GameObject logo;
+  public GameObject bg;
+  public float duration = 2.0f;
+  public float bgEndPositionX = 2500;
+  public float logoEndPositionX = 2500;
+
+  public bool rotAndScale = true;
+  public float rotationAmt = 360;
+  public float scaleAmt = 631;
+
+  public bool complete { get; set; }
+
+  private Transform logoTran;
+  private Transform bgTran;
+
+  private TweenThread bgTween;
+  private TweenThread logoTween;
+  private TweenThread rot;
+  private TweenThread scale;
+
+  protected override void awake()
+  {
+    logoTran = logo.GetComponent<Transform>();
+    if (!logoTran)
+      Debug.LogError("MISSING LOGO TRAN");
+
+    bgTran = bg.GetComponent<Transform>();
+    if (!bgTran)
+      Debug.LogError("MISSING BG TRAN");
+
+    complete = false;
+  }
+
+  protected override void start()
+  {
+    bgTween = TweenManager.CreateTweenThread(duration, bgTran.LocalPosition.x, bgEndPositionX, EASING_METHOD.EASE_OUT_CIRCLE);
+    logoTween = TweenManager.CreateTweenThread(duration , logoTran.LocalPosition.x, logoEndPositionX, EASING_METHOD.EASE_OUT_CIRCLE);
+    rot = TweenManager.CreateTweenThread(duration , 0, rotationAmt, EASING_METHOD.EASE_OUT_BACK);
+    scale = TweenManager.CreateTweenThread(duration, 0, scaleAmt, EASING_METHOD.EASE_OUT_BACK);
+  }
+
+  protected override void update()
+  {
+    if (bgTween != null)
+      bgTran.LocalPosition = new Vector3(bgTween.GetValue(), 0, bgTran.LocalPosition.z);
+
+    if (rotAndScale)
+    {
+      logoTran.LocalScale = new Vector3(scale.GetValue(), scale.GetValue(), 1);
+      logoTran.LocalEulerAngles = new Vector3(0, 0, SHADE.Math.DegreesToRadians(rot.GetValue()));
+    }
+    else
+    {
+      logoTran.LocalPosition = new Vector3(logoTween.GetValue(), 0, logoTran.LocalPosition.z);
+    }
+
+    if (bgTween.IsCompleted() && logoTween.IsCompleted())
+      complete = true;
+  }
+
+  public void resetToLeft()
+  {
+    logoTran.LocalEulerAngles = Vector3.Zero;
+    logoTran.LocalPosition = Vector3.Zero;
+    logoTran.LocalScale = Vector3.Zero;
+    bgTween.duration = 0.8f;
+    bgTween.Reset(-3000.0f,0.0f);
+    logoTween.duration = 0.8f;
+    logoTween.Reset();
+    rot.duration = 0.8f;
+    rot.Reset();
+    scale.duration = 0.8f;
+    scale.Reset();
+    complete = false;
+    rotAndScale = true;
+  }
+
+
+}
+
--- a/Assets/Scripts/UI/SC_LevelTransistion.cs.shmeta
+++ b/Assets/Scripts/UI/SC_LevelTransistion.cs.shmeta
@ -0,0 +1,3 @@
+Name: SC_LevelTransistion
+ID: 158044875
+Type: 9
--- a/Assets/Scripts/UI/SC_MainMenu.cs
+++ b/Assets/Scripts/UI/SC_MainMenu.cs
@ -26,6 +26,7 @@ public class MainMenu : Script
  {
    Input.SetMouseCentering(false);
    Application.IsCursorVisible = true;
+    if(SceneFadeInOut.Instance)
      SceneFadeInOut.Instance.CallFadeOut();
  }
  protected override void update()
--- a/Assets/Scripts/UI/SC_MultiplierTextFx.cs
+++ b/Assets/Scripts/UI/SC_MultiplierTextFx.cs
@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;

 namespace SHADE_Scripting.UI
@ -40,8 +41,13 @@ namespace SHADE_Scripting.UI

    protected override void update()
    {
+
+      if (sizeThread == null || sizeInvertThread == null)
+        return;
+
      Transform transform = GetComponent<Transform>();

+      GetComponent<TextRenderable>().Text = $"X {GameManager.Instance.currMultiplierCombo}";

      if (transform != null)
      {
@ -66,7 +72,6 @@ namespace SHADE_Scripting.UI

        public void ShowMultiplier(int multiplier, float duration)
        {
-            GetComponent<TextRenderable>().Text = $"X {multiplier}";
            sizeThread.duration = duration + sizeUpDuration;

            sizeInvertThread.Reset();
--- a/Assets/Scripts/UI/SC_Results.cs
+++ b/Assets/Scripts/UI/SC_Results.cs
@ -14,6 +14,7 @@ public class Results : Script
  public GameObject maxCombo;
  public GameObject finalScore;
  public GameObject contiuneBtn;
+  public GameObject levelTransition;
  public uint nextScene;
  public float scoreTweenDur = 2.0f;

@ -73,9 +74,7 @@ public class Results : Script
    {
      contiune.OnRelease.RegisterAction(() =>
      {
-        if (SceneFadeInOut.Instance != null)
-          SceneFadeInOut.Instance.CallFadeIn();
-
+        levelTransition.GetScript<LevelTransistion>().resetToLeft();
        waitForTransition = true;

        GameManager.Instance.GamePause = false;
@ -93,7 +92,7 @@ public class Results : Script

  protected override void update()
  {
-    if (SceneFadeInOut.Instance && SceneFadeInOut.Instance.FadeInFinished() && waitForTransition)
+    if (levelTransition.GetScript<LevelTransistion>().complete && waitForTransition)
    {
      Audio.StopAllSounds();
      SceneManager.ChangeScene(nextScene);
--- a/Assets/Scripts/UI/SC_ScaleBounce.cs
+++ b/Assets/Scripts/UI/SC_ScaleBounce.cs
@ -1,4 +1,4 @@
-using SHADE;
+using SHADE;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@ -27,7 +27,7 @@ namespace SHADE_Scripting.UI
    {
      thread = TweenManager.CreateTweenThread(duration, minScale, maxScale, EASING_METHOD.EASE_IN_SINE);
      Transform trans = GetComponent<Transform>();
-            if(trans != null)
+      if (trans != null)
      {
        defaultScale = trans.LocalScale;
      }
@ -35,20 +35,22 @@ namespace SHADE_Scripting.UI

    protected override void update()
    {
+
      if (thread == null)
        return;
-            if(isActive != lastActive && isActive == true)
+
+      if (isActive != lastActive && isActive == true)
      {
        thread.Reset();
      }
      lastActive = isActive;

      Transform trans = GetComponent<Transform>();
-            if(trans != null && isActive)
+      if (trans != null && isActive)
      {
        trans.LocalScale = defaultScale * thread.GetValue();
      }
-            if(thread.IsCompleted())
+      if (thread.IsCompleted())
      {
        thread.ResetInvert();
      }
--- a/Assets/Scripts/UI/SC_ScrollingCredits.cs
+++ b/Assets/Scripts/UI/SC_ScrollingCredits.cs
@ -7,11 +7,12 @@ using System.Threading.Tasks;

 namespace SHADE_Scripting.UI
 {
-    public class ScrollingCredits: Script
+  public class ScrollingCredits : Script
  {

    public float endY = 4000.0f;
    public float duration = 30.0f;
+    public GameObject levelTransition;


    [NonSerialized]
@ -25,10 +26,9 @@ namespace SHADE_Scripting.UI

    protected override void start()
    {
-            base.start();

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

    protected override void update()
    {
-            base.update();

      Transform transform = GetComponent<Transform>();

-            if(thread != null && transform !=  null)
+      if (thread != null && transform != null)
      {
-                transform.LocalPosition = new Vector3( transform.LocalPosition.x ,thread.GetValue() , transform.LocalPosition.z);
+        transform.LocalPosition = new Vector3(transform.LocalPosition.x, thread.GetValue(), transform.LocalPosition.z);
      }
    }
  }
--- a/Assets/Scripts/UI/SC_SingleScaleBounce.cs
+++ b/Assets/Scripts/UI/SC_SingleScaleBounce.cs
@ -38,7 +38,7 @@ namespace SHADE_Scripting.UI
    protected override void start()
    {
      
-        thread = TweenManager.CreateTweenThread(0.0f, 1.0f, 1.0f, EASING_METHOD.EASE_IN_SINE);
+        thread = TweenManager.CreateTweenThread(0.0f, 1.0f, 1.0f, EASING_METHOD.LINEAR);
    }


@ -50,6 +50,7 @@ namespace SHADE_Scripting.UI
        {
          scaleUp = false;
          thread.duration = durationDown;
+          thread.method = EASING_METHOD.LINEAR;
          thread.ResetInvert();
        }
      }
@ -65,6 +66,7 @@ namespace SHADE_Scripting.UI
      {
        thread.duration = durationUp;
        thread.Reset(1.0f, scaleSize);
+        thread.method = EASING_METHOD.EASE_OUT_BACK;
      }
      else
      {
--- a/Assets/Scripts/UI/SC_StealFoodPopUp.cs
+++ b/Assets/Scripts/UI/SC_StealFoodPopUp.cs
@ -35,9 +35,9 @@ public class StealFoodPopUp : Script

  protected override void start()
  {
-    rot = TweenManager.CreateTweenThread(popInDuration, 0, rotationAmt, EASING_METHOD.EASE_IN_SINE);
-    scaleX = TweenManager.CreateTweenThread(popInDuration, 0, scaleAmtX, EASING_METHOD.EASE_IN_SINE);
-    scaleY = TweenManager.CreateTweenThread(popInDuration, 0, scaleAmtY, EASING_METHOD.EASE_IN_SINE);
+    rot = TweenManager.CreateTweenThread(popInDuration * 0.4f, 0, rotationAmt, EASING_METHOD.LINEAR);
+    scaleX = TweenManager.CreateTweenThread(popInDuration, 0, scaleAmtX, EASING_METHOD.EASE_OUT_BACK);
+    scaleY = TweenManager.CreateTweenThread(popInDuration, 0, scaleAmtY, EASING_METHOD.EASE_OUT_BACK);

    tran = GetComponent<Transform>();
    if (!tran)
--- a/Assets/Shaders/Kirsch_CS.shshaderb
+++ b/Assets/Shaders/Kirsch_CS.shshaderb
--- a/Assets/Shaders/ParticleUpdateGrowThenShrink_CS.shshaderb
+++ b/Assets/Shaders/ParticleUpdateGrowThenShrink_CS.shshaderb
--- a/Assets/Shaders/ParticleUpdateRandomAcc_CS.shshaderb
+++ b/Assets/Shaders/ParticleUpdateRandomAcc_CS.shshaderb
--- a/Assets/Shaders/ParticleUpdateRandomColor_CS.shshaderb
+++ b/Assets/Shaders/ParticleUpdateRandomColor_CS.shshaderb
--- a/Assets/Shaders/UI_FS.shshaderb
+++ b/Assets/Shaders/UI_FS.shshaderb
--- a/Assets/Shaders/UI_TRANSISTION_FS.glsl
+++ b/Assets/Shaders/UI_TRANSISTION_FS.glsl
@ -0,0 +1,41 @@
+#version 450
+#extension GL_ARB_separate_shader_objects : enable
+#extension GL_ARB_shading_language_420pack : enable
+#extension GL_EXT_nonuniform_qualifier : require
+
+struct MatPropData
+{
+  int textureIndex;
+  float alpha;
+};
+
+layout(location = 0) in struct
+{
+  vec4 vertPos; // location 0
+  vec2 uv; // location = 1
+  vec4 normal; // location = 2
+
+} In;
+
+// material stuff
+layout(location = 3) flat in struct
+{
+  int materialIndex;
+  uint eid;
+  uint lightLayerIndex;
+} In2;
+
+layout (set = 0, binding = 1) uniform sampler2D textures[]; // for textures (global)
+layout (std430, set = 2, binding = 0) buffer MaterialProperties     // For materials 
+{
+  MatPropData data[];
+} MatProp;
+
+layout(location = 0) out vec4 fragColor;
+layout(location = 1) out uint outEntityID;
+
+void main()
+{
+  fragColor = texture(textures[nonuniformEXT(MatProp.data[In2.materialIndex].textureIndex)], In.uv);
+  outEntityID = In2.eid;
+}
--- a/Assets/Shaders/UI_TRANSISTION_FS.shshaderb
+++ b/Assets/Shaders/UI_TRANSISTION_FS.shshaderb
--- a/Assets/Shaders/UI_TRANSISTION_FS.shshaderb.shmeta
+++ b/Assets/Shaders/UI_TRANSISTION_FS.shshaderb.shmeta
@ -0,0 +1,3 @@
+Name: UI_TRANSISTION_FS
+ID: 40208610
+Type: 2
--- a/Assets/Texture/UI/TX_TransistionBG.dds
+++ b/Assets/Texture/UI/TX_TransistionBG.dds
--- a/Assets/Texture/UI/TX_TransistionBG.shtex
+++ b/Assets/Texture/UI/TX_TransistionBG.shtex
--- a/Assets/Texture/UI/TX_TransistionBG.shtex.shmeta
+++ b/Assets/Texture/UI/TX_TransistionBG.shtex.shmeta
@ -0,0 +1,3 @@
+Name: TX_TransistionBG
+ID: 50770098
+Type: 3
--- a/SHADE_Engine/src/Graphics/Descriptors/SHVkDescriptorPool.h
+++ b/SHADE_Engine/src/Graphics/Descriptors/SHVkDescriptorPool.h
@ -47,7 +47,7 @@ namespace SHADE
            /// <summary>
            /// Maximum number of descriptor sets allowed
            /// </summary>
-            uint32_t MaxSets = 100;
+            uint32_t MaxSets = 300;
            /// <summary>
            /// Flags used to create the DescriptorPool
            /// </summary>
Author	SHA1	Message	Date
Sri Sham Haran	0f7d86543f	Fix adaptive bgm not changing on alert	2023-04-02 18:16:25 +08:00
Glence	8ffca03f16	AI fix	2023-04-02 13:32:21 +08:00
XiaoQiDigipen	724f8ae2cf	Merge pull request #456 from SHADE-DP/Navigation adjusted hitbox timing	2023-04-02 12:48:39 +08:00
maverickdgg	f495dfe4fd	adjusted hitbox timing	2023-04-02 12:34:47 +08:00
Glence	e5c8f4c380	fix camera jittering	2023-04-01 21:30:18 +08:00
Glence	f114a7f59a	Scene changes for level preview	2023-04-01 21:06:12 +08:00
XiaoQiDigipen	273bdfcdcc	Merge pull request #455 from SHADE-DP/PlayerController bug fixes	2023-04-01 19:18:29 +08:00
Glence	9b55d69f9a	Merge branch 'main' into PlayerController	2023-04-01 19:14:38 +08:00
Glence	716087d15c	small bug fixes	2023-04-01 19:14:30 +08:00
Xiao Qi	5c79bb7f9f	Recompiled all shaders	2023-04-01 18:55:25 +08:00
XiaoQiDigipen	f54448b5eb	Merge pull request #454 from SHADE-DP/PlayerController Credits and Transition done	2023-04-01 18:09:04 +08:00
Glence	51f426868e	credits and transition done	2023-04-01 18:07:22 +08:00
Glence	51867f0c5e	Merge branch 'main' into PlayerController	2023-04-01 17:23:04 +08:00
Glence	96fd8295aa	audio	2023-04-01 17:22:51 +08:00
XiaoQiDigipen	a3c1993576	Merge pull request #453 from SHADE-DP/PlayerController Level changes and bug fix	2023-04-01 16:43:19 +08:00
Glence	cc9b7c20c4	Merge branch 'main' into PlayerController	2023-04-01 16:30:43 +08:00
Glence	ce6288880a	other stuff	2023-04-01 16:30:33 +08:00
Glence	b2e38df969	Merge branch 'main' into PlayerController	2023-04-01 16:11:09 +08:00
XiaoQiDigipen	0dad2e9e9f	Merge pull request #451 from SHADE-DP/PlayerController Scene changes	2023-04-01 16:11:08 +08:00
Glence	f70a41a9dc	transition for level is done along with bug fix	2023-04-01 16:08:32 +08:00
Glence	3e4794cebc	Merge branch 'main' into PlayerController	2023-04-01 00:51:27 +08:00
Glence	191ed7de43	scene changes	2023-04-01 00:51:15 +08:00