diff --git a/Assets/Application.SHConfig b/Assets/Application.SHConfig index 97477f5a..5673556d 100644 --- a/Assets/Application.SHConfig +++ b/Assets/Application.SHConfig @@ -1,4 +1,4 @@ Start in Fullscreen: false -Starting Scene ID: 91478134 +Starting Scene ID: 97158628 Window Size: {x: 1920, y: 1080} Window Title: SHADE Engine \ No newline at end of file diff --git a/Assets/Audio/Cinematics.bank b/Assets/Audio/Cinematics.bank new file mode 100644 index 00000000..3a46d298 Binary files /dev/null and b/Assets/Audio/Cinematics.bank differ diff --git a/Assets/Audio/Cinematics.bank.shmeta b/Assets/Audio/Cinematics.bank.shmeta new file mode 100644 index 00000000..739b926e --- /dev/null +++ b/Assets/Audio/Cinematics.bank.shmeta @@ -0,0 +1,3 @@ +Name: Cinematics +ID: 197932678 +Type: 11 diff --git a/Assets/Audio/Master.strings.bank b/Assets/Audio/Master.strings.bank index b769c07f..a8d82a33 100644 Binary files a/Assets/Audio/Master.strings.bank and b/Assets/Audio/Master.strings.bank differ diff --git a/Assets/Audio/Music.bank b/Assets/Audio/Music.bank index d3aef69c..154d8479 100644 Binary files a/Assets/Audio/Music.bank and b/Assets/Audio/Music.bank differ diff --git a/Assets/Audio/SFX.bank b/Assets/Audio/SFX.bank index 01922b43..66556fd2 100644 Binary files a/Assets/Audio/SFX.bank and b/Assets/Audio/SFX.bank differ diff --git a/Assets/Audio/UI.bank b/Assets/Audio/UI.bank index 92edfdf6..58c11ddb 100644 Binary files a/Assets/Audio/UI.bank and b/Assets/Audio/UI.bank differ diff --git a/Assets/CollisionTags.SHConfig b/Assets/CollisionTags.SHConfig index 3fb14287..d662b247 100644 --- a/Assets/CollisionTags.SHConfig +++ b/Assets/CollisionTags.SHConfig @@ -1,11 +1,11 @@ -0 StaticObject 1110000000000000 +0 StaticObject 1100000000000000 1 Player 1100000000000000 2 Food 1000000000000000 3 Breakable 1100000000000000 4 ScoringWallCollider 0110000000000000 5 Homeowner 1100000000000000 6 Camera 0010000000000000 -7 8 0000000000000000 +7 StaticWithCameraCollision 1110000000000000 8 9 0000000000000000 9 10 0000000000000000 10 11 0000000000000000 diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade index 7221f55d..e1eeafc1 100644 --- a/Assets/Scenes/Level1.shade +++ b/Assets/Scenes/Level1.shade @@ -47,7 +47,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1.20000005, z: 1} Friction: 0.400000006 @@ -101,7 +101,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1.20000005, z: 1} Friction: 0.400000006 @@ -215,7 +215,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1.20000005, z: 1} Friction: 0.400000006 @@ -978,7 +978,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 1} Friction: 0.400000006 @@ -1059,7 +1059,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 1} Friction: 0.400000006 @@ -1356,7 +1356,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 1} Friction: 0.400000006 @@ -1421,7 +1421,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1448,7 +1448,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1475,7 +1475,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1484,7 +1484,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1511,7 +1511,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1520,7 +1520,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1547,7 +1547,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1556,7 +1556,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1583,7 +1583,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1592,7 +1592,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1619,7 +1619,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 0.200000003, z: 0.25} Friction: 0.400000006 @@ -1628,7 +1628,7 @@ Position Offset: {x: 0, y: 2.0999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 0.899999976, z: 0.25} Friction: 0.400000006 @@ -1637,7 +1637,7 @@ Position Offset: {x: 0, y: 0.449999988, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1646,7 +1646,7 @@ Position Offset: {x: -0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1673,7 +1673,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.200000003, z: 0.25} Friction: 0.400000006 @@ -1682,7 +1682,7 @@ Position Offset: {x: 0, y: 2.0999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.899999976, z: 0.25} Friction: 0.400000006 @@ -1691,7 +1691,7 @@ Position Offset: {x: 0, y: 0.449999988, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1700,7 +1700,7 @@ Position Offset: {x: -0.899999976, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1727,7 +1727,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.200000003, z: 0.25} Friction: 0.400000006 @@ -1736,7 +1736,7 @@ Position Offset: {x: 0, y: 2.0999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.899999976, z: 0.25} Friction: 0.400000006 @@ -1745,7 +1745,7 @@ Position Offset: {x: 0, y: 0.449999988, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1754,7 +1754,7 @@ Position Offset: {x: -0.899999976, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1781,7 +1781,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1798,7 +1798,7 @@ Components: Transform Component: Translate: {x: -5.5, y: 0, z: -3} - Rotate: {x: 0, y: 0, z: 0} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 0.999978602, y: 1, z: 0.999978602} IsActive: true Renderable Component: @@ -1808,7 +1808,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.200000003, z: 0.25} Friction: 0.400000006 @@ -1817,7 +1817,7 @@ Position Offset: {x: 0, y: 2.0999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.899999976, z: 0.25} Friction: 0.400000006 @@ -1826,7 +1826,7 @@ Position Offset: {x: 0, y: 0.449999988, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1835,7 +1835,7 @@ Position Offset: {x: -0.899999976, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1862,7 +1862,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1871,7 +1871,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1898,7 +1898,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1907,7 +1907,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1934,7 +1934,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1961,7 +1961,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1988,7 +1988,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2015,7 +2015,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 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: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2069,7 +2069,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.200000003, z: 0.25} Friction: 0.400000006 @@ -2078,7 +2078,7 @@ Position Offset: {x: 0, y: 2.0999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.899999976, z: 0.25} Friction: 0.400000006 @@ -2087,7 +2087,7 @@ Position Offset: {x: 0, y: 0.449999988, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2096,7 +2096,7 @@ Position Offset: {x: -0.899999976, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2123,7 +2123,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 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: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2159,7 +2159,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -2186,7 +2186,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2195,7 +2195,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -2222,7 +2222,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2249,7 +2249,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2276,7 +2276,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2303,7 +2303,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2330,7 +2330,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2357,7 +2357,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2366,7 +2366,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -2393,7 +2393,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2402,7 +2402,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -2518,7 +2518,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -3338,7 +3338,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 15, y: 0.200000003, z: 15} Friction: 0.400000006 @@ -4107,7 +4107,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 7 Type: Box Half Extents: {x: 20, y: 0.100000001, z: 20} Friction: 0.400000006 @@ -7491,88 +7491,6 @@ Rotation Offset: {x: 0, y: 0, z: 0} IsActive: true Scripts: ~ -- EID: 217 - Name: ===Anims=== - IsActive: true - NumberOfChildren: 4 - Components: ~ - Scripts: ~ -- EID: 221 - Name: Obj1 - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.301929057, y: 0.912136197, z: -9.20810795} - Rotate: {x: 0, y: 1.57079637, z: 0} - Scale: {x: 0.100000024, y: 0.100000024, z: 0.100000024} - IsActive: true - Renderable Component: - Mesh: 141097368 - Material: 117923942 - IsActive: true - Animator Component: - Rig: 72178939 - AnimationController: 0 - IsActive: true - Scripts: ~ -- EID: 219 - Name: Obj3 - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 2.48987007, y: 0.868837833, z: -9.20810795} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 0.113750041, y: 0.113750041, z: 0.113750041} - IsActive: true - Renderable Component: - Mesh: 149723808 - Material: 117923942 - IsActive: true - Animator Component: - Rig: 80728853 - AnimationController: 0 - IsActive: true - Scripts: ~ -- EID: 218 - Name: Obj2 - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 1.47563028, y: 0.454107046, z: -9.20810795} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 0.0350000113, y: 0.0350000113, z: 0.0350000113} - IsActive: true - Renderable Component: - Mesh: 135102560 - Material: 117923942 - IsActive: true - Animator Component: - Rig: 80500944 - AnimationController: 0 - IsActive: true - Scripts: ~ -- EID: 220 - Name: Obj4 - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.050871402, y: -0.0112784812, z: -8.23628521} - Rotate: {x: 0, y: -1.57079601, z: 0} - Scale: {x: 0.318530291, y: 0.318552583, z: 0.318530291} - IsActive: true - Renderable Component: - Mesh: 134911040 - Material: 117923942 - IsActive: true - Animator Component: - Rig: 76715962 - AnimationController: 0 - IsActive: true - Scripts: ~ - EID: 198 Name: ====Raccoon==== IsActive: true @@ -7668,8 +7586,8 @@ playerJumpStartClip: 223009573 playerJumpLoopClip: 230974023 playerJumpEndClip: 228134756 - silhouettePlayer: 51000 - silhouetteBag: 51000 + silhouettePlayer: 462 + silhouetteBag: 465 - EID: 65733 Name: HoldingPoint IsActive: true @@ -7753,6 +7671,10 @@ Mesh: 149697411 Material: 126391182 IsActive: true + Animator Component: + Rig: 77816045 + AnimationController: 0 + IsActive: true Scripts: ~ - EID: 465 Name: SilouetteBag @@ -7768,6 +7690,10 @@ Mesh: 144838771 Material: 126391182 IsActive: true + Animator Component: + Rig: 77816045 + AnimationController: 0 + IsActive: true Scripts: ~ - EID: 65732 Name: RespawnPoint @@ -7933,9 +7859,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 63979907 - Hovered Texture: 51379325 - Clicked Texture: 66788278 + Default Texture: 63738242 + Hovered Texture: 58455648 + Clicked Texture: 66776217 IsActive: true UI Component: Canvas ID: 458 @@ -7945,10 +7871,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 456 @@ -7978,10 +7904,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 455 @@ -7999,9 +7925,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 64806384 - Hovered Texture: 58347825 - Clicked Texture: 63234380 + Default Texture: 64995894 + Hovered Texture: 58109178 + Clicked Texture: 60429179 IsActive: true UI Component: Canvas ID: 458 @@ -8011,10 +7937,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 454 @@ -8078,7 +8004,7 @@ - EID: 459 Name: Gameplay Canvas IsActive: true - NumberOfChildren: 3 + NumberOfChildren: 4 Components: Canvas Component: Canvas Width: 1920 @@ -8089,7 +8015,7 @@ - EID: 449 Name: Score Text IsActive: true - NumberOfChildren: 1 + NumberOfChildren: 0 Components: Transform Component: Translate: {x: -800, y: 365, z: 0.600000024} @@ -8107,27 +8033,15 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ -- EID: 521 - Name: Score BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.300000012, y: 0.600000024, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 3.45600009, y: 2, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 127527215 - IsActive: true - UI Component: - Canvas ID: 459 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ + Scripts: + - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning + Enabled: true + offsetPerDigit: 25 + - Type: SHADE_Scripting.UI.SingleScaleBounce + Enabled: true + durationUp: 0.150000006 + durationDown: 0.300000012 + scaleSize: 1.20000005 - EID: 520 Name: Timer Text IsActive: true @@ -8217,6 +8131,26 @@ Clicked: false IsActive: true Scripts: ~ +- EID: 521 + Name: Score BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -770, y: 425, z: 59.9999962} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 345.600006, y: 200, z: 60} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 127527215 + IsActive: true + UI Component: + Canvas ID: 459 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ - EID: 503 Name: DirectionalLight IsActive: true diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade index d8a4fc8c..c3c40c44 100644 --- a/Assets/Scenes/Level2.shade +++ b/Assets/Scenes/Level2.shade @@ -2892,7 +2892,7 @@ - EID: 199 Name: Gameplay Canvas IsActive: true - NumberOfChildren: 3 + NumberOfChildren: 4 Components: Canvas Component: Canvas Width: 1920 @@ -2903,7 +2903,7 @@ - EID: 237 Name: Score Text IsActive: true - NumberOfChildren: 1 + NumberOfChildren: 0 Components: Transform Component: Translate: {x: -800, y: 365, z: 0.600000024} @@ -2921,27 +2921,15 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ -- EID: 521 - Name: Score BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.300000012, y: 0.600000024, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 3.45600009, y: 2, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 127527215 - IsActive: true - UI Component: - Canvas ID: 199 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ + Scripts: + - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning + Enabled: true + offsetPerDigit: 25 + - Type: SHADE_Scripting.UI.SingleScaleBounce + Enabled: true + durationUp: 0.150000006 + durationDown: 0.300000012 + scaleSize: 1.20000005 - EID: 206 Name: Timer Text IsActive: true @@ -3033,6 +3021,26 @@ Scripts: - Type: FixRotation Enabled: true +- EID: 521 + Name: Score BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -770, y: 425, z: 59.9999962} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 345.600006, y: 200, z: 60} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 127527215 + IsActive: true + UI Component: + Canvas ID: 199 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ - EID: 198 Name: ====Raccoon==== IsActive: true @@ -3051,7 +3059,7 @@ IsActive: true Renderable Component: Mesh: 149697411 - Material: 126974645 + Material: 128805346 IsActive: true RigidBody Component: Type: Dynamic @@ -3081,6 +3089,10 @@ Position Offset: {x: 0, y: 0.300000012, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} IsActive: true + Animator Component: + Rig: 77816045 + AnimationController: 0 + IsActive: true Scripts: - Type: PlayerController Enabled: true @@ -3108,6 +3120,20 @@ throwItem: false rayDistance: 0.75 rayHeight: 0.100000001 + - Type: PlayerAnimations + Enabled: true + playerIdleClip: 227450439 + playerWalkClip: 229125027 + playerRunClip: 228149757 + playerPickUpClip: 219605278 + playerCarryIdleClip: 231128260 + playerCarryWalkClip: 227671720 + playerThrowClip: 223399345 + playerJumpStartClip: 223009573 + playerJumpLoopClip: 230974023 + playerJumpEndClip: 228134756 + silhouettePlayer: 462 + silhouetteBag: 465 - EID: 3 Name: HoldingPoint IsActive: true @@ -3170,7 +3196,11 @@ IsActive: true Renderable Component: Mesh: 144838771 - Material: 123745521 + Material: 117923942 + IsActive: true + Animator Component: + Rig: 77816045 + AnimationController: 0 IsActive: true Scripts: ~ - EID: 462 @@ -3187,6 +3217,10 @@ Mesh: 149697411 Material: 126391182 IsActive: true + Animator Component: + Rig: 77816045 + AnimationController: 0 + IsActive: true Scripts: ~ - EID: 465 Name: SilouetteBag @@ -3202,6 +3236,10 @@ Mesh: 144838771 Material: 126391182 IsActive: true + Animator Component: + Rig: 77816045 + AnimationController: 0 + IsActive: true Scripts: ~ - EID: 239 Name: RespawnPoint @@ -5469,7 +5507,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: -3.45969725, y: 0, z: -2.61272359} + Translate: {x: 0, y: 0, z: -1.92464328} Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} IsActive: true @@ -5527,13 +5565,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: 8 Name: ResumeButton IsActive: true @@ -5549,9 +5581,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 63979907 - Hovered Texture: 51379325 - Clicked Texture: 66788278 + Default Texture: 63738242 + Hovered Texture: 58455648 + Clicked Texture: 66776217 IsActive: true UI Component: Canvas ID: 10 @@ -5561,10 +5593,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 0 @@ -5574,7 +5606,7 @@ Components: Transform Component: Translate: {x: 0, y: -300, z: 0} - Rotate: {x: -3.74789906, y: 1.43110418, z: 2.63486958} + Rotate: {x: 1.48352981, y: 0.5, z: 0.399993658} Scale: {x: 400, y: 100, z: 500} IsActive: true Renderable Component: @@ -5594,10 +5626,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - Type: FixRotation @@ -5617,9 +5649,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 64806384 - Hovered Texture: 58347825 - Clicked Texture: 63234380 + Default Texture: 64995894 + Hovered Texture: 58109178 + Clicked Texture: 60429179 IsActive: true UI Component: Canvas ID: 10 @@ -5629,10 +5661,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 11 @@ -6133,7 +6165,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 10, y: 1, z: 18} Friction: 0.400000006 @@ -6171,7 +6203,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 0.200000003, z: 0.25} Friction: 0.400000006 @@ -6180,7 +6212,7 @@ Position Offset: {x: 0, y: 2.0999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 0.899999976, z: 0.25} Friction: 0.400000006 @@ -6189,7 +6221,7 @@ Position Offset: {x: 0, y: 0.449999988, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6198,7 +6230,7 @@ Position Offset: {x: -0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6225,7 +6257,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6234,7 +6266,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -6261,7 +6293,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6288,7 +6320,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6315,7 +6347,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6342,7 +6374,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6369,7 +6401,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6396,7 +6428,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6405,7 +6437,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -6432,7 +6464,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6459,7 +6491,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6486,7 +6518,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6513,7 +6545,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 0.150000006, z: 0.25} Friction: 0.400000006 @@ -6522,7 +6554,7 @@ Position Offset: {x: 0, y: 2.125, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6531,7 +6563,7 @@ Position Offset: {x: -0.455000013, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6576,7 +6608,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.800000012, y: 2, z: 0.0350000001} Friction: 0.400000006 @@ -6593,8 +6625,8 @@ Components: Transform Component: Translate: {x: -5, y: 0, z: 3} - Rotate: {x: -0, y: 1.57079601, z: 0} - Scale: {x: 0.999980152, y: 1, z: 0.999980152} + Rotate: {x: 0, y: 1.57079601, z: 0} + Scale: {x: 0.999979854, y: 1, z: 0.999979854} IsActive: true Renderable Component: Mesh: 148351779 @@ -6603,7 +6635,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6630,7 +6662,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6639,7 +6671,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -6666,7 +6698,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6693,7 +6725,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6720,7 +6752,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6747,7 +6779,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6774,7 +6806,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6801,7 +6833,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 0.150000006, z: 0.25} Friction: 0.400000006 @@ -6810,7 +6842,7 @@ Position Offset: {x: 0, y: 2.125, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6819,7 +6851,7 @@ Position Offset: {x: -0.455000013, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6891,7 +6923,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6918,7 +6950,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6945,7 +6977,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6972,7 +7004,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -6999,7 +7031,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -7075,7 +7107,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7102,7 +7134,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7119,7 +7151,7 @@ Components: Transform Component: Translate: {x: -2, y: 0, z: 0} - 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: @@ -7129,7 +7161,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7156,7 +7188,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7194,7 +7226,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7221,7 +7253,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7248,7 +7280,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7265,7 +7297,7 @@ Components: Transform Component: Translate: {x: -2, y: 0, z: 0} - 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: @@ -7275,7 +7307,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7302,7 +7334,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7340,7 +7372,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7367,7 +7399,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7394,7 +7426,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7421,7 +7453,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7448,7 +7480,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7486,7 +7518,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7513,7 +7545,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7540,7 +7572,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7567,7 +7599,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7594,7 +7626,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7632,7 +7664,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7659,7 +7691,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7686,7 +7718,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7713,7 +7745,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7740,7 +7772,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7893,7 +7925,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7920,7 +7952,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7958,7 +7990,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -7985,7 +8017,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.0500000007, z: 2} Friction: 0.400000006 @@ -8023,7 +8055,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -8032,7 +8064,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -8059,7 +8091,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -8068,7 +8100,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -8095,7 +8127,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.200000003, z: 0.25} Friction: 0.400000006 @@ -8104,7 +8136,7 @@ Position Offset: {x: 0, y: 2.0999999, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 0.899999976, z: 0.25} Friction: 0.400000006 @@ -8113,7 +8145,7 @@ Position Offset: {x: 0, y: 0.449999988, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -8122,7 +8154,7 @@ Position Offset: {x: -0.949999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -8149,7 +8181,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -8176,7 +8208,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -8203,7 +8235,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -8230,7 +8262,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -8638,8 +8670,8 @@ Components: Transform Component: Translate: {x: -1.5, y: 0, z: -1.5} - Rotate: {x: 0, y: -1.57079601, z: 0} - Scale: {x: 0.999761641, y: 1, z: 0.999761641} + Rotate: {x: -0, y: -1.57079601, z: 0} + Scale: {x: 0.999761581, y: 1, z: 0.999761581} IsActive: true Renderable Component: Mesh: 136828790 @@ -10587,9 +10619,9 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: -0.000432491302, y: 2, z: -1.14566433e-07} + Translate: {x: -0.000432729721, y: 2, z: -1.14566461e-07} Rotate: {x: -0, y: 1.57079601, z: 0} - Scale: {x: 0.99998945, y: 1, z: 0.99998945} + Scale: {x: 0.99998939, y: 1, z: 0.99998939} IsActive: true Renderable Component: Mesh: 147761585 @@ -10598,7 +10630,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.20000005, y: 0.100000001, z: 2.20000005} Friction: 0.400000006 @@ -10641,9 +10673,9 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 0.878599584, z: -1.57223099e-07} + Translate: {x: -2.38418579e-07, y: 0.878599584, z: -1.14514904e-07} Rotate: {x: -0, y: 1.57079601, z: 0} - Scale: {x: 0.999942183, y: 1, z: 0.999942183} + Scale: {x: 0.999942064, y: 1, z: 0.999942064} IsActive: true Renderable Component: Mesh: 142336524 @@ -10652,7 +10684,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 7 Type: Box Half Extents: {x: 0.899999976, y: 0.100000001, z: 1.89999998} Friction: 0.400000006 @@ -10679,7 +10711,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 @@ -10688,7 +10720,7 @@ Position Offset: {x: 0, y: 0.5, z: -1.14999998} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 @@ -10704,9 +10736,9 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: -0.000432729721, y: 0, z: -1.14566461e-07} + Translate: {x: -0.00043296814, y: 0, z: -1.1456649e-07} Rotate: {x: -0, y: 1.57079601, z: 0} - Scale: {x: 0.99994278, y: 1, z: 0.99994278} + Scale: {x: 0.99994266, y: 1, z: 0.99994266} IsActive: true Renderable Component: Mesh: 140066298 @@ -10715,7 +10747,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 @@ -10724,7 +10756,7 @@ Position Offset: {x: 0, y: 0.5, z: -1.14999998} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 @@ -10825,7 +10857,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.20000005, y: 0.100000001, z: 2.20000005} Friction: 0.400000006 @@ -10879,7 +10911,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 7 Type: Box Half Extents: {x: 0.899999976, y: 0.100000001, z: 1.89999998} Friction: 0.400000006 @@ -10906,7 +10938,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 @@ -10915,7 +10947,7 @@ Position Offset: {x: 0, y: 0.5, z: -0.954999983} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 @@ -10931,8 +10963,8 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0.000105836909, y: 0, z: 0.000872135162} - Rotate: {x: -0, y: 1.57079601, z: -0} + Translate: {x: 0.000105844418, y: 6.11775647e-07, z: 0.000879764557} + Rotate: {x: 0, y: 1.57079601, z: -0} Scale: {x: 0.999942899, y: 1, z: 0.999942899} IsActive: true Renderable Component: @@ -10942,7 +10974,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 @@ -10951,7 +10983,7 @@ Position Offset: {x: 0, y: 0.5, z: -0.954999983} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 @@ -11016,7 +11048,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.20000005, y: 0.100000001, z: 2.20000005} Friction: 0.400000006 @@ -11032,9 +11064,9 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0.000216073822, y: 1, z: -0.500002861} - Rotate: {x: 2.98023224e-08, y: 1.57079542, z: 1.57079542} - Scale: {x: 2, y: 0.999999523, z: 1.10000002} + Translate: {x: 0.000216193032, y: 1, z: -0.500002861} + Rotate: {x: 2.98022655e-08, y: 1.57079542, z: 1.5707953} + Scale: {x: 1.99999988, y: 0.999999464, z: 1.10000002} IsActive: true Renderable Component: Mesh: 139576452 @@ -11060,7 +11092,7 @@ Components: Transform Component: Translate: {x: -2.49641334e-06, y: 1, z: -2.86102295e-06} - Rotate: {x: -0, y: 1.57079601, z: 0} + Rotate: {x: -0, y: 1.57079601, z: -0} Scale: {x: 0.999976516, y: 1, z: 0.999976516} IsActive: true Renderable Component: @@ -11070,7 +11102,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 7 Type: Box Half Extents: {x: 0.899999976, y: 0.100000001, z: 1.89999998} Friction: 0.400000006 @@ -11087,7 +11119,7 @@ Components: Transform Component: Translate: {x: -2.49641334e-06, y: 1, z: -2.86102295e-06} - Rotate: {x: -0, y: 1.57079601, z: 0} + Rotate: {x: -0, y: 1.57079601, z: -0} Scale: {x: 0.999963403, y: 1, z: 0.999963403} IsActive: true Renderable Component: @@ -11097,7 +11129,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 @@ -11106,7 +11138,7 @@ Position Offset: {x: 0, y: 0.5, z: -0.954999983} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 @@ -11123,7 +11155,7 @@ Components: Transform Component: Translate: {x: -2.49641334e-06, y: 0, z: -2.86102295e-06} - Rotate: {x: -0, y: 1.57079601, z: 0} + Rotate: {x: -0, y: 1.57079601, z: -0} Scale: {x: 0.999942899, y: 1, z: 0.999942899} IsActive: true Renderable Component: @@ -11133,7 +11165,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 @@ -11142,7 +11174,7 @@ Position Offset: {x: 0, y: 0.5, z: -0.954999983} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 @@ -11306,7 +11338,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.20000005, y: 0.100000001, z: 2.20000005} Friction: 0.400000006 @@ -11360,7 +11392,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 @@ -11369,7 +11401,7 @@ Position Offset: {x: 0, y: 0.5, z: -0.954999983} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 1, z: 0.100000001} Friction: 0.400000006 diff --git a/Assets/Scenes/Level3.shade b/Assets/Scenes/Level3.shade index 16375e8e..b116d292 100644 --- a/Assets/Scenes/Level3.shade +++ b/Assets/Scenes/Level3.shade @@ -73,7 +73,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -82,7 +82,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -109,7 +109,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -118,7 +118,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -145,7 +145,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 3.22600007, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -172,7 +172,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -181,7 +181,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -208,7 +208,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -217,7 +217,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -244,7 +244,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -271,7 +271,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -280,7 +280,7 @@ Position Offset: {x: 0.660000026, y: -0.400000006, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -289,7 +289,7 @@ Position Offset: {x: 1, y: -0.600000024, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -298,7 +298,7 @@ Position Offset: {x: 1.36000001, y: -0.899999976, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -307,7 +307,7 @@ Position Offset: {x: 1.70000005, y: -1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -316,7 +316,7 @@ Position Offset: {x: 2.04999995, y: -1.39999998, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -325,7 +325,7 @@ Position Offset: {x: 2.4000001, y: -1.64999998, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -334,7 +334,7 @@ Position Offset: {x: 2.75, y: -1.86000001, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005} Friction: 0.400000006 @@ -361,7 +361,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -388,7 +388,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -415,7 +415,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -424,7 +424,7 @@ Position Offset: {x: 0.0500000007, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -451,7 +451,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -478,7 +478,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -505,7 +505,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -532,7 +532,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -541,7 +541,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.93700004} Friction: 0.400000006 @@ -568,7 +568,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -577,7 +577,7 @@ Position Offset: {x: 0.0500000007, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -604,7 +604,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -613,7 +613,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -640,7 +640,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -667,7 +667,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -694,7 +694,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 4.05200005, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -736,7 +736,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -793,7 +793,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.883000016, y: 1.08800006, z: 0.232999995} Friction: 0.400000006 @@ -820,7 +820,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2.13700008, y: 1.028, z: 0.324999988} Friction: 0.400000006 @@ -847,7 +847,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.883000016, y: 1.08800006, z: 0.232999995} Friction: 0.400000006 @@ -874,7 +874,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1276,7 +1276,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1303,7 +1303,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1312,7 +1312,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1792,7 +1792,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1801,7 +1801,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1828,7 +1828,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1837,7 +1837,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1864,7 +1864,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1873,7 +1873,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1900,7 +1900,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1909,7 +1909,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -1926,8 +1926,8 @@ Components: Transform Component: Translate: {x: 7, y: 0, z: 1} - Rotate: {x: 0, y: -1.57079601, z: 0} - Scale: {x: 0.999954402, y: 1, z: 0.999954402} + Rotate: {x: -0, y: -1.57079601, z: 0} + Scale: {x: 0.999954343, y: 1, z: 0.999954343} IsActive: true Renderable Component: Mesh: 142118787 @@ -1936,7 +1936,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1945,7 +1945,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.149000004, y: 2.20000005, z: 2.204} Friction: 0.400000006 @@ -1972,7 +1972,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -1981,7 +1981,7 @@ Position Offset: {x: 0.449999988, y: 1.10000002, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002} Friction: 0.400000006 @@ -2008,7 +2008,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2025,7 +2025,7 @@ Components: Transform Component: Translate: {x: 10, y: 0, z: 1} - 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: @@ -2035,7 +2035,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 3.93700004, y: 2.20000005, z: 0.224999994} Friction: 0.400000006 @@ -2062,7 +2062,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2089,7 +2089,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2116,7 +2116,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2143,7 +2143,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2170,7 +2170,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2197,7 +2197,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2239,7 +2239,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2266,7 +2266,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2293,7 +2293,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2320,7 +2320,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2.04500008, y: 0.896000028, z: 0.275000006} Friction: 0.400000006 @@ -2347,7 +2347,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2374,7 +2374,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2401,7 +2401,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2428,7 +2428,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2455,7 +2455,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2482,7 +2482,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2509,7 +2509,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 2, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2626,7 +2626,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 1, y: 2.20000005, z: 0.25} Friction: 0.400000006 @@ -2653,7 +2653,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 0.200000003, y: 2.20000005, z: 0.200000003} Friction: 0.400000006 @@ -5621,7 +5621,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 7 Type: Box Half Extents: {x: 15, y: 1, z: 15} Friction: 0.400000006 @@ -5644,7 +5644,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 7 Type: Box Half Extents: {x: 6, y: 0.200000003, z: 5} Friction: 0.400000006 @@ -5667,7 +5667,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 7 Type: Box Half Extents: {x: 10, y: 0.200000003, z: 3} Friction: 0.400000006 @@ -5690,7 +5690,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 15, y: 1, z: 15} Friction: 0.400000006 @@ -5707,13 +5707,13 @@ Components: Transform Component: Translate: {x: 1.93802273, y: 2.39508605, z: 4.01721716} - Rotate: {x: 0, y: 0, z: 0} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} IsActive: true Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 6, y: 0.5, z: 0.150000006} Friction: 0.400000006 @@ -5730,13 +5730,13 @@ 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: 1, y: 1, z: 1} IsActive: true Collider Component: Colliders: - Is Trigger: false - Collision Tag: 0 + Collision Tag: 7 Type: Box Half Extents: {x: 4.01900005, y: 1.10099995, z: 0.147} Friction: 0.400000006 @@ -5782,7 +5782,7 @@ Collider Component: Colliders: - Is Trigger: false - Collision Tag: 1 + Collision Tag: 0 Type: Box Half Extents: {x: 0.200000003, y: 0.5, z: 2.5} Friction: 0.400000006 @@ -8430,9 +8430,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 63979907 - Hovered Texture: 51379325 - Clicked Texture: 66788278 + Default Texture: 63738242 + Hovered Texture: 58455648 + Clicked Texture: 66776217 IsActive: true UI Component: Canvas ID: 547 @@ -8442,10 +8442,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 545 @@ -8475,10 +8475,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - Type: FixRotation @@ -8498,9 +8498,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 64806384 - Hovered Texture: 58347825 - Clicked Texture: 63234380 + Default Texture: 64995894 + Hovered Texture: 58109178 + Clicked Texture: 60429179 IsActive: true UI Component: Canvas ID: 547 @@ -8510,10 +8510,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 543 @@ -8544,7 +8544,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0.830674767, y: 0, z: 1.40718019} + Translate: {x: 2.16695547, y: 0.0687829852, z: 0.574704885} Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} IsActive: true @@ -8700,7 +8700,7 @@ - EID: 526 Name: Gameplay Canvas IsActive: true - NumberOfChildren: 3 + NumberOfChildren: 4 Components: Canvas Component: Canvas Width: 1920 @@ -8711,7 +8711,7 @@ - EID: 237 Name: Score Text IsActive: true - NumberOfChildren: 1 + NumberOfChildren: 0 Components: Transform Component: Translate: {x: -800, y: 365, z: 0.600000024} @@ -8729,27 +8729,15 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ -- EID: 521 - Name: Score BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.300000012, y: 0.600000024, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 3.45600009, y: 2, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 127527215 - IsActive: true - UI Component: - Canvas ID: 526 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ + Scripts: + - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning + Enabled: true + offsetPerDigit: 25 + - Type: SHADE_Scripting.UI.SingleScaleBounce + Enabled: true + durationUp: 0.150000006 + durationDown: 0.300000012 + scaleSize: 1.20000005 - EID: 525 Name: Timer Text IsActive: true @@ -8841,6 +8829,26 @@ Scripts: - Type: FixRotation Enabled: true +- EID: 521 + Name: Score BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -770, y: 425, z: 59.9999962} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 345.600006, y: 200, z: 60} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 127527215 + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ - EID: 238 Name: ====GameManager==== IsActive: true @@ -11612,7 +11620,7 @@ IsActive: true Renderable Component: Mesh: 149697411 - Material: 126974645 + Material: 128805346 IsActive: true RigidBody Component: Type: Dynamic @@ -11642,6 +11650,10 @@ Position Offset: {x: 0, y: 0.300000012, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} IsActive: true + Animator Component: + Rig: 77816045 + AnimationController: 0 + IsActive: true Scripts: - Type: PlayerController Enabled: true @@ -11669,6 +11681,20 @@ throwItem: false rayDistance: 0.75 rayHeight: 0.100000001 + - Type: PlayerAnimations + Enabled: true + playerIdleClip: 227450439 + playerWalkClip: 229125027 + playerRunClip: 228149757 + playerPickUpClip: 219605278 + playerCarryIdleClip: 231128260 + playerCarryWalkClip: 227671720 + playerThrowClip: 223399345 + playerJumpStartClip: 223009573 + playerJumpLoopClip: 230974023 + playerJumpEndClip: 228134756 + silhouettePlayer: 462 + silhouetteBag: 465 - EID: 66068 Name: HoldingPoint IsActive: true @@ -11731,7 +11757,11 @@ IsActive: true Renderable Component: Mesh: 144838771 - Material: 123745521 + Material: 117923942 + IsActive: true + Animator Component: + Rig: 77816045 + AnimationController: 0 IsActive: true Scripts: ~ - EID: 462 @@ -11748,6 +11778,10 @@ Mesh: 149697411 Material: 126391182 IsActive: true + Animator Component: + Rig: 77816045 + AnimationController: 0 + IsActive: true Scripts: ~ - EID: 465 Name: SilouetteBag @@ -11763,6 +11797,10 @@ Mesh: 144838771 Material: 126391182 IsActive: true + Animator Component: + Rig: 77816045 + AnimationController: 0 + IsActive: true Scripts: ~ - EID: 66065 Name: RespawnPoint diff --git a/Assets/Scenes/LoseScene.shade b/Assets/Scenes/LoseScene.shade index 00730785..b74fb117 100644 --- a/Assets/Scenes/LoseScene.shade +++ b/Assets/Scenes/LoseScene.shade @@ -74,10 +74,10 @@ sceneID: 97158628 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 6 @@ -109,10 +109,10 @@ Enabled: true - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 3 diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index b6490a0b..ea770107 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -100,10 +100,10 @@ sceneID: 91947920 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 6 @@ -135,10 +135,10 @@ Enabled: true - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 7 @@ -168,10 +168,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - Type: SHADE_Scripting.UI.ChangeCanvasButton @@ -204,10 +204,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - Type: SHADE_Scripting.UI.ChangeCanvasButton @@ -240,10 +240,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - Type: SHADE_Scripting.UI.ChangeCanvasButton @@ -276,10 +276,10 @@ Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - Type: SHADE_Scripting.UI.ChangeCanvasButton @@ -429,10 +429,10 @@ multiImageList: 15 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 17 @@ -466,10 +466,10 @@ multiImageList: 15 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 18 @@ -502,10 +502,10 @@ canvasToActivate: 0 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 19 @@ -576,10 +576,10 @@ canvasToActivate: 0 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 22 @@ -1263,10 +1263,10 @@ canvasToActivate: 0 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 49 @@ -1372,10 +1372,10 @@ canvasToActivate: 0 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 53 diff --git a/Assets/Scenes/WinScene.shade b/Assets/Scenes/WinScene.shade index a936ac54..c1ba5024 100644 --- a/Assets/Scenes/WinScene.shade +++ b/Assets/Scenes/WinScene.shade @@ -74,10 +74,10 @@ sceneID: 97158628 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 6 @@ -109,10 +109,10 @@ Enabled: true - Type: SHADE_Scripting.UI.ButtonFX Enabled: true - onHoverEnterSound: Empty + onHoverEnterSound: event:/UI/botton_hover onHoverExitSound: Empty - onClickSound: event:/UI/mouse_down_element - onReleaseSound: Empty + onClickSound: event:/UI/button_success + onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 - EID: 3 diff --git a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs index b57e7fcd..1a7d4a81 100644 --- a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs +++ b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs @@ -110,8 +110,8 @@ public partial class Homeowner1 : BehaviourTree //These should be somewhere else //Debug.Log("TESTING"); - AudioHandler.audioClipHandlers["BGMUnalert"] = Audio.CreateAudioClip("event:/Music/player_undetected"); - AudioHandler.audioClipHandlers["BGMAlert"] = Audio.CreateAudioClip("event:/Music/player_detected"); + //AudioHandler.audioClipHandlers["BGMUnalert"] = Audio.CreateAudioClip("event:/Music/player_undetected"); + //AudioHandler.audioClipHandlers["BGMAlert"] = Audio.CreateAudioClip("event:/Music/player_detected"); AudioHandler.audioClipHandlers["BGMAdaptive"] = Audio.CreateAudioClip("event:/Music/bgm_adaptive"); AudioHandler.audioClipHandlers["SFXFootstep"] = Audio.CreateAudioClip("event:/Homeowner/homeowner_footsteps"); @@ -121,7 +121,7 @@ public partial class Homeowner1 : BehaviourTree AudioHandler.audioClipHandlers["SFXDetectSting"] = Audio.CreateAudioClip("event:/Music/stingers/player_detected"); AudioHandler.audioClipHandlers["SFXHumming"] = Audio.CreateAudioClip("event:/Homeowner/homeowner_humming"); Audio.AttachAudioClipToObject(AudioHandler.audioClipHandlers["SFXHumming"], GameObject.EntityId); - AudioHandler.audioClipHandlers["SFXHumming"].SetVolume(0.15f); + //AudioHandler.audioClipHandlers["SFXHumming"].SetVolume(0.15f); AudioHandler.audioClipHandlers["SFXHumming"].Play(); if (aiInstance != null && aiInstance != this) diff --git a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerIdleState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerIdleState.cs index 589db690..893818a3 100644 --- a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerIdleState.cs +++ b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerIdleState.cs @@ -16,13 +16,23 @@ public class PlayerIdleState : BaseState { if (!holdItem) { - PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerIdleClip); - PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerIdleClip); + if (PlayerAnimations.Instance.playerIdleClip) + { + PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerIdleClip); + PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerIdleClip); + PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerIdleClip); + PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerIdleClip); + } } else { - PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip); - PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip); + if (PlayerAnimations.Instance.playerCarryIdleClip) + { + PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip); + PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip); + PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip); + PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip); + } } } } diff --git a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerJumpState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerJumpState.cs index 1adfdf67..8d5350d7 100644 --- a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerJumpState.cs +++ b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerJumpState.cs @@ -9,7 +9,7 @@ public class PlayerJumpState : BaseState } public override void OnEnter() { - //Debug.Log("WALK ENTER"); + //Debug.Log("jump"); } public override void update() { diff --git a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerRunState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerRunState.cs index dc39c045..7f30effc 100644 --- a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerRunState.cs +++ b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerRunState.cs @@ -14,10 +14,12 @@ public class PlayerRunState : BaseState public override void OnEnter() { //Debug.Log("WALK ENTER"); - if (PlayerAnimations.Instance) + if (PlayerAnimations.Instance && PlayerAnimations.Instance.playerRunClip) { PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerRunClip); PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerRunClip); + PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerRunClip); + PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerRunClip); } } public override void update() diff --git a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerWalkState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerWalkState.cs index 12cdc860..c15fb5b1 100644 --- a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerWalkState.cs +++ b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerWalkState.cs @@ -20,17 +20,23 @@ public class PlayerWalkState : BaseState { if (!holdItem) { - if(PlayerAnimations.Instance.playerWalkClip) + if (PlayerAnimations.Instance.playerWalkClip) + { PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerWalkClip); - if(PlayerAnimations.Instance.playerWalkClip) PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerWalkClip); + PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerWalkClip); + PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerWalkClip); + } } else { - if(PlayerAnimations.Instance.playerCarryWalkClip) + if (PlayerAnimations.Instance.playerCarryWalkClip) + { PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip); - if(PlayerAnimations.Instance.playerCarryWalkClip) PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip); + PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip); + PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip); + } } } } diff --git a/Assets/Scripts/Gameplay/Player/SC_PlayerAnimations.cs b/Assets/Scripts/Gameplay/Player/SC_PlayerAnimations.cs index 22b87d55..2bda8938 100644 --- a/Assets/Scripts/Gameplay/Player/SC_PlayerAnimations.cs +++ b/Assets/Scripts/Gameplay/Player/SC_PlayerAnimations.cs @@ -57,17 +57,19 @@ public class PlayerAnimations : Script if (!BagAnimator) Debug.LogError("Bag Animator is MISSING!"); - if(!silhouettePlayer) + if(silhouettePlayer) silhoPlayerAnimator = silhouettePlayer.GetComponent(); else Debug.LogError("Silho Player is MISSING!"); + if (!silhoPlayerAnimator) Debug.LogError("Silho Player Animator is MISSING!"); - if(!silhouetteBag) + if(silhouetteBag) silhoBagAnimator = silhouetteBag.GetComponent(); else Debug.LogError("Silho bag is MISSING!"); + if (!silhoBagAnimator) Debug.LogError("Silho Player Animator is MISSING!"); } diff --git a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs index 78b92b84..9bac991b 100644 --- a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs +++ b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs @@ -324,6 +324,8 @@ public class PlayerController : Script if ( (Input.GetKeyDown(Input.KeyCode.Space) || landedOnJumpPad ) && isGrounded && rb != null) { currentState = RaccoonStates.JUMP; + if (stateMachine && !stateMachine.IsState(typeof(PlayerJumpState))) + stateMachine.SetState(typeof(PlayerJumpState)); Vector3 v = rb.LinearVelocity; v.y = initialJumpVel * 0.5f; if (holdItem && pat != null && pat.item.GetScript() != null) @@ -346,8 +348,12 @@ public class PlayerController : Script } } - if(!isGrounded && rb != null && (rb.LinearVelocity.y < 0.0f || Input.GetKeyUp(Input.KeyCode.Space))) + if (!isGrounded && rb != null && (rb.LinearVelocity.y < 0.0f || Input.GetKeyUp(Input.KeyCode.Space))) + { currentState = RaccoonStates.FALLING; + if (stateMachine && !stateMachine.IsState(typeof(PlayerFallState))) + stateMachine.SetState(typeof(PlayerFallState)); + } } @@ -378,7 +384,11 @@ public class PlayerController : Script { isGrounded = true; if (currentState == RaccoonStates.FALLING) + { currentState = RaccoonStates.LANDED; + if (stateMachine && !stateMachine.IsState(typeof(PlayerLandState))) + stateMachine.SetState(typeof(PlayerLandState)); + } } else isGrounded = false; diff --git a/Assets/Scripts/Gameplay/SC_GameManager.cs b/Assets/Scripts/Gameplay/SC_GameManager.cs index 8398bb06..78414b26 100644 --- a/Assets/Scripts/Gameplay/SC_GameManager.cs +++ b/Assets/Scripts/Gameplay/SC_GameManager.cs @@ -101,6 +101,8 @@ public class GameManager : Script protected override void update() { + + if (GamePause || !stealFoodPopUpDone) { return; @@ -195,6 +197,13 @@ public class GameManager : Script if (SceneFadeInOut.Instance != null) SceneFadeInOut.Instance.CallFadeIn(); } + + if (Input.GetKeyUp(Input.KeyCode.G)) + { + ItemScored(); + Score += 500; + } + } @@ -219,6 +228,13 @@ public class GameManager : Script fx.ShowMultiplier(currMultiplierCombo, maxMultiplierDuration); } + SingleScaleBounce sb = scoreText.GetScript(); + if(sb) + { + sb.ScaleBounceOnce(); + } + + } } diff --git a/Assets/Scripts/UI/SC_ButtonFX.cs b/Assets/Scripts/UI/SC_ButtonFX.cs index 7ecad2f2..dcfd42c7 100644 --- a/Assets/Scripts/UI/SC_ButtonFX.cs +++ b/Assets/Scripts/UI/SC_ButtonFX.cs @@ -9,10 +9,10 @@ namespace SHADE_Scripting.UI { public class ButtonFX:Script { - public string onHoverEnterSound = "Empty"; + public string onHoverEnterSound = "event:/UI/botton_hover"; public string onHoverExitSound = "Empty"; - public string onClickSound = "event:/UI/mouse_down_element"; - public string onReleaseSound = "Empty"; + public string onClickSound = "event:/UI/button_success"; + public string onReleaseSound = "event:/UI/button_fail"; [NonSerialized] private AudioClipHandler onHoverEnterACHandler; diff --git a/Assets/Scripts/UI/SC_CutSceneEnd.cs b/Assets/Scripts/UI/SC_CutSceneEnd.cs index f5007443..7aa65b1f 100644 --- a/Assets/Scripts/UI/SC_CutSceneEnd.cs +++ b/Assets/Scripts/UI/SC_CutSceneEnd.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using SHADE; - +using SHADE_Scripting.Audio; public class CutsceneEnd : Script { @@ -58,6 +58,17 @@ public class CutsceneEnd : Script { initCutscene4(); initCutscene5(); + AudioHandler.audioClipHandlers["cutsceneBGM"] = Audio.CreateAudioClip("event:/Cinematics/BGM"); + AudioHandler.audioClipHandlers["cutscenePanelSlide"] = Audio.CreateAudioClip("event:/Cinematics/panel_slide"); + + //Cutscene 4 Audio + AudioHandler.audioClipHandlers["cutscene4Run"] = Audio.CreateAudioClip("event:/Cinematics/4/1_run"); + + + //Cutscene 5 Audio + AudioHandler.audioClipHandlers["cutscene5Yay"] = Audio.CreateAudioClip("event:/Cinematics/5/2_yay"); + + AudioHandler.audioClipHandlers["cutsceneBGM"].Play(); } protected override void update() @@ -70,6 +81,11 @@ public class CutsceneEnd : Script skip = true; oldDuration = duration; duration = skipDuration; + + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Stop(true); + AudioHandler.audioClipHandlers["cutscene4Run"].Stop(true); + AudioHandler.audioClipHandlers["cutscene5Yay"].Stop(true); + } if (Input.GetKeyUp(Input.KeyCode.Space) && cutscene4Done && canvas4.IsActiveSelf) @@ -90,6 +106,11 @@ public class CutsceneEnd : Script { if (canvas4.IsActiveSelf) { + if(time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + AudioHandler.audioClipHandlers["cutscene4Run"].Play(); + } if (showPic4a) { if (time < duration) @@ -116,6 +137,10 @@ public class CutsceneEnd : Script if (showPic4b) { + if (time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + } if (time < duration) { pic4bTran.LocalPosition = Vector3.Lerp(pic4bTran.LocalPosition, listOfCutscene4Points[1].LocalPosition, time / duration); @@ -140,6 +165,10 @@ public class CutsceneEnd : Script if (showPic4c) { + if (time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + } if (time < duration) { pic4cTran.LocalPosition = Vector3.Lerp(pic4cTran.LocalPosition, listOfCutscene4Points[2].LocalPosition, time / duration); @@ -171,6 +200,10 @@ public class CutsceneEnd : Script { if (showPic5a) { + if (time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + } if (time < duration) { pic5aTran.LocalPosition = Vector3.Lerp(pic5aTran.LocalPosition, listOfCutscene5Points[0].LocalPosition, time / duration); @@ -195,6 +228,11 @@ public class CutsceneEnd : Script if (showPic5b) { + if (time == 0) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + AudioHandler.audioClipHandlers["cutscene5Yay"].Play(); + } if (time < duration) { pic5bTran.LocalPosition = Vector3.Lerp(pic5bTran.LocalPosition, listOfCutscene5Points[1].LocalPosition, time / duration); diff --git a/Assets/Scripts/UI/SC_CutsceneIntro.cs b/Assets/Scripts/UI/SC_CutsceneIntro.cs index db393ff9..89f7061d 100644 --- a/Assets/Scripts/UI/SC_CutsceneIntro.cs +++ b/Assets/Scripts/UI/SC_CutsceneIntro.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using SHADE; - +using SHADE_Scripting.Audio; public class CutsceneIntro : Script { @@ -87,6 +87,24 @@ public class CutsceneIntro : Script initCutscene1(); initCutscene2(); initCutscene3(); + + //Cutscene BGM + AudioHandler.audioClipHandlers["cutsceneBGM"] = Audio.CreateAudioClip("event:/Cinematics/BGM"); + AudioHandler.audioClipHandlers["cutscenePanelSlide"] = Audio.CreateAudioClip("event:/Cinematics/panel_slide"); + + //Cutscene 2 Audio + AudioHandler.audioClipHandlers["cutscene2Stomach"] = Audio.CreateAudioClip("event:/Cinematics/2/1_stomach"); + AudioHandler.audioClipHandlers["cutscene2Alert"] = Audio.CreateAudioClip("event:/Cinematics/2/2_alert"); + AudioHandler.audioClipHandlers["cutscene2Sparkle"] = Audio.CreateAudioClip("event:/Cinematics/2/3_sparkle"); + + //Cutscene 3 Audio + AudioHandler.audioClipHandlers["cutscene3Jump"] = Audio.CreateAudioClip("event:/Cinematics/3/1_jump"); + AudioHandler.audioClipHandlers["cutscene3Sparkle"] = Audio.CreateAudioClip("event:/Cinematics/3/2_sparkle"); + AudioHandler.audioClipHandlers["cutscene3Carry"] = Audio.CreateAudioClip("event:/Cinematics/3/3_carry"); + AudioHandler.audioClipHandlers["cutscene3Throw"] = Audio.CreateAudioClip("event:/Cinematics/3/4_throw"); + AudioHandler.audioClipHandlers["cutscene3Yay"] = Audio.CreateAudioClip("event:/Cinematics/3/5_yay"); + + AudioHandler.audioClipHandlers["cutsceneBGM"].Play(); } protected override void update() @@ -98,6 +116,16 @@ public class CutsceneIntro : Script if (Input.GetKeyUp(Input.KeyCode.Space) && !skip && (!cutscene1Done || !cutscene2Done || !cutscene3Done)) { skip = true; + AudioHandler.audioClipHandlers["cutscene2Stomach"].Stop(true); + AudioHandler.audioClipHandlers["cutscene2Alert"].Stop(true); + AudioHandler.audioClipHandlers["cutscene2Sparkle"].Stop(true); + AudioHandler.audioClipHandlers["cutscene3Jump"].Stop(true); + AudioHandler.audioClipHandlers["cutscene3Sparkle"].Stop(true); + AudioHandler.audioClipHandlers["cutscene3Carry"].Stop(true); + AudioHandler.audioClipHandlers["cutscene3Throw"].Stop(true); + AudioHandler.audioClipHandlers["cutscene3Yay"].Stop(true); + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Stop(true); + oldDuration = duration; duration = skipDuration; } @@ -128,6 +156,10 @@ public class CutsceneIntro : Script { if (canvas1.IsActiveSelf) { + if(time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + } if (showPic1a) { if (time < duration) @@ -154,6 +186,10 @@ public class CutsceneIntro : Script if (showPic1b) { + if (time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + } if (time < duration) { pic1bTran.LocalPosition = Vector3.Lerp(pic1bTran.LocalPosition, listOfCutscene1Points[1].LocalPosition, time / duration); @@ -178,6 +214,10 @@ public class CutsceneIntro : Script if (showPic1c) { + if (time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + } if (time < duration) { pic1cTran.LocalPosition = Vector3.Lerp(pic1cTran.LocalPosition, listOfCutscene1Points[2].LocalPosition, time / duration); @@ -209,6 +249,11 @@ public class CutsceneIntro : Script { if (showPic2a) { + if (time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + AudioHandler.audioClipHandlers["cutscene2Stomach"].Play(); + } if (time < duration) { pic2aTran.LocalPosition = Vector3.Lerp(pic2aTran.LocalPosition, listOfCutscene2Points[0].LocalPosition, time / duration); @@ -233,6 +278,11 @@ public class CutsceneIntro : Script if (showPic2b) { + if(time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + AudioHandler.audioClipHandlers["cutscene2Alert"].Play(); + } if (time < duration) { pic2bTran.LocalPosition = Vector3.Lerp(pic2bTran.LocalPosition, listOfCutscene2Points[1].LocalPosition, time / duration); @@ -257,6 +307,11 @@ public class CutsceneIntro : Script if (showPic2c) { + if (time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + AudioHandler.audioClipHandlers["cutscene2Sparkle"].Play(); + } if (time < duration) { pic2cTran.LocalPosition = Vector3.Lerp(pic2cTran.LocalPosition, listOfCutscene2Points[2].LocalPosition, time / duration); @@ -288,6 +343,11 @@ public class CutsceneIntro : Script { if (showPic3a) { + if(time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + AudioHandler.audioClipHandlers["cutscene3Jump"].Play(); + } if (time < duration) { pic3aTran.LocalPosition = Vector3.Lerp(pic3aTran.LocalPosition, listOfCutscene3Points[0].LocalPosition, time / duration); @@ -312,6 +372,11 @@ public class CutsceneIntro : Script if (showPic3b) { + if (time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + AudioHandler.audioClipHandlers["cutscene3Sparkle"].Play(); + } if (time < duration) { pic3bTran.LocalPosition = Vector3.Lerp(pic3bTran.LocalPosition, listOfCutscene3Points[1].LocalPosition, time / duration); @@ -336,6 +401,11 @@ public class CutsceneIntro : Script if (showPic3c) { + if (time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + AudioHandler.audioClipHandlers["cutscene3Carry"].Play(); + } if (time < duration) { pic3cTran.LocalPosition = Vector3.Lerp(pic3cTran.LocalPosition, listOfCutscene3Points[2].LocalPosition, time / duration); @@ -360,6 +430,11 @@ public class CutsceneIntro : Script if (showPic3d) { + if (time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + AudioHandler.audioClipHandlers["cutscene3Throw"].Play(); + } if (time < duration) { pic3dTran.LocalPosition = Vector3.Lerp(pic3dTran.LocalPosition, listOfCutscene3Points[3].LocalPosition, time / duration); @@ -384,6 +459,11 @@ public class CutsceneIntro : Script if (showPic3e) { + if (time == 0 && !skip) + { + AudioHandler.audioClipHandlers["cutscenePanelSlide"].Play(); + AudioHandler.audioClipHandlers["cutscene3Yay"].Play(); + } if (time < duration) { pic3eTran.LocalPosition = Vector3.Lerp(pic3eTran.LocalPosition, listOfCutscene3Points[4].LocalPosition, time / duration); diff --git a/Assets/Scripts/UI/SC_EndScene.cs b/Assets/Scripts/UI/SC_EndScene.cs index 3812db2a..5fbca3b6 100644 --- a/Assets/Scripts/UI/SC_EndScene.cs +++ b/Assets/Scripts/UI/SC_EndScene.cs @@ -10,8 +10,8 @@ public class EndScene : Script protected override void awake() { - AudioHandler.audioClipHandlers["SFXMouseDownElement"] = Audio.CreateAudioClip("event:/UI/mouse_down_element"); - AudioHandler.audioClipHandlers["SFXUISuccess"] = Audio.CreateAudioClip("event:/UI/success"); + //AudioHandler.audioClipHandlers["SFXMouseDownElement"] = Audio.CreateAudioClip("event:/UI/mouse_down_element"); + //AudioHandler.audioClipHandlers["SFXUISuccess"] = Audio.CreateAudioClip("event:/UI/success"); } protected override void start() @@ -27,28 +27,28 @@ public class EndScene : Script if (Input.GetKeyDown(Input.KeyCode.R)) { //Audio.PlaySFXOnce2D("event:/UI/mouse_down_element"); - AudioHandler.audioClipHandlers["SFXMouseDownElement"].Play(); + //AudioHandler.audioClipHandlers["SFXMouseDownElement"].Play(); } if (Input.GetKeyUp(Input.KeyCode.R)) { //Audio.PlaySFXOnce2D("event:/UI/success"); //Audio.StopAllSounds(); AudioHandler.StopAllSounds(false); - AudioHandler.audioClipHandlers["SFXUISuccess"].Play(); + //AudioHandler.audioClipHandlers["SFXUISuccess"].Play(); SceneManager.ChangeScene(mainGameScene); } if (Input.GetKeyDown(Input.KeyCode.M)) { //Audio.PlaySFXOnce2D("event:/UI/mouse_down_element"); - AudioHandler.audioClipHandlers["SFXMouseDownElement"].Play(); + //AudioHandler.audioClipHandlers["SFXMouseDownElement"].Play(); } if (Input.GetKeyUp(Input.KeyCode.M)) { //Audio.PlaySFXOnce2D("event:/UI/success"); //Audio.StopAllSounds(); AudioHandler.StopAllSounds(false); - AudioHandler.audioClipHandlers["SFXUISuccess"].Play(); + //AudioHandler.audioClipHandlers["SFXUISuccess"].Play(); SceneManager.ChangeScene(mainMainScene); } diff --git a/Assets/Scripts/UI/SC_MainMenu.cs b/Assets/Scripts/UI/SC_MainMenu.cs index 8252344d..33958118 100644 --- a/Assets/Scripts/UI/SC_MainMenu.cs +++ b/Assets/Scripts/UI/SC_MainMenu.cs @@ -13,8 +13,8 @@ public class MainMenu : Script protected override void awake() { AudioHandler.audioClipHandlers["BGMMainMenu"] = Audio.CreateAudioClip("event:/Music/main_menu"); - AudioHandler.audioClipHandlers["SFXMouseDownElement"] = Audio.CreateAudioClip("event:/UI/mouse_down_element"); - AudioHandler.audioClipHandlers["SFXUISuccess"] = Audio.CreateAudioClip("event:/UI/success"); + //AudioHandler.audioClipHandlers["SFXMouseDownElement"] = Audio.CreateAudioClip("event:/UI/mouse_down_element"); + //AudioHandler.audioClipHandlers["SFXUISuccess"] = Audio.CreateAudioClip("event:/UI/success"); //Audio.PlayBGMOnce2D("event:/Music/main_menu"); AudioHandler.audioClipHandlers["BGMMainMenu"].Play(); diff --git a/Assets/Scripts/UI/SC_Options.cs b/Assets/Scripts/UI/SC_Options.cs index bccc0317..5020af91 100644 --- a/Assets/Scripts/UI/SC_Options.cs +++ b/Assets/Scripts/UI/SC_Options.cs @@ -31,7 +31,6 @@ namespace SHADE_Scripting.UI if (mv != null) { mv.ScaledValue = Settings.masterVolume; - } if (sfx != null) { @@ -68,19 +67,19 @@ namespace SHADE_Scripting.UI if (mv != null) { - Settings.masterVolume = mv.ScaledValue * 0.01f; - SHADE.Audio.SetVCAVolume("vca:/MASTER", Settings.masterVolume); + Settings.masterVolume = mv.ScaledValue; + SHADE.Audio.SetVCAVolume("vca:/MASTER", Settings.masterVolume * 0.01f); } if (sfx != null) { - Settings.sfxVolume = sfx.ScaledValue * 0.01f; - SHADE.Audio.SetVCAVolume("vca:/SFX", Settings.sfxVolume); - SHADE.Audio.SetVCAVolume("vca:/UI", Settings.sfxVolume); + Settings.sfxVolume = sfx.ScaledValue; + SHADE.Audio.SetVCAVolume("vca:/SFX", Settings.sfxVolume * 0.01f); + SHADE.Audio.SetVCAVolume("vca:/UI", Settings.sfxVolume * 0.01f); } if (bgm != null) { - Settings.bgmVolume = bgm.ScaledValue * 0.01f; - SHADE.Audio.SetVCAVolume("vca:/MUSIC", Settings.bgmVolume); + Settings.bgmVolume = bgm.ScaledValue; + SHADE.Audio.SetVCAVolume("vca:/MUSIC", Settings.bgmVolume * 0.01f); } if (fov != null) { diff --git a/Assets/Scripts/UI/SC_PauseMenu.cs b/Assets/Scripts/UI/SC_PauseMenu.cs index 7dd528b0..a5d14a87 100644 --- a/Assets/Scripts/UI/SC_PauseMenu.cs +++ b/Assets/Scripts/UI/SC_PauseMenu.cs @@ -70,6 +70,8 @@ public class PauseMenu : Script GameManager.Instance.GamePause = false; GameManager.Instance.stealFoodPopUpDone = false; GameManager.Instance.PreviewLevelDone = false; + Application.FixDeltaTime = Time.DefaultFixDeltaTime; + AnimationSystem.TimeScale = AnimationSystem.DefaultTimeScale; }); } else @@ -83,6 +85,8 @@ public class PauseMenu : Script quit.OnRelease.RegisterAction(() => { Audio.StopAllSounds(); + Application.FixDeltaTime = Time.DefaultFixDeltaTime; + AnimationSystem.TimeScale = AnimationSystem.DefaultTimeScale; //go to main menu SceneManager.ChangeScene(97158628); }); diff --git a/Assets/Scripts/UI/SC_ScoreTextDigitPositioning.cs b/Assets/Scripts/UI/SC_ScoreTextDigitPositioning.cs new file mode 100644 index 00000000..0578ce21 --- /dev/null +++ b/Assets/Scripts/UI/SC_ScoreTextDigitPositioning.cs @@ -0,0 +1,42 @@ +using SHADE; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SHADE_Scripting.UI +{ + public class ScoreTextDigitPositioning:Script + { + [NonSerialized] + Vector3 defaultPosition; + + public float offsetPerDigit = 0.0f; + + protected override void awake() + { + Transform trans = GetComponent(); + if(trans) + { + defaultPosition = trans.LocalPosition; + } + } + + protected override void update() + { + TextRenderable text = GetComponent(); + Transform trans = GetComponent(); + if (trans && text) + { + String str = text.Text; + + Vector3 offset = new Vector3((str.Length - 1) * offsetPerDigit, 0.0f, 0.0f); + + trans.LocalPosition = defaultPosition - offset; + } + } + + + } +} diff --git a/Assets/Scripts/UI/SC_ScoreTextDigitPositioning.cs.shmeta b/Assets/Scripts/UI/SC_ScoreTextDigitPositioning.cs.shmeta new file mode 100644 index 00000000..69d30960 --- /dev/null +++ b/Assets/Scripts/UI/SC_ScoreTextDigitPositioning.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_ScoreTextDigitPositioning +ID: 166859312 +Type: 9 diff --git a/Assets/Scripts/UI/SC_SingleScaleBounce.cs b/Assets/Scripts/UI/SC_SingleScaleBounce.cs new file mode 100644 index 00000000..d0eb4b66 --- /dev/null +++ b/Assets/Scripts/UI/SC_SingleScaleBounce.cs @@ -0,0 +1,73 @@ +using SHADE; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SHADE_Scripting.UI +{ + public class SingleScaleBounce: Script + { + [NonSerialized] + TweenThread thread; + + [NonSerialized] + Vector3 defaultScale; + + public float durationUp = 0.15f; + public float durationDown = 0.3f; + + public float scaleSize = 1.2f; + + [NonSerialized] + private bool scaleUp = false; + + protected override void awake() + { + Transform trans = GetComponent(); + if(trans != null) + { + defaultScale = trans.LocalScale; + } + + } + + protected override void start() + { + thread = TweenManager.CreateTweenThread(0.0f,1.0f,1.0f,EASING_METHOD.EASE_IN_SINE); + } + + + protected override void update() + { + if(scaleUp) + { + if(thread.IsCompleted()) + { + scaleUp = false; + thread.duration = durationDown; + thread.ResetInvert(); + } + } + + Transform trans = GetComponent(); + if(trans != null) + { + trans.LocalScale = defaultScale * thread.GetValue(); + } + + + } + + + public void ScaleBounceOnce() + { + scaleUp = true; + thread.duration = durationUp; + thread.Reset(1.0f, scaleSize); + } + + + } +} diff --git a/Assets/Scripts/UI/SC_SingleScaleBounce.cs.shmeta b/Assets/Scripts/UI/SC_SingleScaleBounce.cs.shmeta new file mode 100644 index 00000000..63bec3f1 --- /dev/null +++ b/Assets/Scripts/UI/SC_SingleScaleBounce.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_SingleScaleBounce +ID: 151165363 +Type: 9 diff --git a/Assets/Texture/Buttons/Button_Retry_Pressed.dds b/Assets/Texture/Buttons/Button_Resume_Clicked.dds similarity index 76% rename from Assets/Texture/Buttons/Button_Retry_Pressed.dds rename to Assets/Texture/Buttons/Button_Resume_Clicked.dds index a7a5c125..fcecfa1f 100644 Binary files a/Assets/Texture/Buttons/Button_Retry_Pressed.dds and b/Assets/Texture/Buttons/Button_Resume_Clicked.dds differ diff --git a/Assets/Texture/Buttons/Button_Retry_Pressed.shtex b/Assets/Texture/Buttons/Button_Resume_Clicked.shtex similarity index 76% rename from Assets/Texture/Buttons/Button_Retry_Pressed.shtex rename to Assets/Texture/Buttons/Button_Resume_Clicked.shtex index a3b7dce9..60b033da 100644 Binary files a/Assets/Texture/Buttons/Button_Retry_Pressed.shtex and b/Assets/Texture/Buttons/Button_Resume_Clicked.shtex differ diff --git a/Assets/Texture/Buttons/Button_Resume_Clicked.shtex.shmeta b/Assets/Texture/Buttons/Button_Resume_Clicked.shtex.shmeta new file mode 100644 index 00000000..2e0027f3 --- /dev/null +++ b/Assets/Texture/Buttons/Button_Resume_Clicked.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Button_Resume_Clicked +ID: 66776217 +Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Idle.dds b/Assets/Texture/Buttons/Button_Resume_Default.dds similarity index 69% rename from Assets/Texture/Buttons/Button_Retry_Idle.dds rename to Assets/Texture/Buttons/Button_Resume_Default.dds index 09ad55f3..d73e485a 100644 Binary files a/Assets/Texture/Buttons/Button_Retry_Idle.dds and b/Assets/Texture/Buttons/Button_Resume_Default.dds differ diff --git a/Assets/Texture/Buttons/Button_Retry_Idle.shtex b/Assets/Texture/Buttons/Button_Resume_Default.shtex similarity index 69% rename from Assets/Texture/Buttons/Button_Retry_Idle.shtex rename to Assets/Texture/Buttons/Button_Resume_Default.shtex index 00592238..fe6035fa 100644 Binary files a/Assets/Texture/Buttons/Button_Retry_Idle.shtex and b/Assets/Texture/Buttons/Button_Resume_Default.shtex differ diff --git a/Assets/Texture/Buttons/Button_Resume_Default.shtex.shmeta b/Assets/Texture/Buttons/Button_Resume_Default.shtex.shmeta new file mode 100644 index 00000000..d61c38a2 --- /dev/null +++ b/Assets/Texture/Buttons/Button_Resume_Default.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Button_Resume_Default +ID: 63738242 +Type: 3 diff --git a/Assets/Texture/Buttons/Button_Resume_Hovered.dds b/Assets/Texture/Buttons/Button_Resume_Hovered.dds new file mode 100644 index 00000000..d81df8ab Binary files /dev/null and b/Assets/Texture/Buttons/Button_Resume_Hovered.dds differ diff --git a/Assets/Texture/Buttons/Button_Resume_Hovered.shtex b/Assets/Texture/Buttons/Button_Resume_Hovered.shtex new file mode 100644 index 00000000..7f55eb04 Binary files /dev/null and b/Assets/Texture/Buttons/Button_Resume_Hovered.shtex differ diff --git a/Assets/Texture/Buttons/Button_Resume_Hovered.shtex.shmeta b/Assets/Texture/Buttons/Button_Resume_Hovered.shtex.shmeta new file mode 100644 index 00000000..720d8c47 --- /dev/null +++ b/Assets/Texture/Buttons/Button_Resume_Hovered.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Button_Resume_Hovered +ID: 58455648 +Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Clicked.dds b/Assets/Texture/Buttons/Button_Retry_Clicked.dds new file mode 100644 index 00000000..6ca0270e Binary files /dev/null and b/Assets/Texture/Buttons/Button_Retry_Clicked.dds differ diff --git a/Assets/Texture/Buttons/Button_Retry_Clicked.shtex b/Assets/Texture/Buttons/Button_Retry_Clicked.shtex new file mode 100644 index 00000000..25b089be Binary files /dev/null and b/Assets/Texture/Buttons/Button_Retry_Clicked.shtex differ diff --git a/Assets/Texture/Buttons/Button_Retry_Clicked.shtex.shmeta b/Assets/Texture/Buttons/Button_Retry_Clicked.shtex.shmeta new file mode 100644 index 00000000..496f0c1b --- /dev/null +++ b/Assets/Texture/Buttons/Button_Retry_Clicked.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Button_Retry_Clicked +ID: 60429179 +Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Default.dds b/Assets/Texture/Buttons/Button_Retry_Default.dds new file mode 100644 index 00000000..8ad235cd Binary files /dev/null and b/Assets/Texture/Buttons/Button_Retry_Default.dds differ diff --git a/Assets/Texture/Buttons/Button_Retry_Default.shtex b/Assets/Texture/Buttons/Button_Retry_Default.shtex new file mode 100644 index 00000000..42573a5d Binary files /dev/null and b/Assets/Texture/Buttons/Button_Retry_Default.shtex differ diff --git a/Assets/Texture/Buttons/Button_Retry_Default.shtex.shmeta b/Assets/Texture/Buttons/Button_Retry_Default.shtex.shmeta new file mode 100644 index 00000000..2627554c --- /dev/null +++ b/Assets/Texture/Buttons/Button_Retry_Default.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Button_Retry_Default +ID: 64995894 +Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Hover.dds b/Assets/Texture/Buttons/Button_Retry_Hover.dds deleted file mode 100644 index 5eb05b41..00000000 Binary files a/Assets/Texture/Buttons/Button_Retry_Hover.dds and /dev/null differ diff --git a/Assets/Texture/Buttons/Button_Retry_Hover.shtex b/Assets/Texture/Buttons/Button_Retry_Hover.shtex deleted file mode 100644 index a6cee8ed..00000000 Binary files a/Assets/Texture/Buttons/Button_Retry_Hover.shtex and /dev/null differ diff --git a/Assets/Texture/Buttons/Button_Retry_Hover.shtex.shmeta b/Assets/Texture/Buttons/Button_Retry_Hover.shtex.shmeta deleted file mode 100644 index 28928eda..00000000 --- a/Assets/Texture/Buttons/Button_Retry_Hover.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: Button_Retry_Hover -ID: 58347825 -Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Hovered.dds b/Assets/Texture/Buttons/Button_Retry_Hovered.dds new file mode 100644 index 00000000..ab974c20 Binary files /dev/null and b/Assets/Texture/Buttons/Button_Retry_Hovered.dds differ diff --git a/Assets/Texture/Buttons/Button_Retry_Hovered.shtex b/Assets/Texture/Buttons/Button_Retry_Hovered.shtex new file mode 100644 index 00000000..597fe430 Binary files /dev/null and b/Assets/Texture/Buttons/Button_Retry_Hovered.shtex differ diff --git a/Assets/Texture/Buttons/Button_Retry_Hovered.shtex.shmeta b/Assets/Texture/Buttons/Button_Retry_Hovered.shtex.shmeta new file mode 100644 index 00000000..2c5cdd4f --- /dev/null +++ b/Assets/Texture/Buttons/Button_Retry_Hovered.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Button_Retry_Hovered +ID: 58109178 +Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Idle.shtex.shmeta b/Assets/Texture/Buttons/Button_Retry_Idle.shtex.shmeta deleted file mode 100644 index 7f2cf050..00000000 --- a/Assets/Texture/Buttons/Button_Retry_Idle.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: Button_Retry_Idle -ID: 64806384 -Type: 3 diff --git a/Assets/Texture/Buttons/Button_Retry_Pressed.shtex.shmeta b/Assets/Texture/Buttons/Button_Retry_Pressed.shtex.shmeta deleted file mode 100644 index d4064d14..00000000 --- a/Assets/Texture/Buttons/Button_Retry_Pressed.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: Button_Retry_Pressed -ID: 63234380 -Type: 3 diff --git a/SHADE_CSharp/premake5.lua b/SHADE_CSharp/premake5.lua index f735b515..0bb5f448 100644 --- a/SHADE_CSharp/premake5.lua +++ b/SHADE_CSharp/premake5.lua @@ -24,15 +24,13 @@ project "SHADE_CSharp" { "SHADE_Engine" } - - warnings 'Extra' - postbuildcommands { - "xcopy /r /y /q \"%{outputdir}\\net5.0\\SHADE_CSharp.xml\" \"%{outputdir}\"", - "xcopy /r /y /q \"%{outputdir}\\net5.0\\SHADE_CSharp.pdb\" \"%{outputdir}\"" + "xcopy /r /y /q \"%{wks.location}/bin/$(Configuration)\\net5.0\\SHADE_CSharp.pdb\" \"%{wks.location}/bin/$(Configuration)\"" } + warnings 'Extra' + filter "configurations:Debug" symbols "On" defines {"_DEBUG"} diff --git a/SHADE_Engine/src/AudioSystem/SHAudioSystem.cpp b/SHADE_Engine/src/AudioSystem/SHAudioSystem.cpp index eac465ff..724c31a0 100644 --- a/SHADE_Engine/src/AudioSystem/SHAudioSystem.cpp +++ b/SHADE_Engine/src/AudioSystem/SHAudioSystem.cpp @@ -115,6 +115,7 @@ namespace SHADE LoadBank((AUDIO_FOLDER_PATH + "Master.bank").data()); LoadBank((AUDIO_FOLDER_PATH + "Master.strings.bank").data()); LoadBank((AUDIO_FOLDER_PATH + "Music.bank").data()); + LoadBank((AUDIO_FOLDER_PATH + "Cinematics.bank").data()); LoadBank((AUDIO_FOLDER_PATH + "SFX.bank").data()); LoadBank((AUDIO_FOLDER_PATH + "UI.bank").data()); @@ -133,11 +134,12 @@ namespace SHADE const ReceiverPtr ON_PAUSE_RECEIVER_PTR = std::dynamic_pointer_cast(ON_PAUSE_RECEIVER); SHEventManager::SubscribeTo(SH_EDITOR_ON_PAUSE_EVENT, ON_PAUSE_RECEIVER_PTR); + #endif + const std::shared_ptr ON_SCENE_EXIT_RECEIVER{ std::make_shared>(this, &SHAudioSystem::onSceneExit) }; const ReceiverPtr ON_SCENE_EXIT_RECEIVER_PTR = std::dynamic_pointer_cast(ON_SCENE_EXIT_RECEIVER); SHEventManager::SubscribeTo(SH_SCENE_EXIT_POST, ON_SCENE_EXIT_RECEIVER_PTR); - #endif } void SHADE::SHAudioSystem::Run(double dt) @@ -839,6 +841,7 @@ namespace SHADE auto [begin, end] = audioClipLibrary.GetDenseAccess(); for (auto& it = begin; it != end; ++it) { + it->instance->stop(FMOD_STUDIO_STOP_ALLOWFADEOUT); it->instance->release(); } diff --git a/SHADE_Engine/src/Camera/SHCameraSystem.cpp b/SHADE_Engine/src/Camera/SHCameraSystem.cpp index bd4252f3..1686c0dc 100644 --- a/SHADE_Engine/src/Camera/SHCameraSystem.cpp +++ b/SHADE_Engine/src/Camera/SHCameraSystem.cpp @@ -215,7 +215,7 @@ namespace SHADE if (pivot.lookAtCameraOrigin) - CameraLookAt(*camera, camera->position + pivot.GetTargetOffset()); + CameraLookAt(*camera, camera->position + tOffset); diff --git a/SHADE_Engine/src/Input/SHInputManager.cpp b/SHADE_Engine/src/Input/SHInputManager.cpp index dd3cfe80..6645aa1b 100644 --- a/SHADE_Engine/src/Input/SHInputManager.cpp +++ b/SHADE_Engine/src/Input/SHInputManager.cpp @@ -798,17 +798,45 @@ namespace SHADE //Get cursor position, even when it is outside window POINT p; - GetCursorPos(&p); + GetCursorPos(&p); //This point is WRT the screen, not the window + //ScreenToClient(GetActiveWindow(), &p); mouseScreenX = p.x; mouseScreenY = p.y; + //SHLOGV_INFO("MouseScreenY = {}", mouseScreenY); - //Velocity - mouseVelocityX = static_cast(mouseScreenX - mouseScreenXLast) / dt; - mouseVelocityY = static_cast(mouseScreenY - mouseScreenYLast) / dt; + if (!mouseCentering) + { + //Velocity + mouseVelocityX = static_cast(mouseScreenX - mouseScreenXLast) / dt; + mouseVelocityY = static_cast(mouseScreenY - mouseScreenYLast) / dt; + } + else + { + //Mouse centering + //uint32_t width = SHADE::SHGraphicsSystemInterface::GetWindowWidth(); + //uint32_t height = SHADE::SHGraphicsSystemInterface::GetWindowHeight(); + int mouseCenterX = 0; + int mouseCenterY = 0; + RECT wndRect = { NULL }; //4th quadrant + if (GetWindowRect(GetActiveWindow(), &wndRect)) + { + mouseCenterX = wndRect.left + (wndRect.right - wndRect.left) / 2; + mouseCenterY = wndRect.top + (wndRect.bottom - wndRect.top) / 2; + //SHLOGV_INFO("W: {0}, H: {1}", (wndRect.right - wndRect.left), (wndRect.bottom - wndRect.top)); + } + //Velocity + mouseVelocityX = static_cast(mouseScreenX - mouseCenterX) / dt; + mouseVelocityY = static_cast(mouseScreenY - mouseCenterY) / dt; + //SHLOGV_INFO("mouseScreenY = {0:0}, mouseCenterY = {1:0}", mouseScreenY, mouseCenterY); + //SHLOGV_INFO("{0.0}", mouseVelocityY); + + SetMouseScreenPosition(mouseCenterX, mouseCenterY); + } + //Mouse Centering - if (mouseCentering) + /*if (mouseCentering) { uint32_t width = SHADE::SHGraphicsSystemInterface::GetWindowWidth(); uint32_t height = SHADE::SHGraphicsSystemInterface::GetWindowHeight(); @@ -819,7 +847,7 @@ namespace SHADE GetCursorPos(&p); mouseVelocityX -= static_cast(p.x - mouseScreenX) / dt; mouseVelocityY -= static_cast(p.y - mouseScreenY) / dt; - } + }*/ if (mouseVelocityX != 0.0 || mouseVelocityY != 0.0) controllerInUse = false; diff --git a/SHADE_Managed/src/Scripts/ScriptStore.cxx b/SHADE_Managed/src/Scripts/ScriptStore.cxx index 5d3a3bac..9ef447bf 100644 --- a/SHADE_Managed/src/Scripts/ScriptStore.cxx +++ b/SHADE_Managed/src/Scripts/ScriptStore.cxx @@ -882,6 +882,11 @@ namespace SHADE System::Collections::Generic::IEnumerable^ selectorFunc(System::Reflection::Assembly^ assembly) { + if (assembly == nullptr) + { + Debug::LogError("[ScriptStore] Received null assembly while collecting Script types. This should not happen!"); + return nullptr; + } return assembly->GetExportedTypes(); } Pair^ resultSelectorFunc(System::Reflection::Assembly^ assembly, System::Type^ type)