I'd call this Version 0.3

2024-11-21 16:04:18 +00:00 · 2019-10-07 00:21:35 +02:00 · 2019-10-07 00:21:35 +02:00 · 820f132f8b
commit 820f132f8b
parent e038394fc7
30 changed files with 6784 additions and 191 deletions
--- a/Assets/Components/BlackHole.cs
+++ b/Assets/Components/BlackHole.cs
@ -6,6 +6,8 @@ using UnityEngine;
 [RequireComponent(typeof(Collider2D))]
 public class BlackHole : MonoBehaviour
 {
+    protected float spentMass;
+
    public float Mass {
        get {
            return rigidbody.mass;
@ -16,6 +18,15 @@ public class BlackHole : MonoBehaviour
        }
    }

+    public float UnspentMass {
+        get {
+            return rigidbody.mass - spentMass;
+        }
+        set {
+            spentMass = rigidbody.mass - value;
+        }
+    }
+
    public float Scale {
        get {
            return transform.localScale.x;
@ -33,6 +44,7 @@ public class BlackHole : MonoBehaviour

    protected void Start() {
        Mass = 50;
+        spentMass = 0;
    }

    protected void OnTriggerEnter2D(Collider2D other) {
--- a/Assets/Components/Disappear.cs
+++ b/Assets/Components/Disappear.cs
@ -20,7 +20,7 @@ public class Disappear : MonoBehaviour
    }

    protected void Update() {
-        health -= Mathf.Pow(5, particle.gameController.maxTierPresent - particle.Tier - 4) * Time.deltaTime;
+        health -= Mathf.Pow(particle.gameController.particleDurationConstant, particle.gameController.maxTierPresent - particle.Tier - 4) * Time.deltaTime;

        if(health < 0) {
            Destroy(this.gameObject);
--- a/Assets/Components/GameController.cs
+++ b/Assets/Components/GameController.cs
@ -9,11 +9,11 @@ public class GameController : MonoBehaviour
    public float gravitationConstant = 2;
    public int particlesToMerge = 5;
    public int scaleMultiplier = 3;
-    public int particleDurationPerTier = 5;
+    public int particleDurationConstant = 5;

-    [Header("Big Bang")]
-    public int bigBangParticles;
+    [Header("Black Hole")]
    public GameObject blackHolePrefab;
+    public BlackHole blackHole;

    [Header("Particles")]
    public GameObject particlePrefab;
@ -25,17 +25,51 @@ public class GameController : MonoBehaviour
    [Header("Upgrades")]
    public float[] upgradePushForce;
    public float[] upgradePushRadius;
-    public float[] upgradeParticleCount;
+    public int[] upgradeParticleCount;
+    public int[] upgradeParticleTiers;

    [Header("Bought Upgrades")]
-    public int levelPush = 0;
-    public int levelClick = 0;
+    public int _levelAntig = 0;
+    public int _levelMatter = 0;
+    public int _levelFission = 0;
+
+    public int LevelAntig {
+        get {
+            return _levelAntig;
+        }
+        set {
+            _levelAntig = value;
+            pusher.pushForce = upgradePushForce[_levelAntig];
+            pusher.pushRadius = upgradePushRadius[_levelAntig];
+        }
+    }
+
+    public int LevelMatter {
+        get {
+            return _levelMatter;
+        }
+        set {
+            _levelMatter = value;
+            spawner.spawnedTier = upgradeParticleTiers[_levelMatter];
+        }
+    }
+
+    public int LevelFission {
+        get {
+            return _levelFission;
+        }
+        set {
+            _levelFission = value;
+            spawner.spawnCount = upgradeParticleCount[_levelFission];
+        }
+    }

    [Header("References")]
    public SpawnOnMouseClick spawner;
    public PushOnMouseClick pusher;
    public CameraPan panner;
    public MusicManager musicManager;
+    public Canvas canvas;

    protected void Awake() {
        spawner = Camera.main.GetComponent<SpawnOnMouseClick>();
@ -43,10 +77,15 @@ public class GameController : MonoBehaviour
        panner = Camera.main.GetComponent<CameraPan>();
        musicManager = GetComponent<MusicManager>();
        simulatedObjects = new List<Gravitation>();
+        blackHole = GameObject.FindGameObjectWithTag("BlackHole").GetComponent<BlackHole>();
+        canvas = GameObject.FindGameObjectWithTag("Canvas").GetComponent<Canvas>();
    }

    protected void Start() {
        maxTierPresent = -1;
+        LevelAntig = 0;
+        LevelFission = 0;
+        LevelMatter = 0;
    }

    public void CheckNewMaxTier(int tier) {
--- a/Assets/Components/Particle.cs
+++ b/Assets/Components/Particle.cs
@ -49,12 +49,6 @@ public class Particle : MonoBehaviour {
        }
    }

-    public float Duration {
-        get {
-            return gameController.particleDurationPerTier * (Tier + 1);
-        }
-    }
-
    public GameObject ParticlePrefab {
        get {
            return gameController.particlePrefab;
--- a/Assets/Components/TextFromBlackHoleMass.cs
+++ b/Assets/Components/TextFromBlackHoleMass.cs
@ -11,6 +11,7 @@ public class TextFromBlackHoleMass : MonoBehaviour

    protected void Awake() {
        text = GetComponent<Text>();
+        blackHole = GameObject.FindGameObjectWithTag("BlackHole").GetComponent<BlackHole>();
    }

    protected void Update()
--- a/Assets/Components/TextFromCost.cs
+++ b/Assets/Components/TextFromCost.cs
@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class TextFromCost : MonoBehaviour
+{
+    protected Text text;
+
+    protected void Awake() {
+        text = GetComponent<Text>();
+    }
+
+    public void DisplayCost(float cost) {
+        if(cost > 0) {
+            text.text = cost.ToString("0");
+        }
+        else {
+            text.text = "";
+        }
+    }
+}
--- a/Assets/Components/TextFromCost.cs.meta
+++ b/Assets/Components/TextFromCost.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 432e89ec84c8b9440ab49c5b48484993
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Components/TextFromUnspentBlackHoleMass.cs
+++ b/Assets/Components/TextFromUnspentBlackHoleMass.cs
@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+
+public class TextFromUnspentBlackHoleMass : MonoBehaviour
+{
+    protected Text text;
+    public BlackHole blackHole;
+
+    protected void Awake() {
+        text = GetComponent<Text>();
+        blackHole = GameObject.FindGameObjectWithTag("BlackHole").GetComponent<BlackHole>();
+    }
+
+    protected void Update()
+    {
+        text.text = blackHole.UnspentMass.ToString("0");
+    }
+}
--- a/Assets/Components/TextFromUnspentBlackHoleMass.cs.meta
+++ b/Assets/Components/TextFromUnspentBlackHoleMass.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2e88c8ce76416bd43959fc254130d130
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Components/UpgradeButton.cs
+++ b/Assets/Components/UpgradeButton.cs
@ -0,0 +1,92 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine.EventSystems;
+
+[Serializable]
+public enum UpgradeType {
+    ANTIG, MATTER, FISSION
+}
+
+public class UpgradeButton : MonoBehaviour 
+{
+    public int cost;
+    public int level;
+    public UpgradeType type;
+
+    public Sprite cantBuySprite;
+    public Sprite canBuySprite;
+    public Sprite hoveredSprite;
+    public Sprite boughtSprite;
+
+    protected bool CanBeBought {
+        get {
+            return gameController.blackHole.UnspentMass >= cost;
+        }
+    }
+
+    protected bool HasBeenBought {
+        get {
+            switch(type) {
+                case UpgradeType.ANTIG: return gameController.LevelAntig >= level;
+                case UpgradeType.MATTER: return gameController.LevelMatter >= level;
+                case UpgradeType.FISSION: return gameController.LevelFission >= level;
+            }
+            //ok c#
+            return false;
+        }
+    }
+
+    protected GameController gameController;
+    protected Image image;
+
+    protected void Awake() {
+        gameController = GameObject.Find("GameController").GetComponent<GameController>();
+        image = GetComponent<Image>();
+    }
+
+    protected void Start() {
+        RefreshUpgrades();
+    }
+
+    public void OnPointerEnter() {
+        if(!HasBeenBought && CanBeBought) {
+            image.sprite = hoveredSprite;
+            gameController.canvas.BroadcastMessage("DisplayCost", cost);
+        }
+    }
+
+    public void OnPointerExit() {
+        if(!HasBeenBought && CanBeBought) {
+            image.sprite = canBuySprite;
+            gameController.canvas.BroadcastMessage("DisplayCost", -1f);
+        }
+    }
+    
+    public void OnPointerClick() {
+        if(!HasBeenBought && CanBeBought) {
+            gameController.blackHole.UnspentMass -= cost;
+            switch(type) {
+                case UpgradeType.ANTIG: gameController.LevelAntig = level; break;
+                case UpgradeType.MATTER: gameController.LevelMatter = level; break;
+                case UpgradeType.FISSION: gameController.LevelFission = level; break;
+            }
+            gameController.canvas.BroadcastMessage("RefreshUpgrades");
+        }
+    }
+
+    public void RefreshUpgrades() {
+        if(HasBeenBought) {
+            image.sprite = boughtSprite;
+        }
+        else if(CanBeBought) {
+            image.sprite = canBuySprite;
+        }
+        else {
+            image.sprite = cantBuySprite;
+        }
+    }
+    
+}
--- a/Assets/Components/UpgradeButton.cs.meta
+++ b/Assets/Components/UpgradeButton.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ca79e58093961194f867028413ed0c92
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/EventSystem.prefab
+++ b/Assets/Prefabs/EventSystem.prefab
@ -0,0 +1,68 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4149834372449123650
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4149834372449123655}
+  - component: {fileID: 4149834372449123648}
+  - component: {fileID: 4149834372449123649}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4149834372449123655
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4149834372449123650}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4149834372449123648
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4149834372449123650}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!114 &4149834372449123649
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4149834372449123650}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalAxis: UIHorizontal
+  m_VerticalAxis: UIVertical
+  m_SubmitButton: UISubmit
+  m_CancelButton: UICancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
--- a/Assets/Prefabs/EventSystem.prefab.meta
+++ b/Assets/Prefabs/EventSystem.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1494a5a29db06cd46ad1296e4d19e683
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/GameController.prefab
+++ b/Assets/Prefabs/GameController.prefab
@ -302,9 +302,9 @@ MonoBehaviour:
  gravitationConstant: 2
  particlesToMerge: 5
  scaleMultiplier: 3
-  particleDurationPerTier: 15
-  bigBangParticles: 150
+  particleDurationConstant: 5
  blackHolePrefab: {fileID: 0}
+  blackHole: {fileID: 0}
  particlePrefab: {fileID: 5473375028011702754, guid: e73d8e05bd7498c4a80a63094f4594a8,
    type: 3}
  tierGradients:
@ -485,15 +485,30 @@ MonoBehaviour:
  - {fileID: 9100000, guid: 93a7bcdb67702484494f3bbd777ad2e8, type: 2}
  simulatedObjects: []
  maxTierPresent: 0
-  upgradePushForce: []
-  upgradePushRadius: []
-  upgradeParticleCount: []
-  levelPush: 0
-  levelClick: 0
+  upgradePushForce:
+  - 0
+  - 100
+  - 1000
+  - 10000
+  - 100000
+  - 1000000
+  upgradePushRadius:
+  - 0
+  - 1
+  - 10
+  - 100
+  - 1000
+  - 10000
+  upgradeParticleCount: 010000000200000003000000040000000500000006000000
+  upgradeParticleTiers: 000000000100000002000000030000000400000005000000
+  _levelAntig: 0
+  _levelMatter: 0
+  _levelFission: 0
  spawner: {fileID: 0}
  pusher: {fileID: 0}
  panner: {fileID: 0}
  musicManager: {fileID: 0}
+  canvas: {fileID: 0}
 --- !u!114 &1086337020
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/Mass.prefab
+++ b/Assets/Prefabs/Mass.prefab
@ -0,0 +1,173 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5870222235659139423
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5870222235659139416}
+  - component: {fileID: 5870222235659139418}
+  - component: {fileID: 5870222235659139417}
+  m_Layer: 5
+  m_Name: Mass Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5870222235659139416
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5870222235659139423}
+  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: 5870222235995333643}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 3.7, y: 15}
+  m_SizeDelta: {x: 111.3, y: 15}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &5870222235659139418
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5870222235659139423}
+  m_CullTransparentMesh: 0
+--- !u!114 &5870222235659139417
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5870222235659139423}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 16bf2f8238537fa49abe10854fc7799a, type: 3}
+    m_FontSize: 12
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 6
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Mass
+--- !u!1 &5870222235995333642
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5870222235995333643}
+  - component: {fileID: 5870222235995333637}
+  - component: {fileID: 5870222235995333636}
+  - component: {fileID: 5870222235995333638}
+  m_Layer: 5
+  m_Name: Mass
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5870222235995333643
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5870222235995333642}
+  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: 5870222235659139416}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 12, y: 12}
+  m_SizeDelta: {x: 115, y: 38.7}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &5870222235995333637
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5870222235995333642}
+  m_CullTransparentMesh: 0
+--- !u!114 &5870222235995333636
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5870222235995333642}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 16bf2f8238537fa49abe10854fc7799a, type: 3}
+    m_FontSize: 32
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 6
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: '50
+
+'
+--- !u!114 &5870222235995333638
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5870222235995333642}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1902801cf75c7ea4f82979802e80aaef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  blackHole: {fileID: 0}
--- a/Assets/Prefabs/Mass.prefab.meta
+++ b/Assets/Prefabs/Mass.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 48928de23c4bf22498a7fc6a69f24b08
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Particle.prefab
+++ b/Assets/Prefabs/Particle.prefab
@ -280,8 +280,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 4ae389aca0e2e82408a1ddd869680dc0, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  forceBase: 1000
-  forceVariance: 250
+  forceBase: 1
+  forceVariance: 0
  emissionPeriod: 2
  emissionQuantity: 2
 --- !u!114 &6410014372807664776
