Quarry works

Assets/Prefab/GameWin.prefab

@@ -9,7 +9,11 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2388334960364419616}
+<<<<<<< HEAD
   - component: {fileID: 506448308499323742}
+=======
+  - component: {fileID: 3814219544740361507}
+>>>>>>> 26ce5a29592f8304c4bcd6a6414c9c688c665a12
   m_Layer: 0
   m_Name: GameWin
   m_TagString: Untagged
@@ -31,7 +35,11 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+<<<<<<< HEAD
 --- !u!114 &506448308499323742
+=======
+--- !u!114 &3814219544740361507
+>>>>>>> 26ce5a29592f8304c4bcd6a6414c9c688c665a12
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -43,5 +51,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d3674a5cdecf6e14abe5d88e6f0f7618, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+<<<<<<< HEAD
   housePrefab: {fileID: 0}
   workerPrefab: {fileID: 0}
+=======
+  housePrefab: {fileID: 7607310651946833762, guid: 118ed7528555d45418acb5a87b330000,
+    type: 3}
+  workerPrefab: {fileID: 548039319383633024, guid: 7dc194a2047a39340a91ca7636a56290,
+    type: 3}
+>>>>>>> 26ce5a29592f8304c4bcd6a6414c9c688c665a12

Assets/Scripts/EventSystem/EventType.cs

@@ -10,7 +10,8 @@ public enum EventType
     CitySmall, 
     CityBig, 
     HuntingSmall,
-    HuntingBig, 
+    HuntingBig,
+    WinMusic,
     //effects
     WoodChopped, 
     StoneCut, 

Assets/Scripts/GameEnd/WinGame.cs

@@ -26,6 +26,7 @@ public class WinGame : MonoBehaviour
 
     private IEnumerator EndGame()
     {
+        EventSystem.EventHappened(EventType.WinMusic);
         float spawnRate = 5f;
         int count = 0;
         while (count < 9)
@@ -44,6 +45,7 @@ public class WinGame : MonoBehaviour
             yield return new WaitForSeconds(spawnRate);
         }
         count = 0;
+        EventSystem.EventHappened(EventType.TimePeriodChanged);
         while (count < 150)
         {
             GameObject go = Instantiate<GameObject>(workerPrefab);

Assets/Scripts/UI.meta

+fileFormatVersion: 2
+guid: 6c8bd6d1b4693cf40af60b640e73f52b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/Border.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Border : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    private void OnMouseEnter()
+    {
+        //Debug.Log("Kauppa kiinni");
+    }
+}

Assets/Scripts/UI/Border.cs.meta

+fileFormatVersion: 2
+guid: 9dfa4cb8b74a55949bb9087ebc8eafef
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/BuyCapacity.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BuyCapacity : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    private void OnMouseOver()
+    {
+        if (Input.GetMouseButtonDown(1))
+        {
+            Debug.Log("Ostit Tilaa");
+        }
+    }
+}

Assets/Scripts/UI/BuyCapacity.cs.meta

+fileFormatVersion: 2
+guid: 94999d051d3d2a4438290a189966dcf8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/BuyCity.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BuyCity : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    private void OnMouseOver()
+    {
+        if (Input.GetMouseButtonDown(1))
+        {
+            Debug.Log("Ostit Voiton");
+        }
+    }
+}

Assets/Scripts/UI/BuyCity.cs.meta

+fileFormatVersion: 2
+guid: 2d496a86a17b9d0489876dbf81a4e9bc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/BuyCollector.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BuyCollector : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    private void OnMouseOver()
+    {
+        if (Input.GetMouseButtonDown(1))
+        {
+            Debug.Log("Ostit Tyovoimaa");
+        }
+    }
+}

Assets/Scripts/UI/BuyCollector.cs.meta

+fileFormatVersion: 2
+guid: fb47c1de3fd43ba4384f11aad63ef0a0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/BuyEfficiency.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BuyEfficiency : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    private void OnMouseOver()
+    {
+        if (Input.GetMouseButtonDown(1))
+        {
+            Debug.Log("Ostit Tehokkuutta");
+        }
+    }
+}

Assets/Scripts/UI/BuyEfficiency.cs.meta

+fileFormatVersion: 2
+guid: 06839e5c330959c45a2523fafd4a33ab
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/BuyPopulation.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BuyPopulation : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    private void OnMouseOver()
+    {
+        if (Input.GetMouseButtonDown(1))
+        {
+            Debug.Log("Ostit Ihmisia");
+        }
+    }
+}

Assets/Scripts/UI/BuyPopulation.cs.meta

+fileFormatVersion: 2
+guid: 515574251ae631045a8464c9761619c7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/BuySpeed.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BuySpeed : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    private void OnMouseOver()
+    {
+        if (Input.GetMouseButtonDown(1))
+        {
+            Debug.Log("Ostit Nopeutta");
+        }
+    }
+}

Assets/Scripts/UI/BuySpeed.cs.meta

+fileFormatVersion: 2
+guid: 9c1faba44d65021418a87209c49f7953
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/UpgradeShop.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UpgradeShop : MonoBehaviour
+{ 
+    private bool shopVisible;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        shopVisible = false;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    private void OnMouseEnter()
+    {
+        //Debug.Log("Kauppa auki");
+    }
+}