From 25fba668c73038519e5441e23652efeba498494e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gervais?= Date: Fri, 8 Apr 2016 10:13:24 -0400 Subject: [PATCH 1/5] =?UTF-8?q?ajout=C3=A9=20variable=20stepSize,on=20a=20?= =?UTF-8?q?ajustera?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/PlanetManager.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/PlanetManager.cs b/Assets/Scripts/PlanetManager.cs index f9df79b..325f791 100644 --- a/Assets/Scripts/PlanetManager.cs +++ b/Assets/Scripts/PlanetManager.cs @@ -12,6 +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 GameObject WedgePrefab = null; public List wedges = new List(); @@ -88,7 +89,7 @@ public class PlanetManager : MonoBehaviour var index = GetWedgeIndex(thetaPlayerX); var w = wedges[index]; - w.offset = w.offset - 0.25f; + w.offset = w.offset - CartierStepSize; if (w.offset < CartierMinRatio) w.offset = 0.5f; @@ -99,7 +100,7 @@ public class PlanetManager : MonoBehaviour var indexOppose = GetWedgeOpposé(index); var v = wedges[indexOppose]; - v.offset = v.offset + 0.25f; + v.offset = v.offset + CartierStepSize; if (v.offset > CartierMaxRatio) v.offset = 1.5f; @@ -224,7 +225,7 @@ public class PlanetManager : MonoBehaviour /// public class Wedge { - public float offset = 1.0f; //valeurs entre -1 et 1; -1 étant renfoncé, 0 position normale, et 1 vers l'extérieur + public float offset = 1.0f; //valeurs entre minRatio et maxRatio; < 1 étant renfoncé, 1 position normale, et > 1 vers l'extérieur public float tMin = 0; //theta min et theta max : angle thetat de début et fin du cartier; public float tMax = 0; From 1f5e0ac5a8a5b5f0080cc22fd171661aa7aae789 Mon Sep 17 00:00:00 2001 From: Sophie Date: Fri, 8 Apr 2016 12:15:16 -0400 Subject: [PATCH 2/5] changed z offset of planet parts --- Assets/Scripts/PlanetManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/PlanetManager.cs b/Assets/Scripts/PlanetManager.cs index f9df79b..93a205c 100644 --- a/Assets/Scripts/PlanetManager.cs +++ b/Assets/Scripts/PlanetManager.cs @@ -78,7 +78,7 @@ public class PlanetManager : MonoBehaviour } } - w.sprite.transform.localScale = new Vector3(w.offset, w.offset,0.0f); + w.sprite.transform.localScale = new Vector3(w.offset, w.offset,1.0f); } } 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 3/5] 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 From 106f953436f720c03a82f5d1e203896d5749c95d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gervais?= Date: Fri, 8 Apr 2016 13:48:48 -0400 Subject: [PATCH 4/5] Collider des asteroid, ca fonctionne mieux avec des rigid body... --- Assets/Prefabs/Asteroid.prefab | 28 +++++++++++------------- Assets/Prefabs/WedgePrefab00.prefab | 34 ++++++++++++++++++++--------- Assets/Scripts/Asteroid.cs | 5 +++-- Assets/_Scenes/planet.unity | 25 ++++++++++++++++----- 4 files changed, 60 insertions(+), 32 deletions(-) diff --git a/Assets/Prefabs/Asteroid.prefab b/Assets/Prefabs/Asteroid.prefab index 7127214..5849238 100644 --- a/Assets/Prefabs/Asteroid.prefab +++ b/Assets/Prefabs/Asteroid.prefab @@ -11,7 +11,7 @@ GameObject: - 33: {fileID: 3335396} - 23: {fileID: 2317388} - 114: {fileID: 11437858} - - 58: {fileID: 5847224} + - 135: {fileID: 13502558} m_Layer: 0 m_Name: Asteroid m_TagString: Asteroid @@ -64,20 +64,6 @@ 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 @@ -91,6 +77,18 @@ MonoBehaviour: m_EditorClassIdentifier: speed: 1 step: 0 +--- !u!135 &13502558 +SphereCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 160026} + m_Material: {fileID: 0} + m_IsTrigger: 1 + 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 9a9530f..73389f1 100644 --- a/Assets/Prefabs/WedgePrefab00.prefab +++ b/Assets/Prefabs/WedgePrefab00.prefab @@ -9,10 +9,11 @@ GameObject: m_Component: - 4: {fileID: 427432} - 212: {fileID: 21228928} - - 58: {fileID: 5856220} + - 135: {fileID: 13583406} + - 54: {fileID: 5455998} m_Layer: 0 m_Name: WedgePrefab - m_TagString: Untagged + m_TagString: Wedge m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -27,7 +28,7 @@ GameObject: - 4: {fileID: 411762} m_Layer: 0 m_Name: WedgePrefab00 - m_TagString: Wedge + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -57,20 +58,33 @@ Transform: m_Children: [] m_Father: {fileID: 411762} m_RootOrder: 0 ---- !u!58 &5856220 -CircleCollider2D: +--- !u!54 &5455998 +Rigidbody: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 152938} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!135 &13583406 +SphereCollider: 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} + m_Enabled: 1 serializedVersion: 2 - m_Radius: 1.985 + m_Radius: 2 + m_Center: {x: 0, y: 0, z: 0} --- !u!212 &21228928 SpriteRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/Scripts/Asteroid.cs b/Assets/Scripts/Asteroid.cs index 141c844..12c2107 100644 --- a/Assets/Scripts/Asteroid.cs +++ b/Assets/Scripts/Asteroid.cs @@ -28,7 +28,7 @@ public class Asteroid : MonoBehaviour } //collider must be set as "isTrigger" in unity for this method to work - void OnCollisionEnter2D(Collider otherCol) + public void OnTriggerEnter(Collider otherCol) { @@ -39,7 +39,8 @@ public class Asteroid : MonoBehaviour if (otherCol.gameObject.tag == "Wedge") { var pmgr = FindObjectOfType(); - pmgr.PushWedge(otherCol.gameObject.transform.rotation.z); + pmgr.PushWedge(otherCol.gameObject.transform.parent.eulerAngles.z); + Destroy(this.gameObject); } } diff --git a/Assets/_Scenes/planet.unity b/Assets/_Scenes/planet.unity index 33a1088..d0b76cc 100644 --- a/Assets/_Scenes/planet.unity +++ b/Assets/_Scenes/planet.unity @@ -136,7 +136,7 @@ Prefab: m_Modifications: - target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} propertyPath: m_LocalPosition.x - value: 3.51 + value: 8.22 objectReference: {fileID: 0} - target: {fileID: 494682, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} propertyPath: m_LocalPosition.y @@ -166,10 +166,6 @@ Prefab: 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 @@ -268,6 +264,25 @@ MonoBehaviour: CartierMaxRatio: 2 CartierStepSize: 0.25 WedgePrefab: {fileID: 170328, guid: 0b78da08dfa398840862539a74cc2377, type: 2} +--- !u!1 &475725347 stripped +GameObject: + m_PrefabParentObject: {fileID: 160026, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} + m_PrefabInternal: {fileID: 240262242} +--- !u!54 &475725353 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 475725347} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &638371353 GameObject: m_ObjectHideFlags: 0 From 9b705e5044bebc7d4266d005d29d8fb5b78b74b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gervais?= Date: Fri, 8 Apr 2016 15:11:57 -0400 Subject: [PATCH 5/5] =?UTF-8?q?G=C3=A9n=C3=A9ration=20des=20ast=C3=A9roiri?= =?UTF-8?q?de=20vers=20les=20players.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Asteroid.cs | 4 +- Assets/Scripts/AsteroidSpawner.cs | 37 ++++++++++++++---- Assets/Scripts/Astronaut.cs | 2 +- Assets/Scripts/PlanetManager.cs | 4 +- Assets/Scripts/testRotate.cs | 6 +-- Assets/_Scenes/planet.unity | 64 +------------------------------ 6 files changed, 40 insertions(+), 77 deletions(-) diff --git a/Assets/Scripts/Asteroid.cs b/Assets/Scripts/Asteroid.cs index 12c2107..56875e8 100644 --- a/Assets/Scripts/Asteroid.cs +++ b/Assets/Scripts/Asteroid.cs @@ -10,8 +10,8 @@ public class Asteroid : MonoBehaviour // Use this for initialization void Start() { - speed = Random.Range(0.1F, 2F); - print(speed); + speed = Random.Range(0.9F, 3F); + // print(speed); center = new Vector3(0, 0); } diff --git a/Assets/Scripts/AsteroidSpawner.cs b/Assets/Scripts/AsteroidSpawner.cs index f53a580..821fb83 100644 --- a/Assets/Scripts/AsteroidSpawner.cs +++ b/Assets/Scripts/AsteroidSpawner.cs @@ -7,9 +7,13 @@ public class AsteroidSpawner : TimerFunctionsClass public float NextSpawnTime = 1.0f; public GameObject AsteroidPrefab; + public bool GenerationVersLesjoueurs = true; //random lorsque false; // Use this for initialization - void Start () { + void Start () + { + + if (GenerationVersLesjoueurs) NextSpawnTime = 3 * NextSpawnTime; this.SetTimer(NextSpawnTime, SpawnAsteroidEvent); this.StartTimer(); } @@ -21,14 +25,33 @@ public class AsteroidSpawner : TimerFunctionsClass public void SpawnAsteroidEvent() { + if (!GenerationVersLesjoueurs) + { + // 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; + + } + else + { + var players = GameObject.FindGameObjectsWithTag("Player"); + var planet = FindObjectOfType(); + foreach (var p in players) + { + var playerTheta = Mathf.Atan2(p.transform.position.y, p.transform.position.x); + var angle = ( 360.0f + (((playerTheta * 180)) / Mathf.PI)) % 360; ///TODO : a changer pour p.theta + print("angle:" + angle); + Instantiate(AsteroidPrefab, planet.GetPlanetCoordinatesFromPlayerXY(angle, UnityEngine.Random.Range(10f,15f)), Quaternion.identity); + } + + } + - // 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); diff --git a/Assets/Scripts/Astronaut.cs b/Assets/Scripts/Astronaut.cs index 44e3a47..f0fb79f 100644 --- a/Assets/Scripts/Astronaut.cs +++ b/Assets/Scripts/Astronaut.cs @@ -137,7 +137,7 @@ public class Astronaut : MonoBehaviour { { Vector3 rotation = transform.rotation.eulerAngles; rotation.z = Mathf.Sin(walkTime*Mathf.PI)*50; - print("rotation " + rotation); + // print("rotation " + rotation); transform.rotation = Quaternion.Euler(rotation); yield return null; } diff --git a/Assets/Scripts/PlanetManager.cs b/Assets/Scripts/PlanetManager.cs index 6298910..f496eea 100644 --- a/Assets/Scripts/PlanetManager.cs +++ b/Assets/Scripts/PlanetManager.cs @@ -181,9 +181,9 @@ public class PlanetManager : MonoBehaviour public Vector3 GetPlanetCoordinatesFromPlayerXY(float playerLocalX, float playerLocalY) { var theta = playerLocalX; - var wedgeRadius = GetPlanetRadius(playerLocalX); + var wedgeRadius = GetPlanetRadius(playerLocalX) + playerLocalY; var x = wedgeRadius * Mathf.Cos(theta * Mathf.PI / 180); - var y = wedgeRadius * Mathf.Sin(theta * Mathf.PI / 180) + playerLocalY; + var y = wedgeRadius * Mathf.Sin(theta * Mathf.PI / 180) ; return new Vector3(x, y, 0); } diff --git a/Assets/Scripts/testRotate.cs b/Assets/Scripts/testRotate.cs index d80d6bd..bd587f5 100644 --- a/Assets/Scripts/testRotate.cs +++ b/Assets/Scripts/testRotate.cs @@ -68,10 +68,10 @@ public class testRotate : MonoBehaviour { // var x = r * Mathf.Cos(theta * Mathf.PI / 180); // var y = r * Mathf.Sin(theta * Mathf.PI / 180); // + y0 du player - var player = GameObject.Find("CubePlayer").gameObject; + // var player = GameObject.Find("CubePlayer").gameObject; //player.transform.position = Vector3.Lerp(player.transform.position, new Vector3(x, y, 0 ), Time.deltaTime); - player.transform.position = Vector3.Lerp(player.transform.position, - planet.GetPlanetCoordinatesFromPlayerXY(theta, 0f), Time.fixedDeltaTime); + // player.transform.position = Vector3.Lerp(player.transform.position, + // planet.GetPlanetCoordinatesFromPlayerXY(theta, 0f), Time.fixedDeltaTime); } } diff --git a/Assets/_Scenes/planet.unity b/Assets/_Scenes/planet.unity index d0b76cc..a382705 100644 --- a/Assets/_Scenes/planet.unity +++ b/Assets/_Scenes/planet.unity @@ -127,48 +127,7 @@ MonoBehaviour: 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: 8.22 - 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} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} - m_IsPrefabParent: 0 + GenerationVersLesjoueurs: 1 --- !u!1 &437600384 GameObject: m_ObjectHideFlags: 0 @@ -264,25 +223,6 @@ MonoBehaviour: CartierMaxRatio: 2 CartierStepSize: 0.25 WedgePrefab: {fileID: 170328, guid: 0b78da08dfa398840862539a74cc2377, type: 2} ---- !u!1 &475725347 stripped -GameObject: - m_PrefabParentObject: {fileID: 160026, guid: cc1a204562630cd40a1dd685b5ed8e6e, type: 2} - m_PrefabInternal: {fileID: 240262242} ---- !u!54 &475725353 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 475725347} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!1 &638371353 GameObject: m_ObjectHideFlags: 0 @@ -383,7 +323,7 @@ GameObject: - 114: {fileID: 1250089535} m_Layer: 0 m_Name: CubePlayer - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0