diff --git a/Assets/Materials/UI/Steal_Food.shmat b/Assets/Materials/UI/Steal_Food.shmat new file mode 100644 index 00000000..4aca025e --- /dev/null +++ b/Assets/Materials/UI/Steal_Food.shmat @@ -0,0 +1,8 @@ +- VertexShader: 46580970 + FragmentShader: 35983630 + SubPass: UI + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 63456868 + data.alpha: 1 + data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UI/Steal_Food.shmat.shmeta b/Assets/Materials/UI/Steal_Food.shmat.shmeta new file mode 100644 index 00000000..ca5c979e --- /dev/null +++ b/Assets/Materials/UI/Steal_Food.shmat.shmeta @@ -0,0 +1,3 @@ +Name: Steal_Food +ID: 127459277 +Type: 7 diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade index d71d7b04..f9e62d31 100644 --- a/Assets/Scenes/Level1.shade +++ b/Assets/Scenes/Level1.shade @@ -4472,7 +4472,7 @@ IsActive: true Renderable Component: Mesh: 136892700 - Material: 131956078 + Material: 122370915 IsActive: true RigidBody Component: Type: Dynamic @@ -4523,7 +4523,7 @@ IsActive: true Renderable Component: Mesh: 141841143 - Material: 131956078 + Material: 122370915 IsActive: true RigidBody Component: Type: Dynamic @@ -4574,7 +4574,7 @@ IsActive: true Renderable Component: Mesh: 144128170 - Material: 131956078 + Material: 122370915 IsActive: true RigidBody Component: Type: Dynamic @@ -4625,7 +4625,7 @@ IsActive: true Renderable Component: Mesh: 144128170 - Material: 131956078 + Material: 122370915 IsActive: true RigidBody Component: Type: Dynamic @@ -4983,7 +4983,7 @@ - EID: 217 Name: ===Anims=== IsActive: true - NumberOfChildren: 5 + NumberOfChildren: 4 Components: ~ Scripts: ~ - EID: 221 @@ -5071,7 +5071,7 @@ - EID: 65775 Name: Player IsActive: true - NumberOfChildren: 3 + NumberOfChildren: 5 Components: Transform Component: Translate: {x: -8, y: 1.142977, z: -4} @@ -5131,8 +5131,8 @@ delayTimer: 1 aimingLength: 0.899999976 throwItem: false - silhouettePlayer: 51000 - silhouetteBag: 51000 + silhouettePlayer: 462 + silhouetteBag: 465 rayDistance: 0.5 rayHeight: 0.100000001 aimingFOV: 50 @@ -5202,6 +5202,36 @@ Material: 123745521 IsActive: true Scripts: ~ +- EID: 462 + Name: SilouettePlayer + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1.00000012, y: 1, z: 1.00000012} + IsActive: true + Renderable Component: + Mesh: 149697411 + Material: 126391182 + IsActive: true + Scripts: ~ +- EID: 465 + Name: SilouetteBag + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1.00000012, y: 1, z: 1.00000012} + IsActive: true + Renderable Component: + Mesh: 144838771 + Material: 126391182 + IsActive: true + Scripts: ~ - EID: 65732 Name: RespawnPoint IsActive: true @@ -5212,4 +5242,35 @@ Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} IsActive: true + Scripts: ~ +- EID: 464 + Name: Canvas + IsActive: true + NumberOfChildren: 1 + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + Scale by canvas width: false + IsActive: true + Scripts: ~ +- EID: 460 + Name: RetryButton + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -100, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 300, y: 300, z: 500} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 127459277 + IsActive: true + UI Component: + Canvas ID: 464 + Hovered: false + Clicked: false + IsActive: true Scripts: ~ \ No newline at end of file diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade index a23c33e4..47b32e34 100644 --- a/Assets/Scenes/Level2.shade +++ b/Assets/Scenes/Level2.shade @@ -59,7 +59,7 @@ - EID: 240 Name: ====ItemPool==== IsActive: true - NumberOfChildren: 29 + NumberOfChildren: 31 Components: ~ Scripts: ~ - EID: 241 @@ -1968,6 +1968,108 @@ highlightSpeed: 300 highlightThickness: 250 highlightLowerClamp: 0.25 +- EID: 176 + Name: Mesh_Apple + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 1.33684826, y: 0.0771836638, z: 6.68176699} + Rotate: {x: -0, y: 0, z: -0} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + Renderable Component: + Mesh: 144128170 + Material: 122370915 + IsActive: true + RigidBody Component: + Type: Dynamic + Drag: 0.00999999978 + Angular Drag: 0.100000001 + Use Gravity: true + Interpolate: false + Sleeping Enabled: true + Freeze Position X: false + Freeze Position Y: false + Freeze Position Z: false + Freeze Rotation X: false + Freeze Rotation Y: false + Freeze Rotation Z: false + IsActive: true + Collider Component: + Colliders: + - Is Trigger: false + Collision Tag: 2 + Type: Box + Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003} + Friction: 0.400000006 + Bounciness: 0 + Density: 1 + Position Offset: {x: 0, y: 0, z: 0} + Rotation Offset: {x: 0, y: 0, z: 0} + IsActive: true + Scripts: + - Type: Item + Enabled: true + Score: 10 + currCategory: 0 + density: 1 + dontReturn: false + soundDistance: 10 + highlightSpeed: 300 + highlightThickness: 250 + highlightLowerClamp: 0.25 +- EID: 175 + Name: Mesh_Meat + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 3.2909081, y: 0.179948017, z: 6.6051631} + Rotate: {x: -0, y: 0, z: -0} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + Renderable Component: + Mesh: 136892700 + Material: 122370915 + IsActive: true + RigidBody Component: + Type: Dynamic + Drag: 0.00999999978 + Angular Drag: 0.100000001 + Use Gravity: true + Interpolate: false + Sleeping Enabled: true + Freeze Position X: false + Freeze Position Y: false + Freeze Position Z: false + Freeze Rotation X: false + Freeze Rotation Y: false + Freeze Rotation Z: false + IsActive: true + Collider Component: + Colliders: + - Is Trigger: false + Collision Tag: 2 + Type: Box + Half Extents: {x: 0.300000012, y: 0.300000012, z: 0.300000012} + Friction: 0.400000006 + Bounciness: 0 + Density: 1 + Position Offset: {x: 0, y: 0, z: 0} + Rotation Offset: {x: 0, y: 0, z: 0} + IsActive: true + Scripts: + - Type: Item + Enabled: true + Score: 50 + currCategory: 1 + density: 1 + dontReturn: false + soundDistance: 10 + highlightSpeed: 300 + highlightThickness: 250 + highlightLowerClamp: 0.25 - EID: 15 Name: ====ScoreZonePool==== IsActive: true @@ -4722,7 +4824,7 @@ Components: Transform Component: Translate: {x: 0, y: -300, z: 0} - Rotate: {x: -1.48352981, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} Scale: {x: 300, y: 200, z: 500} IsActive: true Renderable Component: diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index 95daed42..7ab9c413 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -203,26 +203,31 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ + Scripts: + - Type: SHADE_Scripting.UI.ScaleBounce + Enabled: true + minScale: 1 + maxScale: 1.20000005 + duration: 1.5 - EID: 54 Name: test - IsActive: true + IsActive: false NumberOfChildren: 0 Components: Transform Component: Translate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 3.14159274} Scale: {x: 1920, y: 500, z: 1} - IsActive: true + IsActive: false Renderable Component: Mesh: 141771688 Material: 129138332 - IsActive: true + IsActive: false UI Component: Canvas ID: 0 Hovered: false Clicked: false - IsActive: true + IsActive: false Scripts: ~ - EID: 2 Name: Light @@ -270,13 +275,14 @@ Enabled: true sceneID: 96668835 obj: 1 - test: 54 - EID: 8 Name: TweenManager IsActive: true NumberOfChildren: 0 Components: ~ - Scripts: ~ + Scripts: + - Type: SHADE_Scripting.UI.TweenManager + Enabled: true - EID: 13 Name: How To Play Canvas IsActive: false diff --git a/Assets/Scripts/Gameplay/Item/SC_Item.cs b/Assets/Scripts/Gameplay/Item/SC_Item.cs index 0a96199a..c8fa1bcd 100644 --- a/Assets/Scripts/Gameplay/Item/SC_Item.cs +++ b/Assets/Scripts/Gameplay/Item/SC_Item.cs @@ -55,6 +55,22 @@ public class Item : Script protected override void start() { GameManager.Instance.totalItemCount += 1; + + if (rend) + { + if (currCategory == ItemCategory.LIGHT) + { + highlightThickness /= 10; + } + + if (currCategory == ItemCategory.MEDIUM) + { + highlightThickness /= 5; + } + + rend.Material.SetProperty("data.thickness", highlightThickness); + } + } protected override void update() @@ -66,7 +82,6 @@ public class Item : Script float ratio = System.Math.Clamp(1 - (disSqr / (1 + disSqr)), highlightLowerClamp, 1.0f); highlightPos += highlightSpeed * Time.DeltaTimeF * ratio; rend.Material.SetProperty("data.highlightPosition", highlightPos); - rend.Material.SetProperty("data.thickness", highlightThickness); } if (returnBack && !dontReturn) diff --git a/Assets/Texture/TX_Steal_Food.dds b/Assets/Texture/TX_Steal_Food.dds new file mode 100644 index 00000000..981d2385 Binary files /dev/null and b/Assets/Texture/TX_Steal_Food.dds differ diff --git a/Assets/Texture/TX_Steal_Food.shtex b/Assets/Texture/TX_Steal_Food.shtex new file mode 100644 index 00000000..1086f980 Binary files /dev/null and b/Assets/Texture/TX_Steal_Food.shtex differ diff --git a/Assets/Texture/TX_Steal_Food.shtex.shmeta b/Assets/Texture/TX_Steal_Food.shtex.shmeta new file mode 100644 index 00000000..66569d82 --- /dev/null +++ b/Assets/Texture/TX_Steal_Food.shtex.shmeta @@ -0,0 +1,3 @@ +Name: TX_Steal_Food +ID: 63456868 +Type: 3