From 9b6a0d112ed3347d07ac7eab63925d3880dd9aeb Mon Sep 17 00:00:00 2001 From: Glence Date: Sat, 25 Mar 2023 16:09:40 +0800 Subject: [PATCH] remove density --- Assets/Scenes/Level1.shade | 4 --- Assets/Scenes/Level2.shade | 41 ------------------------- Assets/Scenes/Level3.shade | 37 ---------------------- Assets/Scripts/Gameplay/Item/SC_Item.cs | 5 --- 4 files changed, 87 deletions(-) diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade index 4bbd7e47..b5ac7855 100644 --- a/Assets/Scenes/Level1.shade +++ b/Assets/Scenes/Level1.shade @@ -7769,7 +7769,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 200 @@ -7822,7 +7821,6 @@ Score: 500 currCategory: 2 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 200 @@ -7875,7 +7873,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 200 @@ -7928,7 +7925,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 200 diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade index 27b58a64..f481e842 100644 --- a/Assets/Scenes/Level2.shade +++ b/Assets/Scenes/Level2.shade @@ -113,7 +113,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -166,7 +165,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -219,7 +217,6 @@ Score: 500 currCategory: 2 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -272,7 +269,6 @@ Score: 500 currCategory: 2 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -325,7 +321,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -378,7 +373,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -431,7 +425,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -490,7 +483,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -711,7 +703,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -764,7 +755,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -817,7 +807,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -870,7 +859,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -923,7 +911,6 @@ Score: 500 currCategory: 2 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -976,7 +963,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1029,7 +1015,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1082,7 +1067,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1135,7 +1119,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1188,7 +1171,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1241,7 +1223,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1294,7 +1275,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1347,7 +1327,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1400,7 +1379,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1453,7 +1431,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1506,7 +1483,6 @@ Score: 500 currCategory: 2 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1559,7 +1535,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1612,7 +1587,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1665,7 +1639,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1724,7 +1697,6 @@ Score: 500 currCategory: 2 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1777,7 +1749,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1830,7 +1801,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1883,7 +1853,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1936,7 +1905,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1989,7 +1957,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2048,7 +2015,6 @@ Score: 500 currCategory: 2 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2101,7 +2067,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2154,7 +2119,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2207,7 +2171,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2260,7 +2223,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2313,7 +2275,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2372,7 +2333,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2599,7 +2559,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 diff --git a/Assets/Scenes/Level3.shade b/Assets/Scenes/Level3.shade index 57e52506..4e17191c 100644 --- a/Assets/Scenes/Level3.shade +++ b/Assets/Scenes/Level3.shade @@ -9537,7 +9537,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9590,7 +9589,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9643,7 +9641,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9696,7 +9693,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9749,7 +9745,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9802,7 +9797,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9855,7 +9849,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9908,7 +9901,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9961,7 +9953,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10014,7 +10005,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10067,7 +10057,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10120,7 +10109,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10173,7 +10161,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10226,7 +10213,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10279,7 +10265,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10332,7 +10317,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10385,7 +10369,6 @@ Score: 500 currCategory: 2 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10438,7 +10421,6 @@ Score: 500 currCategory: 2 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10491,7 +10473,6 @@ Score: 500 currCategory: 2 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10544,7 +10525,6 @@ Score: 500 currCategory: 2 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10603,7 +10583,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10830,7 +10809,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -11057,7 +11035,6 @@ Score: 500 currCategory: 2 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -11110,7 +11087,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11163,7 +11139,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11216,7 +11191,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11269,7 +11243,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11322,7 +11295,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11381,7 +11353,6 @@ Score: 500 currCategory: 2 currFood: 0 - density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -11434,7 +11405,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11487,7 +11457,6 @@ Score: 50 currCategory: 1 currFood: 0 - density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11540,7 +11509,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11593,7 +11561,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11646,7 +11613,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11732,7 +11698,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -11959,7 +11924,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -12186,7 +12150,6 @@ Score: 10 currCategory: 0 currFood: 0 - density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 diff --git a/Assets/Scripts/Gameplay/Item/SC_Item.cs b/Assets/Scripts/Gameplay/Item/SC_Item.cs index f632c850..86b605c0 100644 --- a/Assets/Scripts/Gameplay/Item/SC_Item.cs +++ b/Assets/Scripts/Gameplay/Item/SC_Item.cs @@ -30,8 +30,6 @@ public class Item : Script private bool caputurePos = false; private Vector3 firstPostion; private Vector3 firstRotation; - private Collider collider; - public float density = 1.0f; public bool dontReturn = false; @@ -52,9 +50,6 @@ public class Item : Script { transform = GetComponent(); rb = GetComponent(); - collider = GetComponent(); - if(collider) - collider.GetCollisionShape(0).Density = density; rend = GetComponent(); if (!rend)