From 683fdd7ad9e9faf3690d7646cb7d3992abe17b28 Mon Sep 17 00:00:00 2001
From: Kimi Heinonen <kimiheinonen@hotmail.com>
Date: Sun, 3 Mar 2019 20:31:42 +0200
Subject: [PATCH] fine tune
---
Assets/Prefab/City.prefab | 2 ++
Assets/Prefab/ShopTrigger.prefab | 6 +++---
Assets/Scripts/City/City.cs | 7 ++++---
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Assets/Prefab/City.prefab b/Assets/Prefab/City.prefab
index 9109199..dfe9949 100644
--- a/Assets/Prefab/City.prefab
+++ b/Assets/Prefab/City.prefab
@@ -131,6 +131,8 @@ MonoBehaviour:
resourcePoolLevel: 0
roadLevel: 0
paneelienmaara: 0
+ shopPreFab: {fileID: 7162492650952366835, guid: f0354d4d550e4994cb346ed8fce67111,
+ type: 3}
--- !u!1001 &5416443199572362591
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefab/ShopTrigger.prefab b/Assets/Prefab/ShopTrigger.prefab
index a48490a..44648fe 100644
--- a/Assets/Prefab/ShopTrigger.prefab
+++ b/Assets/Prefab/ShopTrigger.prefab
@@ -57,7 +57,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 1, y: 0.67}
+ m_Size: {x: 1, y: 0.7}
m_EdgeRadius: 0
--- !u!212 &7162492650593089022
SpriteRenderer:
@@ -479,7 +479,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 1, y: 0.66}
+ m_Size: {x: 1, y: 0.7}
m_EdgeRadius: 0
--- !u!212 &7162492651555988094
SpriteRenderer:
@@ -598,7 +598,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 3, y: 3.2}
+ m_Size: {x: 5, y: 5}
m_EdgeRadius: 0
--- !u!114 &7162492651648248339
MonoBehaviour:
diff --git a/Assets/Scripts/City/City.cs b/Assets/Scripts/City/City.cs
index f3f2fd1..cbc5ddb 100644
--- a/Assets/Scripts/City/City.cs
+++ b/Assets/Scripts/City/City.cs
@@ -31,7 +31,8 @@ public class City : MonoBehaviour
public int paneelienmaara = 0;
-
+ [SerializeField]
+ GameObject shopPreFab;
// Start is called before the first frame update
void Start()
@@ -169,8 +170,8 @@ public class City : MonoBehaviour
{
return workerlista;
}
- public void OnMouseDown()
+ private void OnMouseEnter()
{
- AddCollector();
+ Instantiate<GameObject>(shopPreFab);
}
}
--
GitLab