--- a/Assets/Prefabs/Upgrade
+++ b/Assets/Prefabs/Upgrade
@ -0,0 +1,154 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6631481499280746846
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6631481499280746833}
+  - component: {fileID: 6631481499280746835}
+  - component: {fileID: 6631481499280746832}
+  - component: {fileID: 6631481499280746834}
+  - component: {fileID: 6631481499280746837}
+  m_Layer: 5
+  m_Name: Upgrade Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6631481499280746833
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6631481499280746846}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -328, y: 0}
+  m_SizeDelta: {x: 80, y: 80}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &6631481499280746835
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6631481499280746846}
+  m_CullTransparentMesh: 0
+--- !u!114 &6631481499280746832
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6631481499280746846}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 3f40e2ce71fbc8a4ebf95665675b7e9c, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6631481499280746834
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6631481499280746846}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ca79e58093961194f867028413ed0c92, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cost: 10
+  level: 1
+  type: 0
+  cantBuySprite: {fileID: 21300000, guid: 3f40e2ce71fbc8a4ebf95665675b7e9c, type: 3}
+  canBuySprite: {fileID: 21300000, guid: 0e2997bf2b9fb35488e6e07d51a9d79d, type: 3}
+  hoveredSprite: {fileID: 21300000, guid: 4653b81fb2bfcce4f9158c87e4cebeaa, type: 3}
+  boughtSprite: {fileID: 21300000, guid: 1a62b77312e1bad41a4d63592bf31f9e, type: 3}
+--- !u!114 &6631481499280746837
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6631481499280746846}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Delegates:
+  - eventID: 0
+    callback:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 6631481499280746834}
+          m_MethodName: OnPointerEnter
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+  - eventID: 1
+    callback:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 6631481499280746834}
+          m_MethodName: OnPointerExit
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+  - eventID: 4
+    callback:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 6631481499280746834}
+          m_MethodName: OnPointerClick
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
--- a/Assets/Prefabs/Upgrade
+++ b/Assets/Prefabs/Upgrade
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 12df848b888b3fb42bc7e87f205b2b6e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Upgrades.prefab
+++ b/Assets/Prefabs/Upgrades.prefab
--- a/Assets/Prefabs/Upgrades.prefab.meta
+++ b/Assets/Prefabs/Upgrades.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 92e4f986dfcd64b42bf3ab401d8a2ecb
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/Game.unity
+++ b/Assets/Scenes/Game.unity
--- a/Assets/Sprites/Button_State_1.png.meta
+++ b/Assets/Sprites/Button_State_1.png.meta
@ -31,7 +31,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
    aniso: -1
    mipBias: -100
    wrapU: 1
