From 0695a19964ba3a99d20816702187a26607ccad79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gervais?= Date: Fri, 8 Apr 2016 12:59:00 -0400 Subject: [PATCH] AsteroidSpawner + collider asteroides et plateformes en cours . (doesn't trigger ?!?) --- Assets/Prefabs/Asteroid.prefab | 30 +++--- Assets/Prefabs/WedgePrefab00.prefab | 17 +++- Assets/Scripts/Asteroid.cs | 17 ++++ Assets/Scripts/AsteroidSpawner.cs | 37 ++++++++ Assets/Scripts/AsteroidSpawner.cs.meta | 12 +++ Assets/Scripts/PlanetManager.cs | 2 +- Assets/Scripts/testRotate.cs | 4 +- Assets/_Scenes/planet.unity | 123 +++++++++++++++++++------ ProjectSettings/TagManager.asset | 2 +- 9 files changed, 198 insertions(+), 46 deletions(-) create mode 100644 Assets/Scripts/AsteroidSpawner.cs create mode 100644 Assets/Scripts/AsteroidSpawner.cs.meta diff --git a/Assets/Prefabs/Asteroid.prefab b/Assets/Prefabs/Asteroid.prefab index d28abf7..7127214 100644 --- a/Assets/Prefabs/Asteroid.prefab +++ b/Assets/Prefabs/Asteroid.prefab @@ -9,9 +9,9 @@ GameObject: m_Component: - 4: {fileID: 494682} - 33: {fileID: 3335396} - - 135: {fileID: 13519402} - 23: {fileID: 2317388} - 114: {fileID: 11437858} + - 58: {fileID: 5847224} m_Layer: 0 m_Name: Asteroid m_TagString: Asteroid @@ -26,7 +26,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 160026} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.51, y: 1.36, z: 0} + m_LocalPosition: {x: 8.22, y: 1.36, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -64,6 +64,20 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 160026} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!58 &5847224 +CircleCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 160026} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 --- !u!114 &11437858 MonoBehaviour: m_ObjectHideFlags: 1 @@ -77,18 +91,6 @@ MonoBehaviour: m_EditorClassIdentifier: speed: 1 step: 0 ---- !u!135 &13519402 -SphereCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 160026} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &100100000 Prefab: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/WedgePrefab00.prefab b/Assets/Prefabs/WedgePrefab00.prefab index f46b5df..9a9530f 100644 --- a/Assets/Prefabs/WedgePrefab00.prefab +++ b/Assets/Prefabs/WedgePrefab00.prefab @@ -9,6 +9,7 @@ GameObject: m_Component: - 4: {fileID: 427432} - 212: {fileID: 21228928} + - 58: {fileID: 5856220} m_Layer: 0 m_Name: WedgePrefab m_TagString: Untagged @@ -26,7 +27,7 @@ GameObject: - 4: {fileID: 411762} m_Layer: 0 m_Name: WedgePrefab00 - m_TagString: Untagged + m_TagString: Wedge m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -56,6 +57,20 @@ Transform: m_Children: [] m_Father: {fileID: 411762} m_RootOrder: 0 +--- !u!58 &5856220 +CircleCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 152938} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 1.985 --- !u!212 &21228928 SpriteRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/Scripts/Asteroid.cs b/Assets/Scripts/Asteroid.cs index 23cb82d..141c844 100644 --- a/Assets/Scripts/Asteroid.cs +++ b/Assets/Scripts/Asteroid.cs @@ -26,4 +26,21 @@ public class Asteroid : MonoBehaviour step = speed * Time.deltaTime; this.transform.position = Vector3.MoveTowards(transform.position, center, step); } + + //collider must be set as "isTrigger" in unity for this method to work + void OnCollisionEnter2D(Collider otherCol) + { + + + if (otherCol.gameObject.tag == "Player") + { + //Stun the player + } + if (otherCol.gameObject.tag == "Wedge") + { + var pmgr = FindObjectOfType(); + pmgr.PushWedge(otherCol.gameObject.transform.rotation.z); + } + } + } diff --git a/Assets/Scripts/AsteroidSpawner.cs b/Assets/Scripts/AsteroidSpawner.cs new file mode 100644 index 0000000..f53a580 --- /dev/null +++ b/Assets/Scripts/AsteroidSpawner.cs @@ -0,0 +1,37 @@ +using UnityEngine; +using System.Collections; +using System; + +public class AsteroidSpawner : TimerFunctionsClass +{ + + public float NextSpawnTime = 1.0f; + public GameObject AsteroidPrefab; + + // Use this for initialization + void Start () { + this.SetTimer(NextSpawnTime, SpawnAsteroidEvent); + this.StartTimer(); + } + + // Update is called once per frame + void Update () { + base.Update(); + } + + public void SpawnAsteroidEvent() + { + + // Random entre 10 et 20, * 1 ou -1 + var x = UnityEngine.Random.Range(10.0f, 20.0f) * (Mathf.Floor(UnityEngine.Random.Range(0.0f, 1.99f)) * 2 - 1); + var y = UnityEngine.Random.Range(10.0f, 20.0f) * (Mathf.Floor(UnityEngine.Random.Range(0.0f, 1.99f)) * 2 - 1); + + //instantiate as child of AsteroidSpawner + var a = Instantiate(AsteroidPrefab, new Vector3(x, y, 0.0f), Quaternion.identity); + //a.tranform.parent = this.transform; + + //Cooldown untill next random spawn + SetTimer(NextSpawnTime, SpawnAsteroidEvent); + StartTimer(); + } +} diff --git a/Assets/Scripts/AsteroidSpawner.cs.meta b/Assets/Scripts/AsteroidSpawner.cs.meta new file mode 100644 index 0000000..29c31c5 --- /dev/null +++ b/Assets/Scripts/AsteroidSpawner.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 43c82cd8902191d49b45cf914b13e97c +timeCreated: 1460125980 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlanetManager.cs b/Assets/Scripts/PlanetManager.cs index 325f791..3c769d6 100644 --- a/Assets/Scripts/PlanetManager.cs +++ b/Assets/Scripts/PlanetManager.cs @@ -12,7 +12,7 @@ public class PlanetManager : MonoBehaviour public bool CartierResetRatioSpeedRandomize = true; public float CartierMinRatio = 0.4f; public float CartierMaxRatio = 2.0f; - public float CartierStepSize = 0.25; + public float CartierStepSize = 0.25f; public GameObject WedgePrefab = null; public List wedges = new List(); diff --git a/Assets/Scripts/testRotate.cs b/Assets/Scripts/testRotate.cs index 34a9c2f..d80d6bd 100644 --- a/Assets/Scripts/testRotate.cs +++ b/Assets/Scripts/testRotate.cs @@ -55,8 +55,8 @@ public class testRotate : MonoBehaviour { /// void FixedUpdate() { - - var theta = Time.realtimeSinceStartup * speed % 360.0f; // Position X du player = angle theta + + var theta = 0;// Time.realtimeSinceStartup * speed % 360.0f; // Position X du player = angle theta var planet = GameObject.Find("Planet").gameObject.GetComponent(); diff --git a/Assets/_Scenes/planet.unity b/Assets/_Scenes/planet.unity index db41455..33a1088 100644 --- a/Assets/_Scenes/planet.unity +++ b/Assets/_Scenes/planet.unity @@ -85,6 +85,94 @@ NavMeshSettings: cellSize: 0.16666667 manualCellSize: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &150247454 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 150247455} + - 114: {fileID: 150247456} + m_Layer: 0 + m_Name: AsteroidSpawner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &150247455 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 150247454} + 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: [] + m_Father: {fileID: 0} + m_RootOrder: 3 +--- !u!114 &150247456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 150247454} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 43c82cd8902191d49b45cf914b13e97c, type: 3} + m_Name: + m_EditorClassIdentifier: + textTime: + NextSpawnTime: 1 + AsteroidPrefab: {fileID: 160026, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} +--- !u!1001 &240262242 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} + propertyPath: m_LocalPosition.x + value: 3.51 + objectReference: {fileID: 0} + - target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} + propertyPath: m_LocalPosition.y + value: 1.36 + objectReference: {fileID: 0} + - target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 13519402, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} + m_IsPrefabParent: 0 --- !u!1 &437600384 GameObject: m_ObjectHideFlags: 0 @@ -103,7 +191,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!23 &437600385 MeshRenderer: m_ObjectHideFlags: 0 @@ -174,7 +262,12 @@ MonoBehaviour: m_EditorClassIdentifier: NbCartiers: 10 TailleCartiersEnDegres: 0 - WedgePrefab: {fileID: 186656, guid: 901b80ca01ac0de4ca89de7f82c3709f, type: 2} + CartierResetRatioSpeedFactor: 0.23 + CartierResetRatioSpeedRandomize: 1 + CartierMinRatio: 0.4 + CartierMaxRatio: 2 + CartierStepSize: 0.25 + WedgePrefab: {fileID: 170328, guid: 0b78da08dfa398840862539a74cc2377, type: 2} --- !u!1 &638371353 GameObject: m_ObjectHideFlags: 0 @@ -273,8 +366,6 @@ GameObject: - 65: {fileID: 1250089530} - 23: {fileID: 1250089529} - 114: {fileID: 1250089535} - - 114: {fileID: 1250089534} - - 114: {fileID: 1250089533} m_Layer: 0 m_Name: CubePlayer m_TagString: Untagged @@ -339,28 +430,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 ---- !u!114 &1250089533 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1250089528} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7dea5240387606044ad82f94c4235e31, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1250089534 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1250089528} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ab91e6d9b759ad545b023f33788c97ba, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1250089535 MonoBehaviour: m_ObjectHideFlags: 0 @@ -372,4 +441,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac56b6226ed50a742a676cbfae403f88, type: 3} m_Name: m_EditorClassIdentifier: - fireRate: 1 + fireRate: 0.2 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 8f98569..793cb0a 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -4,7 +4,7 @@ TagManager: serializedVersion: 2 tags: - - Asteroid + - Wedge layers: - Default - TransparentFX