diff --git a/Assets/BuildingParent.cs b/Assets/BuildingParent.cs index 49d2c3a..a26e006 100644 --- a/Assets/BuildingParent.cs +++ b/Assets/BuildingParent.cs @@ -16,7 +16,7 @@ public class BuildingParent : MonoBehaviour public Obstacle InstantiatedObstacle; private void Start() { - index = 5; + index = 1; Func(); } private void FixedUpdate() @@ -28,7 +28,7 @@ public class BuildingParent : MonoBehaviour index++; ObjPooler(); } - if (iterator < 5) + if (iterator < 1) { if (BuildingPool[iterator % BuildingPool.Count].PlayerExitedfromBuilding == true) { diff --git a/Assets/ObstacleHitReceiver.cs b/Assets/ObstacleHitReceiver.cs index 011e17a..e74a9d5 100644 --- a/Assets/ObstacleHitReceiver.cs +++ b/Assets/ObstacleHitReceiver.cs @@ -6,7 +6,6 @@ public class ObstacleHitReceiver : MonoBehaviour { private void OnCollisionEnter(Collision collision) { - Debug.Log("Collided with: " + collision.gameObject.name); if (collision.gameObject.layer == LayerMask.NameToLayer("Player")) { UIManager.instance.player.Health -= Random.Range(1,5); diff --git a/Assets/Physics Materials.meta b/Assets/Physics Materials.meta new file mode 100644 index 0000000..5772399 --- /dev/null +++ b/Assets/Physics Materials.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6acf56a652e55f549bf2a102fb0f7f0c +folderAsset: yes +timeCreated: 1432339741 +licenseType: Store +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Physics Materials/Bouncy.physicMaterial b/Assets/Physics Materials/Bouncy.physicMaterial new file mode 100644 index 0000000..0c1db6f --- /dev/null +++ b/Assets/Physics Materials/Bouncy.physicMaterial @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bouncy + dynamicFriction: 0.4 + staticFriction: 0.4 + bounciness: 1 + frictionCombine: 0 + bounceCombine: 2 diff --git a/Assets/Physics Materials/Bouncy.physicMaterial.meta b/Assets/Physics Materials/Bouncy.physicMaterial.meta new file mode 100644 index 0000000..296a45b --- /dev/null +++ b/Assets/Physics Materials/Bouncy.physicMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1725d39bf28070e48bfdff1c4a690f3f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 13400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index bfc901d..ab06cfb 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1304,7 +1304,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ea6c37a6e422e894f98866cc833d0bb4, type: 3} m_Name: m_EditorClassIdentifier: - speed: 5 + speed: 2.5 --- !u!136 &811116568 CapsuleCollider: m_ObjectHideFlags: 0 @@ -1898,8 +1898,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: -0.7071068, w: 0} m_LocalPosition: {x: 0, y: -0.23100013, z: -0.07500011} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} - m_ConstrainProportionsScale: 1 + m_LocalScale: {x: 0.75, y: 0.75, z: 0.4} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3582,7 +3582,7 @@ CapsuleCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2005889266442601893} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 1725d39bf28070e48bfdff1c4a690f3f, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -3758,7 +3758,7 @@ CapsuleCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3304611605568280386} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 1725d39bf28070e48bfdff1c4a690f3f, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -3886,7 +3886,7 @@ CapsuleCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192844905509389938} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 1725d39bf28070e48bfdff1c4a690f3f, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -4093,7 +4093,7 @@ CapsuleCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 55671297660870986} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 1725d39bf28070e48bfdff1c4a690f3f, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -4239,7 +4239,7 @@ CapsuleCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5511949880729769040} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 1725d39bf28070e48bfdff1c4a690f3f, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -4354,7 +4354,7 @@ CapsuleCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5686648194208044468} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 1725d39bf28070e48bfdff1c4a690f3f, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -4564,7 +4564,7 @@ CapsuleCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6439511195454674620} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 1725d39bf28070e48bfdff1c4a690f3f, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -4727,7 +4727,7 @@ CapsuleCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7709351718131772510} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 1725d39bf28070e48bfdff1c4a690f3f, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -4887,7 +4887,7 @@ SphereCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2506717555901091701} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 1725d39bf28070e48bfdff1c4a690f3f, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -5060,7 +5060,7 @@ BoxCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1682390409143760079} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 1725d39bf28070e48bfdff1c4a690f3f, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index c1a2aaa..a337506 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -18,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0 m_ClothInterCollisionStiffness: 0 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcffff7fffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffbffffffffffcffff7fffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1