diff --git a/Assets/Animations/Nebulus.anim b/Assets/Animations/Nebulus.anim new file mode 100644 index 0000000..1cfbf47 --- /dev/null +++ b/Assets/Animations/Nebulus.anim @@ -0,0 +1,98 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Nebulus + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: df4a9a3a7d7bc3c4095a673039e20e0b, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 21300000, guid: ab3f4553d6bf2b242be8e8ce993da26e, type: 3} + attribute: m_Sprite + path: Aura + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 0} + attribute: m_Sprite + path: Details + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2003435589 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 3181064726 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: df4a9a3a7d7bc3c4095a673039e20e0b, type: 3} + - {fileID: 21300000, guid: ab3f4553d6bf2b242be8e8ce993da26e, type: 3} + - {fileID: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Nebulus.anim.meta b/Assets/Animations/Nebulus.anim.meta new file mode 100644 index 0000000..55eb624 --- /dev/null +++ b/Assets/Animations/Nebulus.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7282499425b251a439f2df8930b56edb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Quark.anim b/Assets/Animations/Quark.anim new file mode 100644 index 0000000..c7fc71b --- /dev/null +++ b/Assets/Animations/Quark.anim @@ -0,0 +1,98 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Quark + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: fcd64b8625b1bf84b95c05f410edd9f9, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 21300000, guid: ab3f4553d6bf2b242be8e8ce993da26e, type: 3} + attribute: m_Sprite + path: Aura + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 0} + attribute: m_Sprite + path: Details + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2003435589 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 3181064726 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: fcd64b8625b1bf84b95c05f410edd9f9, type: 3} + - {fileID: 21300000, guid: ab3f4553d6bf2b242be8e8ce993da26e, type: 3} + - {fileID: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Quark.anim.meta b/Assets/Animations/Quark.anim.meta new file mode 100644 index 0000000..a98791b --- /dev/null +++ b/Assets/Animations/Quark.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9815aadcd91ed5b4098c77b152ecf683 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animators/Nebulus.controller b/Assets/Animators/Nebulus.controller new file mode 100644 index 0000000..46801f3 --- /dev/null +++ b/Assets/Animators/Nebulus.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6837596297389991035 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Nebulus + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 7282499425b251a439f2df8930b56edb, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Nebulus + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 9041623882960401141} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &9041623882960401141 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -6837596297389991035} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -6837596297389991035} diff --git a/Assets/Animators/Nebulus.controller.meta b/Assets/Animators/Nebulus.controller.meta new file mode 100644 index 0000000..24127f4 --- /dev/null +++ b/Assets/Animators/Nebulus.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c0850c00f73c1a7448391a14a513e274 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animators/Quark.controller b/Assets/Animators/Quark.controller new file mode 100644 index 0000000..aad359f --- /dev/null +++ b/Assets/Animators/Quark.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6332664712235871266 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Quark + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 9815aadcd91ed5b4098c77b152ecf683, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-772749152438734418 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -6332664712235871266} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -6332664712235871266} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Quark + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -772749152438734418} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Animators/Quark.controller.meta b/Assets/Animators/Quark.controller.meta new file mode 100644 index 0000000..b5d61f3 --- /dev/null +++ b/Assets/Animators/Quark.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6537c3711346924459455feaf4579420 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Components/Disappear.cs b/Assets/Components/Disappear.cs index c8e1b85..81dee9a 100644 --- a/Assets/Components/Disappear.cs +++ b/Assets/Components/Disappear.cs @@ -4,31 +4,25 @@ using UnityEngine; public class Disappear : MonoBehaviour { - public float timeLeft; + public float health; protected Particle particle; - public float FractionLeft { - get { - return timeLeft / particle.Duration; - } - } - protected void Awake() { particle = GetComponent(); } - private void Start() { + protected void Start() { ResetTimer(); } public void ResetTimer() { - timeLeft = particle.Duration; + health = 1f; } - private void Update() { - timeLeft -= Time.deltaTime; + protected void Update() { + health -= Mathf.Pow(5, particle.gameController.maxTierPresent - particle.Tier - 4) * Time.deltaTime; - if(timeLeft < 0) { + if(health < 0) { Destroy(this.gameObject); } } diff --git a/Assets/Components/Emitter.cs b/Assets/Components/Emitter.cs index 647030f..6a598fc 100644 --- a/Assets/Components/Emitter.cs +++ b/Assets/Components/Emitter.cs @@ -23,6 +23,7 @@ public class Emitter : MonoBehaviour protected void Emit() { Invoke("Emit", emissionPeriod); if(particle.Tier < 2) return; + if(particle.Tier <= particle.gameController.maxTierPresent - 4) return; for(int i = 0; i < emissionQuantity; i++) { GameObject newObject = Instantiate(particle.ParticlePrefab, transform.position, Quaternion.identity); Particle newParticle = newObject.GetComponent(); diff --git a/Assets/Components/GameController.cs b/Assets/Components/GameController.cs index 6ff575b..fc01362 100644 --- a/Assets/Components/GameController.cs +++ b/Assets/Components/GameController.cs @@ -19,6 +19,8 @@ public class GameController : MonoBehaviour public GameObject particlePrefab; public Gradient[] tierGradients; public RuntimeAnimatorController[] tierAnimation; + public List simulatedObjects; + public int maxTierPresent; [Header("Upgrades")] public float[] upgradePushForce; @@ -40,5 +42,28 @@ public class GameController : MonoBehaviour pusher = Camera.main.GetComponent(); panner = Camera.main.GetComponent(); musicManager = GetComponent(); + simulatedObjects = new List(); + } + + protected void Start() { + maxTierPresent = -1; + } + + public void CheckNewMaxTier(int tier) { + if(tier > maxTierPresent) { + maxTierPresent = tier; + musicManager.UpdateLayers(maxTierPresent); + } + } + + public void RecalculateMaxTier() { + maxTierPresent = -1; + foreach(GameObject particleObject in GameObject.FindGameObjectsWithTag("Particle")) { + Particle particle = particleObject.GetComponent(); + if(particle.Tier > maxTierPresent) { + maxTierPresent = particle.Tier; + } + }; + musicManager.UpdateLayers(maxTierPresent); } } diff --git a/Assets/Components/Gravitation.cs b/Assets/Components/Gravitation.cs index 68602d6..494593d 100644 --- a/Assets/Components/Gravitation.cs +++ b/Assets/Components/Gravitation.cs @@ -14,12 +14,17 @@ public class Gravitation : MonoBehaviour [Header("Internals")] public int positionInList; - public static List simulatedObjects; [Header("References")] protected new Rigidbody2D rigidbody; protected GameController gameController; + public List SimulatedObjects { + get { + return gameController.simulatedObjects; + } + } + public float Mass { get { return rigidbody.mass; @@ -38,15 +43,12 @@ public class Gravitation : MonoBehaviour } private void OnEnable() { - if(simulatedObjects == null) { - simulatedObjects = new List(); - } - positionInList = simulatedObjects.Count; - simulatedObjects.Add(this); + positionInList = SimulatedObjects.Count; + SimulatedObjects.Add(this); } private void OnDisable() { - simulatedObjects.Remove(this); + SimulatedObjects.Remove(this); } private void Start() @@ -57,7 +59,7 @@ public class Gravitation : MonoBehaviour // O(n²) private void FixedUpdate() { - foreach(Gravitation other in simulatedObjects.Skip(positionInList + 1)) { + foreach(Gravitation other in SimulatedObjects.Skip(positionInList + 1)) { if(other.positionInList <= this.positionInList) continue; float distance = Vector3.Distance(this.transform.position, other.transform.position); float force = GravitationConstant * this.Mass * other.Mass / Mathf.Clamp(Mathf.Pow(distance, 2), 0.1f, float.PositiveInfinity); diff --git a/Assets/Components/Hue.cs b/Assets/Components/Hue.cs index 9e6d8bf..c2c4865 100644 --- a/Assets/Components/Hue.cs +++ b/Assets/Components/Hue.cs @@ -28,7 +28,7 @@ public class Hue : MonoBehaviour } public void RefreshColor() { - Vector4 hsva = new Vector4(0, 0, particle.disappear.FractionLeft - 1, 0); + Vector4 hsva = new Vector4(0, 0, particle.disappear.health - 1, 0); Color.RGBToHSV(color, out hsva.x, out _, out _); material.SetVector("_HSVAAdjust", hsva); } diff --git a/Assets/Components/Merger.cs b/Assets/Components/Merger.cs index e4a1442..3ed15d6 100644 --- a/Assets/Components/Merger.cs +++ b/Assets/Components/Merger.cs @@ -28,10 +28,10 @@ public class Merger : MonoBehaviour protected void Awake() { particle = GetComponentInParent(); + mergeCandidates = new List(); } protected void Start() { - mergeCandidates = new List(); mergeEnabled = false; Invoke("EnableMerge", mergeAfterSeconds); } diff --git a/Assets/Components/MusicManager.cs b/Assets/Components/MusicManager.cs index 9aebfd0..a3cbaec 100644 --- a/Assets/Components/MusicManager.cs +++ b/Assets/Components/MusicManager.cs @@ -4,36 +4,50 @@ using System.Collections.Generic; using UnityEngine; -[Serializable] -public class MusicLayer { - public AudioSource audioSource; - - public MusicLayer(AudioSource audioSource) { - this.audioSource = audioSource; - } - - public float Volume { - get { - return audioSource.volume; - } - set { - audioSource.volume = value; - } - } -} - - public class MusicManager : MonoBehaviour { - public List layers; + public AudioSource baseLayer; + public List layers; - void Start() + protected bool neverStarted; + + protected void Start() { - List audioSources = new List(); - GetComponentsInChildren(true, audioSources); - foreach(AudioSource audioSource in audioSources) { - MusicLayer layer = new MusicLayer(audioSource); - layer.Volume = 0; + foreach(AudioSource audioSource in layers) { + audioSource.volume = 0; + } + neverStarted = true; + } + + public void UpdateLayers(int maxTier) { + if(maxTier == -1) { + baseLayer.volume = 1f; + } + else { + baseLayer.volume = 0f; + } + + if(neverStarted) { + foreach(AudioSource layer in layers) { + layer.Play(); + } + neverStarted = false; + } + + if(maxTier >= layers.Count) { + foreach(AudioSource layer in layers) { + layer.volume = 1f; + } + } + else { + for(int i = 0; i < layers.Count; i++) { + if(maxTier >= i) { + layers[i].volume = 1f; + } + else { + layers[i].volume = 0f; + } + } } } } diff --git a/Assets/Components/Particle.cs b/Assets/Components/Particle.cs index f1322ce..b64b204 100644 --- a/Assets/Components/Particle.cs +++ b/Assets/Components/Particle.cs @@ -27,8 +27,9 @@ public class Particle : MonoBehaviour { set { _tier = value; Scale = Mathf.Pow(gameController.scaleMultiplier, _tier); - animator.runtimeAnimatorController = gameController.tierAnimation[_tier]; - hue.PossibleColors = gameController.tierGradients[_tier]; + animator.runtimeAnimatorController = gameController.tierAnimation[_tier % gameController.tierAnimation.Length]; + hue.PossibleColors = gameController.tierGradients[_tier % gameController.tierGradients.Length]; + gameController.CheckNewMaxTier(_tier); disappear.ResetTimer(); } } @@ -77,7 +78,13 @@ public class Particle : MonoBehaviour { } protected void Start() { - animator.runtimeAnimatorController = gameController.tierAnimation[_tier]; - hue.PossibleColors = gameController.tierGradients[_tier]; + animator.runtimeAnimatorController = gameController.tierAnimation[_tier % gameController.tierAnimation.Length]; + hue.PossibleColors = gameController.tierGradients[_tier % gameController.tierGradients.Length]; + } + + protected void OnDestroy() { + if(Tier >= gameController.maxTierPresent) { + gameController.RecalculateMaxTier(); + } } } \ No newline at end of file diff --git a/Assets/Music/base.ogg.meta b/Assets/Music/base.ogg.meta new file mode 100644 index 0000000..6ed3ed2 --- /dev/null +++ b/Assets/Music/base.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f775738b748618e4a9f4e742e21a282e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Music/layer1.ogg.meta b/Assets/Music/layer1.ogg.meta new file mode 100644 index 0000000..1f14137 --- /dev/null +++ b/Assets/Music/layer1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 37e30c686763c1e4ca22b20a356252c0 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/BlackHole.prefab b/Assets/Prefabs/BlackHole.prefab index bd9a5db..310f564 100644 --- a/Assets/Prefabs/BlackHole.prefab +++ b/Assets/Prefabs/BlackHole.prefab @@ -219,7 +219,7 @@ SpriteRenderer: m_SortingLayerID: -2048492593 m_SortingLayer: -1 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: bec3e76d5f137cb4ead4f3842b8db978, type: 3} + m_Sprite: {fileID: 21300000, guid: 836bb3b381695454b8268c383338a2c3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Prefabs/GameController.prefab b/Assets/Prefabs/GameController.prefab index 68c8595..be03dd8 100644 --- a/Assets/Prefabs/GameController.prefab +++ b/Assets/Prefabs/GameController.prefab @@ -1,5 +1,132 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2840017336573732720 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 576137496605705657} + - component: {fileID: 4850948939192426854} + m_Layer: 0 + m_Name: Layer 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &576137496605705657 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2840017336573732720} + 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: 1990625892755510357} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &4850948939192426854 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2840017336573732720} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 37e30c686763c1e4ca22b20a356252c0, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &4669070901862137127 GameObject: m_ObjectHideFlags: 0 @@ -10,6 +137,7 @@ GameObject: m_Component: - component: {fileID: 9012813807232547518} - component: {fileID: 4937878819460165300} + - component: {fileID: 1086337020} m_Layer: 0 m_Name: GameController m_TagString: GameController @@ -27,7 +155,8 @@ Transform: 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_Children: + - {fileID: 1990625892755510357} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -47,6 +176,8 @@ MonoBehaviour: particlesToMerge: 5 scaleMultiplier: 3 particleDurationPerTier: 15 + bigBangParticles: 150 + blackHolePrefab: {fileID: 0} particlePrefab: {fileID: 5473375028011702754, guid: e73d8e05bd7498c4a80a63094f4594a8, type: 3} tierGradients: @@ -220,8 +351,205 @@ MonoBehaviour: m_NumAlphaKeys: 2 tierAnimation: - {fileID: 9100000, guid: 20f89caa72793bb44b234d8992bad691, type: 2} - - {fileID: 9100000, guid: 20f89caa72793bb44b234d8992bad691, type: 2} - - {fileID: 9100000, guid: 20f89caa72793bb44b234d8992bad691, type: 2} - - {fileID: 9100000, guid: 20f89caa72793bb44b234d8992bad691, type: 2} - - {fileID: 9100000, guid: 20f89caa72793bb44b234d8992bad691, type: 2} - - {fileID: 9100000, guid: 20f89caa72793bb44b234d8992bad691, type: 2} + - {fileID: 9100000, guid: 6537c3711346924459455feaf4579420, type: 2} + - {fileID: 9100000, guid: c0850c00f73c1a7448391a14a513e274, type: 2} + simulatedObjects: [] + maxTierPresent: 0 + upgradePushForce: + - 0 + - 0 + - 0 + - 0 + - 0 + upgradePushRadius: + - 0 + - 0 + - 0 + - 0 + - 0 + upgradeParticleCount: + - 1 + - 2 + - 4 + - 7 + - 10 + levelPush: 0 + levelClick: 0 + spawner: {fileID: 0} + pusher: {fileID: 0} + panner: {fileID: 0} + musicManager: {fileID: 0} +--- !u!114 &1086337020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4669070901862137127} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c5d6ca16f02f68b44bdb6d018c9eb490, type: 3} + m_Name: + m_EditorClassIdentifier: + baseLayer: {fileID: 787973444833592173} + layers: + - {fileID: 4850948939192426854} +--- !u!1 &7887871963136015922 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2826821897386302087} + - component: {fileID: 787973444833592173} + m_Layer: 0 + m_Name: Base Layer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2826821897386302087 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7887871963136015922} + 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: 1990625892755510357} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &787973444833592173 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7887871963136015922} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: f775738b748618e4a9f4e742e21a282e, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &8146944179958534398 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1990625892755510357} + m_Layer: 0 + m_Name: Music + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1990625892755510357 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8146944179958534398} + 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: 2826821897386302087} + - {fileID: 576137496605705657} + m_Father: {fileID: 9012813807232547518} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Particle.prefab b/Assets/Prefabs/Particle.prefab index 1cb5f32..145f5fa 100644 --- a/Assets/Prefabs/Particle.prefab +++ b/Assets/Prefabs/Particle.prefab @@ -101,7 +101,7 @@ GameObject: - component: {fileID: 8346599265516913425} m_Layer: 0 m_Name: Particle - m_TagString: Untagged + m_TagString: Particle m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -308,7 +308,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6d3f9558d29b4414a9c0661fe7b075a0, type: 3} m_Name: m_EditorClassIdentifier: - timeLeft: 0 + health: 0 --- !u!1 &7524624946521742832 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 2c45d4f..e8fe65c 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -350,6 +350,11 @@ PrefabInstance: propertyPath: m_Name value: BlackHole objectReference: {fileID: 0} + - target: {fileID: 2084275844800580026, guid: d2ff0823532914e4a8f5ecd0efc2a146, + type: 3} + propertyPath: m_TagString + value: BlackHole + objectReference: {fileID: 0} - target: {fileID: 2084275844800580021, guid: d2ff0823532914e4a8f5ecd0efc2a146, type: 3} propertyPath: m_LocalPosition.x @@ -585,45 +590,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4937878819460165300, guid: bf08d766b6e86cf4a8773489143ab2d5, + - target: {fileID: 4850948939192426854, guid: bf08d766b6e86cf4a8773489143ab2d5, type: 3} - propertyPath: upgradeParticleCount.Array.size - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4937878819460165300, guid: bf08d766b6e86cf4a8773489143ab2d5, - type: 3} - propertyPath: upgradePushRadius.Array.size - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4937878819460165300, guid: bf08d766b6e86cf4a8773489143ab2d5, - type: 3} - propertyPath: upgradePushForce.Array.size - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4937878819460165300, guid: bf08d766b6e86cf4a8773489143ab2d5, - type: 3} - propertyPath: upgradeParticleCount.Array.data[0] - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4937878819460165300, guid: bf08d766b6e86cf4a8773489143ab2d5, - type: 3} - propertyPath: upgradeParticleCount.Array.data[1] - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4937878819460165300, guid: bf08d766b6e86cf4a8773489143ab2d5, - type: 3} - propertyPath: upgradeParticleCount.Array.data[2] - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4937878819460165300, guid: bf08d766b6e86cf4a8773489143ab2d5, - type: 3} - propertyPath: upgradeParticleCount.Array.data[3] - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 4937878819460165300, guid: bf08d766b6e86cf4a8773489143ab2d5, - type: 3} - propertyPath: upgradeParticleCount.Array.data[4] - value: 10 + propertyPath: m_PlayOnAwake + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bf08d766b6e86cf4a8773489143ab2d5, type: 3} @@ -694,5 +664,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6700387586635078816, guid: 6baf9ec6ad712d940a83a3bf6ae3e6b1, + type: 3} + propertyPath: pushRadius + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6baf9ec6ad712d940a83a3bf6ae3e6b1, type: 3} diff --git a/Assets/Sprites/0_Quark.png.meta b/Assets/Sprites/0_Quark.png.meta index a36610a..ab93e46 100644 --- a/Assets/Sprites/0_Quark.png.meta +++ b/Assets/Sprites/0_Quark.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 0 aniso: -1 mipBias: -100 wrapU: 1 @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 12 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -70,6 +70,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/4_Nebulus.png.meta b/Assets/Sprites/4_Nebulus.png.meta new file mode 100644 index 0000000..b488c03 --- /dev/null +++ b/Assets/Sprites/4_Nebulus.png.meta @@ -0,0 +1,115 @@ +fileFormatVersion: 2 +guid: df4a9a3a7d7bc3c4095a673039e20e0b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 94 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Gray_Haze.png b/Assets/Sprites/Gray_Haze.png new file mode 100644 index 0000000..4514d9f Binary files /dev/null and b/Assets/Sprites/Gray_Haze.png differ diff --git a/Assets/Sprites/Gray_Haze.png.meta b/Assets/Sprites/Gray_Haze.png.meta new file mode 100644 index 0000000..52710e9 --- /dev/null +++ b/Assets/Sprites/Gray_Haze.png.meta @@ -0,0 +1,115 @@ +fileFormatVersion: 2 +guid: 836bb3b381695454b8268c383338a2c3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 1500 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 77c74c8..2f72dc3 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,9 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - Particle + - BlackHole layers: - Default - TransparentFX