diff --git a/Assets/Prefabs/Traps/Conveyor Belt with Cube.prefab b/Assets/Prefabs/Traps/Conveyor Belt with Cube.prefab index 73872e1..4f44c35 100644 --- a/Assets/Prefabs/Traps/Conveyor Belt with Cube.prefab +++ b/Assets/Prefabs/Traps/Conveyor Belt with Cube.prefab @@ -11,8 +11,6 @@ GameObject: - component: {fileID: 4490968977809283} - component: {fileID: 33922994427887733} - component: {fileID: 23937057364958257} - - component: {fileID: 3845129242341207909} - - component: {fileID: 5867501616828889193} m_Layer: 0 m_Name: Cube_GroundWGrass m_TagString: Coloured @@ -30,9 +28,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4721099854274309} - - {fileID: 4721099527720510} + m_Children: [] m_Father: {fileID: 437627090} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -81,40 +77,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!65 &3845129242341207909 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1141755146290067} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1.0000005, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &5867501616828889193 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1141755146290067} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6692f0c965cb4fa41b616ba0991653a3, type: 3} - m_Name: - m_EditorClassIdentifier: - VisualOffset: {x: 0, y: 0, z: 0} - is_Walkable: 1 - isWater: 0 - isPit: 0 - isCrystals: 0 - isRock: 0 - isSpawnable: 0 - SpawnDirection: 2 - Action: {fileID: 11400000, guid: 0b1bcd75cb7dade4fb598ee3412594c2, type: 2} --- !u!1 &2430657395993931422 GameObject: m_ObjectHideFlags: 0 @@ -124,6 +86,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 437627090} + - component: {fileID: 1806707899937284459} + - component: {fileID: 7417423694022785374} m_Layer: 0 m_Name: Conveyor Belt with Cube m_TagString: Untagged @@ -147,6 +111,40 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1806707899937284459 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2430657395993931422} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &7417423694022785374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2430657395993931422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6692f0c965cb4fa41b616ba0991653a3, type: 3} + m_Name: + m_EditorClassIdentifier: + VisualOffset: {x: 0, y: 0, z: 0} + is_Walkable: 1 + isWater: 0 + isPit: 0 + isCrystals: 0 + isRock: 0 + isSpawnable: 0 + SpawnDirection: 2 + Action: {fileID: 11400000, guid: 0b1bcd75cb7dade4fb598ee3412594c2, type: 2} --- !u!1 &3424486742927057916 GameObject: m_ObjectHideFlags: 0 @@ -172,13 +170,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3424486742927057916} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0.51, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: [] m_Father: {fileID: 437627090} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!33 &1376194202737726602 MeshFilter: m_ObjectHideFlags: 0 @@ -224,137 +222,3 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!1001 &589977586 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4490968977809283} - m_Modifications: - - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_Name - value: Cube_GroundL - objectReference: {fileID: 0} - - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.y - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3} ---- !u!4 &4721099527720510 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, - type: 3} - m_PrefabInstance: {fileID: 589977586} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &816154313 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4490968977809283} - m_Modifications: - - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_Name - value: Cube_GroundU - objectReference: {fileID: 0} - - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3} ---- !u!4 &4721099854274309 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, - type: 3} - m_PrefabInstance: {fileID: 816154313} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Traps/ShootingCannon + Block.prefab b/Assets/Prefabs/Traps/ShootingCannon + Block.prefab index d72ac94..ca359a7 100644 --- a/Assets/Prefabs/Traps/ShootingCannon + Block.prefab +++ b/Assets/Prefabs/Traps/ShootingCannon + Block.prefab @@ -29,9 +29,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4541774030144991256} - - {fileID: 4541774030055075990} + m_Children: [] m_Father: {fileID: 6179448856766749153} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -153,7 +151,6 @@ MonoBehaviour: type: 3} spawnLocation: {fileID: 6183695074135418386} counter: {fileID: 7559508468311915784} - countdowntimer: 3 --- !u!1 &6180422965807075217 GameObject: m_ObjectHideFlags: 0 @@ -529,137 +526,3 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} m_maskType: 0 ---- !u!1001 &4546202104718436698 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4546202105378142430} - m_Modifications: - - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_Name - value: Cube_GroundL - objectReference: {fileID: 0} - - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.y - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3} ---- !u!4 &4541774030055075990 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, - type: 3} - m_PrefabInstance: {fileID: 4546202104718436698} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &4546202104896956884 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4546202105378142430} - m_Modifications: - - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_Name - value: Cube_GroundU - objectReference: {fileID: 0} - - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3} ---- !u!4 &4541774030144991256 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, - type: 3} - m_PrefabInstance: {fileID: 4546202104896956884} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/LevelBlocks/Block.cs b/Assets/Scripts/LevelBlocks/Block.cs index 77469fc..6dcfd61 100644 --- a/Assets/Scripts/LevelBlocks/Block.cs +++ b/Assets/Scripts/LevelBlocks/Block.cs @@ -26,6 +26,7 @@ public class Block : MonoBehaviour public bool isCrystals = false; public bool isRock = false; + public bool isCollectableSpawnable = false; [Header("Spawn Settings")] [Tooltip("Can this block be spawned on")] diff --git a/Assets/Scripts/Traps/ShootingCannon.cs b/Assets/Scripts/Traps/ShootingCannon.cs index 3fa443f..659d2a9 100644 --- a/Assets/Scripts/Traps/ShootingCannon.cs +++ b/Assets/Scripts/Traps/ShootingCannon.cs @@ -10,7 +10,7 @@ public class ShootingCannon : ActiveBlock public GameObject shootingObject; public Transform spawnLocation; public TextMeshPro counter; - public int countdowntimer; + int countdowntimer = 3; int countdown; public override int GetInitative()