diff --git a/Assets/Materials/UIMat_LoseScene.shmat b/Assets/Materials/UIMat_LoseScene.shmat new file mode 100644 index 00000000..b962f5ad --- /dev/null +++ b/Assets/Materials/UIMat_LoseScene.shmat @@ -0,0 +1,8 @@ +- VertexShader: 46580970 + FragmentShader: 35983630 + SubPass: G-Buffer Write + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 54324293 + data.alpha: 0 + data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UIMat_LoseScene.shmat.shmeta b/Assets/Materials/UIMat_LoseScene.shmat.shmeta new file mode 100644 index 00000000..a769f4af --- /dev/null +++ b/Assets/Materials/UIMat_LoseScene.shmat.shmeta @@ -0,0 +1,3 @@ +Name: UIMat_LoseScene +ID: 123313564 +Type: 7 diff --git a/Assets/Materials/UIMat_MainMenu.shmat b/Assets/Materials/UIMat_MainMenu.shmat new file mode 100644 index 00000000..625021b0 --- /dev/null +++ b/Assets/Materials/UIMat_MainMenu.shmat @@ -0,0 +1,8 @@ +- VertexShader: 46580970 + FragmentShader: 35983630 + SubPass: G-Buffer Write + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 54429632 + data.alpha: 0 + data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UIMat_MainMenu.shmat.shmeta b/Assets/Materials/UIMat_MainMenu.shmat.shmeta new file mode 100644 index 00000000..4c16715f --- /dev/null +++ b/Assets/Materials/UIMat_MainMenu.shmat.shmeta @@ -0,0 +1,3 @@ +Name: UIMat_MainMenu +ID: 121834459 +Type: 7 diff --git a/Assets/Materials/UIMat_WinScene.shmat b/Assets/Materials/UIMat_WinScene.shmat new file mode 100644 index 00000000..b8d5b183 --- /dev/null +++ b/Assets/Materials/UIMat_WinScene.shmat @@ -0,0 +1,8 @@ +- VertexShader: 46580970 + FragmentShader: 35983630 + SubPass: G-Buffer Write + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 57302694 + data.alpha: 0 + data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UIMat_WinScene.shmat.shmeta b/Assets/Materials/UIMat_WinScene.shmat.shmeta new file mode 100644 index 00000000..ad3b44dd --- /dev/null +++ b/Assets/Materials/UIMat_WinScene.shmat.shmeta @@ -0,0 +1,3 @@ +Name: UIMat_WinScene +ID: 129138332 +Type: 7 diff --git a/Assets/Scenes/LoseScene.shade b/Assets/Scenes/LoseScene.shade new file mode 100644 index 00000000..f4e7dd1d --- /dev/null +++ b/Assets/Scenes/LoseScene.shade @@ -0,0 +1,71 @@ +- EID: 0 + Name: Light + IsActive: true + NumberOfChildren: 0 + Components: + Light Component: + Position: {x: 0, y: 0, z: 0} + Type: Directional + Direction: {x: 0, y: 0, z: 1} + Color: {x: 1, y: 1, z: 1, w: 1} + Layer: 4294967295 + Strength: 0 + IsActive: true + Scripts: ~ +- EID: 1 + Name: Canvas + IsActive: true + NumberOfChildren: 1 + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + IsActive: true + Scripts: ~ +- EID: 2 + Name: Default + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1920, y: 1080, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 123313564 + IsActive: true + Scripts: ~ +- EID: 3 + Name: Camera + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + Camera Component: + Position: {x: 0, y: 0, z: 0} + Pitch: 0 + Yaw: 0 + Roll: 0 + Width: 1920 + Height: 1080 + Near: 0.00999999978 + Far: 10000 + Perspective: true + IsActive: true + Scripts: ~ +- EID: 4 + Name: Default + IsActive: true + NumberOfChildren: 0 + Components: ~ + Scripts: + - Type: EndScene + Enabled: true + mainGameScene: 86098106 + mainMainScene: 97158628 \ No newline at end of file diff --git a/Assets/Scenes/LoseScene.shade.shmeta b/Assets/Scenes/LoseScene.shade.shmeta new file mode 100644 index 00000000..f166177b --- /dev/null +++ b/Assets/Scenes/LoseScene.shade.shmeta @@ -0,0 +1,3 @@ +Name: LoseScene +ID: 91685359 +Type: 5 diff --git a/Assets/Scenes/MainGame.shade b/Assets/Scenes/MainGame.shade index 4d9946cf..3b7c15ea 100644 --- a/Assets/Scenes/MainGame.shade +++ b/Assets/Scenes/MainGame.shade @@ -23,7 +23,7 @@ - EID: 51 Name: Floor_Master IsActive: true - NumberOfChildren: 5 + NumberOfChildren: 6 Components: Transform Component: Translate: {x: 0, y: 0, z: 0} @@ -56,17 +56,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 22 Name: Floor_Large @@ -82,17 +71,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 23 Name: Floor_Large @@ -108,17 +86,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 24 Name: Floor_Large @@ -134,17 +101,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 25 Name: Floor_Large @@ -160,17 +116,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 27 Name: Floor_Row_2 @@ -197,17 +142,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 29 Name: Floor_Large @@ -223,17 +157,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 30 Name: Floor_Large @@ -249,17 +172,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 31 Name: Floor_Large @@ -275,17 +187,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 32 Name: Floor_Large @@ -301,17 +202,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 33 Name: Floor_Row_3 @@ -338,17 +228,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 35 Name: Floor_Large @@ -364,17 +243,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 36 Name: Floor_Large @@ -390,17 +258,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 37 Name: Floor_Large @@ -416,17 +273,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 38 Name: Floor_Large @@ -442,17 +288,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 39 Name: Floor_Row_4 @@ -479,17 +314,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 41 Name: Floor_Large @@ -505,17 +329,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 42 Name: Floor_Large @@ -531,17 +344,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 43 Name: Floor_Large @@ -557,17 +359,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 44 Name: Floor_Large @@ -583,17 +374,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 45 Name: Floor_Row_5 @@ -620,17 +400,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 47 Name: Floor_Large @@ -646,17 +415,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 48 Name: Floor_Large @@ -672,17 +430,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 49 Name: Floor_Large @@ -698,17 +445,6 @@ Mesh: 142812576 Material: 127069936 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 50 Name: Floor_Large @@ -724,11 +460,22 @@ Mesh: 142812576 Material: 127069936 IsActive: true + Scripts: ~ +- EID: 65779 + Name: Floor_Collider + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {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 Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} + Half Extents: {x: 10, y: 0.0500000007, z: 18} Friction: 0.400000006 Bounciness: 0 Density: 1 @@ -1588,7 +1335,7 @@ IsActive: true Scripts: ~ - EID: 85 - Name: Floor_Large + Name: Default IsActive: true NumberOfChildren: 0 Components: @@ -2328,17 +2075,6 @@ Mesh: 142812576 Material: 132690168 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 120 Name: Floor_Large @@ -2354,17 +2090,6 @@ Mesh: 142812576 Material: 132690168 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 122 Name: Floor_Row_2 @@ -2391,17 +2116,6 @@ Mesh: 142812576 Material: 132690168 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 124 Name: Floor_Large @@ -2417,17 +2131,6 @@ Mesh: 142812576 Material: 132690168 IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Type: Box - Half Extents: {x: 2, y: 0.0500000007, z: 2} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: -0.00999999978, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true Scripts: ~ - EID: 128 Name: Ceiling_Master @@ -3807,7 +3510,7 @@ Components: Transform Component: Translate: {x: 1.5, y: 0, z: 0.75} - Rotate: {x: -0, y: 0, z: 0} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 0.999873936, y: 1, z: 0.999873936} IsActive: true Renderable Component: @@ -8501,8 +8204,8 @@ NumberOfChildren: 3 Components: Transform Component: - Translate: {x: 1.82666111, y: 0.00499972701, z: 7.4207387} - Rotate: {x: -0, y: 0, z: 0} + Translate: {x: 1.82666111, y: 0.144074574, z: 7.4207387} + Rotate: {x: -0, y: 0, z: -0} Scale: {x: 0.999999881, y: 1, z: 0.999999881} IsActive: true Renderable Component: @@ -8536,6 +8239,7 @@ IsActive: true Scripts: - Type: PlayerController + Enabled: true currentState: 0 maxMoveVel: 3 moveForce: 50 @@ -8548,6 +8252,7 @@ mediumMultiper: 0.5 heavyMultiper: 0.25 - Type: PickAndThrow + Enabled: true throwForce: [300, 300, 300] delayTimer: 1 aimingLength: 1.5 @@ -8573,7 +8278,7 @@ Scale: {x: 1, y: 1, z: 1} IsActive: true Camera Component: - Position: {x: 1.82666111, y: 0.00499972701, z: 7.4207387} + Position: {x: 1.82666111, y: 0.144074574, z: 7.4207387} Pitch: -44.9962234 Yaw: 169.420654 Roll: 1.28065994e-06 @@ -8585,6 +8290,7 @@ IsActive: true Scripts: - Type: SHADE_Scripting.ThirdPersonCamera + Enabled: true armLength: 1 turnSpeedPitch: 0.300000012 turnSpeedYaw: 0.5 diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index 136584f0..9e6be582 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -1,8 +1,12 @@ - EID: 0 - Name: Default + Name: Canvas IsActive: true NumberOfChildren: 1 - Components: ~ + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + IsActive: true Scripts: ~ - EID: 1 Name: Default @@ -16,11 +20,11 @@ IsActive: true Renderable Component: Mesh: 141771688 - Material: 129340704 + Material: 121834459 IsActive: true Scripts: ~ - EID: 2 - Name: Default + Name: Light IsActive: true NumberOfChildren: 0 Components: @@ -34,7 +38,7 @@ IsActive: true Scripts: ~ - EID: 3 - Name: Default + Name: Camera IsActive: true NumberOfChildren: 0 Components: @@ -61,4 +65,5 @@ NumberOfChildren: 0 Components: ~ Scripts: - - Type: MainMenu \ No newline at end of file + - Type: MainMenu + Enabled: true \ No newline at end of file diff --git a/Assets/Scenes/UI Test.shade.shmeta b/Assets/Scenes/UI Test.shade.shmeta index cf38916e..69930499 100644 --- a/Assets/Scenes/UI Test.shade.shmeta +++ b/Assets/Scenes/UI Test.shade.shmeta @@ -1,3 +1,3 @@ Name: UI Test -ID: 87707373 +ID: 92092466 Type: 5 diff --git a/Assets/Scenes/WinScene.shade b/Assets/Scenes/WinScene.shade new file mode 100644 index 00000000..269d3e95 --- /dev/null +++ b/Assets/Scenes/WinScene.shade @@ -0,0 +1,61 @@ +- EID: 0 + Name: Default + IsActive: true + NumberOfChildren: 0 + Components: + Light Component: + Position: {x: 0, y: 0, z: 0} + Type: Directional + Direction: {x: 0, y: 0, z: 1} + Color: {x: 1, y: 1, z: 1, w: 1} + Layer: 4294967295 + Strength: 0 + IsActive: true + Scripts: ~ +- EID: 1 + Name: Canvas + IsActive: true + NumberOfChildren: 1 + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + IsActive: true + Scripts: ~ +- EID: 2 + Name: Default + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1920, y: 1080, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 129138332 + IsActive: true + Scripts: ~ +- EID: 3 + Name: Camera + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + Camera Component: + Position: {x: 0, y: 0, z: 0} + Pitch: 0 + Yaw: 0 + Roll: 0 + Width: 1920 + Height: 1080 + Near: 0.00999999978 + Far: 10000 + Perspective: true + IsActive: true + Scripts: ~ \ No newline at end of file diff --git a/Assets/Scenes/WinScene.shade.shmeta b/Assets/Scenes/WinScene.shade.shmeta new file mode 100644 index 00000000..8f56588b --- /dev/null +++ b/Assets/Scenes/WinScene.shade.shmeta @@ -0,0 +1,3 @@ +Name: WinScene +ID: 92009475 +Type: 5 diff --git a/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs b/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs index bffb54d6..3d2e4ffc 100644 --- a/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs +++ b/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs @@ -66,7 +66,7 @@ public class PickAndThrow : Script if (Input.GetMouseButtonUp(Input.MouseCode.LeftButton) && pc.isAiming) { - Audio.PlayBGMOnce2D("event:/Raccoon/raccoon_throw"); + Audio.PlaySFXOnce2D("event:/Raccoon/raccoon_throw"); pc.isAiming = false; if(tpc) pc.camArm.ArmLength = tpc.armLength; diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerRunState.cs b/Assets/Scripts/Gameplay/Player/UT_PlayerRunState.cs index f7a30e1d..314f8950 100644 --- a/Assets/Scripts/Gameplay/Player/UT_PlayerRunState.cs +++ b/Assets/Scripts/Gameplay/Player/UT_PlayerRunState.cs @@ -21,7 +21,7 @@ public class PlayerRunState : BaseState if (timer > delay) { - Audio.PlayBGMOnce2D("event:/Raccoon/raccoon_footsteps"); + Audio.PlaySFXOnce2D("event:/Raccoon/raccoon_footsteps"); timer = 0; } } diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerWalkState.cs b/Assets/Scripts/Gameplay/Player/UT_PlayerWalkState.cs index 471da145..1c0ef13a 100644 --- a/Assets/Scripts/Gameplay/Player/UT_PlayerWalkState.cs +++ b/Assets/Scripts/Gameplay/Player/UT_PlayerWalkState.cs @@ -21,7 +21,7 @@ public class PlayerWalkState : BaseState if (timer > delay) { - Audio.PlayBGMOnce2D("event:/Raccoon/raccoon_footsteps"); + Audio.PlaySFXOnce2D("event:/Raccoon/raccoon_footsteps"); timer = 0; } } diff --git a/Assets/Scripts/Gameplay/SC_Item.cs b/Assets/Scripts/Gameplay/SC_Item.cs index 2cdda06c..80b08dd8 100644 --- a/Assets/Scripts/Gameplay/SC_Item.cs +++ b/Assets/Scripts/Gameplay/SC_Item.cs @@ -37,9 +37,9 @@ public class Item : Script if (once) { if(currCategory == ItemCategory.LIGHT) - Audio.PlayBGMOnce2D("event:/Props/impact_elastic"); + Audio.PlaySFXOnce2D("event:/Props/impact_elastic"); else if (currCategory == ItemCategory.MEDIUM || currCategory == ItemCategory.HEAVY) - Audio.PlayBGMOnce2D("event:/Props/impact_hard"); + Audio.PlaySFXOnce2D("event:/Props/impact_hard"); once = false; } } diff --git a/Assets/Scripts/Gameplay/SC_ScoringZone.cs b/Assets/Scripts/Gameplay/SC_ScoringZone.cs index dec02c37..7f2f15a4 100644 --- a/Assets/Scripts/Gameplay/SC_ScoringZone.cs +++ b/Assets/Scripts/Gameplay/SC_ScoringZone.cs @@ -12,7 +12,7 @@ public class ScoringZone : Script { if (gameManger && info.GameObject.GetScript()) { - Audio.PlayBGMOnce2D("event:/Music/stingers/item_scored"); + Audio.PlaySFXOnce2D("event:/Music/stingers/item_scored"); gameManger.Score += info.GameObject.GetScript().Score; gameManger.totalItemCount -= 1; info.GameObject.SetActive(false); diff --git a/Assets/Scripts/SC_EndScene.cs b/Assets/Scripts/SC_EndScene.cs new file mode 100644 index 00000000..d22157a4 --- /dev/null +++ b/Assets/Scripts/SC_EndScene.cs @@ -0,0 +1,31 @@ +using System; +using SHADE; + +public class EndScene : Script +{ + public uint mainGameScene = 86098106; + public uint mainMainScene = 97158628; + + protected override void awake() + { + } + protected override void update() + { + if (Input.GetKey(Input.KeyCode.R)) + { + Audio.PlaySFXOnce2D("event:/UI/mouse_down_element"); + SceneManager.ChangeScene(mainGameScene); + } + + if (Input.GetKey(Input.KeyCode.M)) + { + Audio.PlaySFXOnce2D("event:/UI/mouse_down_element"); + SceneManager.ChangeScene(mainMainScene); + } + + if (Input.GetKey(Input.KeyCode.Escape)) + { + Application.Quit(); + } + } +} diff --git a/Assets/Scripts/SC_EndScene.cs.shmeta b/Assets/Scripts/SC_EndScene.cs.shmeta new file mode 100644 index 00000000..81d26165 --- /dev/null +++ b/Assets/Scripts/SC_EndScene.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_EndScene +ID: 165333970 +Type: 9 diff --git a/Assets/Scripts/SC_MainMenu.cs b/Assets/Scripts/SC_MainMenu.cs index 56579541..9d6b4b4c 100644 --- a/Assets/Scripts/SC_MainMenu.cs +++ b/Assets/Scripts/SC_MainMenu.cs @@ -10,8 +10,14 @@ public class MainMenu : Script { if (Input.GetKey(Input.KeyCode.Space)) { + Audio.PlaySFXOnce2D("event:/UI/mouse_down_element"); SceneManager.ChangeScene(86098106); } + + if (Input.GetKey(Input.KeyCode.Escape)) + { + Application.Quit(); + } } } diff --git a/Assets/Texture/TX_LoseScene.dds b/Assets/Texture/TX_LoseScene.dds new file mode 100644 index 00000000..e6430c46 Binary files /dev/null and b/Assets/Texture/TX_LoseScene.dds differ diff --git a/Assets/Texture/TX_LoseScene.shtex b/Assets/Texture/TX_LoseScene.shtex new file mode 100644 index 00000000..e4b9ea83 Binary files /dev/null and b/Assets/Texture/TX_LoseScene.shtex differ diff --git a/Assets/Texture/TX_LoseScene.shtex.shmeta b/Assets/Texture/TX_LoseScene.shtex.shmeta new file mode 100644 index 00000000..b3d8c16c --- /dev/null +++ b/Assets/Texture/TX_LoseScene.shtex.shmeta @@ -0,0 +1,3 @@ +Name: TX_LoseScene +ID: 54324293 +Type: 3 diff --git a/Assets/Texture/TX_EndScreen.dds b/Assets/Texture/TX_WinScene.dds similarity index 97% rename from Assets/Texture/TX_EndScreen.dds rename to Assets/Texture/TX_WinScene.dds index 4ba58025..64f7e679 100644 Binary files a/Assets/Texture/TX_EndScreen.dds and b/Assets/Texture/TX_WinScene.dds differ diff --git a/Assets/Texture/TX_EndScreen.shtex b/Assets/Texture/TX_WinScene.shtex similarity index 97% rename from Assets/Texture/TX_EndScreen.shtex rename to Assets/Texture/TX_WinScene.shtex index 7de7d99f..45967704 100644 Binary files a/Assets/Texture/TX_EndScreen.shtex and b/Assets/Texture/TX_WinScene.shtex differ diff --git a/Assets/Texture/TX_WinScene.shtex.shmeta b/Assets/Texture/TX_WinScene.shtex.shmeta new file mode 100644 index 00000000..e1c0bee5 --- /dev/null +++ b/Assets/Texture/TX_WinScene.shtex.shmeta @@ -0,0 +1,3 @@ +Name: TX_WinScene +ID: 57302694 +Type: 3