@ -42,11 +42,11 @@ TextureImporter:
  compressionQuality: 50
  spriteMode: 1
  spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 50
+  spriteBorder: {x: 8, y: 8, z: 8, w: 8}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 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: []
--- a/Assets/Sprites/Button_State_2.png.meta
+++ b/Assets/Sprites/Button_State_2.png.meta
@ -31,7 +31,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
    aniso: -1
    mipBias: -100
    wrapU: 1
@ -42,11 +42,11 @@ TextureImporter:
  compressionQuality: 50
  spriteMode: 1
  spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 50
+  spriteBorder: {x: 8, y: 8, z: 8, w: 8}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 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: []
--- a/Assets/Sprites/Button_State_3.png.meta
+++ b/Assets/Sprites/Button_State_3.png.meta
@ -31,7 +31,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
    aniso: -1
    mipBias: -100
    wrapU: 1
@ -42,11 +42,11 @@ TextureImporter:
  compressionQuality: 50
  spriteMode: 1
  spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 50
+  spriteBorder: {x: 8, y: 8, z: 8, w: 8}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 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: []
--- a/Assets/Sprites/Button_State_4.png
+++ b/Assets/Sprites/Button_State_4.png
--- a/Assets/Sprites/Button_State_4.png.meta
+++ b/Assets/Sprites/Button_State_4.png.meta
@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: 1a62b77312e1bad41a4d63592bf31f9e
+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: 0
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 50
+  spriteBorder: {x: 8, y: 8, z: 8, w: 8}
+  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: 
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
@ -101,3 +101,67 @@ InputManager:
    type: 0
    axis: 0
    joyNum: 0
+  - serializedVersion: 3
+    m_Name: UIVertical
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: down
+    positiveButton: up
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0
+    sensitivity: 0.1
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: UIHorizontal
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: left
+    positiveButton: right
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0
+    sensitivity: 0.1
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: UISubmit
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: enter
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0
+    sensitivity: 0.1
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: UICancel
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: backspace
+    altNegativeButton: 
+    altPositiveButton: escape
+    gravity: 0
+    dead: 0
+    sensitivity: 0.1
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -118,7 +118,7 @@ PlayerSettings:
    16:10: 0
    16:9: 1
    Others: 0
-  bundleVersion: 0.2
+  bundleVersion: 0.3
  preloadedAssets: []
  metroInputSource: 0
  wsaTransparentSwapchain: 0
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@ -6,6 +6,7 @@ TagManager:
  tags:
  - Particle
  - BlackHole
+  - Canvas
  layers:
  - Default
  - TransparentFX