From e5cf27b937334c05e2d6c1be63987979a77c381f Mon Sep 17 00:00:00 2001 From: ClairePeta Date: Fri, 9 Aug 2019 19:48:52 +1000 Subject: [PATCH] Work in Progress - Scripting up Traps --- Assets/Prefabs/Traps/Conveyor Belt.prefab | 138 ++++++++++++++++++ .../Prefabs/Traps/Conveyor Belt.prefab.meta | 7 + Assets/Prefabs/Traps/CrushingBoulder.prefab | 21 ++- Assets/Prefabs/Traps/CudeWithCrystals.prefab | 87 ++++++++--- Assets/Prefabs/Traps/FloatingOnWater.prefab | 19 ++- Assets/Prefabs/Traps/InGroundTrap.prefab | 109 ++++++-------- Assets/Prefabs/Traps/ShootingCannon.prefab | 40 ++++- Assets/Scenes/Trap Creation - Claire.unity | 4 +- Assets/Scripts/Traps.meta | 8 + Assets/Scripts/Traps/ConveyorBelt.cs | 11 ++ Assets/Scripts/Traps/ConveyorBelt.cs.meta | 11 ++ Assets/Scripts/Traps/CrushingBoulder.cs | 11 ++ Assets/Scripts/Traps/CrushingBoulder.cs.meta | 11 ++ Assets/Scripts/Traps/CubeWithCrystals.cs | 32 ++++ Assets/Scripts/Traps/CubeWithCrystals.cs.meta | 11 ++ Assets/Scripts/Traps/FloatingOnWater.cs | 53 +++++++ Assets/Scripts/Traps/FloatingOnWater.cs.meta | 11 ++ Assets/Scripts/Traps/InGroundTrap.cs | 11 ++ Assets/Scripts/Traps/InGroundTrap.cs.meta | 11 ++ Assets/Scripts/Traps/ShootingCannon.cs | 11 ++ Assets/Scripts/Traps/ShootingCannon.cs.meta | 11 ++ Assets/Scripts/Traps/Traps.cs | 42 ++++++ Assets/Scripts/Traps/Traps.cs.meta | 11 ++ .../Textures/Planes/Converyor Belt.jpg | 3 + .../Textures/Planes/Converyor Belt.jpg.meta | 88 +++++++++++ .../Textures/Planes/Materials.meta | 8 + .../Planes/Materials/Converyor Belt.mat | 77 ++++++++++ .../Planes/Materials/Converyor Belt.mat.meta | 8 + 28 files changed, 768 insertions(+), 97 deletions(-) create mode 100644 Assets/Prefabs/Traps/Conveyor Belt.prefab create mode 100644 Assets/Prefabs/Traps/Conveyor Belt.prefab.meta create mode 100644 Assets/Scripts/Traps.meta create mode 100644 Assets/Scripts/Traps/ConveyorBelt.cs create mode 100644 Assets/Scripts/Traps/ConveyorBelt.cs.meta create mode 100644 Assets/Scripts/Traps/CrushingBoulder.cs create mode 100644 Assets/Scripts/Traps/CrushingBoulder.cs.meta create mode 100644 Assets/Scripts/Traps/CubeWithCrystals.cs create mode 100644 Assets/Scripts/Traps/CubeWithCrystals.cs.meta create mode 100644 Assets/Scripts/Traps/FloatingOnWater.cs create mode 100644 Assets/Scripts/Traps/FloatingOnWater.cs.meta create mode 100644 Assets/Scripts/Traps/InGroundTrap.cs create mode 100644 Assets/Scripts/Traps/InGroundTrap.cs.meta create mode 100644 Assets/Scripts/Traps/ShootingCannon.cs create mode 100644 Assets/Scripts/Traps/ShootingCannon.cs.meta create mode 100644 Assets/Scripts/Traps/Traps.cs create mode 100644 Assets/Scripts/Traps/Traps.cs.meta create mode 100644 Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Converyor Belt.jpg create mode 100644 Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Converyor Belt.jpg.meta create mode 100644 Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Materials.meta create mode 100644 Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Materials/Converyor Belt.mat create mode 100644 Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Materials/Converyor Belt.mat.meta diff --git a/Assets/Prefabs/Traps/Conveyor Belt.prefab b/Assets/Prefabs/Traps/Conveyor Belt.prefab new file mode 100644 index 0000000..327ec97 --- /dev/null +++ b/Assets/Prefabs/Traps/Conveyor Belt.prefab @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2418273759298412064 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6885336512813422994} + - component: {fileID: 2418273759298412065} + m_Layer: 0 + m_Name: Conveyor Belt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6885336512813422994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2418273759298412064} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 534819064938385325} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2418273759298412065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2418273759298412064} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6692f0c965cb4fa41b616ba0991653a3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6298733943245737397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 534819064938385325} + - component: {fileID: 4321558135700899541} + - component: {fileID: 3879023477559693693} + - component: {fileID: 8557379418806623069} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &534819064938385325 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6298733943245737397} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_Children: [] + m_Father: {fileID: 6885336512813422994} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4321558135700899541 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6298733943245737397} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3879023477559693693 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6298733943245737397} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d243897630e0747498d8b617f60dc26d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!64 &8557379418806623069 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6298733943245737397} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/Prefabs/Traps/Conveyor Belt.prefab.meta b/Assets/Prefabs/Traps/Conveyor Belt.prefab.meta new file mode 100644 index 0000000..6076102 --- /dev/null +++ b/Assets/Prefabs/Traps/Conveyor Belt.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d3d2528b8c8962e4ba9ed0d99025771b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/CrushingBoulder.prefab b/Assets/Prefabs/Traps/CrushingBoulder.prefab index c461d81..a60649d 100644 --- a/Assets/Prefabs/Traps/CrushingBoulder.prefab +++ b/Assets/Prefabs/Traps/CrushingBoulder.prefab @@ -216,6 +216,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6745622317302131140} + - component: {fileID: 4087432991862725476} m_Layer: 0 m_Name: CrushingBoulder m_TagString: Untagged @@ -240,6 +241,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4087432991862725476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6745622317302131141} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 87ae70f1ec0c67743923bd4a83ee85d8, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6745622315586474845 PrefabInstance: m_ObjectHideFlags: 0 @@ -247,10 +260,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6745622317302131140} m_Modifications: - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass (9) - objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -295,6 +304,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + propertyPath: m_Name + value: Cube_GroundWGrass (9) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &6742653090089018601 stripped diff --git a/Assets/Prefabs/Traps/CudeWithCrystals.prefab b/Assets/Prefabs/Traps/CudeWithCrystals.prefab index 4fc063b..715b853 100644 --- a/Assets/Prefabs/Traps/CudeWithCrystals.prefab +++ b/Assets/Prefabs/Traps/CudeWithCrystals.prefab @@ -1,5 +1,40 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &7009033047396183185 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6222932897940046940} + m_Layer: 0 + m_Name: Crystals + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6222932897940046940 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7009033047396183185} + 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: 9123591757219074862} + - {fileID: 9116052424124833850} + - {fileID: 9123414696532779387} + - {fileID: 9116306614291212775} + - {fileID: 9115906075035381432} + m_Father: {fileID: 9119206199061355250} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9119206199061355249 GameObject: m_ObjectHideFlags: 0 @@ -9,6 +44,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9119206199061355250} + - component: {fileID: 2280553813620852594} m_Layer: 0 m_Name: CudeWithCrystals m_TagString: Untagged @@ -27,21 +63,30 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6222932897940046940} - {fileID: 9116208357191883012} - - {fileID: 9123591757219074862} - - {fileID: 9116052424124833850} - - {fileID: 9123414696532779387} - - {fileID: 9116306614291212775} - - {fileID: 9115906075035381432} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2280553813620852594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9119206199061355249} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f123a8ae7c42549bd1daccb6fe61e0, type: 3} + m_Name: + m_EditorClassIdentifier: + crystals: {fileID: 7009033047396183185} --- !u!1001 &9119206197491717339 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 9119206199061355250} + m_TransformParent: {fileID: 6222932897940046940} m_Modifications: - target: {fileID: 4025485266255164, guid: 01b136a21d4d344429b829a7b1a12661, type: 3} propertyPath: m_LocalPosition.x @@ -49,7 +94,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4025485266255164, guid: 01b136a21d4d344429b829a7b1a12661, type: 3} propertyPath: m_LocalPosition.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4025485266255164, guid: 01b136a21d4d344429b829a7b1a12661, type: 3} propertyPath: m_LocalPosition.z @@ -73,7 +118,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4025485266255164, guid: 01b136a21d4d344429b829a7b1a12661, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4025485266255164, guid: 01b136a21d4d344429b829a7b1a12661, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -104,7 +149,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 9119206199061355250} + m_TransformParent: {fileID: 6222932897940046940} m_Modifications: - target: {fileID: 4461811097192420, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3} propertyPath: m_LocalPosition.x @@ -112,7 +157,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4461811097192420, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3} propertyPath: m_LocalPosition.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4461811097192420, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3} propertyPath: m_LocalPosition.z @@ -136,7 +181,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4461811097192420, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4461811097192420, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -167,7 +212,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 9119206199061355250} + m_TransformParent: {fileID: 6222932897940046940} m_Modifications: - target: {fileID: 1956409168649530, guid: 9c6910cdbb0ef93408a3da833d0feeb2, type: 3} propertyPath: m_Name @@ -179,7 +224,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4626633069526452, guid: 9c6910cdbb0ef93408a3da833d0feeb2, type: 3} propertyPath: m_LocalPosition.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4626633069526452, guid: 9c6910cdbb0ef93408a3da833d0feeb2, type: 3} propertyPath: m_LocalPosition.z @@ -203,7 +248,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4626633069526452, guid: 9c6910cdbb0ef93408a3da833d0feeb2, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4626633069526452, guid: 9c6910cdbb0ef93408a3da833d0feeb2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -230,7 +275,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 9119206199061355250} + m_TransformParent: {fileID: 6222932897940046940} m_Modifications: - target: {fileID: 4315419121807260, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3} propertyPath: m_LocalPosition.x @@ -238,7 +283,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4315419121807260, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3} propertyPath: m_LocalPosition.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4315419121807260, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3} propertyPath: m_LocalPosition.z @@ -262,7 +307,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4315419121807260, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4315419121807260, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -325,7 +370,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4128166634420518, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4128166634420518, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -356,7 +401,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 9119206199061355250} + m_TransformParent: {fileID: 6222932897940046940} m_Modifications: - target: {fileID: 1435387787644366, guid: 68b340d812c9ddc45a3c09a4613f4b07, type: 3} propertyPath: m_Name @@ -368,7 +413,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4799286435405670, guid: 68b340d812c9ddc45a3c09a4613f4b07, type: 3} propertyPath: m_LocalPosition.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4799286435405670, guid: 68b340d812c9ddc45a3c09a4613f4b07, type: 3} propertyPath: m_LocalPosition.z @@ -392,7 +437,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4799286435405670, guid: 68b340d812c9ddc45a3c09a4613f4b07, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4799286435405670, guid: 68b340d812c9ddc45a3c09a4613f4b07, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Prefabs/Traps/FloatingOnWater.prefab b/Assets/Prefabs/Traps/FloatingOnWater.prefab index e297e2c..e7f00d7 100644 --- a/Assets/Prefabs/Traps/FloatingOnWater.prefab +++ b/Assets/Prefabs/Traps/FloatingOnWater.prefab @@ -24,7 +24,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3043143187275025574} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7432977658103809198} @@ -42,13 +42,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7729055451593449897} + - component: {fileID: 2253904448710596599} m_Layer: 0 m_Name: FloatingOnWater m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7729055451593449897 Transform: m_ObjectHideFlags: 0 @@ -65,6 +66,20 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2253904448710596599 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7114897324399640995} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13e596b7661bb0b43b4ef2f0432f5966, type: 3} + m_Name: + m_EditorClassIdentifier: + clientData: {fileID: 11400000, guid: 78d89605739516c4f9c66fb270137102, type: 2} + lilypad: {fileID: 3043143187275025574} --- !u!1001 &7437530683803243968 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Traps/InGroundTrap.prefab b/Assets/Prefabs/Traps/InGroundTrap.prefab index 92f5e40..36e3cf3 100644 --- a/Assets/Prefabs/Traps/InGroundTrap.prefab +++ b/Assets/Prefabs/Traps/InGroundTrap.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3281312547625224782} + - component: {fileID: 6304764979941371139} m_Layer: 0 m_Name: InGroundTrap m_TagString: Untagged @@ -42,6 +43,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6304764979941371139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3281312547625224785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 90d16cd20b1d52149ae6b3d4c15c79db, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3281312545795134744 PrefabInstance: m_ObjectHideFlags: 0 @@ -49,14 +62,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass (5) - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.x value: -1 @@ -101,6 +106,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + propertyPath: m_Name + value: Cube_GroundWGrass (5) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &3280420306353529516 stripped @@ -173,14 +182,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass (3) - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.x value: -1 @@ -225,6 +226,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + propertyPath: m_Name + value: Cube_GroundWGrass (3) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &3280420306532555509 stripped @@ -307,14 +312,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.x value: -1 @@ -359,6 +356,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + propertyPath: m_Name + value: Cube_GroundWGrass + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &3280420305989102954 stripped @@ -431,14 +432,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass (6) - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -483,6 +476,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + propertyPath: m_Name + value: Cube_GroundWGrass (6) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &3280420305258570972 stripped @@ -679,14 +676,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass (1) - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -731,6 +720,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + propertyPath: m_Name + value: Cube_GroundWGrass (1) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &3280420305136919339 stripped @@ -746,14 +739,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass (2) - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.x value: 1 @@ -798,6 +783,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + propertyPath: m_Name + value: Cube_GroundWGrass (2) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &3280420305197933621 stripped @@ -813,14 +802,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass (4) - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.x value: 1 @@ -865,6 +846,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + propertyPath: m_Name + value: Cube_GroundWGrass (4) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &3280420305176429574 stripped @@ -947,14 +932,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass (7) - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.x value: 1 @@ -999,6 +976,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + propertyPath: m_Name + value: Cube_GroundWGrass (7) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &3280420304827894398 stripped diff --git a/Assets/Prefabs/Traps/ShootingCannon.prefab b/Assets/Prefabs/Traps/ShootingCannon.prefab index a916e44..17f3175 100644 --- a/Assets/Prefabs/Traps/ShootingCannon.prefab +++ b/Assets/Prefabs/Traps/ShootingCannon.prefab @@ -216,6 +216,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4407065910963968002} + - component: {fileID: 1984256088146121770} m_Layer: 0 m_Name: ShootingCannon m_TagString: Untagged @@ -241,6 +242,31 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1984256088146121770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4407065910963968001} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44366bd8a25270844bdd9a5db9f2b0e0, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!65 &7713460145294617833 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4408273554855513639} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.24999993, y: 0.2500002, z: 0.53749573} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &4407065910499815543 PrefabInstance: m_ObjectHideFlags: 0 @@ -248,10 +274,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4407065910963968002} m_Modifications: - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass (10) - objectReference: {fileID: 0} - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -296,6 +318,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + propertyPath: m_Name + value: Cube_GroundWGrass (10) + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} --- !u!4 &4406490330407094211 stripped @@ -436,6 +462,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 601c1b79e12ee6f428da0cdfc7412e9e, type: 3} +--- !u!1 &4408273554855513639 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1229707520659320, guid: 601c1b79e12ee6f428da0cdfc7412e9e, + type: 3} + m_PrefabInstance: {fileID: 4407065911188193631} + m_PrefabAsset: {fileID: 0} --- !u!4 &4411312180479633393 stripped Transform: m_CorrespondingSourceObject: {fileID: 4831352554563246, guid: 601c1b79e12ee6f428da0cdfc7412e9e, diff --git a/Assets/Scenes/Trap Creation - Claire.unity b/Assets/Scenes/Trap Creation - Claire.unity index 2b2340e..0a1a88f 100644 --- a/Assets/Scenes/Trap Creation - Claire.unity +++ b/Assets/Scenes/Trap Creation - Claire.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3050f3b15e89363b077e668bac2c97b066c1d03484d06847bad349cbfbc183b8 -size 29085 +oid sha256:153aef7b45a8aadfaedd2163e8244b73d7ba415080bd40510823bcecd1d69fae +size 24764 diff --git a/Assets/Scripts/Traps.meta b/Assets/Scripts/Traps.meta new file mode 100644 index 0000000..63c2778 --- /dev/null +++ b/Assets/Scripts/Traps.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5358f80f9c6bc444848d36b37dfca20 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Traps/ConveyorBelt.cs b/Assets/Scripts/Traps/ConveyorBelt.cs new file mode 100644 index 0000000..9a9ae64 --- /dev/null +++ b/Assets/Scripts/Traps/ConveyorBelt.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ConveyorBelt : MonoBehaviour +{ + public void Animate() + { + Debug.Log("abs"); + } +} diff --git a/Assets/Scripts/Traps/ConveyorBelt.cs.meta b/Assets/Scripts/Traps/ConveyorBelt.cs.meta new file mode 100644 index 0000000..e6581d5 --- /dev/null +++ b/Assets/Scripts/Traps/ConveyorBelt.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6692f0c965cb4fa41b616ba0991653a3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Traps/CrushingBoulder.cs b/Assets/Scripts/Traps/CrushingBoulder.cs new file mode 100644 index 0000000..a9895f6 --- /dev/null +++ b/Assets/Scripts/Traps/CrushingBoulder.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CrushingBoulder : MonoBehaviour +{ + public void Animate() + { + Debug.Log("abs"); + } +} diff --git a/Assets/Scripts/Traps/CrushingBoulder.cs.meta b/Assets/Scripts/Traps/CrushingBoulder.cs.meta new file mode 100644 index 0000000..292063f --- /dev/null +++ b/Assets/Scripts/Traps/CrushingBoulder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 87ae70f1ec0c67743923bd4a83ee85d8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Traps/CubeWithCrystals.cs b/Assets/Scripts/Traps/CubeWithCrystals.cs new file mode 100644 index 0000000..615e3bd --- /dev/null +++ b/Assets/Scripts/Traps/CubeWithCrystals.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CubeWithCrystals : MonoBehaviour +{ + bool characterInWater = false; + public GameObject crystals; + + IEnumerator GrowShrinkCoroutine(Vector3 endPosition) + { + float elapsedTime = 0; + Vector3 startPosition = crystals.transform.position; + float time = 0.8f; + while (elapsedTime < time) + { + transform.position = Vector3.Lerp(startPosition, endPosition, (elapsedTime / time)); + yield return new WaitForEndOfFrame(); + elapsedTime += Time.deltaTime; + } + crystals.transform.position = endPosition; + } + + public void Animate() + { + StartCoroutine(GrowShrinkCoroutine(new Vector3(0, 1, 0))); + } + public void returnToPosition() + { + StartCoroutine(GrowShrinkCoroutine(new Vector3(0, 0, 0))); + } +} diff --git a/Assets/Scripts/Traps/CubeWithCrystals.cs.meta b/Assets/Scripts/Traps/CubeWithCrystals.cs.meta new file mode 100644 index 0000000..38ca3a8 --- /dev/null +++ b/Assets/Scripts/Traps/CubeWithCrystals.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 80f123a8ae7c42549bd1daccb6fe61e0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Traps/FloatingOnWater.cs b/Assets/Scripts/Traps/FloatingOnWater.cs new file mode 100644 index 0000000..217e7c1 --- /dev/null +++ b/Assets/Scripts/Traps/FloatingOnWater.cs @@ -0,0 +1,53 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Networking.Client; + +public class FloatingOnWater : MonoBehaviour +{ + bool characterInWater = false; + public ConnectedClients clientData; + private List Names; + public GameObject lilypad; + + private void Start() + { + for(int i = 0; i < clientData.AllClients.Count; i++) + { + Names.Add(clientData.AllClients[i].characterAnimal + "(Clone)"); + } + } + void OnTriggerEnter(Collider other) + { + for(int i = 0; i < Names.Count; i++) + { + if (other.gameObject.name == Names[i]) + { + characterInWater = true; + } + } + } + + IEnumerator FloatSinkCoroutine(Vector3 endPosition) + { + float elapsedTime = 0; + Vector3 startPosition = lilypad.transform.position; + float time = 0.8f; + while (elapsedTime < time) + { + transform.position = Vector3.Lerp(startPosition, endPosition, (elapsedTime / time)); + yield return new WaitForEndOfFrame(); + elapsedTime += Time.deltaTime; + } + lilypad.transform.position = endPosition; + } + + public void Animate() + { + StartCoroutine(FloatSinkCoroutine(new Vector3(0, 1, 0))); + } + public void returnToPosition() + { + StartCoroutine(FloatSinkCoroutine(new Vector3(0, 0, 0))); + } +} diff --git a/Assets/Scripts/Traps/FloatingOnWater.cs.meta b/Assets/Scripts/Traps/FloatingOnWater.cs.meta new file mode 100644 index 0000000..3d648a8 --- /dev/null +++ b/Assets/Scripts/Traps/FloatingOnWater.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 13e596b7661bb0b43b4ef2f0432f5966 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Traps/InGroundTrap.cs b/Assets/Scripts/Traps/InGroundTrap.cs new file mode 100644 index 0000000..ad246d2 --- /dev/null +++ b/Assets/Scripts/Traps/InGroundTrap.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class InGroundTrap : MonoBehaviour +{ + public void Animate() + { + Debug.Log("abs"); + } +} diff --git a/Assets/Scripts/Traps/InGroundTrap.cs.meta b/Assets/Scripts/Traps/InGroundTrap.cs.meta new file mode 100644 index 0000000..c949264 --- /dev/null +++ b/Assets/Scripts/Traps/InGroundTrap.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 90d16cd20b1d52149ae6b3d4c15c79db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Traps/ShootingCannon.cs b/Assets/Scripts/Traps/ShootingCannon.cs new file mode 100644 index 0000000..8f8e2f0 --- /dev/null +++ b/Assets/Scripts/Traps/ShootingCannon.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ShootingCannon : MonoBehaviour +{ + public void Animate() + { + Debug.Log("abs"); + } +} diff --git a/Assets/Scripts/Traps/ShootingCannon.cs.meta b/Assets/Scripts/Traps/ShootingCannon.cs.meta new file mode 100644 index 0000000..2be7ee8 --- /dev/null +++ b/Assets/Scripts/Traps/ShootingCannon.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 44366bd8a25270844bdd9a5db9f2b0e0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Traps/Traps.cs b/Assets/Scripts/Traps/Traps.cs new file mode 100644 index 0000000..789dbcf --- /dev/null +++ b/Assets/Scripts/Traps/Traps.cs @@ -0,0 +1,42 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Traps : MonoBehaviour +{ + + public List ConveyorBelts; + public List CrushingBoulders; + public List CubesWithCrystals; + public List FloatingOnWater; + public List InGroundTraps; + public List ShootingCannons; + + public void environmentTurn() + { + for(int a = 0; a < ConveyorBelts.Count; a++) + { + ConveyorBelts[a].GetComponent().Animate(); + } + for (int b = 0; b < CrushingBoulders.Count; b++) + { + CrushingBoulders[b].GetComponent().Animate(); + } + for (int c = 0; c < CubesWithCrystals.Count; c++) + { + CubesWithCrystals[c].GetComponent().Animate(); + } + for (int d = 0; d < FloatingOnWater.Count; d++) + { + FloatingOnWater[d].GetComponent().Animate(); + } + for (int e = 0; e < InGroundTraps.Count; e++) + { + InGroundTraps[e].GetComponent().Animate(); + } + for (int f = 0; f < ShootingCannons.Count; f++) + { + ShootingCannons[f].GetComponent().Animate(); + } + } +} diff --git a/Assets/Scripts/Traps/Traps.cs.meta b/Assets/Scripts/Traps/Traps.cs.meta new file mode 100644 index 0000000..580443a --- /dev/null +++ b/Assets/Scripts/Traps/Traps.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 612f47a9f74b2694d8625347d8656417 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Converyor Belt.jpg b/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Converyor Belt.jpg new file mode 100644 index 0000000..047eb44 --- /dev/null +++ b/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Converyor Belt.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc18da1fa73c7cf2948207f99a45e3104bbad568b04a8235d8a15b7a2bef9e8f +size 42277 diff --git a/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Converyor Belt.jpg.meta b/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Converyor Belt.jpg.meta new file mode 100644 index 0000000..a235ea2 --- /dev/null +++ b/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Converyor Belt.jpg.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 753251444482f754badab10e43567ff1 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Materials.meta b/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Materials.meta new file mode 100644 index 0000000..2e3317b --- /dev/null +++ b/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 995027f31a8d05e4cad4733d8964a6d1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Materials/Converyor Belt.mat b/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Materials/Converyor Belt.mat new file mode 100644 index 0000000..d8b5f09 --- /dev/null +++ b/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Materials/Converyor Belt.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Converyor Belt + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 753251444482f754badab10e43567ff1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Materials/Converyor Belt.mat.meta b/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Materials/Converyor Belt.mat.meta new file mode 100644 index 0000000..4323f62 --- /dev/null +++ b/Assets/Third Party Assets/KUBIKOS - World/Textures/Planes/Materials/Converyor Belt.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d243897630e0747498d8b617f60dc26d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: