diff --git a/Assets/Audio/Master.bank b/Assets/Audio/Master.bank index 49135fbc..4447377d 100644 Binary files a/Assets/Audio/Master.bank and b/Assets/Audio/Master.bank differ diff --git a/Assets/Audio/Master.strings.bank b/Assets/Audio/Master.strings.bank index a8d82a33..c69a30db 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 154d8479..30d594ca 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 66556fd2..bb26b8ef 100644 Binary files a/Assets/Audio/SFX.bank and b/Assets/Audio/SFX.bank differ diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade index b6a5ecd1..cadf6da8 100644 --- a/Assets/Scenes/Level1.shade +++ b/Assets/Scenes/Level1.shade @@ -1,3 +1,4 @@ +- NavData: 0 - EID: 1 Name: DefaultLight IsActive: true @@ -2419,7 +2420,7 @@ Components: Transform Component: Translate: {x: 0, y: 0, z: 0} - Rotate: {x: 0, y: 0, z: 0} + Rotate: {x: -0.0818509459, y: 0.5, z: -11.5662012} Scale: {x: 1, y: 1, z: 1} IsActive: true Renderable Component: @@ -7009,6 +7010,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -7061,6 +7063,7 @@ Enabled: true Score: 500 currCategory: 2 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -7113,6 +7116,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -7165,6 +7169,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -7801,8 +7806,6 @@ armLength: 2 turnSpeedPitch: 0.200000003 turnSpeedYaw: 0.400000006 - inverseXControls: true - inverseYControls: false pitchUpperClamp: 45 pitchLowerClamp: 5 - EID: 65731 @@ -8486,7 +8489,7 @@ Rotation Offset: {x: 0, y: 0, z: 0} IsActive: true classSHADE::SHParticleEmitterComponent: - Emission Count: 4 + Emission Count: 10 Is Passive: false Emission Interval: 0 Min Life: 1 @@ -8501,7 +8504,7 @@ Rotation Decay: 0 Texture Asset ID: 0 Custom Update Shader Asset ID: 0 - Color Tint: {x: 0.470701218, y: 0.559471369, z: 0.283432603, w: 1} + Color Tint: {x: 0.581223547, y: 0.722466946, z: 0.283257961, w: 1} Acceleration: {x: 0, y: -0.0390000008, z: 0} IsActive: true Scripts: @@ -8509,6 +8512,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 1 density: 1 dontReturn: false soundDistance: 10 diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade index d259ec5a..29266a48 100644 --- a/Assets/Scenes/Level2.shade +++ b/Assets/Scenes/Level2.shade @@ -1,3 +1,4 @@ +- NavData: 0 - EID: 20 Name: ===== Light ===== IsActive: true @@ -111,6 +112,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -163,6 +165,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -215,6 +218,7 @@ Enabled: true Score: 500 currCategory: 2 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -267,6 +271,7 @@ Enabled: true Score: 500 currCategory: 2 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -319,6 +324,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -371,6 +377,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -423,6 +430,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -481,6 +489,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 2 dontReturn: false soundDistance: 10 @@ -701,6 +710,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -753,6 +763,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -805,6 +816,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -857,6 +869,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -909,6 +922,7 @@ Enabled: true Score: 500 currCategory: 2 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -961,6 +975,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1013,6 +1028,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1025,7 +1041,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 2.66560459, y: 0.10531798, z: 5.97001934} + Translate: {x: 4.52824974, y: 0.902858257, z: 3.99456692} Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} IsActive: true @@ -1065,6 +1081,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1117,6 +1134,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1169,6 +1187,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1221,6 +1240,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1273,6 +1293,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1325,6 +1346,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1377,6 +1399,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1429,6 +1452,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1481,6 +1505,7 @@ Enabled: true Score: 500 currCategory: 2 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1533,6 +1558,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1585,6 +1611,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1637,6 +1664,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1695,6 +1723,7 @@ Enabled: true Score: 500 currCategory: 2 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -1747,6 +1776,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 3 dontReturn: false soundDistance: 10 @@ -1799,6 +1829,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 3 dontReturn: false soundDistance: 10 @@ -1851,6 +1882,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 3 dontReturn: false soundDistance: 10 @@ -1903,6 +1935,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 3 dontReturn: false soundDistance: 10 @@ -1955,6 +1988,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 3 dontReturn: false soundDistance: 10 @@ -2013,6 +2047,7 @@ Enabled: true Score: 500 currCategory: 2 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -2065,6 +2100,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 3 dontReturn: false soundDistance: 10 @@ -2117,6 +2153,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 3 dontReturn: false soundDistance: 10 @@ -2169,6 +2206,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 3 dontReturn: false soundDistance: 10 @@ -2221,6 +2259,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 3 dontReturn: false soundDistance: 10 @@ -2273,6 +2312,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 3 dontReturn: false soundDistance: 10 @@ -2331,6 +2371,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 2 dontReturn: false soundDistance: 10 @@ -2557,6 +2598,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 2 dontReturn: false soundDistance: 10 @@ -3102,7 +3144,7 @@ armLength: 2 turnSpeedPitch: 0.200000003 turnSpeedYaw: 0.400000006 - inverseXControls: true + inverseXControls: false inverseYControls: false pitchUpperClamp: 45 pitchLowerClamp: 5 diff --git a/Assets/Scenes/Level3.shade b/Assets/Scenes/Level3.shade index 6b51e67e..1ac90ccb 100644 --- a/Assets/Scenes/Level3.shade +++ b/Assets/Scenes/Level3.shade @@ -1,3 +1,4 @@ +- NavData: 0 - EID: 0 Name: Light_Direction IsActive: true @@ -9535,6 +9536,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -9587,6 +9589,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -9639,6 +9642,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -9691,6 +9695,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -9743,6 +9748,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -9795,6 +9801,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -9847,6 +9854,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -9899,6 +9907,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -9951,6 +9960,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -10003,6 +10013,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -10055,6 +10066,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -10107,6 +10119,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -10159,6 +10172,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -10211,6 +10225,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -10263,6 +10278,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -10315,6 +10331,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -10367,6 +10384,7 @@ Enabled: true Score: 500 currCategory: 2 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -10419,6 +10437,7 @@ Enabled: true Score: 500 currCategory: 2 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -10471,6 +10490,7 @@ Enabled: true Score: 500 currCategory: 2 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -10523,6 +10543,7 @@ Enabled: true Score: 500 currCategory: 2 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -10581,6 +10602,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 2 dontReturn: false soundDistance: 10 @@ -10807,6 +10829,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 2 dontReturn: false soundDistance: 10 @@ -11033,6 +11056,7 @@ Enabled: true Score: 500 currCategory: 2 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -11085,6 +11109,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: true soundDistance: 10 @@ -11137,6 +11162,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: true soundDistance: 10 @@ -11189,6 +11215,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: true soundDistance: 10 @@ -11241,6 +11268,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: true soundDistance: 10 @@ -11293,6 +11321,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: true soundDistance: 10 @@ -11351,6 +11380,7 @@ Enabled: true Score: 500 currCategory: 2 + currFood: 0 density: 1 dontReturn: false soundDistance: 10 @@ -11403,6 +11433,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: true soundDistance: 10 @@ -11455,6 +11486,7 @@ Enabled: true Score: 50 currCategory: 1 + currFood: 0 density: 1 dontReturn: true soundDistance: 10 @@ -11507,6 +11539,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: true soundDistance: 10 @@ -11559,6 +11592,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: true soundDistance: 10 @@ -11611,6 +11645,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 1 dontReturn: true soundDistance: 10 @@ -11696,6 +11731,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 2 dontReturn: false soundDistance: 10 @@ -11922,6 +11958,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 2 dontReturn: false soundDistance: 10 @@ -12148,6 +12185,7 @@ Enabled: true Score: 10 currCategory: 0 + currFood: 0 density: 2 dontReturn: false soundDistance: 10 @@ -12472,8 +12510,6 @@ armLength: 2 turnSpeedPitch: 0.200000003 turnSpeedYaw: 0.400000006 - inverseXControls: true - inverseYControls: false pitchUpperClamp: 45 pitchLowerClamp: 5 - EID: 66064 diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index a4f98e50..299cf867 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -1,3 +1,4 @@ +- NavData: 0 - EID: 0 Name: Main Menu Canvas IsActive: true @@ -540,7 +541,14 @@ Canvas Height: 1080 Scale by canvas width: false IsActive: false - Scripts: ~ + Scripts: + - Type: SHADE_Scripting.UI.Options + Enabled: true + masterVolSlider: 29 + sfxVolSlider: 30 + bgmVolSlider: 31 + fovSlider: 37 + sensitivitySlider: 38 - EID: 20 Name: BackGround IsActive: true @@ -898,47 +906,47 @@ Scripts: ~ - EID: 449 Name: Camera Invert X Text - IsActive: false + IsActive: true NumberOfChildren: 0 Components: Transform Component: Translate: {x: 0, y: -200, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 75, y: 75, z: 1} - IsActive: false + IsActive: true Text Renderer Component: Text: "Camera Invert X:" Font: 174412429 Color: {x: 0, y: 0, z: 0, w: 1} Text Size: {x: 1, y: 1, z: 1} - IsActive: false + IsActive: true UI Component: Canvas ID: 19 Hovered: false Clicked: false - IsActive: false + IsActive: true Scripts: ~ - EID: 447 Name: Camera Invert Y Text - IsActive: false + IsActive: true NumberOfChildren: 0 Components: Transform Component: Translate: {x: 800, y: -200, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 75, y: 75, z: 1} - IsActive: false + IsActive: true Text Renderer Component: Text: "Y:" Font: 174412429 Color: {x: 0, y: 0, z: 0, w: 1} Text Size: {x: 1, y: 1, z: 1} - IsActive: false + IsActive: true UI Component: Canvas ID: 19 Hovered: false Clicked: false - IsActive: false + IsActive: true Scripts: ~ - EID: 36 Name: Camera Slider Group @@ -1008,54 +1016,62 @@ Scripts: ~ - EID: 448 Name: Invert X Toggle Button - IsActive: false + IsActive: true NumberOfChildren: 0 Components: Transform Component: Translate: {x: -300, y: -200, z: 0} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 75, y: 75, z: 1} - IsActive: false + Scale: {x: 150, y: 150, z: 1} + IsActive: true Renderable Component: Mesh: 141771688 Material: 129340704 - IsActive: false + IsActive: true Toggle Button Component: - Non Toggled Texture: 55358401 - Toggled Texture: 52333376 + Non Toggled Texture: 50439604 + Toggled Texture: 64389107 Value: false - IsActive: false + IsActive: true UI Component: Canvas ID: 19 Hovered: false Clicked: false - IsActive: false - Scripts: ~ + IsActive: true + Scripts: + - Type: InverseCamera + Enabled: true + inverseX: true + inverseY: false - EID: 445 Name: Invert Y Toggle Button - IsActive: false + IsActive: true NumberOfChildren: 0 Components: Transform Component: Translate: {x: -50, y: -200, z: 0} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 75, y: 75, z: 1} - IsActive: false + Scale: {x: 150, y: 150, z: 1} + IsActive: true Renderable Component: Mesh: 141771688 Material: 129340704 - IsActive: false + IsActive: true Toggle Button Component: - Non Toggled Texture: 55358401 - Toggled Texture: 52333376 + Non Toggled Texture: 50439604 + Toggled Texture: 64389107 Value: false - IsActive: false + IsActive: true UI Component: Canvas ID: 19 Hovered: false Clicked: false - IsActive: false - Scripts: ~ + IsActive: true + Scripts: + - Type: InverseCamera + Enabled: true + inverseX: false + inverseY: true - EID: 39 Name: Audio Slider Text Group IsActive: true @@ -1490,9 +1506,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 52916516 - Hovered Texture: 52916516 - Clicked Texture: 52916516 + Default Texture: 55897117 + Hovered Texture: 55897117 + Clicked Texture: 55897117 IsActive: true UI Component: Canvas ID: 50 @@ -1518,9 +1534,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 55380564 - Hovered Texture: 55380564 - Clicked Texture: 55380564 + Default Texture: 52151774 + Hovered Texture: 52151774 + Clicked Texture: 52151774 IsActive: true UI Component: Canvas ID: 50 @@ -1546,9 +1562,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 53392159 - Hovered Texture: 53392159 - Clicked Texture: 53392159 + Default Texture: 51704639 + Hovered Texture: 51704639 + Clicked Texture: 51704639 IsActive: true UI Component: Canvas ID: 50 diff --git a/Assets/Scripts/Gameplay/Item/SC_Item.cs b/Assets/Scripts/Gameplay/Item/SC_Item.cs index 494fc464..91bdf835 100644 --- a/Assets/Scripts/Gameplay/Item/SC_Item.cs +++ b/Assets/Scripts/Gameplay/Item/SC_Item.cs @@ -10,9 +10,19 @@ public class Item : Script HEAVY } + public enum Food + { + EGG, + APPLE, + MEAT, + WATERMELON, + CHEESE + } + public int Score = 10; public ItemCategory currCategory; + public Food currFood; public bool returnBack { get; set; } private Transform transform; private RigidBody rb; @@ -146,6 +156,7 @@ public class Item : Script Audio.DetachAudioClipFromObject(AudioHandler.audioClipHandlers["SFXImpactElastic"]); Audio.DetachAudioClipFromObject(AudioHandler.audioClipHandlers["SFXImpactHard"]); + Debug.Log("ENTER"); if(emitter) emitter.Emit(); diff --git a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerLandState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerLandState.cs index d3a56dbb..a37f64f1 100644 --- a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerLandState.cs +++ b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerLandState.cs @@ -1,4 +1,5 @@ using SHADE; +using SHADE_Scripting.Audio; using System; public class PlayerLandState : BaseState diff --git a/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs b/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs index c0de6235..3a536529 100644 --- a/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs +++ b/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs @@ -61,7 +61,7 @@ public class PickAndThrow : Script protected override void awake() { pc = GetScript(); - if(!pc) + if (!pc) Debug.LogError("PLAYER CONTROLLER EMPTY"); raccoonHoldLocation = GetComponentInChildren(); @@ -69,15 +69,17 @@ public class PickAndThrow : Script Debug.LogError("CHILD EMPTY"); tpc = GetScriptInChildren(); - if(!tpc) + if (!tpc) Debug.LogError("TPC EMPTY"); - AudioHandler.audioClipHandlers["SFXThrow"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_throw"); + AudioHandler.audioClipHandlers["SFXThrowLarge"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_throw_large"); + AudioHandler.audioClipHandlers["SFXThrowMedium"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_throw_medium"); + AudioHandler.audioClipHandlers["SFXThrowSmall"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_throw_small"); timer = delayTimer; trajComp = GetComponentInChildren(); - if(!trajComp) + if (!trajComp) Debug.LogError("TrajectoryRenderable MISSING"); } @@ -126,7 +128,13 @@ public class PickAndThrow : Script if (Input.GetMouseButtonUp(Input.MouseCode.LeftButton) && pc.isAiming) { - AudioHandler.audioClipHandlers["SFXThrow"].Play(); + if (itemScript.currCategory == ItemCategory.LIGHT) + AudioHandler.audioClipHandlers["SFXThrowSmall"].Play(); + else if (itemScript.currCategory == ItemCategory.MEDIUM) + AudioHandler.audioClipHandlers["SFXThrowMedium"].Play(); + else + AudioHandler.audioClipHandlers["SFXThrowLarge"].Play(); + itemRidigBody.IsGravityEnabled = true; itemCollider.GetCollisionShape(0).IsTrigger = false; pc.isAiming = false; diff --git a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs index 25b3ac44..66b951d4 100644 --- a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs +++ b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs @@ -150,6 +150,10 @@ public class PlayerController : Script } AudioHandler.audioClipHandlers["footsteps"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_footsteps"); + AudioHandler.audioClipHandlers["Jump"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_jump"); + AudioHandler.audioClipHandlers["JumpPad"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_jumpPad"); + AudioHandler.audioClipHandlers["Land"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_land"); + AudioHandler.audioClipHandlers["RaccoonCaught"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_caught"); playLandedAnimation = false; @@ -403,7 +407,11 @@ public class PlayerController : Script v.y *= jumpPadMultiplayer; landedOnJumpPad = false; jumpPadDrop = true; + AudioHandler.audioClipHandlers["JumpPad"].Play(); } + else + AudioHandler.audioClipHandlers["Jump"].Play(); + rb.LinearVelocity = v; } } @@ -444,7 +452,8 @@ public class PlayerController : Script { isGrounded = true; if (currentState == RaccoonStates.FALLING) - { + { + AudioHandler.audioClipHandlers["Land"].Play(); currentState = RaccoonStates.LANDED; jumpPadDrop = false; dropTimer = 0.0f; @@ -491,6 +500,7 @@ public class PlayerController : Script { if (currentState == RaccoonStates.CAUGHT && tranform && respawnPoint) { + AudioHandler.audioClipHandlers["RaccoonCaught"].Play(); currentState = RaccoonStates.IDLE; if (stateMachine && !stateMachine.IsState(typeof(PlayerIdleState))) stateMachine.SetState(typeof(PlayerIdleState)); diff --git a/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs b/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs index a4a8d0bc..6c6ae48d 100644 --- a/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs +++ b/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs @@ -14,8 +14,6 @@ namespace SHADE_Scripting public float armLength = 2.0f; public float turnSpeedPitch = 0.3f; public float turnSpeedYaw = 0.5f; - public bool inverseXControls = false; - public bool inverseYControls = false; public float pitchUpperClamp = 45.0f; public float pitchLowerClamp = 5.0f; @@ -51,15 +49,15 @@ namespace SHADE_Scripting if (arm) { Vector2 vel = Input.GetMouseVelocity(); - if(inverseYControls) + if(Settings.inverseY) arm.Pitch -= vel.y * turnSpeedPitch * Time.DeltaTimeF; else arm.Pitch += vel.y * turnSpeedPitch * Time.DeltaTimeF; - if (inverseXControls) - arm.Yaw -= vel.x * turnSpeedYaw * Time.DeltaTimeF; - else + if (Settings.inverseX) arm.Yaw += vel.x * turnSpeedYaw * Time.DeltaTimeF; + else + arm.Yaw -= vel.x * turnSpeedYaw * Time.DeltaTimeF; if (arm.Pitch > pitchUpperClamp) { diff --git a/Assets/Scripts/Gameplay/SC_GameManager.cs b/Assets/Scripts/Gameplay/SC_GameManager.cs index d384f150..4a81a67d 100644 --- a/Assets/Scripts/Gameplay/SC_GameManager.cs +++ b/Assets/Scripts/Gameplay/SC_GameManager.cs @@ -90,6 +90,7 @@ public class GameManager : Script Application.FixDeltaTime = Time.DefaultFixDeltaTime; AudioHandler.audioClipHandlers["SFXItemScore"] = Audio.CreateAudioClip("event:/Music/stingers/item_scored"); + AudioHandler.audioClipHandlers["RaccoonScored"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_scored"); } protected override void start() @@ -248,6 +249,7 @@ public class GameManager : Script Audio.SetParameter("Multiplier", currMultiplierCombo); AudioHandler.audioClipHandlers["SFXItemScore"].Play(); + AudioHandler.audioClipHandlers["RaccoonScored"].Play(); MultiplierTextFx fx = multiplierText.GetScript(); if (fx) diff --git a/Assets/Scripts/UI/SC_InverseCamera.cs b/Assets/Scripts/UI/SC_InverseCamera.cs new file mode 100644 index 00000000..34c97d7c --- /dev/null +++ b/Assets/Scripts/UI/SC_InverseCamera.cs @@ -0,0 +1,53 @@ +using SHADE; +using SHADE_Scripting.UI; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + + +public class InverseCamera : Script +{ + public bool inverseX = false; + public bool inverseY = false; + + protected override void awake() + { + UIElement ui = GetComponent(); + if (ui) + { + Toggle toggle = ui.GetComponent(); + + if(inverseX) + toggle.SetValue(Settings.inverseX); + if(inverseY) + toggle.SetValue(Settings.inverseY); + } + else + { + Debug.LogError("Failed to register Toggle action for inverse"); + } + } + protected override void start() + { + UIElement ui = GetComponent(); + if (ui) + { + ui.OnClick.RegisterAction(() => + { + Toggle toggle = ui.GetComponent(); + if(inverseX) + Settings.inverseX = toggle.GetValue(); + if(inverseY) + Settings.inverseY = toggle.GetValue(); + }); + } + else + { + Debug.LogError("Failed to register Toggle action for inverse"); + } + } + +} + diff --git a/Assets/Scripts/UI/SC_InverseCamera.cs.shmeta b/Assets/Scripts/UI/SC_InverseCamera.cs.shmeta new file mode 100644 index 00000000..1e430082 --- /dev/null +++ b/Assets/Scripts/UI/SC_InverseCamera.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_InverseCamera +ID: 160969739 +Type: 9 diff --git a/Assets/Scripts/UI/SC_Options.cs b/Assets/Scripts/UI/SC_Options.cs index 5020af91..4ff727dd 100644 --- a/Assets/Scripts/UI/SC_Options.cs +++ b/Assets/Scripts/UI/SC_Options.cs @@ -15,9 +15,6 @@ namespace SHADE_Scripting.UI public GameObject fovSlider; public GameObject sensitivitySlider; - - - protected override void awake() { Slider mv = masterVolSlider.GetComponent(); @@ -26,8 +23,6 @@ namespace SHADE_Scripting.UI Slider fov = fovSlider.GetComponent(); Slider sens = sensitivitySlider.GetComponent(); - - if (mv != null) { mv.ScaledValue = Settings.masterVolume; diff --git a/Assets/Scripts/UI/Settings.cs b/Assets/Scripts/UI/Settings.cs index 4a8d2f40..3fc7ef64 100644 --- a/Assets/Scripts/UI/Settings.cs +++ b/Assets/Scripts/UI/Settings.cs @@ -13,5 +13,7 @@ static public class Settings static public float masterVolume = 100.0f; static public float sfxVolume = 100.0f; static public float bgmVolume = 100.0f; + static public bool inverseX = false; + static public bool inverseY = false; } diff --git a/Assets/Texture/UI/Checkbox_Empty.dds b/Assets/Texture/UI/Checkbox_Empty.dds new file mode 100644 index 00000000..887602c0 Binary files /dev/null and b/Assets/Texture/UI/Checkbox_Empty.dds differ diff --git a/Assets/Texture/UI/Checkbox_Empty.shtex b/Assets/Texture/UI/Checkbox_Empty.shtex new file mode 100644 index 00000000..09914bbb Binary files /dev/null and b/Assets/Texture/UI/Checkbox_Empty.shtex differ diff --git a/Assets/Texture/UI/Checkbox_Empty.shtex.shmeta b/Assets/Texture/UI/Checkbox_Empty.shtex.shmeta new file mode 100644 index 00000000..e0e104d3 --- /dev/null +++ b/Assets/Texture/UI/Checkbox_Empty.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Checkbox_Empty +ID: 50439604 +Type: 3 diff --git a/Assets/Texture/UI/Checkbox_Filled.dds b/Assets/Texture/UI/Checkbox_Filled.dds new file mode 100644 index 00000000..4a9c54ca Binary files /dev/null and b/Assets/Texture/UI/Checkbox_Filled.dds differ diff --git a/Assets/Texture/UI/Checkbox_Filled.shtex b/Assets/Texture/UI/Checkbox_Filled.shtex new file mode 100644 index 00000000..f063248d Binary files /dev/null and b/Assets/Texture/UI/Checkbox_Filled.shtex differ diff --git a/Assets/Texture/UI/Checkbox_Filled.shtex.shmeta b/Assets/Texture/UI/Checkbox_Filled.shtex.shmeta new file mode 100644 index 00000000..9a006440 --- /dev/null +++ b/Assets/Texture/UI/Checkbox_Filled.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Checkbox_Filled +ID: 64389107 +Type: 3 diff --git a/Assets/Texture/UI/Level Select/Level_1_Select.dds b/Assets/Texture/UI/Level Select/Level_1_Select.dds new file mode 100644 index 00000000..57593a60 Binary files /dev/null and b/Assets/Texture/UI/Level Select/Level_1_Select.dds differ diff --git a/Assets/Texture/UI/Level Select/Level_1_Select.shtex b/Assets/Texture/UI/Level Select/Level_1_Select.shtex new file mode 100644 index 00000000..65e863d2 Binary files /dev/null and b/Assets/Texture/UI/Level Select/Level_1_Select.shtex differ diff --git a/Assets/Texture/UI/Level Select/Level_1_Select.shtex.shmeta b/Assets/Texture/UI/Level Select/Level_1_Select.shtex.shmeta new file mode 100644 index 00000000..c1452276 --- /dev/null +++ b/Assets/Texture/UI/Level Select/Level_1_Select.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Level_1_Select +ID: 55897117 +Type: 3 diff --git a/Assets/Texture/UI/Level Select/Level_2_Select.dds b/Assets/Texture/UI/Level Select/Level_2_Select.dds new file mode 100644 index 00000000..b19a7f76 Binary files /dev/null and b/Assets/Texture/UI/Level Select/Level_2_Select.dds differ diff --git a/Assets/Texture/UI/Level Select/Level_2_Select.shtex b/Assets/Texture/UI/Level Select/Level_2_Select.shtex new file mode 100644 index 00000000..7fa0a3f4 Binary files /dev/null and b/Assets/Texture/UI/Level Select/Level_2_Select.shtex differ diff --git a/Assets/Texture/UI/Level Select/Level_2_Select.shtex.shmeta b/Assets/Texture/UI/Level Select/Level_2_Select.shtex.shmeta new file mode 100644 index 00000000..1e523f92 --- /dev/null +++ b/Assets/Texture/UI/Level Select/Level_2_Select.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Level_2_Select +ID: 52151774 +Type: 3 diff --git a/Assets/Texture/UI/Level Select/Level_3_Select.dds b/Assets/Texture/UI/Level Select/Level_3_Select.dds new file mode 100644 index 00000000..bcdd03ed Binary files /dev/null and b/Assets/Texture/UI/Level Select/Level_3_Select.dds differ diff --git a/Assets/Texture/UI/Level Select/Level_3_Select.shtex b/Assets/Texture/UI/Level Select/Level_3_Select.shtex new file mode 100644 index 00000000..a1d5da1b Binary files /dev/null and b/Assets/Texture/UI/Level Select/Level_3_Select.shtex differ diff --git a/Assets/Texture/UI/Level Select/Level_3_Select.shtex.shmeta b/Assets/Texture/UI/Level Select/Level_3_Select.shtex.shmeta new file mode 100644 index 00000000..4cd4d4eb --- /dev/null +++ b/Assets/Texture/UI/Level Select/Level_3_Select.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Level_3_Select +ID: 51704639 +Type: 3 diff --git a/Assets/Texture/UI/Level Select/TX_Button_Level1.dds b/Assets/Texture/UI/Level Select/TX_Button_Level1.dds deleted file mode 100644 index b135829e..00000000 Binary files a/Assets/Texture/UI/Level Select/TX_Button_Level1.dds and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/TX_Button_Level1.shtex b/Assets/Texture/UI/Level Select/TX_Button_Level1.shtex deleted file mode 100644 index da2080f1..00000000 Binary files a/Assets/Texture/UI/Level Select/TX_Button_Level1.shtex and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/TX_Button_Level1.shtex.shmeta b/Assets/Texture/UI/Level Select/TX_Button_Level1.shtex.shmeta deleted file mode 100644 index 84ca0573..00000000 --- a/Assets/Texture/UI/Level Select/TX_Button_Level1.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: TX_Button_Level1 -ID: 52916516 -Type: 3 diff --git a/Assets/Texture/UI/Level Select/TX_Button_Level2_1.dds b/Assets/Texture/UI/Level Select/TX_Button_Level2_1.dds deleted file mode 100644 index c2b1549f..00000000 Binary files a/Assets/Texture/UI/Level Select/TX_Button_Level2_1.dds and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/TX_Button_Level2_1.shtex b/Assets/Texture/UI/Level Select/TX_Button_Level2_1.shtex deleted file mode 100644 index 16cc8698..00000000 Binary files a/Assets/Texture/UI/Level Select/TX_Button_Level2_1.shtex and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/TX_Button_Level2_1.shtex.shmeta b/Assets/Texture/UI/Level Select/TX_Button_Level2_1.shtex.shmeta deleted file mode 100644 index fca5293e..00000000 --- a/Assets/Texture/UI/Level Select/TX_Button_Level2_1.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: TX_Button_Level2_1 -ID: 55380564 -Type: 3 diff --git a/Assets/Texture/UI/Level Select/TX_Button_Level3_1.dds b/Assets/Texture/UI/Level Select/TX_Button_Level3_1.dds deleted file mode 100644 index 0ed94f6a..00000000 Binary files a/Assets/Texture/UI/Level Select/TX_Button_Level3_1.dds and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/TX_Button_Level3_1.shtex b/Assets/Texture/UI/Level Select/TX_Button_Level3_1.shtex deleted file mode 100644 index 2ea0a7ac..00000000 Binary files a/Assets/Texture/UI/Level Select/TX_Button_Level3_1.shtex and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/TX_Button_Level3_1.shtex.shmeta b/Assets/Texture/UI/Level Select/TX_Button_Level3_1.shtex.shmeta deleted file mode 100644 index 9f33e955..00000000 --- a/Assets/Texture/UI/Level Select/TX_Button_Level3_1.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: TX_Button_Level3_1 -ID: 53392159 -Type: 3 diff --git a/SHADE_Managed/src/Components/Toggle.cxx b/SHADE_Managed/src/Components/Toggle.cxx new file mode 100644 index 00000000..70324b0f --- /dev/null +++ b/SHADE_Managed/src/Components/Toggle.cxx @@ -0,0 +1,30 @@ +// Precompiled Headers +#include "SHpch.h" +// Primary Header +#include "Toggle.hxx" +#include "Assets/NativeAsset.hxx" +#include "Utility/Convert.hxx" +#include "Utility/Debug.hxx" + + +#include "ECS_Base/Managers/SHSystemManager.h" +#include "UI/SHUISystem.h" + + +namespace SHADE +{ + Toggle::Toggle(Entity entity) + : Component(entity) + {} + + bool Toggle::GetValue() + { + return GetNativeComponent()->GetValue(); + } + + void Toggle::SetValue(bool value) + { + return GetNativeComponent()->SetValue(value); + } + +} diff --git a/SHADE_Managed/src/Components/Toggle.hxx b/SHADE_Managed/src/Components/Toggle.hxx new file mode 100644 index 00000000..47200d29 --- /dev/null +++ b/SHADE_Managed/src/Components/Toggle.hxx @@ -0,0 +1,48 @@ +/************************************************************************************//*! +\file Slider.hxx +\author Daniel Chua, 2001877 +\par email: yeechendaniel/@digipen.edu +\date Feb 26, 2023 +\brief Contains the definition of the managed Slider class with the + declaration of functions for working with it. + + Note: This file is written in C++17/CLI. + +Copyright (C) 2023 DigiPen Institute of Technology. +Reproduction or disclosure of this file or its contents without the prior written consent +of DigiPen Institute of Technology is prohibited. +*//*************************************************************************************/ +#pragma once + +// Project Includes +#include "Components/Component.hxx" +#include "Math/Vector3.hxx" +#include "Math/Quaternion.hxx" +// External Dependencies +#include "UI/SHToggleButtonComponent.h" + +namespace SHADE +{ + /// + /// CLR version of the SHADE Engine's SHSliderComponent. + /// + public ref class Toggle : public Component + { + internal: + /*-----------------------------------------------------------------------------*/ + /* Constructors */ + /*-----------------------------------------------------------------------------*/ + /// + /// Constructs a Slider Component that represents a native SHSliderComponent + /// tied to the specified Entity. + /// + /// Entity that this Component will be tied to. + Toggle(Entity entity); + + public: + + bool GetValue(); + void SetValue(bool value); + }; +} + diff --git a/SHADE_Managed/src/Engine/ECS.cxx b/SHADE_Managed/src/Engine/ECS.cxx index f29dd2ac..513c16cb 100644 --- a/SHADE_Managed/src/Engine/ECS.cxx +++ b/SHADE_Managed/src/Engine/ECS.cxx @@ -53,6 +53,7 @@ of DigiPen Institute of Technology is prohibited. #include "Components\Animator.hxx" #include "Components\ParticleEmitter.hxx" #include "Components\Navigation.hxx" +#include "Components\Toggle.hxx" namespace SHADE @@ -345,6 +346,7 @@ namespace SHADE componentMap.Add(createComponentSet()); componentMap.Add(createComponentSet()); componentMap.Add(createComponentSet()); + componentMap.Add(createComponentSet()); } /*---------------------------------------------------------------------------------*/