diff --git a/Assets/Scenes/CutSceneEnd.shade b/Assets/Scenes/CutSceneEnd.shade index c5893975..a1c81fb5 100644 --- a/Assets/Scenes/CutSceneEnd.shade +++ b/Assets/Scenes/CutSceneEnd.shade @@ -113,7 +113,7 @@ Text Renderer Component: Text: Press Space to contiune Font: 176667660 - Color: {x: 1, y: 1, z: 1, w: 1} + Color: {x: 0, y: 0, z: 0, w: 1} Text Size: {x: 1, y: 1, z: 1} IsActive: true UI Component: @@ -152,6 +152,7 @@ Scripts: - Type: CutsceneEnd Enabled: true + nextScene: 92009475 duration: 1 skipDuration: 0.100000001 cutscene4Points: 4 @@ -294,7 +295,7 @@ Text Renderer Component: Text: Press Space to contiune Font: 176667660 - Color: {x: 1, y: 1, z: 1, w: 1} + Color: {x: 0, y: 0, z: 0, w: 1} Text Size: {x: 1, y: 1, z: 1} IsActive: false UI Component: diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade index 1d47aa62..2fb7685e 100644 --- a/Assets/Scenes/Level2.shade +++ b/Assets/Scenes/Level2.shade @@ -2960,7 +2960,7 @@ Components: Transform Component: Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995} - Rotate: {x: 0, y: -299.5, z: 0.49999997} + Rotate: {x: 0, y: 0, z: 0} Scale: {x: 4.26499987, y: 2, z: 1} IsActive: true Renderable Component: @@ -2972,7 +2972,9 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ + Scripts: + - Type: FixRotation + Enabled: true - EID: 198 Name: ====Raccoon==== IsActive: true @@ -5398,7 +5400,7 @@ Enabled: true waypointsPool: 166 startWaypoint: 162 - patrolSpeed: 1 + patrolSpeed: 0.75 chaseSpeed: 2 turningSpeed: 5 sightDistance: 8 @@ -5441,6 +5443,7 @@ Default Texture: 63979907 Hovered Texture: 51379325 Clicked Texture: 66788278 + current texture: 0 IsActive: true UI Component: Canvas ID: 10 @@ -5474,6 +5477,7 @@ Default Texture: 61602036 Hovered Texture: 58910810 Clicked Texture: 57786063 + current texture: 0 IsActive: true UI Component: Canvas ID: 10 @@ -5489,6 +5493,8 @@ onReleaseSound: Empty hoverScale: 1.10000002 clickScale: 0.899999976 + - Type: FixRotation + Enabled: true - EID: 458 Name: RetryButton IsActive: true @@ -5507,6 +5513,7 @@ Default Texture: 64806384 Hovered Texture: 58347825 Clicked Texture: 63234380 + current texture: 0 IsActive: true UI Component: Canvas ID: 10 @@ -8144,7 +8151,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.400000006, y: 0.439999998, z: 0.400000006} Friction: 0.400000006 @@ -8153,7 +8160,7 @@ Position Offset: {x: 0, y: 0.219999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0399999991, y: 1, z: 0.400000006} Friction: 0.400000006 @@ -8993,7 +9000,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.699999988, y: 0.0500000007, z: 1.20000005} Friction: 0.400000006 @@ -9002,7 +9009,7 @@ Position Offset: {x: 0, y: 0.77700001, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0500000007, y: 0.800000012, z: 0.0500000007} Friction: 0.400000006 @@ -9011,7 +9018,7 @@ Position Offset: {x: -0.449999988, y: 0.400000006, z: -0.850000024} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0500000007, y: 0.800000012, z: 0.0500000007} Friction: 0.400000006 @@ -9020,7 +9027,7 @@ Position Offset: {x: -0.449999988, y: 0.400000006, z: 0.850000024} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0500000007, y: 0.800000012, z: 0.0500000007} Friction: 0.400000006 @@ -9029,7 +9036,7 @@ Position Offset: {x: 0.449999988, y: 0.400000006, z: 0.850000024} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0500000007, y: 0.800000012, z: 0.0500000007} Friction: 0.400000006 @@ -9056,7 +9063,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.400000006, y: 0.439999998, z: 0.400000006} Friction: 0.400000006 @@ -9065,7 +9072,7 @@ Position Offset: {x: 0, y: 0.219999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0399999991, y: 1, z: 0.400000006} Friction: 0.400000006 @@ -9092,7 +9099,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.400000006, y: 0.439999998, z: 0.400000006} Friction: 0.400000006 @@ -9101,7 +9108,7 @@ Position Offset: {x: 0, y: 0.219999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0399999991, y: 1, z: 0.400000006} Friction: 0.400000006 @@ -9128,7 +9135,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.400000006, y: 0.439999998, z: 0.400000006} Friction: 0.400000006 @@ -9137,7 +9144,7 @@ Position Offset: {x: 0, y: 0.219999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0399999991, y: 1, z: 0.400000006} Friction: 0.400000006 @@ -9164,7 +9171,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.400000006, y: 0.439999998, z: 0.400000006} Friction: 0.400000006 @@ -9173,7 +9180,7 @@ Position Offset: {x: 0, y: 0.219999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0399999991, y: 1, z: 0.400000006} Friction: 0.400000006 @@ -10539,7 +10546,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.899999976, y: 0.100000001, z: 1.89999998} Friction: 0.400000006 @@ -10638,7 +10645,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.400000006, y: 0.439999998, z: 0.400000006} Friction: 0.400000006 @@ -10647,7 +10654,7 @@ Position Offset: {x: 0, y: 0.219999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0399999991, y: 1, z: 0.400000006} Friction: 0.400000006 @@ -10766,7 +10773,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.899999976, y: 0.100000001, z: 1.89999998} Friction: 0.400000006 @@ -10957,7 +10964,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.899999976, y: 0.100000001, z: 1.89999998} Friction: 0.400000006 @@ -11056,7 +11063,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.699999988, y: 0.0500000007, z: 1.20000005} Friction: 0.400000006 @@ -11065,7 +11072,7 @@ Position Offset: {x: 0, y: 0.77700001, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0500000007, y: 0.800000012, z: 0.0500000007} Friction: 0.400000006 @@ -11074,7 +11081,7 @@ Position Offset: {x: -0.25, y: 0.400000006, z: -0.550000012} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0500000007, y: 0.800000012, z: 0.0500000007} Friction: 0.400000006 @@ -11083,7 +11090,7 @@ Position Offset: {x: -0.25, y: 0.400000006, z: 0.550000012} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0500000007, y: 0.800000012, z: 0.0500000007} Friction: 0.400000006 @@ -11092,7 +11099,7 @@ Position Offset: {x: 0.25, y: 0.400000006, z: 0.550000012} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0500000007, y: 0.800000012, z: 0.0500000007} Friction: 0.400000006 @@ -11119,7 +11126,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.400000006, y: 0.439999998, z: 0.400000006} Friction: 0.400000006 @@ -11128,7 +11135,7 @@ Position Offset: {x: 0, y: 0.219999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0399999991, y: 1, z: 0.400000006} Friction: 0.400000006 diff --git a/Assets/Scenes/Level3.shade b/Assets/Scenes/Level3.shade index 709ae0b9..1d3f226f 100644 --- a/Assets/Scenes/Level3.shade +++ b/Assets/Scenes/Level3.shade @@ -71,7 +71,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -80,7 +80,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -107,7 +107,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -116,7 +116,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -143,7 +143,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 3.22600007, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -170,7 +170,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -179,7 +179,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -215,7 +215,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -242,7 +242,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -269,7 +269,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -278,7 +278,7 @@ Position Offset: {x: 0.300000012, y: -0.119999997, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -287,7 +287,7 @@ Position Offset: {x: 0.660000026, y: -0.400000006, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -296,7 +296,7 @@ Position Offset: {x: 1, y: -0.600000024, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -305,7 +305,7 @@ Position Offset: {x: 1.36000001, y: -0.899999976, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -314,7 +314,7 @@ Position Offset: {x: 1.70000005, y: -1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -323,7 +323,7 @@ Position Offset: {x: 2.04999995, y: -1.39999998, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -332,7 +332,7 @@ Position Offset: {x: 2.4000001, y: -1.64999998, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -341,7 +341,7 @@ Position Offset: {x: 2.75, y: -1.86000001, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -368,7 +368,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -395,7 +395,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -412,8 +412,8 @@ Components: Transform Component: Translate: {x: -1, y: 0, z: 4} - Rotate: {x: 0, y: -1.57079637, z: 0} - Scale: {x: 0.999951899, y: 1, z: 0.999951899} + Rotate: {x: -0, y: -1.57079613, z: 0} + Scale: {x: 0.99995178, y: 1, z: 0.99995178} IsActive: true Renderable Component: Mesh: 144033065 @@ -422,7 +422,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -431,7 +431,7 @@ Position Offset: {x: 0.0500000007, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -485,7 +485,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -512,7 +512,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -539,7 +539,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -548,7 +548,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.93700004} Friction: 0.400000006 @@ -575,7 +575,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -584,7 +584,7 @@ Position Offset: {x: 0.0500000007, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -611,7 +611,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -620,7 +620,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -647,7 +647,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -674,7 +674,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -701,7 +701,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 4.05200005, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -743,7 +743,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -881,7 +881,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -973,7 +973,7 @@ Components: Transform Component: Translate: {x: 1.5, y: 0, z: 4} - Rotate: {x: 0, y: 0, z: 0} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 0.999952376, y: 1, z: 0.999952376} IsActive: true Renderable Component: @@ -1283,7 +1283,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1310,7 +1310,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1319,7 +1319,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1677,7 +1677,7 @@ Components: Transform Component: Translate: {x: 0, y: 0, z: 4} - Rotate: {x: 0, y: 0, z: 0} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} IsActive: true Renderable Component: @@ -1692,7 +1692,7 @@ Components: Transform Component: Translate: {x: 2, y: 0, z: 4} - Rotate: {x: 0, y: 0, z: 0} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} IsActive: true Renderable Component: @@ -1799,7 +1799,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1808,7 +1808,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1835,7 +1835,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1844,7 +1844,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1871,7 +1871,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1880,7 +1880,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1907,7 +1907,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1916,7 +1916,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1943,7 +1943,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1952,7 +1952,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.149000004, y: 2.20000005, z: 2.204} Friction: 0.400000006 @@ -1979,7 +1979,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1988,7 +1988,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -2015,7 +2015,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2042,7 +2042,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 3.93700004, y: 2.20000005, z: 0.224999994} Friction: 0.400000006 @@ -2069,7 +2069,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2096,7 +2096,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2123,7 +2123,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2150,7 +2150,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2177,7 +2177,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2204,7 +2204,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2246,7 +2246,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2273,7 +2273,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2300,7 +2300,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2354,7 +2354,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2381,7 +2381,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2408,7 +2408,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2435,7 +2435,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2462,7 +2462,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2489,7 +2489,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2516,7 +2516,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2633,7 +2633,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2660,7 +2660,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.200000003, y: 2.20000005, z: 0.200000003} Friction: 0.400000006 @@ -2687,7 +2687,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.200000003, y: 2.20000005, z: 0.200000003} Friction: 0.400000006 @@ -2714,7 +2714,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.200000003, y: 2.20000005, z: 0.200000003} Friction: 0.400000006 @@ -3500,7 +3500,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.54999995, y: 1, z: 0.300000012} Friction: 0.400000006 @@ -3509,16 +3509,16 @@ Position Offset: {x: -0.159999996, y: 0.400000006, z: -0.649999976} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box - Half Extents: {x: 1, y: 1, z: 1} + Half Extents: {x: 1, y: 0.400000006, z: 1} Friction: 0.400000006 Bounciness: 0 Density: 1 - Position Offset: {x: 0, y: 0, z: 0} + Position Offset: {x: 0, y: 0.150000006, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 1, z: 1.29999995} Friction: 0.400000006 @@ -3561,8 +3561,8 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 3.25, y: 0, z: 6.25} - Rotate: {x: 0, y: 0, z: 0} + Translate: {x: 3.5, y: 0, z: 6.25} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 0.75, y: 0.75, z: 0.75} IsActive: true Renderable Component: @@ -3572,7 +3572,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.54999995, y: 1, z: 0.300000012} Friction: 0.400000006 @@ -3581,16 +3581,16 @@ Position Offset: {x: 0.159999996, y: 0.400000006, z: -0.649999976} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box - Half Extents: {x: 1, y: 1, z: 1} + Half Extents: {x: 1, y: 0.400000006, z: 1} Friction: 0.400000006 Bounciness: 0 Density: 1 - Position Offset: {x: 0, y: 0, z: 0} + Position Offset: {x: 0, y: 0.150000006, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 1, z: 1.29999995} Friction: 0.400000006 @@ -3606,7 +3606,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 2.5, y: 0, z: 6.25} + Translate: {x: 2.75, y: 0, z: 6.25} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 0.75, y: 0.75, z: 0.75} IsActive: true @@ -3617,7 +3617,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.54999995, y: 1, z: 0.300000012} Friction: 0.400000006 @@ -3626,16 +3626,16 @@ Position Offset: {x: -0.159999996, y: 0.400000006, z: -0.649999976} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box - Half Extents: {x: 1, y: 1, z: 1} + Half Extents: {x: 1, y: 0.400000006, z: 1} Friction: 0.400000006 Bounciness: 0 Density: 1 - Position Offset: {x: 0, y: 0, z: 0} + Position Offset: {x: 0, y: 0.150000006, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 1, z: 1.29999995} Friction: 0.400000006 @@ -3651,15 +3651,29 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 3.25, y: 0.25, z: 6.25} - Rotate: {x: 0, y: 0, z: 0} + Translate: {x: 3.5, y: 0.25, z: 6.25} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 0.749957442, y: 0.75, z: 0.749957442} IsActive: true Renderable Component: Mesh: 135719689 Material: 131956078 IsActive: true - Scripts: ~ + Collider Component: + Colliders: + - Is Trigger: false + Collision Tag: 0 + Type: Box + Half Extents: {x: 1, y: 0.25, z: 1} + Friction: 0.400000006 + Bounciness: 0 + Density: 1 + Position Offset: {x: 0, y: 0.100000001, z: 0} + Rotation Offset: {x: 0, y: 0, z: 0} + IsActive: true + Scripts: + - Type: JumpPad + Enabled: true - EID: 172 Name: BouncyPlatform IsActive: true @@ -3674,7 +3688,21 @@ Mesh: 135719689 Material: 131956078 IsActive: true - Scripts: ~ + Collider Component: + Colliders: + - Is Trigger: false + Collision Tag: 0 + Type: Box + Half Extents: {x: 1, y: 0.25, z: 1} + Friction: 0.400000006 + Bounciness: 0 + Density: 1 + Position Offset: {x: 0, y: 0.100000001, z: 0} + Rotation Offset: {x: 0, y: 0, z: 0} + IsActive: true + Scripts: + - Type: JumpPad + Enabled: true - EID: 173 Name: BouncyPlatform IsActive: true @@ -3682,29 +3710,57 @@ Components: Transform Component: Translate: {x: 1, y: 0.25, z: 7.25} - Rotate: {x: 0, y: 1.57079601, z: 0} - Scale: {x: 0.749957442, y: 0.75, z: 0.749957442} + Rotate: {x: -0, y: 1.57079601, z: -0} + Scale: {x: 0.749952435, y: 0.75, z: 0.749952435} IsActive: true Renderable Component: Mesh: 135719689 Material: 131956078 IsActive: true - Scripts: ~ + Collider Component: + Colliders: + - Is Trigger: false + Collision Tag: 0 + Type: Box + Half Extents: {x: 1, y: 0.25, z: 1} + Friction: 0.400000006 + Bounciness: 0 + Density: 1 + Position Offset: {x: 0, y: 0.100000001, z: 0} + Rotation Offset: {x: 0, y: 0, z: 0} + IsActive: true + Scripts: + - Type: JumpPad + Enabled: true - EID: 174 Name: BouncyPlatform IsActive: true NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 2.5, y: 0.25, z: 6.25} - Rotate: {x: 0, y: 0, z: 0} + Translate: {x: 2.75, y: 0.25, z: 6.25} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 0.749957442, y: 0.75, z: 0.749957442} IsActive: true Renderable Component: Mesh: 135719689 Material: 131956078 IsActive: true - Scripts: ~ + Collider Component: + Colliders: + - Is Trigger: false + Collision Tag: 0 + Type: Box + Half Extents: {x: 1, y: 0.25, z: 1} + Friction: 0.400000006 + Bounciness: 0 + Density: 1 + Position Offset: {x: 0, y: 0.100000001, z: 0} + Rotation Offset: {x: 0, y: 0, z: 0} + IsActive: true + Scripts: + - Type: JumpPad + Enabled: true - EID: 176 Name: KitchenetteCounter IsActive: true @@ -3782,7 +3838,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 2.5, y: 2, z: 1} Friction: 0.400000006 @@ -3809,7 +3865,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1, y: 4.9000001, z: 1} Friction: 0.400000006 @@ -4181,7 +4237,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.899999976, y: 0.340000004, z: 1} Friction: 0.400000006 @@ -4283,7 +4339,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.39199999, y: 0.560000002, z: 0.0340000018} Friction: 0.400000006 @@ -4292,7 +4348,7 @@ Position Offset: {x: 0, y: 0.572000027, z: -0.173999995} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.365999997, y: 0.0700000003, z: 0.382999986} Friction: 0.400000006 @@ -4301,7 +4357,7 @@ Position Offset: {x: 0, y: 0.328999996, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0450000018, y: 0.389999986, z: 0.370999992} Friction: 0.400000006 @@ -4310,7 +4366,7 @@ Position Offset: {x: 0.158999994, y: 0.163000003, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0450000018, y: 0.389999986, z: 0.370999992} Friction: 0.400000006 @@ -4397,7 +4453,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.68599999, y: 0.123999998, z: 1.19799995} Friction: 0.400000006 @@ -4406,7 +4462,7 @@ Position Offset: {x: 0, y: 0.603999972, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0839999989, y: 0.717999995, z: 0.0869999975} Friction: 0.400000006 @@ -4415,7 +4471,7 @@ Position Offset: {x: -0.291999996, y: 0.305999994, z: -0.550000012} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0839999989, y: 0.717999995, z: 0.0869999975} Friction: 0.400000006 @@ -4424,7 +4480,7 @@ Position Offset: {x: -0.291999996, y: 0.305999994, z: 0.537999988} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0839999989, y: 0.717999995, z: 0.0869999975} Friction: 0.400000006 @@ -4433,7 +4489,7 @@ Position Offset: {x: 0.282000005, y: 0.305999994, z: -0.550000012} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0839999989, y: 0.717999995, z: 0.0869999975} Friction: 0.400000006 @@ -4460,7 +4516,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.39199999, y: 0.560000002, z: 0.0340000018} Friction: 0.400000006 @@ -4469,7 +4525,7 @@ Position Offset: {x: 0, y: 0.572000027, z: -0.173999995} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.365999997, y: 0.0700000003, z: 0.382999986} Friction: 0.400000006 @@ -4478,7 +4534,7 @@ Position Offset: {x: 0, y: 0.328999996, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0450000018, y: 0.389999986, z: 0.370999992} Friction: 0.400000006 @@ -4487,7 +4543,7 @@ Position Offset: {x: 0.158999994, y: 0.163000003, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0450000018, y: 0.389999986, z: 0.370999992} Friction: 0.400000006 @@ -4514,7 +4570,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.39199999, y: 0.560000002, z: 0.0340000018} Friction: 0.400000006 @@ -4523,7 +4579,7 @@ Position Offset: {x: 0, y: 0.572000027, z: -0.173999995} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.365999997, y: 0.0700000003, z: 0.382999986} Friction: 0.400000006 @@ -4532,7 +4588,7 @@ Position Offset: {x: 0, y: 0.328999996, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0450000018, y: 0.389999986, z: 0.370999992} Friction: 0.400000006 @@ -4541,7 +4597,7 @@ Position Offset: {x: 0.158999994, y: 0.163000003, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0450000018, y: 0.389999986, z: 0.370999992} Friction: 0.400000006 @@ -4568,7 +4624,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.39199999, y: 0.560000002, z: 0.0340000018} Friction: 0.400000006 @@ -4577,7 +4633,7 @@ Position Offset: {x: 0, y: 0.572000027, z: -0.173999995} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.365999997, y: 0.0700000003, z: 0.382999986} Friction: 0.400000006 @@ -4586,7 +4642,7 @@ Position Offset: {x: 0, y: 0.328999996, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0450000018, y: 0.389999986, z: 0.370999992} Friction: 0.400000006 @@ -4595,7 +4651,7 @@ Position Offset: {x: 0.158999994, y: 0.163000003, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.0450000018, y: 0.389999986, z: 0.370999992} Friction: 0.400000006 @@ -4667,7 +4723,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 3, y: 1.20000005, z: 1} Friction: 0.400000006 @@ -4694,7 +4750,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.899999976, y: 0.349999994, z: 1} Friction: 0.400000006 @@ -4721,7 +4777,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.899999976, y: 0.340000004, z: 1} Friction: 0.400000006 @@ -4748,7 +4804,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.899999976, y: 0.340000004, z: 1} Friction: 0.400000006 @@ -4850,7 +4906,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 0.5, z: 0.5} Friction: 0.400000006 @@ -4877,7 +4933,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 0.5, z: 0.5} Friction: 0.400000006 @@ -4931,7 +4987,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.54999995, y: 1, z: 0.300000012} Friction: 0.400000006 @@ -4940,16 +4996,16 @@ Position Offset: {x: 0.159999996, y: 0.400000006, z: -0.649999976} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box - Half Extents: {x: 1, y: 1, z: 1} + Half Extents: {x: 1, y: 0.400000006, z: 1} Friction: 0.400000006 Bounciness: 0 Density: 1 - Position Offset: {x: 0, y: 0, z: 0} + Position Offset: {x: 0, y: 0.150000006, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 1, z: 1.29999995} Friction: 0.400000006 @@ -4976,7 +5032,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.54999995, y: 1, z: 0.300000012} Friction: 0.400000006 @@ -4985,7 +5041,7 @@ Position Offset: {x: 0.159999996, y: 0.400000006, z: -0.649999976} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1, y: 0.400000006, z: 1} Friction: 0.400000006 @@ -4994,7 +5050,7 @@ Position Offset: {x: 0, y: 0.150000006, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 1, z: 1.29999995} Friction: 0.400000006 @@ -5021,7 +5077,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.54999995, y: 1, z: 0.300000012} Friction: 0.400000006 @@ -5030,7 +5086,7 @@ Position Offset: {x: -0.159999996, y: 0.400000006, z: -0.649999976} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1, y: 0.400000006, z: 1} Friction: 0.400000006 @@ -5039,7 +5095,7 @@ Position Offset: {x: 0, y: 0.153999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 1, z: 1.29999995} Friction: 0.400000006 @@ -5093,7 +5149,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.54999995, y: 1, z: 0.300000012} Friction: 0.400000006 @@ -5102,7 +5158,7 @@ Position Offset: {x: -0.159999996, y: 0.400000006, z: -0.649999976} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1, y: 0.400000006, z: 1} Friction: 0.400000006 @@ -5111,7 +5167,7 @@ Position Offset: {x: 0, y: 0.150000006, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 1, z: 1.29999995} Friction: 0.400000006 @@ -5138,7 +5194,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.54999995, y: 1, z: 0.300000012} Friction: 0.400000006 @@ -5147,7 +5203,7 @@ Position Offset: {x: 0.159999996, y: 0.400000006, z: -0.649999976} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1, y: 0.400000006, z: 1} Friction: 0.400000006 @@ -5156,7 +5212,7 @@ Position Offset: {x: 0, y: 0.150000006, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 1, z: 1.29999995} Friction: 0.400000006 @@ -5226,8 +5282,8 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 2.8479526, y: 0, z: 7.55967045} - Rotate: {x: 0, y: 0, z: 0} + Translate: {x: 3.25, y: 0, z: 7.55967045} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} IsActive: true Renderable Component: @@ -5264,7 +5320,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.54999995, y: 1, z: 0.300000012} Friction: 0.400000006 @@ -5273,7 +5329,7 @@ Position Offset: {x: -0.159999996, y: 0.400000006, z: -0.649999976} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1, y: 0.400000006, z: 1} Friction: 0.400000006 @@ -5282,7 +5338,7 @@ Position Offset: {x: 0, y: 0.150000006, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 1, z: 1.29999995} Friction: 0.400000006 @@ -5309,7 +5365,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1.54999995, y: 1, z: 0.300000012} Friction: 0.400000006 @@ -5318,7 +5374,7 @@ Position Offset: {x: 0.159999996, y: 0.400000006, z: -0.649999976} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 1, y: 0.400000006, z: 1} Friction: 0.400000006 @@ -5327,7 +5383,7 @@ Position Offset: {x: 0, y: 0.150000006, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 1, z: 1.29999995} Friction: 0.400000006 @@ -5408,7 +5464,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 0.5, z: 0.5} Friction: 0.400000006 @@ -5435,7 +5491,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 0.5, z: 0.5} Friction: 0.400000006 @@ -5462,7 +5518,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.5, y: 0.5, z: 0.5} Friction: 0.400000006 @@ -5537,13 +5593,13 @@ IsActive: true Scripts: ~ - EID: 165 - Name: Level1FloorCollider + Name: Level1Floor IsActive: true NumberOfChildren: 0 Components: Transform Component: Translate: {x: 0, y: 0, z: 0} - Rotate: {x: 0, y: 0, z: 0} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 18.7835312, y: 18.7835312, z: 18.7835312} IsActive: true Renderable Component: @@ -5633,7 +5689,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 15, y: 1, z: 15} Friction: 0.400000006 @@ -5736,13 +5792,7 @@ Canvas Height: 1080 Scale by canvas width: false IsActive: false - Scripts: - - Type: PauseMenu - Enabled: true - resumeBtn: 8 - retryBtn: 458 - quitBtn: 0 - canvas: 10 + Scripts: ~ - EID: 546 Name: ResumeButton IsActive: true @@ -5761,6 +5811,7 @@ Default Texture: 63979907 Hovered Texture: 51379325 Clicked Texture: 66788278 + current texture: 0 IsActive: true UI Component: Canvas ID: 547 @@ -5783,7 +5834,7 @@ Components: Transform Component: Translate: {x: 0, y: -300, z: 0} - Rotate: {x: 0.5, y: 0.5, z: 0.5} + Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 500} IsActive: true Renderable Component: @@ -5794,6 +5845,7 @@ Default Texture: 61602036 Hovered Texture: 58910810 Clicked Texture: 57786063 + current texture: 0 IsActive: true UI Component: Canvas ID: 547 @@ -5809,6 +5861,8 @@ onReleaseSound: event:/Music/player_undetected hoverScale: 1.10000002 clickScale: 0.899999976 + - Type: FixRotation + Enabled: true - EID: 544 Name: RetryButton IsActive: true @@ -5827,6 +5881,7 @@ Default Texture: 64806384 Hovered Texture: 58347825 Clicked Texture: 63234380 + current texture: 0 IsActive: true UI Component: Canvas ID: 547 @@ -6151,7 +6206,7 @@ Components: Transform Component: Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995} - Rotate: {x: 0, y: -299.5, z: 0.49999997} + Rotate: {x: 0, y: 0, z: 0} Scale: {x: 4.26499987, y: 2, z: 1} IsActive: true Renderable Component: @@ -6163,7 +6218,9 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ + Scripts: + - Type: FixRotation + Enabled: true - EID: 238 Name: ====GameManager==== IsActive: true @@ -7289,8 +7346,8 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 2.73560429, y: 0.527999997, z: 7.16936541} - Rotate: {x: 0, y: 0, z: 0} + Translate: {x: 2.91941047, y: 0.527999997, z: 7.41522264} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} IsActive: true Renderable Component: @@ -8031,8 +8088,8 @@ Enabled: true Score: 50 currCategory: 1 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8082,8 +8139,8 @@ Enabled: true Score: 50 currCategory: 1 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8133,8 +8190,8 @@ Enabled: true Score: 10 currCategory: 0 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8184,8 +8241,8 @@ Enabled: true Score: 10 currCategory: 0 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8235,8 +8292,8 @@ Enabled: true Score: 10 currCategory: 0 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8343,8 +8400,8 @@ Enabled: true Score: 50 currCategory: 1 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8394,8 +8451,8 @@ Enabled: true Score: 50 currCategory: 1 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8445,8 +8502,8 @@ Enabled: true Score: 10 currCategory: 0 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8496,8 +8553,8 @@ Enabled: true Score: 10 currCategory: 0 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8547,8 +8604,8 @@ Enabled: true Score: 10 currCategory: 0 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8655,8 +8712,8 @@ Enabled: true Score: 50 currCategory: 1 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8706,8 +8763,8 @@ Enabled: true Score: 50 currCategory: 1 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8757,8 +8814,8 @@ Enabled: true Score: 10 currCategory: 0 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8808,8 +8865,8 @@ Enabled: true Score: 10 currCategory: 0 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8859,8 +8916,8 @@ Enabled: true Score: 10 currCategory: 0 - density: 3 - dontReturn: false + density: 1 + dontReturn: true soundDistance: 10 highlightSpeed: 300 highlightThickness: 250 @@ -8877,7 +8934,7 @@ NumberOfChildren: 5 Components: Transform Component: - Translate: {x: 5.5, y: 0.0500000007, z: 10} + Translate: {x: 5.5, y: 0.171148509, z: 10} Rotate: {x: -0, y: -3.1415925, z: 0} Scale: {x: 0.999999404, y: 1, z: 0.999999404} IsActive: true @@ -8923,7 +8980,7 @@ maxJumpHeight: 2 maxJumpTime: 0.75 fallMultipler: 3 - jumpPadMultiplayer: 1.20000005 + jumpPadMultiplayer: 1.5 lightMultiper: 0.899999976 mediumMultiper: 0.699999988 heavyMultiper: 0.5 @@ -8958,13 +9015,13 @@ Components: Transform Component: Translate: {x: 0, y: -5.96046448e-08, z: 0} - Rotate: {x: 0, y: 9.42477798, z: 2.23517329e-08} + Rotate: {x: 0, y: 3.1415925, z: 2.23517329e-08} Scale: {x: 1, y: 1, z: 1} IsActive: true Camera Component: Position: {x: 2.12735963, y: 0.362327784, z: 7.98933029} Pitch: 0 - Yaw: 360 + Yaw: 0 Roll: 1.28065994e-06 Width: 1920 Near: 0.00999999978 @@ -8973,7 +9030,7 @@ FOV: 45 IsActive: true Camera Arm Component: - Arm Pitch: 20 + Arm Pitch: 40 Arm Yaw: 0 Arm Length: 3 Look At Camera Origin: true @@ -9059,7 +9116,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 6, y: 0.5, z: 0.150000006} Friction: 0.400000006 @@ -9082,7 +9139,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 0.200000003, y: 0.5, z: 2.5} Friction: 0.400000006 @@ -9105,7 +9162,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 1 Type: Box Half Extents: {x: 2.20000005, y: 0.5, z: 1.29999995} Friction: 0.400000006 diff --git a/Assets/Scenes/LoseScene.shade b/Assets/Scenes/LoseScene.shade index fa0191f4..f8baefc8 100644 --- a/Assets/Scenes/LoseScene.shade +++ b/Assets/Scenes/LoseScene.shade @@ -29,7 +29,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 0, z: 0.100000001} + Translate: {x: 0, y: 0, z: 0.300000012} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 1920, y: 1080, z: 1} IsActive: true @@ -49,7 +49,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 75, z: 0} + Translate: {x: 0, y: 75, z: 0.200000003} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} IsActive: true @@ -85,7 +85,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: -200, z: 0} + Translate: {x: 0, y: -200, z: 0.200000003} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} IsActive: true diff --git a/Assets/Scenes/WinScene.shade b/Assets/Scenes/WinScene.shade index 8195f716..5aea6f35 100644 --- a/Assets/Scenes/WinScene.shade +++ b/Assets/Scenes/WinScene.shade @@ -29,7 +29,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 0, z: 0.100000001} + Translate: {x: 0, y: 0, z: 0.300000012} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 1920, y: 1080, z: 1} IsActive: true @@ -49,7 +49,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 75, z: 0} + Translate: {x: 0, y: 75, z: 0.200000003} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} IsActive: true @@ -85,7 +85,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: -200, z: 0} + Translate: {x: 0, y: -200, z: 0.200000003} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} IsActive: true diff --git a/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs b/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs index e23e9ff1..87ef2b85 100644 --- a/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs +++ b/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs @@ -21,12 +21,12 @@ public class PickAndThrow : Script private Collider itemCollider; private Item itemScript; private Transform raccoonHoldLocation; - private ThirdPersonCamera tpc; + public ThirdPersonCamera tpc { get; set; } private float lastXDir; private float lastZDir; private bool inRange = false; public bool throwItem = false; - private Vector3 prevTargetOffSet; + public Vector3 prevTargetOffSet { get; set; } [Tooltip("Lenght of ray")] public float rayDistance = 1; @@ -165,7 +165,7 @@ public class PickAndThrow : Script } } - private void ResetItemObject() + public void ResetItemObject() { itemRidigBody = null; itemTransform = null; diff --git a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs index 13bc0166..4e2f38ec 100644 --- a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs +++ b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs @@ -409,9 +409,18 @@ public class PlayerController : Script if (pat && pat.item) { - holdItem = false; - isAiming = false; - pat.item.GetScript().returnBack = true; + if (holdItem) + { + holdItem = false; + pat.item.GetScript().returnBack = true; + } + if (isAiming) + { + isAiming = false; + cam.FOV = pat.defaultFOV; + camArm.TargetOffset = pat.prevTargetOffSet; + camArm.ArmLength = pat.tpc.armLength; + } } } } diff --git a/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs b/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs index 71cb31a4..6e4e1f7b 100644 --- a/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs +++ b/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs @@ -27,7 +27,7 @@ namespace SHADE_Scripting { AddComponent(); } - GetComponent().SetMainCamera(); + if (!GetComponent()) { AddComponent(); diff --git a/Assets/Scripts/Gameplay/SC_GameManager.cs b/Assets/Scripts/Gameplay/SC_GameManager.cs index 0b50090e..e654bd99 100644 --- a/Assets/Scripts/Gameplay/SC_GameManager.cs +++ b/Assets/Scripts/Gameplay/SC_GameManager.cs @@ -94,6 +94,8 @@ public class GameManager : Script if (SceneFadeInOut.Instance != null) SceneFadeInOut.Instance.CallFadeOut(); Application.IsCursorVisible = false; + + GamePause = false; } protected override void update() diff --git a/Assets/Scripts/Gameplay/SC_PreviewLevel.cs b/Assets/Scripts/Gameplay/SC_PreviewLevel.cs index 8092f8f9..ca59d538 100644 --- a/Assets/Scripts/Gameplay/SC_PreviewLevel.cs +++ b/Assets/Scripts/Gameplay/SC_PreviewLevel.cs @@ -53,7 +53,7 @@ namespace SHADE_Scripting.UI protected override void update() { - if (!SceneFadeInOut.Instance.FadeOutFinished() && !point1Done) + if (SceneFadeInOut.Instance && !SceneFadeInOut.Instance.FadeOutFinished() && !point1Done) { moveToEndPoint1.Reset(); return; @@ -68,13 +68,13 @@ namespace SHADE_Scripting.UI SceneFadeInOut.Instance.alphaValue = 0.01f; } - if (skip && SceneFadeInOut.Instance.FadeInFinished()) + if (skip && SceneFadeInOut.Instance && SceneFadeInOut.Instance.FadeInFinished()) { playerCamera.GetComponent().SetMainCamera(); SceneFadeInOut.Instance.CallFadeOut(); } - if (skip && SceneFadeInOut.Instance.FadeOutFinished()) + if (skip && SceneFadeInOut.Instance && SceneFadeInOut.Instance.FadeOutFinished()) { GameManager.Instance.PreviewLevelDone = true; } @@ -85,7 +85,7 @@ namespace SHADE_Scripting.UI if (!point1Done) { listOfCamera[0].GetComponent().LocalPosition = moveToEndPoint1.GetValue(); - if (moveToEndPoint1.IsCompleted()) + if (SceneFadeInOut.Instance && moveToEndPoint1.IsCompleted()) { point1Done = true; SceneFadeInOut.Instance.CallFadeIn(); @@ -93,13 +93,13 @@ namespace SHADE_Scripting.UI } } - if (SceneFadeInOut.Instance.FadeInFinished() && point1Done) + if (SceneFadeInOut.Instance && SceneFadeInOut.Instance.FadeInFinished() && point1Done) { listOfCamera[1].SetMainCamera(); SceneFadeInOut.Instance.CallFadeOut(); } - if (SceneFadeInOut.Instance.FadeOutFinished() && point1Done) + if (SceneFadeInOut.Instance && SceneFadeInOut.Instance.FadeOutFinished() && point1Done) { if (!point2Done) { @@ -118,13 +118,13 @@ namespace SHADE_Scripting.UI } } - if (SceneFadeInOut.Instance.FadeInFinished() && point2Done) + if (SceneFadeInOut.Instance && SceneFadeInOut.Instance.FadeInFinished() && point2Done) { listOfCamera[2].SetMainCamera(); SceneFadeInOut.Instance.CallFadeOut(); } - if (SceneFadeInOut.Instance.FadeOutFinished() && point2Done) + if (SceneFadeInOut.Instance && SceneFadeInOut.Instance.FadeOutFinished() && point2Done) { if (!point3Done) { @@ -143,13 +143,13 @@ namespace SHADE_Scripting.UI } } - if (SceneFadeInOut.Instance.FadeInFinished() && point3Done) + if (SceneFadeInOut.Instance && SceneFadeInOut.Instance.FadeInFinished() && point3Done) { playerCamera.GetComponent().SetMainCamera(); SceneFadeInOut.Instance.CallFadeOut(); } - if (SceneFadeInOut.Instance.FadeOutFinished() && point3Done) + if (SceneFadeInOut.Instance && SceneFadeInOut.Instance.FadeOutFinished() && point3Done) { GameManager.Instance.PreviewLevelDone = true; } diff --git a/Assets/Scripts/UI/SC_PauseMenu.cs b/Assets/Scripts/UI/SC_PauseMenu.cs index 39c6f860..3e9c7f77 100644 --- a/Assets/Scripts/UI/SC_PauseMenu.cs +++ b/Assets/Scripts/UI/SC_PauseMenu.cs @@ -49,6 +49,7 @@ public class PauseMenu : Script gamePauseText.Enabled = false; if (canvas) canvas.SetActive(false); + Application.FixDeltaTime = Time.DefaultFixDeltaTime; } }); } @@ -101,6 +102,7 @@ public class PauseMenu : Script gamePauseText.Enabled = true; if (canvas) canvas.SetActive(true); + Application.FixDeltaTime = 0; } } diff --git a/SHADE_Engine/src/FRC/SHFramerateController.cpp b/SHADE_Engine/src/FRC/SHFramerateController.cpp index e504698f..40ae0182 100644 --- a/SHADE_Engine/src/FRC/SHFramerateController.cpp +++ b/SHADE_Engine/src/FRC/SHFramerateController.cpp @@ -37,6 +37,8 @@ namespace SHADE { prevFrameTime = std::chrono::high_resolution_clock::now(); } + + } //TODO Legacy code. Delete soon diff --git a/SHADE_Engine/src/Physics/System/Routines/SHPhysicsUpdateRoutine.cpp b/SHADE_Engine/src/Physics/System/Routines/SHPhysicsUpdateRoutine.cpp index d4f6d623..828f1eea 100644 --- a/SHADE_Engine/src/Physics/System/Routines/SHPhysicsUpdateRoutine.cpp +++ b/SHADE_Engine/src/Physics/System/Routines/SHPhysicsUpdateRoutine.cpp @@ -16,6 +16,7 @@ // Project Headers #include "ECS_Base/Managers/SHSystemManager.h" #include "Scripting/SHScriptEngine.h" +#include "Math/SHMath.h" namespace SHADE { @@ -42,6 +43,10 @@ namespace SHADE } const double FIXED_DT = physicsSystem->fixedDT; + + if (SHMath::CompareFloat(FIXED_DT, 0.0)) + return; + accumulatedTime += dt; int count = 0; diff --git a/SHADE_Engine/src/Physics/System/SHPhysicsSystem.cpp b/SHADE_Engine/src/Physics/System/SHPhysicsSystem.cpp index 5468147a..d63e669a 100644 --- a/SHADE_Engine/src/Physics/System/SHPhysicsSystem.cpp +++ b/SHADE_Engine/src/Physics/System/SHPhysicsSystem.cpp @@ -63,6 +63,11 @@ namespace SHADE return fixedDT; } + double SHPhysicsSystem::GetDefaultFixedDT() const noexcept + { + return DEFAULT_FIXED_STEP; + } + const std::vector& SHPhysicsSystem::GetAllCollisionInfo() const noexcept { return collisionListener.GetCollisionInfoContainer(); @@ -97,7 +102,7 @@ namespace SHADE void SHPhysicsSystem::SetFixedDT(double fixedDt) noexcept { - if (fixedDt <= 0.0) + if (fixedDt < 0.0) { SHLOGV_WARNING("Invalid value for setting fixed delta time! Fixed delta time unchanged.") return; diff --git a/SHADE_Engine/src/Physics/System/SHPhysicsSystem.h b/SHADE_Engine/src/Physics/System/SHPhysicsSystem.h index c80e5d5c..bd233bfe 100644 --- a/SHADE_Engine/src/Physics/System/SHPhysicsSystem.h +++ b/SHADE_Engine/src/Physics/System/SHPhysicsSystem.h @@ -58,6 +58,7 @@ namespace SHADE [[nodiscard]] double GetFixedUpdateRate () const noexcept; [[nodiscard]] double GetFixedDT () const noexcept; + [[nodiscard]] double GetDefaultFixedDT () const noexcept; [[nodiscard]] const std::vector& GetAllTriggerInfo () const noexcept; [[nodiscard]] const std::vector& GetAllCollisionInfo () const noexcept; diff --git a/SHADE_Engine/src/Physics/System/SHPhysicsSystemInterface.cpp b/SHADE_Engine/src/Physics/System/SHPhysicsSystemInterface.cpp index f1326bed..fa578836 100644 --- a/SHADE_Engine/src/Physics/System/SHPhysicsSystemInterface.cpp +++ b/SHADE_Engine/src/Physics/System/SHPhysicsSystemInterface.cpp @@ -60,6 +60,25 @@ namespace SHADE return 0.0; } + double SHPhysicsSystemInterface::GetDeafultFixedDT() noexcept + { + auto* physicsSystem = SHSystemManager::GetSystem(); + if (physicsSystem) + return physicsSystem->GetDefaultFixedDT(); + + SHLOGV_WARNING("Failed to get defualt fixed delta time. 0.0 returned instead."); + return 0.0; + } + + void SHPhysicsSystemInterface::SetFixedDT(double value) noexcept + { + auto* physicsSystem = SHSystemManager::GetSystem(); + if (physicsSystem) + physicsSystem->SetFixedDT(value); + + SHLOGV_WARNING("Failed to set fixed delta time."); + } + int SHPhysicsSystemInterface::GetFixedUpdateRate() noexcept { auto* physicsSystem = SHSystemManager::GetSystem(); diff --git a/SHADE_Engine/src/Physics/System/SHPhysicsSystemInterface.h b/SHADE_Engine/src/Physics/System/SHPhysicsSystemInterface.h index 8815e674..6040a9c2 100644 --- a/SHADE_Engine/src/Physics/System/SHPhysicsSystemInterface.h +++ b/SHADE_Engine/src/Physics/System/SHPhysicsSystemInterface.h @@ -93,6 +93,8 @@ namespace SHADE [[nodiscard]] static const std::vector& GetCollisionInfo () noexcept; [[nodiscard]] static const std::vector& GetTriggerInfo () noexcept; [[nodiscard]] static double GetFixedDT () noexcept; + [[nodiscard]] static void SetFixedDT (double value) noexcept; + [[nodiscard]] static double GetDeafultFixedDT () noexcept; [[nodiscard]] static int GetFixedUpdateRate () noexcept; [[nodiscard]] static const std::vector& Raycast (const RaycastInfo& info) noexcept; diff --git a/SHADE_Managed/src/Engine/Application.cxx b/SHADE_Managed/src/Engine/Application.cxx index e5aeeb9d..e89f97ab 100644 --- a/SHADE_Managed/src/Engine/Application.cxx +++ b/SHADE_Managed/src/Engine/Application.cxx @@ -20,6 +20,7 @@ of DigiPen Institute of Technology is prohibited. #include "ECS_Base/Managers/SHSystemManager.h" #include "Editor/SHEditor.h" #include "Graphics/MiddleEnd/Interface/SHGraphicsSystemInterface.h" +#include "Physics/System/SHPhysicsSystemInterface.h" namespace SHADE { @@ -79,6 +80,14 @@ namespace SHADE { //SHWindow::SetMouseVisible(value); } + double Application::FixDeltaTime::get() + { + return SHPhysicsSystemInterface::GetFixedDT(); + } + void Application::FixDeltaTime::set(double value) + { + SHPhysicsSystemInterface::SetFixedDT(value); + } /*---------------------------------------------------------------------------------*/ /* Usage Functions */ /*---------------------------------------------------------------------------------*/ diff --git a/SHADE_Managed/src/Engine/Application.hxx b/SHADE_Managed/src/Engine/Application.hxx index 6e04b725..2e7b1f23 100644 --- a/SHADE_Managed/src/Engine/Application.hxx +++ b/SHADE_Managed/src/Engine/Application.hxx @@ -79,6 +79,12 @@ namespace SHADE void set(bool value); } + static property double FixDeltaTime + { + double get(); + void set(double value); + } + /*-----------------------------------------------------------------------------*/ /* Usage Functions */ /*-----------------------------------------------------------------------------*/ diff --git a/SHADE_Managed/src/Engine/Time.cxx b/SHADE_Managed/src/Engine/Time.cxx index 12c90453..41a3b1c0 100644 --- a/SHADE_Managed/src/Engine/Time.cxx +++ b/SHADE_Managed/src/Engine/Time.cxx @@ -37,10 +37,17 @@ namespace SHADE float Time::DeltaTimeF::get() { - return static_cast(SHFrameRateController::GetRawDeltaTime()); + return static_cast(SHFrameRateController::GetRawDeltaTime()); } + double Time::FixedDeltaTime::get() { return SHPhysicsSystemInterface::GetFixedDT(); } + + double Time::DefaultFixDeltaTime::get() + { + return SHPhysicsSystemInterface::GetDeafultFixedDT(); + } + } \ No newline at end of file diff --git a/SHADE_Managed/src/Engine/Time.hxx b/SHADE_Managed/src/Engine/Time.hxx index 11c82241..306193a4 100644 --- a/SHADE_Managed/src/Engine/Time.hxx +++ b/SHADE_Managed/src/Engine/Time.hxx @@ -57,5 +57,11 @@ namespace SHADE { double get(); } + + static property double DefaultFixDeltaTime + { + double get(); + } + }; } \ No newline at end of file