From 9fa2ee8082b257024a35dc1cea8f0ce1d4a34497 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 7 Oct 2019 15:11:17 +0200 Subject: [PATCH] Save until now --- Assets/Animations/BlackHole.anim | 199 +++++++++++++++ Assets/Animations/BlackHole.anim.meta | 8 + Assets/Animations/Solus.anim | 98 ++++++++ Assets/Animations/Solus.anim.meta | 8 + Assets/Animators/BlackHole.controller | 72 ++++++ Assets/Animators/BlackHole.controller.meta | 8 + Assets/Animators/Planet.controller | 2 +- Assets/Animators/Solus.controller | 72 ++++++ Assets/Animators/Solus.controller.meta | 8 + Assets/Components/GameController.cs | 6 +- Assets/Components/Gravitation.cs | 1 - Assets/Components/Hue.cs | 2 +- Assets/Components/Particle.cs | 15 +- Assets/Components/PushOnMouseClick.cs | 8 +- Assets/Components/SpawnOnMouseClick.cs | 2 +- Assets/Components/UpgradeButton.cs | 13 +- Assets/Prefabs/BlackHole.prefab | 23 +- Assets/Prefabs/GameController.prefab | 23 +- Assets/Prefabs/Particle.prefab | 5 +- Assets/Prefabs/Upgrades.prefab | 268 ++++++++++----------- Assets/Scenes/Game.unity | 27 ++- Assets/Sprites/6_Solus.png.meta | 115 +++++++++ ProjectSettings/TagManager.asset | 1 + 23 files changed, 816 insertions(+), 168 deletions(-) create mode 100644 Assets/Animations/BlackHole.anim create mode 100644 Assets/Animations/BlackHole.anim.meta create mode 100644 Assets/Animations/Solus.anim create mode 100644 Assets/Animations/Solus.anim.meta create mode 100644 Assets/Animators/BlackHole.controller create mode 100644 Assets/Animators/BlackHole.controller.meta create mode 100644 Assets/Animators/Solus.controller create mode 100644 Assets/Animators/Solus.controller.meta create mode 100644 Assets/Sprites/6_Solus.png.meta diff --git a/Assets/Animations/BlackHole.anim b/Assets/Animations/BlackHole.anim new file mode 100644 index 0000000..ca45375 --- /dev/null +++ b/Assets/Animations/BlackHole.anim @@ -0,0 +1,199 @@ +%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: BlackHole + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 360} + inSlope: {x: 0, y: 0, z: -2} + outSlope: {x: 0, y: 0, z: -2} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 180 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: -2} + outSlope: {x: 0, y: 0, z: -2} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: PurpleHaze + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + 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: 871287824 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 180 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 180 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: PurpleHaze + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 180 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: PurpleHaze + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 360 + inSlope: -2 + outSlope: -2 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 180 + value: 0 + inSlope: -2 + outSlope: -2 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: PurpleHaze + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: PurpleHaze + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: PurpleHaze + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: PurpleHaze + classID: 4 + script: {fileID: 0} + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/BlackHole.anim.meta b/Assets/Animations/BlackHole.anim.meta new file mode 100644 index 0000000..5691520 --- /dev/null +++ b/Assets/Animations/BlackHole.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64fe3ddee19f0e14cab3099d1e737138 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Solus.anim b/Assets/Animations/Solus.anim new file mode 100644 index 0000000..fa3e6ae --- /dev/null +++ b/Assets/Animations/Solus.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: Solus + 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: a09c27e32b0cedd4ba6fae57f2d7d08b, 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: a09c27e32b0cedd4ba6fae57f2d7d08b, 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/Solus.anim.meta b/Assets/Animations/Solus.anim.meta new file mode 100644 index 0000000..1e50a0e --- /dev/null +++ b/Assets/Animations/Solus.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 724dcfee899be1a4fb297dc4071dc4c2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animators/BlackHole.controller b/Assets/Animators/BlackHole.controller new file mode 100644 index 0000000..cc113b0 --- /dev/null +++ b/Assets/Animators/BlackHole.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8935434178432730100 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlackHole + 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: 64fe3ddee19f0e14cab3099d1e737138, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-1929130519955256485 +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: -8935434178432730100} + 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: -8935434178432730100} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlackHole + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -1929130519955256485} + 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/BlackHole.controller.meta b/Assets/Animators/BlackHole.controller.meta new file mode 100644 index 0000000..15743c7 --- /dev/null +++ b/Assets/Animators/BlackHole.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e64650d1d23340347a100b4bedfa9512 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animators/Planet.controller b/Assets/Animators/Planet.controller index d7f5dd3..66e4bb2 100644 --- a/Assets/Animators/Planet.controller +++ b/Assets/Animators/Planet.controller @@ -11,7 +11,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 4600955780912723765} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 240, y: 110, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Animators/Solus.controller b/Assets/Animators/Solus.controller new file mode 100644 index 0000000..0d22cd5 --- /dev/null +++ b/Assets/Animators/Solus.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-1246425065009647102 +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: 3299165908801264640} + 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: 3299165908801264640} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Solus + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -1246425065009647102} + 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!1102 &3299165908801264640 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Solus + 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: 724dcfee899be1a4fb297dc4071dc4c2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animators/Solus.controller.meta b/Assets/Animators/Solus.controller.meta new file mode 100644 index 0000000..aa554e5 --- /dev/null +++ b/Assets/Animators/Solus.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca5534acdf3ff4d4ab5e91aa33b49907 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Components/GameController.cs b/Assets/Components/GameController.cs index 557a2a6..08cf290 100644 --- a/Assets/Components/GameController.cs +++ b/Assets/Components/GameController.cs @@ -86,14 +86,18 @@ public class GameController : MonoBehaviour [HideInInspector] public BlackHole blackHole; + [HideInInspector] + public GameObject upgradePanel; + protected void Awake() { spawner = Camera.main.GetComponent(); pusher = Camera.main.GetComponent(); panner = Camera.main.GetComponent(); musicManager = GetComponent(); simulatedObjects = new List(); - blackHole = GameObject.FindGameObjectWithTag("BlackHole").GetComponent(); canvas = GameObject.FindGameObjectWithTag("Canvas").GetComponent(); + blackHole = GameObject.FindGameObjectWithTag("BlackHole").GetComponent(); + upgradePanel = GameObject.FindGameObjectWithTag("UpgradePanel"); } protected void Start() { diff --git a/Assets/Components/Gravitation.cs b/Assets/Components/Gravitation.cs index dff9adf..a1703ba 100644 --- a/Assets/Components/Gravitation.cs +++ b/Assets/Components/Gravitation.cs @@ -6,7 +6,6 @@ using UnityEngine; [RequireComponent(typeof(Rigidbody2D))] public class Gravitation : MonoBehaviour { - [Header("Config")] public bool isStatic; [HideInInspector] diff --git a/Assets/Components/Hue.cs b/Assets/Components/Hue.cs index 9cde56c..0ad7aa6 100644 --- a/Assets/Components/Hue.cs +++ b/Assets/Components/Hue.cs @@ -27,7 +27,7 @@ public class Hue : MonoBehaviour } public void RefreshColor() { - Vector4 hsva = new Vector4(0, 0, particle.disappear.health - 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/Particle.cs b/Assets/Components/Particle.cs index 6124402..f0b39ae 100644 --- a/Assets/Components/Particle.cs +++ b/Assets/Components/Particle.cs @@ -6,18 +6,31 @@ using UnityEngine; public class Particle : MonoBehaviour { protected int _tier = 0; + [HideInInspector] public new Rigidbody2D rigidbody; + [HideInInspector] public Gravitation gravitation; + [HideInInspector] public GameController gameController; + [HideInInspector] public Merger merger; + [HideInInspector] public Collider2D particleCollider; + [HideInInspector] public Collider2D mergeCollider; + [HideInInspector] public Emitter emitter; + [HideInInspector] public Animator animator; + [HideInInspector] public Hue hue; + [HideInInspector] public SpriteRenderer mainRenderer; + [HideInInspector] public SpriteRenderer auraRenderer; + [HideInInspector] public SpriteRenderer detailsRenderer; + [HideInInspector] public Disappear disappear; public int Tier { @@ -34,7 +47,7 @@ public class Particle : MonoBehaviour { } } - float Scale { + public float Scale { get { return transform.localScale.x; } diff --git a/Assets/Components/PushOnMouseClick.cs b/Assets/Components/PushOnMouseClick.cs index 065f4d4..a6f8c3f 100644 --- a/Assets/Components/PushOnMouseClick.cs +++ b/Assets/Components/PushOnMouseClick.cs @@ -7,6 +7,12 @@ public class PushOnMouseClick : MonoBehaviour public int mouseButton = 1; public float pushForce = 0; public float pushRadius = 0; + + protected GameController gameController; + + protected void Awake() { + gameController = GameObject.FindGameObjectWithTag("GameController").GetComponent(); + } protected Vector3 GetWorldMousePosition() { return Camera.main.ScreenToWorldPoint(Input.mousePosition); @@ -14,7 +20,7 @@ public class PushOnMouseClick : MonoBehaviour protected void Update() { - if(Input.GetMouseButton(mouseButton)) { + if(!gameController.upgradePanel.activeSelf && Input.GetMouseButton(mouseButton)) { Vector3 mousePosition = GetWorldMousePosition(); Collider2D[] affected = Physics2D.OverlapCircleAll(mousePosition, pushRadius); foreach(Collider2D collider in affected) { diff --git a/Assets/Components/SpawnOnMouseClick.cs b/Assets/Components/SpawnOnMouseClick.cs index f583eec..5f134cc 100644 --- a/Assets/Components/SpawnOnMouseClick.cs +++ b/Assets/Components/SpawnOnMouseClick.cs @@ -22,7 +22,7 @@ public class SpawnOnMouseClick : MonoBehaviour void Update() { - if(Input.GetMouseButtonDown(mouseButton)) { + if(!gameController.upgradePanel.activeSelf && Input.GetMouseButtonDown(mouseButton)) { Vector3 mousePosition = GetWorldMousePosition(); for(int i = 0; i < spawnCount; i++) { GameObject particleObject = Instantiate(gameController.particlePrefab, new Vector3(mousePosition.x, mousePosition.y, 0f), Quaternion.identity); diff --git a/Assets/Components/UpgradeButton.cs b/Assets/Components/UpgradeButton.cs index 42939a8..17aeaf8 100644 --- a/Assets/Components/UpgradeButton.cs +++ b/Assets/Components/UpgradeButton.cs @@ -23,6 +23,8 @@ public class UpgradeButton : MonoBehaviour public Sprite hoveredSprite; public Sprite boughtSprite; + protected bool started; + protected bool CanBeBought { get { return gameController.blackHole.UnspentMass >= cost; @@ -46,24 +48,29 @@ public class UpgradeButton : MonoBehaviour protected void Awake() { gameController = GameObject.Find("GameController").GetComponent(); image = GetComponent(); + started = false; + } + + protected void OnEnable() { + if(started) RefreshUpgrades(); } protected void Start() { - RefreshUpgrades(); + started = true; } public void OnPointerEnter() { if(!HasBeenBought && CanBeBought) { image.sprite = hoveredSprite; - gameController.canvas.BroadcastMessage("DisplayCost", cost); } + gameController.canvas.BroadcastMessage("DisplayCost", cost); } public void OnPointerExit() { if(!HasBeenBought && CanBeBought) { image.sprite = canBuySprite; - gameController.canvas.BroadcastMessage("DisplayCost", -1f); } + gameController.canvas.BroadcastMessage("DisplayCost", -1f); } public void OnPointerClick() { diff --git a/Assets/Prefabs/BlackHole.prefab b/Assets/Prefabs/BlackHole.prefab index da683e8..f4fc246 100644 --- a/Assets/Prefabs/BlackHole.prefab +++ b/Assets/Prefabs/BlackHole.prefab @@ -14,6 +14,7 @@ GameObject: - component: {fileID: 2084275844800580023} - component: {fileID: 2084275844800580025} - component: {fileID: 3271020097140099258} + - component: {fileID: 6517147912323212384} m_Layer: 0 m_Name: BlackHole m_TagString: BlackHole @@ -149,6 +150,26 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2f86d0ffd697a6046a85ea2885566da9, type: 3} m_Name: m_EditorClassIdentifier: + spentMass: 0 +--- !u!95 &6517147912323212384 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2084275844800580026} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e64650d1d23340347a100b4bedfa9512, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &9196047638329762968 GameObject: m_ObjectHideFlags: 0 @@ -160,7 +181,7 @@ GameObject: - component: {fileID: 1352545097575099099} - component: {fileID: 3711945108754635774} m_Layer: 0 - m_Name: GameObject + m_Name: PurpleHaze m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/GameController.prefab b/Assets/Prefabs/GameController.prefab index 361c6fe..e7af27a 100644 --- a/Assets/Prefabs/GameController.prefab +++ b/Assets/Prefabs/GameController.prefab @@ -305,7 +305,6 @@ MonoBehaviour: scaleMultiplier: 3 particleDurationConstant: 5 blackHolePrefab: {fileID: 0} - blackHole: {fileID: 0} particlePrefab: {fileID: 5473375028011702754, guid: e73d8e05bd7498c4a80a63094f4594a8, type: 3} tierGradients: @@ -483,9 +482,7 @@ MonoBehaviour: - {fileID: 9100000, guid: 6537c3711346924459455feaf4579420, type: 2} - {fileID: 9100000, guid: c0850c00f73c1a7448391a14a513e274, type: 2} - {fileID: 9100000, guid: 93a7bcdb67702484494f3bbd777ad2e8, type: 2} - - {fileID: 9100000, guid: 93a7bcdb67702484494f3bbd777ad2e8, type: 2} - simulatedObjects: [] - maxTierPresent: 0 + - {fileID: 9100000, guid: ca5534acdf3ff4d4ab5e91aa33b49907, type: 2} upgradePushForce: - 0 - 100 @@ -495,21 +492,25 @@ MonoBehaviour: - 1000000 upgradePushRadius: - 0 - - 1 - - 10 - - 100 - - 1000 - - 10000 - upgradeParticleCount: 010000000200000003000000040000000500000006000000 + - 3 + - 9 + - 27 + - 81 + - 243 + upgradeParticleCount: 01000000020000000300000005000000070000000a000000 upgradeParticleTiers: 000000000100000002000000030000000400000005000000 _levelAntig: 0 _levelMatter: 0 _levelFission: 0 + simulatedObjects: [] + maxTierPresent: 0 spawner: {fileID: 0} pusher: {fileID: 0} panner: {fileID: 0} musicManager: {fileID: 0} canvas: {fileID: 0} + blackHole: {fileID: 0} + upgradePanel: {fileID: 0} --- !u!114 &1086337020 MonoBehaviour: m_ObjectHideFlags: 0 @@ -522,8 +523,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c5d6ca16f02f68b44bdb6d018c9eb490, type: 3} m_Name: m_EditorClassIdentifier: - baseLayer: {fileID: 787973444833592173} changeSpeed: 1 + baseLayer: {fileID: 787973444833592173} layers: - {fileID: 4850948939192426854} - {fileID: 1636788351} diff --git a/Assets/Prefabs/Particle.prefab b/Assets/Prefabs/Particle.prefab index 5c1a688..3852fe8 100644 --- a/Assets/Prefabs/Particle.prefab +++ b/Assets/Prefabs/Particle.prefab @@ -280,7 +280,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4ae389aca0e2e82408a1ddd869680dc0, type: 3} m_Name: m_EditorClassIdentifier: - forceBase: 1 + forceBase: 2 forceVariance: 0 emissionPeriod: 2 emissionQuantity: 2 @@ -308,7 +308,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6d3f9558d29b4414a9c0661fe7b075a0, type: 3} m_Name: m_EditorClassIdentifier: - health: 0 --- !u!1 &7524624946521742832 GameObject: m_ObjectHideFlags: 0 @@ -450,5 +449,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1010c8363cc1ebd4e9c1808f9a2737e2, type: 3} m_Name: m_EditorClassIdentifier: - particle: {fileID: 0} mergeAfterSeconds: 0.2 + particle: {fileID: 0} diff --git a/Assets/Prefabs/Upgrades.prefab b/Assets/Prefabs/Upgrades.prefab index 8ecfdb5..1dbf810 100644 --- a/Assets/Prefabs/Upgrades.prefab +++ b/Assets/Prefabs/Upgrades.prefab @@ -884,7 +884,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2e88c8ce76416bd43959fc254130d130, type: 3} m_Name: m_EditorClassIdentifier: - blackHole: {fileID: 0} --- !u!1 &6071206155449790856 GameObject: m_ObjectHideFlags: 0 @@ -975,11 +974,11 @@ GameObject: - component: {fileID: 6071206155585637458} m_Layer: 5 m_Name: Upgrades - m_TagString: Untagged + m_TagString: UpgradePanel m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6071206155585637459 RectTransform: m_ObjectHideFlags: 0 @@ -1090,11 +1089,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206153612675157} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -1200,10 +1194,10 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: cost - value: 25 + propertyPath: m_Name + value: Upgrade Button objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -1220,11 +1214,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206153612675157} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button (2) - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -1330,15 +1319,20 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: level - value: 3 + propertyPath: m_Name + value: Upgrade Button (2) objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: cost - value: 250 + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: level + value: 3 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -1355,11 +1349,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206155747220281} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -1465,15 +1454,20 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: type - value: 2 + propertyPath: m_Name + value: Upgrade Button objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: cost - value: 25 + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: type + value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -1490,11 +1484,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206155747220281} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button (3) - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -1600,10 +1589,15 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: m_Name + value: Upgrade Button (3) + objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: type - value: 2 + propertyPath: cost + value: 12500 objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -1612,8 +1606,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: cost - value: 500 + propertyPath: type + value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -1630,11 +1624,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206155747220281} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button (4) - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -1740,10 +1729,15 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: m_Name + value: Upgrade Button (4) + objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: type - value: 2 + propertyPath: cost + value: 225000 objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -1752,8 +1746,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: cost - value: 1000 + propertyPath: type + value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -1770,11 +1764,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206153612675157} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button (3) - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -1880,15 +1869,20 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: level - value: 4 + propertyPath: m_Name + value: Upgrade Button (3) objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: cost - value: 500 + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: level + value: 4 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -1905,11 +1899,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206154561887604} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button (1) - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -2015,10 +2004,15 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: m_Name + value: Upgrade Button (1) + objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: type - value: 1 + propertyPath: cost + value: 6000 objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -2027,8 +2021,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: cost - value: 55 + propertyPath: type + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -2045,11 +2039,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206154561887604} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button (3) - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -2155,10 +2144,15 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: m_Name + value: Upgrade Button (3) + objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: type - value: 1 + propertyPath: cost + value: 240000 objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -2167,8 +2161,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: cost - value: 500 + propertyPath: type + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -2185,11 +2179,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206155747220281} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button (2) - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -2295,10 +2284,15 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: m_Name + value: Upgrade Button (2) + objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: type - value: 2 + propertyPath: cost + value: 1500 objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -2307,8 +2301,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: cost - value: 250 + propertyPath: type + value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -2325,11 +2319,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206154561887604} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button (4) - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -2435,10 +2424,15 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: m_Name + value: Upgrade Button (4) + objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: type - value: 1 + propertyPath: cost + value: 1500000 objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -2447,8 +2441,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: cost - value: 1000 + propertyPath: type + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -2465,11 +2459,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206154561887604} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -2575,15 +2564,20 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: type - value: 1 + propertyPath: m_Name + value: Upgrade Button objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: cost - value: 25 + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: type + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -2600,11 +2594,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206155747220281} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button (1) - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -2710,10 +2699,15 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: m_Name + value: Upgrade Button (1) + objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: type - value: 2 + propertyPath: cost + value: 500 objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -2722,8 +2716,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: cost - value: 55 + propertyPath: type + value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -2740,11 +2734,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206153612675157} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button (1) - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -2850,15 +2839,20 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: level - value: 2 + propertyPath: m_Name + value: Upgrade Button (1) objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: cost - value: 55 + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: level + value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -2875,11 +2869,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206154561887604} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button (2) - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -2985,10 +2974,15 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: m_Name + value: Upgrade Button (2) + objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: type - value: 1 + propertyPath: cost + value: 30000 objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -2997,8 +2991,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: cost - value: 250 + propertyPath: type + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} @@ -3015,11 +3009,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6071206153612675157} m_Modifications: - - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, - type: 3} - propertyPath: m_Name - value: Upgrade Button (4) - objectReference: {fileID: 0} - target: {fileID: 6631481499280746833, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: m_LocalPosition.x @@ -3125,15 +3114,20 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, + - target: {fileID: 6631481499280746846, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} - propertyPath: level - value: 5 + propertyPath: m_Name + value: Upgrade Button (4) objectReference: {fileID: 0} - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} propertyPath: cost - value: 1000 + value: 100000 + objectReference: {fileID: 0} + - target: {fileID: 6631481499280746834, guid: 12df848b888b3fb42bc7e87f205b2b6e, + type: 3} + propertyPath: level + value: 5 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 12df848b888b3fb42bc7e87f205b2b6e, type: 3} diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 5801d6e..60561bf 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -470,11 +470,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 863596085} m_Modifications: - - target: {fileID: 5870222235995333642, guid: 48928de23c4bf22498a7fc6a69f24b08, - type: 3} - propertyPath: m_Name - value: Mass - objectReference: {fileID: 0} - target: {fileID: 5870222235995333643, guid: 48928de23c4bf22498a7fc6a69f24b08, type: 3} propertyPath: m_LocalPosition.x @@ -580,6 +575,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5870222235995333642, guid: 48928de23c4bf22498a7fc6a69f24b08, + type: 3} + propertyPath: m_Name + value: Mass + objectReference: {fileID: 0} - target: {fileID: 5870222235995333638, guid: 48928de23c4bf22498a7fc6a69f24b08, type: 3} propertyPath: blackHole @@ -599,6 +599,11 @@ PrefabInstance: propertyPath: m_Name value: Upgrades objectReference: {fileID: 0} + - target: {fileID: 6071206155585637468, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6071206155585637459, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb, type: 3} propertyPath: m_LocalPosition.x @@ -667,7 +672,7 @@ PrefabInstance: - target: {fileID: 6071206155585637459, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb, type: 3} propertyPath: m_SizeDelta.x - value: 873 + value: 856 objectReference: {fileID: 0} - target: {fileID: 6071206155585637459, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb, type: 3} @@ -704,6 +709,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 6071206155585637458, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb, + type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 0.5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb, type: 3} --- !u!1001 &9221969453494073200 @@ -773,5 +783,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9221969453073420047, guid: 6baf9ec6ad712d940a83a3bf6ae3e6b1, + type: 3} + propertyPath: orthographic size + value: 8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6baf9ec6ad712d940a83a3bf6ae3e6b1, type: 3} diff --git a/Assets/Sprites/6_Solus.png.meta b/Assets/Sprites/6_Solus.png.meta new file mode 100644 index 0000000..c21fc9a --- /dev/null +++ b/Assets/Sprites/6_Solus.png.meta @@ -0,0 +1,115 @@ +fileFormatVersion: 2 +guid: a09c27e32b0cedd4ba6fae57f2d7d08b +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: 200 + 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 2254fb2..4cb3529 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -7,6 +7,7 @@ TagManager: - Particle - BlackHole - Canvas + - UpgradePanel layers: - Default - TransparentFX