From 99f9df0754b5583d7c90d202a4bbff484eb825f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leevi=20Gr=C3=B6nlund?= <lejugr@utu.fi>
Date: Sun, 3 Mar 2019 15:21:47 +0200
Subject: [PATCH] Added resource images to prefabs etc
---
.../{StoneResource.prefab => Outcrop.prefab} | 2 +
...source.prefab.meta => Outcrop.prefab.meta} | 0
Assets/Prefab/StoneResouce.prefab | 103 ++++++++++++++++++
Assets/Prefab/StoneResouce.prefab.meta | 7 ++
Assets/Prefab/WoodResource.prefab | 1 +
Assets/Scripts/Resources/Outcrop.cs | 3 +-
Assets/Scripts/Resources/Resource.cs | 11 +-
7 files changed, 117 insertions(+), 10 deletions(-)
rename Assets/Prefab/{StoneResource.prefab => Outcrop.prefab} (99%)
rename Assets/Prefab/{StoneResource.prefab.meta => Outcrop.prefab.meta} (100%)
create mode 100644 Assets/Prefab/StoneResouce.prefab
create mode 100644 Assets/Prefab/StoneResouce.prefab.meta
diff --git a/Assets/Prefab/StoneResource.prefab b/Assets/Prefab/Outcrop.prefab
similarity index 99%
rename from Assets/Prefab/StoneResource.prefab
rename to Assets/Prefab/Outcrop.prefab
index c27b2e4..672f75b 100644
--- a/Assets/Prefab/StoneResource.prefab
+++ b/Assets/Prefab/Outcrop.prefab
@@ -93,6 +93,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 35ded1978221bf847a4ec774ba1dc91c, type: 3}
m_Name:
m_EditorClassIdentifier:
+ wood: 0
+ quarry: {fileID: 0}
--- !u!61 &7985519473791055737
BoxCollider2D:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefab/StoneResource.prefab.meta b/Assets/Prefab/Outcrop.prefab.meta
similarity index 100%
rename from Assets/Prefab/StoneResource.prefab.meta
rename to Assets/Prefab/Outcrop.prefab.meta
diff --git a/Assets/Prefab/StoneResouce.prefab b/Assets/Prefab/StoneResouce.prefab
new file mode 100644
index 0000000..f68b671
--- /dev/null
+++ b/Assets/Prefab/StoneResouce.prefab
@@ -0,0 +1,103 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6392040089189307514
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4378544729630622907}
+ - component: {fileID: 6537826622454043909}
+ - component: {fileID: 4263803972273305565}
+ m_Layer: 0
+ m_Name: StoneResouce
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4378544729630622907
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6392040089189307514}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 3.8576136, y: 4.473294, 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!212 &6537826622454043909
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6392040089189307514}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_Sprite: {fileID: 21300000, guid: 69185a3ed6e033642b69e02c07c3804c, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 1, y: 1}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!114 &4263803972273305565
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6392040089189307514}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 23de19c4f52dce74cb534c58eddea6df, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ resources: 0
+ resourceImg: {fileID: 21300000, guid: 3afeae76aeeab15babf97f3209d522dd, type: 3}
+ sprites:
+ - {fileID: 21300000, guid: 69185a3ed6e033642b69e02c07c3804c, type: 3}
+ - {fileID: 21300002, guid: 69185a3ed6e033642b69e02c07c3804c, type: 3}
+ - {fileID: 21300004, guid: 69185a3ed6e033642b69e02c07c3804c, type: 3}
+ - {fileID: 21300006, guid: 69185a3ed6e033642b69e02c07c3804c, type: 3}
+ - {fileID: 21300008, guid: 69185a3ed6e033642b69e02c07c3804c, type: 3}
+ - {fileID: 21300010, guid: 69185a3ed6e033642b69e02c07c3804c, type: 3}
diff --git a/Assets/Prefab/StoneResouce.prefab.meta b/Assets/Prefab/StoneResouce.prefab.meta
new file mode 100644
index 0000000..6ce00dd
--- /dev/null
+++ b/Assets/Prefab/StoneResouce.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7cc2749849aa8ed44822124911f81580
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefab/WoodResource.prefab b/Assets/Prefab/WoodResource.prefab
index bdbac84..c1572fe 100644
--- a/Assets/Prefab/WoodResource.prefab
+++ b/Assets/Prefab/WoodResource.prefab
@@ -120,6 +120,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
resources: 0
+ resourceImg: {fileID: 21300000, guid: 28f55f31ef54a8ad3a4167614cf51050, type: 3}
sprites:
- {fileID: 21300000, guid: c6be499253804b13b9d479f7394d8bd4, type: 3}
- {fileID: 21300002, guid: c6be499253804b13b9d479f7394d8bd4, type: 3}
diff --git a/Assets/Scripts/Resources/Outcrop.cs b/Assets/Scripts/Resources/Outcrop.cs
index 9f1f36f..774c021 100644
--- a/Assets/Scripts/Resources/Outcrop.cs
+++ b/Assets/Scripts/Resources/Outcrop.cs
@@ -7,8 +7,7 @@ public class Outcrop : MonoBehaviour
{
[SerializeField]
private int wood;
-
- [SerializeField]
+
private GameObject quarry;
public int getAmount()
diff --git a/Assets/Scripts/Resources/Resource.cs b/Assets/Scripts/Resources/Resource.cs
index cd22d75..0282810 100644
--- a/Assets/Scripts/Resources/Resource.cs
+++ b/Assets/Scripts/Resources/Resource.cs
@@ -8,19 +8,14 @@ public abstract class Resource : MonoBehaviour
private int resources;
[SerializeField]
- private bool resourceSource;
+ private Sprite resourceImg;
[SerializeField]
protected Sprite[] sprites;
- public bool isResourceSource()
+ public Sprite getResourceImg()
{
- return resourceSource;
- }
-
- public void setResourceSource(bool i)
- {
- resourceSource = i;
+ return resourceImg;
}
public virtual void setAmount(int i)
--
GitLab