From 1ad1b4acf248b3f0da1d78b4b056e08db5bf1b53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20Gervais?= Date: Sat, 9 Apr 2016 15:20:06 -0400 Subject: [PATCH] =?UTF-8?q?Detroy=20des=20particle=20effects=20une=20fois?= =?UTF-8?q?=20termin=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Prefabs/Asteroid_1.prefab | 2 +- Assets/Prefabs/Asteroid_2.prefab | 2 +- Assets/Prefabs/Asteroid_3.prefab | 2 +- Assets/Prefabs/Asteroid_4.prefab | 2 +- Assets/Prefabs/Astronaut.prefab | 1 + Assets/Scripts/Asteroid.cs | 5 +- Assets/Scripts/AsteroidSpawner.cs | 6 +- Assets/Scripts/Astronaut.cs | 3 +- Assets/Scripts/AstronautAnimator.cs | 13 +- Assets/SelfDestroy.cs | 23 + Assets/SelfDestroy.cs.meta | 12 + Assets/_Scenes/Main.meta | 9 + Assets/_Scenes/Main.unity | 483 +++++++++++++++++++- Assets/_Scenes/Main/LightingData.asset | Bin 0 -> 11960 bytes Assets/_Scenes/Main/LightingData.asset.meta | 8 + 15 files changed, 545 insertions(+), 26 deletions(-) create mode 100644 Assets/SelfDestroy.cs create mode 100644 Assets/SelfDestroy.cs.meta create mode 100644 Assets/_Scenes/Main.meta create mode 100644 Assets/_Scenes/Main/LightingData.asset create mode 100644 Assets/_Scenes/Main/LightingData.asset.meta diff --git a/Assets/Prefabs/Asteroid_1.prefab b/Assets/Prefabs/Asteroid_1.prefab index 31208a6..cac643a 100644 --- a/Assets/Prefabs/Asteroid_1.prefab +++ b/Assets/Prefabs/Asteroid_1.prefab @@ -200,7 +200,7 @@ MonoBehaviour: rotationSpeed: 1 rotationDirection: 1 RandomRotationSpeed: 1 - CrashFlamesEmitter: {fileID: 120238, guid: 1a5b0b5645fa6104087fd9f96b6104b9, type: 2} + CrashFlamesEmitter: {fileID: 105122, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} TrailFlamesEmitter: {fileID: 0} --- !u!135 &13502558 SphereCollider: diff --git a/Assets/Prefabs/Asteroid_2.prefab b/Assets/Prefabs/Asteroid_2.prefab index 5108fc0..dfe6dec 100644 --- a/Assets/Prefabs/Asteroid_2.prefab +++ b/Assets/Prefabs/Asteroid_2.prefab @@ -200,7 +200,7 @@ MonoBehaviour: rotationSpeed: 1 rotationDirection: 1 RandomRotationSpeed: 1 - CrashFlamesEmitter: {fileID: 120238, guid: 1a5b0b5645fa6104087fd9f96b6104b9, type: 2} + CrashFlamesEmitter: {fileID: 105122, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} TrailFlamesEmitter: {fileID: 0} --- !u!135 &13502558 SphereCollider: diff --git a/Assets/Prefabs/Asteroid_3.prefab b/Assets/Prefabs/Asteroid_3.prefab index 7cde8fe..0f0c300 100644 --- a/Assets/Prefabs/Asteroid_3.prefab +++ b/Assets/Prefabs/Asteroid_3.prefab @@ -200,7 +200,7 @@ MonoBehaviour: rotationSpeed: 1 rotationDirection: 1 RandomRotationSpeed: 1 - CrashFlamesEmitter: {fileID: 120238, guid: 1a5b0b5645fa6104087fd9f96b6104b9, type: 2} + CrashFlamesEmitter: {fileID: 105122, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} TrailFlamesEmitter: {fileID: 0} --- !u!135 &13502558 SphereCollider: diff --git a/Assets/Prefabs/Asteroid_4.prefab b/Assets/Prefabs/Asteroid_4.prefab index 18e52c1..80b9d12 100644 --- a/Assets/Prefabs/Asteroid_4.prefab +++ b/Assets/Prefabs/Asteroid_4.prefab @@ -200,7 +200,7 @@ MonoBehaviour: rotationSpeed: 1 rotationDirection: 1 RandomRotationSpeed: 1 - CrashFlamesEmitter: {fileID: 120238, guid: 1a5b0b5645fa6104087fd9f96b6104b9, type: 2} + CrashFlamesEmitter: {fileID: 105122, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} TrailFlamesEmitter: {fileID: 0} --- !u!135 &13502558 SphereCollider: diff --git a/Assets/Prefabs/Astronaut.prefab b/Assets/Prefabs/Astronaut.prefab index 13038c3..d6d4cce 100644 --- a/Assets/Prefabs/Astronaut.prefab +++ b/Assets/Prefabs/Astronaut.prefab @@ -236,6 +236,7 @@ MonoBehaviour: WalkAnimSpeed: 4 WalkAnimAngle: 15 EjectSpinSpeed: 80 + DashParticleSystem: {fileID: 174982, guid: d876c44c9925f0b45b8c53bfb4f4967f, type: 2} DustParticlesEmitter: {fileID: 138982, guid: 6233079c5a9a756458811f283fdca112, type: 2} --- !u!114 &11494368 MonoBehaviour: diff --git a/Assets/Scripts/Asteroid.cs b/Assets/Scripts/Asteroid.cs index 19328f6..7283e8c 100644 --- a/Assets/Scripts/Asteroid.cs +++ b/Assets/Scripts/Asteroid.cs @@ -81,8 +81,11 @@ public class Asteroid : MonoBehaviour audio.bypassListenerEffects = true; AudioSource.PlayClipAtPoint(audio.clip, transform.position, audio.volume); - var wait = new WaitForSeconds(emitter.GetComponent().duration); + + + // var wait = new WaitForSeconds(emitter.GetComponent().duration); //Destroy(emitter); //doesnt play if removed. + Destroy(emitter, emitter.GetComponent().duration); } diff --git a/Assets/Scripts/AsteroidSpawner.cs b/Assets/Scripts/AsteroidSpawner.cs index ff2ceae..cb84664 100644 --- a/Assets/Scripts/AsteroidSpawner.cs +++ b/Assets/Scripts/AsteroidSpawner.cs @@ -46,8 +46,8 @@ public class AsteroidSpawner : TimerFunctionsClass 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); + var x = UnityEngine.Random.Range(30.0f, 40.0f)*(Mathf.Floor(UnityEngine.Random.Range(0.0f, 1.99f))*2 - 1); + var y = UnityEngine.Random.Range(20.0f, 30.0f)*(Mathf.Floor(UnityEngine.Random.Range(0.0f, 1.99f))*2 - 1); //0-3 @@ -78,7 +78,7 @@ public class AsteroidSpawner : TimerFunctionsClass float direction = (Mathf.Floor(UnityEngine.Random.Range(0.0f, 1.99f)) * 2 - 1); Instantiate(AsteroidPrefabTypes[AsteroidType], - direction*planet.GetPlanetCoordinatesFromPlayerXY(angle, UnityEngine.Random.Range(10f,15f)), + direction*planet.GetPlanetCoordinatesFromPlayerXY(angle, UnityEngine.Random.Range(25f,35f)), Quaternion.identity); } diff --git a/Assets/Scripts/Astronaut.cs b/Assets/Scripts/Astronaut.cs index 7a9b098..d03bfb2 100644 --- a/Assets/Scripts/Astronaut.cs +++ b/Assets/Scripts/Astronaut.cs @@ -22,6 +22,7 @@ public class Astronaut : MonoBehaviour { public float Gravity; public float Speed; public float EjectSpeed; + //public float DashSpeed; public PlanetManager planet; @@ -141,7 +142,7 @@ public class Astronaut : MonoBehaviour { if (State != AstronautState.Ejecting) vSpeed -= Gravity * delta; else - vSpeed *= 0.98f; + vSpeed *= 0.99f; } float radius = GetGroundRadius(); diff --git a/Assets/Scripts/AstronautAnimator.cs b/Assets/Scripts/AstronautAnimator.cs index 1e37683..cbcfd48 100644 --- a/Assets/Scripts/AstronautAnimator.cs +++ b/Assets/Scripts/AstronautAnimator.cs @@ -9,6 +9,9 @@ public class AstronautAnimator : MonoBehaviour { public float WalkAnimAngle; public float EjectSpinSpeed; + private GameObject runninParticleEmitter; + + public GameObject DashParticleSystem; public GameObject DustParticlesEmitter; // Use this for initialization protected void Start () { @@ -34,10 +37,17 @@ public class AstronautAnimator : MonoBehaviour { public void Land() { - + //from dash state + runninParticleEmitter = (GameObject)Instantiate(DashParticleSystem, this.gameObject.transform.position, Quaternion.identity); + runninParticleEmitter.transform.Rotate(0,180f,0.0f); + + Destroy(runninParticleEmitter, runninParticleEmitter.GetComponent().duration); + + aspi.SpriteWalk.gameObject.SetActive(true); aspi.SpriteDash.gameObject.SetActive(false); } + public void Walk(bool right) { @@ -87,6 +97,7 @@ public class AstronautAnimator : MonoBehaviour { Debug.Log("Walking stop"); //yield return null; } + public void EmitDustParticules() { diff --git a/Assets/SelfDestroy.cs b/Assets/SelfDestroy.cs new file mode 100644 index 0000000..62f6dd9 --- /dev/null +++ b/Assets/SelfDestroy.cs @@ -0,0 +1,23 @@ +using UnityEngine; +using System.Collections; + +public class SelfDestroy : MonoBehaviour +{ + public GameObject PrefabPs; + + private ParticleSystem ps; + + // Use this for initialization + public void Start () + { + ps = PrefabPs.GetComponent(); + } + + // Update is called once per frame + public void FixedUpdate () { + if (ps && !ps.IsAlive()) + { + Destroy(this.gameObject); + } + } +} diff --git a/Assets/SelfDestroy.cs.meta b/Assets/SelfDestroy.cs.meta new file mode 100644 index 0000000..b210945 --- /dev/null +++ b/Assets/SelfDestroy.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 6d2a1a0c2c72c8f4a8876a5101e76b8d +timeCreated: 1460228472 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scenes/Main.meta b/Assets/_Scenes/Main.meta new file mode 100644 index 0000000..220e3d9 --- /dev/null +++ b/Assets/_Scenes/Main.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f0e36f3fa2b132e429c615a1d1766c44 +folderAsset: yes +timeCreated: 1460225092 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scenes/Main.unity b/Assets/_Scenes/Main.unity index 837a65a..c7fb6fa 100644 --- a/Assets/_Scenes/Main.unity +++ b/Assets/_Scenes/Main.unity @@ -14,13 +14,13 @@ SceneSettings: RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 6 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_Fog: 1 + m_FogColor: {r: 0.030330881, g: 0.040580597, b: 0.24264705, a: 1} m_FogMode: 3 - m_FogDensity: 0.01 + m_FogDensity: 0.2 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientSkyColor: {r: 0.08235294, g: 0.16078432, b: 0.30980393, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 @@ -66,7 +66,8 @@ LightmapSettings: m_FinalGather: 0 m_FinalGatherRayCount: 1024 m_ReflectionCompression: 2 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000001, guid: 737d929c9389ea44bbdf6cbee9d9e13b, + type: 2} m_RuntimeCPUUsage: 25 --- !u!196 &4 NavMeshSettings: @@ -85,12 +86,16 @@ NavMeshSettings: cellSize: 0.16666667 manualCellSize: 0 m_NavMeshData: {fileID: 0} +--- !u!4 &10252813 stripped +Transform: + m_PrefabParentObject: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + m_PrefabInternal: {fileID: 1267123519} --- !u!1001 &72971843 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 345530093} m_Modifications: - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} propertyPath: m_LocalPosition.x @@ -122,7 +127,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} propertyPath: m_RootOrder - value: 6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 11494368, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} propertyPath: planet @@ -136,6 +141,34 @@ Prefab: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.b + value: 0.972414 + objectReference: {fileID: 0} + - target: {fileID: 21257324, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21257324, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21257324, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.b + value: 0.972414 + objectReference: {fileID: 0} + - target: {fileID: 19831948, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: playOnAwake + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} m_IsPrefabParent: 0 @@ -193,10 +226,87 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 8d3ba69018238ee4f9629282ea7d9fcf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 +--- !u!1 &345530092 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 345530093} + m_Layer: 0 + m_Name: Players + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &345530093 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 345530092} + 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: 1419848163} + - {fileID: 780956563} + - {fileID: 1297255189} + - {fileID: 10252813} + m_Father: {fileID: 0} + m_RootOrder: 6 +--- !u!1001 &395306152 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} + propertyPath: m_LocalPosition.x + value: -0.4592259 + objectReference: {fileID: 0} + - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} + propertyPath: m_LocalPosition.y + value: -3.4073124 + objectReference: {fileID: 0} + - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} + propertyPath: m_LocalPosition.z + value: 0.11328125 + objectReference: {fileID: 0} + - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &780956563 stripped +Transform: + m_PrefabParentObject: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + m_PrefabInternal: {fileID: 1660116367} --- !u!1001 &894002996 Prefab: m_ObjectHideFlags: 0 @@ -349,15 +459,117 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 456206, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 11485214, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} propertyPath: NextSpawnTime - value: 1 + value: 2.5 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &1267123519 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 345530093} + m_Modifications: + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalPosition.z + value: 0.11 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11494368, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: planet + value: + objectReference: {fileID: 1027139440} + - target: {fileID: 154602, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Name + value: Astronaut_3 + objectReference: {fileID: 0} + - target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: WalkAnimSpeed + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: WalkAnimAngle + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: EjectSpinSpeed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 154602, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11434752, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: PlayerNumber + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 21257324, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.g + value: 0.9724139 + objectReference: {fileID: 0} + - target: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21257324, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.g + value: 0.9724139 + objectReference: {fileID: 0} + - target: {fileID: 21257324, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1297255189 stripped +Transform: + m_PrefabParentObject: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + m_PrefabInternal: {fileID: 1787240539} +--- !u!4 &1419848163 stripped +Transform: + m_PrefabParentObject: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + m_PrefabInternal: {fileID: 72971843} --- !u!1001 &1469146136 Prefab: m_ObjectHideFlags: 0 @@ -407,17 +619,71 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 11401034, guid: 198e988adacced646a19f757f6237ae1, type: 2} propertyPath: CriticalMax - value: 0.9 + value: 0.75 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 198e988adacced646a19f757f6237ae1, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &1481633668 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 456206, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 456206, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 456206, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 456206, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 456206, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 456206, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 456206, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 456206, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11485214, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} + propertyPath: NextSpawnTime + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 183270, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} + propertyPath: m_Name + value: RandomAsteroidSpawner + objectReference: {fileID: 0} + - target: {fileID: 11485214, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} + propertyPath: GenerationVersLesjoueurs + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e86e27c7b6d9c824cb76115e90a15cac, type: 2} + m_IsPrefabParent: 0 --- !u!1001 &1660116367 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 345530093} m_Modifications: - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} propertyPath: m_LocalPosition.x @@ -449,7 +715,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} propertyPath: m_RootOrder - value: 3 + value: 1 objectReference: {fileID: 0} - target: {fileID: 11494368, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} propertyPath: planet @@ -483,6 +749,128 @@ Prefab: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.g + value: 0.72156864 + objectReference: {fileID: 0} + - target: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.b + value: 0.09803922 + objectReference: {fileID: 0} + - target: {fileID: 21257324, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21257324, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.g + value: 0.72156864 + objectReference: {fileID: 0} + - target: {fileID: 21257324, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.b + value: 0.09803922 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1787240539 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 345530093} + m_Modifications: + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalPosition.z + value: 0.11 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11494368, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: planet + value: + objectReference: {fileID: 1027139440} + - target: {fileID: 154602, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Name + value: Astronaut_2 + objectReference: {fileID: 0} + - target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: WalkAnimSpeed + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: WalkAnimAngle + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 11491252, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: EjectSpinSpeed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 154602, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11434752, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: PlayerNumber + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 21257324, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21257324, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.r + value: 0.07586192 + objectReference: {fileID: 0} + - target: {fileID: 21257324, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21257324, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.r + value: 0.07586192 + objectReference: {fileID: 0} + - target: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21220066, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2} m_IsPrefabParent: 0 @@ -503,7 +891,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 483280, guid: 8347d06db0c264442891d12282c4a4dd, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 483280, guid: 8347d06db0c264442891d12282c4a4dd, type: 2} propertyPath: m_LocalRotation.x @@ -529,6 +917,11 @@ Prefab: propertyPath: m_Name value: Stars behind objectReference: {fileID: 0} + - target: {fileID: 21286820, guid: 8347d06db0c264442891d12282c4a4dd, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7443ae7f877013a42941481b83fee96b, + type: 3} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 8347d06db0c264442891d12282c4a4dd, type: 2} m_IsPrefabParent: 0 @@ -536,6 +929,64 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 483280, guid: 8347d06db0c264442891d12282c4a4dd, type: 2} m_PrefabInternal: {fileID: 1867085521} +--- !u!1 &1914489644 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1914489645} + - 212: {fileID: 1914489646} + m_Layer: 0 + m_Name: infinity + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1914489645 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1914489644} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.5} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 1867085522} + m_RootOrder: 2 +--- !u!212 &1914489646 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1914489644} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_ReflectionProbeUsage: 0 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 0.08235294, g: 0.16078432, b: 0.30980393, a: 1} + m_FlipX: 0 + m_FlipY: 0 --- !u!1 &1945693977 GameObject: m_ObjectHideFlags: 0 @@ -585,7 +1036,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_BackGroundColor: {r: 0.08235294, g: 0.16078432, b: 0.30588236, a: 0.019607844} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -596,7 +1047,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 5 + orthographic size: 9.36 m_Depth: -1 m_CullingMask: serializedVersion: 2 diff --git a/Assets/_Scenes/Main/LightingData.asset b/Assets/_Scenes/Main/LightingData.asset new file mode 100644 index 0000000000000000000000000000000000000000..d9333c193ebc051755840707da45629cdae132dc GIT binary patch literal 11960 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 Cs3Qgd literal 0 HcmV?d00001 diff --git a/Assets/_Scenes/Main/LightingData.asset.meta b/Assets/_Scenes/Main/LightingData.asset.meta new file mode 100644 index 0000000..9991101 --- /dev/null +++ b/Assets/_Scenes/Main/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 737d929c9389ea44bbdf6cbee9d9e13b +timeCreated: 1460225132 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: