diff --git a/Assets/Art/Building/Fan-v2.png.meta b/Assets/Art/Building/Fan-v2.png.meta index 70be847..75db711 100644 --- a/Assets/Art/Building/Fan-v2.png.meta +++ b/Assets/Art/Building/Fan-v2.png.meta @@ -37,9 +37,9 @@ TextureImporter: filterMode: 0 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/Art/Building/Fermentrer-v1.png.meta b/Assets/Art/Building/Fermentrer-v1.png.meta index 318f655..65744f6 100644 --- a/Assets/Art/Building/Fermentrer-v1.png.meta +++ b/Assets/Art/Building/Fermentrer-v1.png.meta @@ -34,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 0 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/Art/Building/Freezer-v1.png.meta b/Assets/Art/Building/Freezer-v1.png.meta index 7e7e56a..d36861a 100644 --- a/Assets/Art/Building/Freezer-v1.png.meta +++ b/Assets/Art/Building/Freezer-v1.png.meta @@ -34,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 0 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/Art/Building/Grinder-v1.png.meta b/Assets/Art/Building/Grinder-v1.png.meta index 52d1e3a..22c17eb 100644 --- a/Assets/Art/Building/Grinder-v1.png.meta +++ b/Assets/Art/Building/Grinder-v1.png.meta @@ -34,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 0 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/Art/Building/HeatExchanger-v1.png.meta b/Assets/Art/Building/HeatExchanger-v1.png.meta index a065ff3..3f1dae5 100644 --- a/Assets/Art/Building/HeatExchanger-v1.png.meta +++ b/Assets/Art/Building/HeatExchanger-v1.png.meta @@ -34,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 0 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/Art/Building/Mixer-v1.png.meta b/Assets/Art/Building/Mixer-v1.png.meta index 6b29a84..60aa9e2 100644 --- a/Assets/Art/Building/Mixer-v1.png.meta +++ b/Assets/Art/Building/Mixer-v1.png.meta @@ -34,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 0 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/Art/Building/Peeler-v1.png.meta b/Assets/Art/Building/Peeler-v1.png.meta index c9d8671..3ed2ad3 100644 --- a/Assets/Art/Building/Peeler-v1.png.meta +++ b/Assets/Art/Building/Peeler-v1.png.meta @@ -34,12 +34,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 0 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/Art/Building/Presser-v1.png.meta b/Assets/Art/Building/Presser-v1.png.meta index c2bcb2e..b9d0140 100644 --- a/Assets/Art/Building/Presser-v1.png.meta +++ b/Assets/Art/Building/Presser-v1.png.meta @@ -37,9 +37,9 @@ TextureImporter: filterMode: 0 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/Art/Building/Slicer-v1.png.meta b/Assets/Art/Building/Slicer-v1.png.meta index 946dd92..34dd33a 100644 --- a/Assets/Art/Building/Slicer-v1.png.meta +++ b/Assets/Art/Building/Slicer-v1.png.meta @@ -37,9 +37,9 @@ TextureImporter: filterMode: 0 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/Art/Building/Spring-v1.png.meta b/Assets/Art/Building/Spring-v1.png.meta index 139433f..928f009 100644 --- a/Assets/Art/Building/Spring-v1.png.meta +++ b/Assets/Art/Building/Spring-v1.png.meta @@ -37,9 +37,9 @@ TextureImporter: filterMode: 0 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/Art/Building/Stair-v1.png.meta b/Assets/Art/Building/Stair-v1.png.meta index 47b3d13..cb8e6cf 100644 --- a/Assets/Art/Building/Stair-v1.png.meta +++ b/Assets/Art/Building/Stair-v1.png.meta @@ -37,9 +37,9 @@ TextureImporter: filterMode: 0 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/Art/Building/Wall-v1.png.meta b/Assets/Art/Building/Wall-v1.png.meta index ca9fcbc..621fae8 100644 --- a/Assets/Art/Building/Wall-v1.png.meta +++ b/Assets/Art/Building/Wall-v1.png.meta @@ -37,9 +37,9 @@ TextureImporter: filterMode: 0 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/Prefabs/Buildings/FermenterBuilding.prefab b/Assets/Prefabs/Buildings/FermenterBuilding.prefab index ff73c78..4840169 100644 --- a/Assets/Prefabs/Buildings/FermenterBuilding.prefab +++ b/Assets/Prefabs/Buildings/FermenterBuilding.prefab @@ -1,5 +1,100 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2797537983845822670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6694629888426113560} + - component: {fileID: 154049142448423677} + - component: {fileID: 6784751758212295617} + m_Layer: 0 + m_Name: Input + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6694629888426113560 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2797537983845822670} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 349759262521275434} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &154049142448423677 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2797537983845822670} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 60} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 80, y: 10} + m_EdgeRadius: 0 +--- !u!114 &6784751758212295617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2797537983845822670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a471a3a004424f44aed18516c22740e, type: 3} + m_Name: + m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.TriggerDetector --- !u!1 &3120737319915985322 GameObject: m_ObjectHideFlags: 0 @@ -31,7 +126,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4772899126792310269} + - {fileID: 6694629888426113560} + - {fileID: 46527758759940608} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -91,6 +189,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.FermenterBuilding BuildingSprite: {fileID: 21300000, guid: f135a55d214afc24c827d0eb4071c1d2, type: 3} k__BackingField: {x: 4, y: 4} + OutputLocation: {fileID: 46527758759940608} + Trigger: {fileID: 6784751758212295617} --- !u!114 &1828818248827728404 MonoBehaviour: m_ObjectHideFlags: 0 @@ -147,3 +247,116 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &8959172932990932085 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4772899126792310269} + - component: {fileID: 5531633789406391328} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4772899126792310269 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8959172932990932085} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 349759262521275434} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &5531633789406391328 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8959172932990932085} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 120, y: 120} + m_EdgeRadius: 0 +--- !u!1 &9144576229309645603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 46527758759940608} + m_Layer: 0 + m_Name: Output + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &46527758759940608 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9144576229309645603} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 349759262521275434} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/Buildings/GrinderBuilding.prefab b/Assets/Prefabs/Buildings/GrinderBuilding.prefab index 2df2c25..5c5340f 100644 --- a/Assets/Prefabs/Buildings/GrinderBuilding.prefab +++ b/Assets/Prefabs/Buildings/GrinderBuilding.prefab @@ -1,5 +1,100 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3595430833662513248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2120849195125567810} + - component: {fileID: 3176033811562508254} + - component: {fileID: 8610151596999353102} + m_Layer: 0 + m_Name: Input + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2120849195125567810 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3595430833662513248} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3111769981366537158} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &3176033811562508254 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3595430833662513248} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 60} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 80, y: 10} + m_EdgeRadius: 0 +--- !u!114 &8610151596999353102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3595430833662513248} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a471a3a004424f44aed18516c22740e, type: 3} + m_Name: + m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.TriggerDetector --- !u!1 &4440782070338813379 GameObject: m_ObjectHideFlags: 0 @@ -31,7 +126,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2120849195125567810} + - {fileID: 8713442339966742884} + - {fileID: 1903441496802878725} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -91,6 +189,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.GrinderBuilding BuildingSprite: {fileID: 21300000, guid: 8d42c129cbe5318479f6e0b645163274, type: 3} k__BackingField: {x: 4, y: 4} + OutputLocation: {fileID: 8713442339966742884} + Trigger: {fileID: 8610151596999353102} --- !u!114 &6912344384447578426 MonoBehaviour: m_ObjectHideFlags: 0 @@ -147,3 +247,116 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &8756157827413143831 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8713442339966742884} + m_Layer: 0 + m_Name: Output + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8713442339966742884 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8756157827413143831} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3111769981366537158} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &9156908484727649311 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1903441496802878725} + - component: {fileID: 4188431694280148088} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1903441496802878725 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9156908484727649311} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3111769981366537158} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &4188431694280148088 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9156908484727649311} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 120, y: 120} + m_EdgeRadius: 0 diff --git a/Assets/Prefabs/Buildings/HeatExchangerBuilding.prefab b/Assets/Prefabs/Buildings/HeatExchangerBuilding.prefab index c634739..d1b063f 100644 --- a/Assets/Prefabs/Buildings/HeatExchangerBuilding.prefab +++ b/Assets/Prefabs/Buildings/HeatExchangerBuilding.prefab @@ -1,5 +1,130 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &231461683433390431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2317104729407442884} + - component: {fileID: 4484406755483081998} + - component: {fileID: 1942144834775209} + m_Layer: 0 + m_Name: Colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2317104729407442884 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231461683433390431} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 615875551494808037} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &4484406755483081998 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231461683433390431} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 60} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 80, y: 40} + m_EdgeRadius: 0 +--- !u!61 &1942144834775209 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231461683433390431} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: -60} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 80, y: 40} + m_EdgeRadius: 0 --- !u!1 &3206624505647374516 GameObject: m_ObjectHideFlags: 0 @@ -31,7 +156,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2317104729407442884} + - {fileID: 4785248704247185961} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -91,6 +218,7 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.HeatExchangerBuilding BuildingSprite: {fileID: 21300000, guid: 4b8b1602f53a3d04e8554daac94b7407, type: 3} k__BackingField: {x: 2, y: 4} + Trigger: {fileID: 5969051150651987790} --- !u!114 &4629984205962621613 MonoBehaviour: m_ObjectHideFlags: 0 @@ -147,3 +275,98 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &6967340363635588965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4785248704247185961} + - component: {fileID: 1227939586632674031} + - component: {fileID: 5969051150651987790} + m_Layer: 0 + m_Name: Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4785248704247185961 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6967340363635588965} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 615875551494808037} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1227939586632674031 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6967340363635588965} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 50, y: 80} + m_EdgeRadius: 0 +--- !u!114 &5969051150651987790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6967340363635588965} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a471a3a004424f44aed18516c22740e, type: 3} + m_Name: + m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.TriggerDetector diff --git a/Assets/Prefabs/Buildings/MixerBuilding.prefab b/Assets/Prefabs/Buildings/MixerBuilding.prefab index 987e9a0..f0b280a 100644 --- a/Assets/Prefabs/Buildings/MixerBuilding.prefab +++ b/Assets/Prefabs/Buildings/MixerBuilding.prefab @@ -31,7 +31,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1314969926453708842} + - {fileID: 6563382296303864760} + - {fileID: 2174585347010182927} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -91,6 +94,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.MixerBuilding BuildingSprite: {fileID: 21300000, guid: 9f1c3134cd186a9438dbb8c240bcd2b1, type: 3} k__BackingField: {x: 4, y: 4} + OutputLocation: {fileID: 6563382296303864760} + Trigger: {fileID: 7949324066162630886} --- !u!114 &6045947053417562082 MonoBehaviour: m_ObjectHideFlags: 0 @@ -147,3 +152,211 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &1896091729327988310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2174585347010182927} + - component: {fileID: 2174264362221989975} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2174585347010182927 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1896091729327988310} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4565707996392801965} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &2174264362221989975 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1896091729327988310} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 120, y: 120} + m_EdgeRadius: 0 +--- !u!1 &4179939457682994329 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1314969926453708842} + - component: {fileID: 8590395300285310144} + - component: {fileID: 7949324066162630886} + m_Layer: 0 + m_Name: Input + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1314969926453708842 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4179939457682994329} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4565707996392801965} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &8590395300285310144 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4179939457682994329} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 60} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 80, y: 10} + m_EdgeRadius: 0 +--- !u!114 &7949324066162630886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4179939457682994329} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a471a3a004424f44aed18516c22740e, type: 3} + m_Name: + m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.TriggerDetector +--- !u!1 &4528332901871762230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6563382296303864760} + m_Layer: 0 + m_Name: Output + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6563382296303864760 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4528332901871762230} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4565707996392801965} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/Buildings/PeelerBuilding.prefab b/Assets/Prefabs/Buildings/PeelerBuilding.prefab index 32811d5..f805734 100644 --- a/Assets/Prefabs/Buildings/PeelerBuilding.prefab +++ b/Assets/Prefabs/Buildings/PeelerBuilding.prefab @@ -1,5 +1,118 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &4408316760645938481 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7853914489562571460} + m_Layer: 0 + m_Name: Output + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7853914489562571460 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4408316760645938481} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5099983185378734521} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4621790073979710715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5225840504514956443} + - component: {fileID: 1379798913818159654} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5225840504514956443 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4621790073979710715} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5099983185378734521} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1379798913818159654 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4621790073979710715} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 120, y: 120} + m_EdgeRadius: 0 --- !u!1 &7230295749174351428 GameObject: m_ObjectHideFlags: 0 @@ -31,7 +144,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1491635797669348914} + - {fileID: 7853914489562571460} + - {fileID: 5225840504514956443} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -91,6 +207,8 @@ MonoBehaviour: m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.PeelerBuilding BuildingSprite: {fileID: 21300000, guid: 76e74d3975dacae4aa24fde5fa7634de, type: 3} k__BackingField: {x: 4, y: 4} + OutputLocation: {fileID: 7853914489562571460} + Trigger: {fileID: 2114377584670844347} --- !u!114 &8988971606233955480 MonoBehaviour: m_ObjectHideFlags: 0 @@ -147,3 +265,98 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &7589395486295387791 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1491635797669348914} + - component: {fileID: 2336605242495089154} + - component: {fileID: 2114377584670844347} + m_Layer: 0 + m_Name: Input + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1491635797669348914 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7589395486295387791} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5099983185378734521} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &2336605242495089154 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7589395486295387791} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 60} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 80, y: 10} + m_EdgeRadius: 0 +--- !u!114 &2114377584670844347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7589395486295387791} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a471a3a004424f44aed18516c22740e, type: 3} + m_Name: + m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.TriggerDetector diff --git a/Assets/Scripts/Game/Buildings/Automation/FermenterBuilding.cs b/Assets/Scripts/Game/Buildings/Automation/FermenterBuilding.cs index 7259f69..0b6bd8e 100644 --- a/Assets/Scripts/Game/Buildings/Automation/FermenterBuilding.cs +++ b/Assets/Scripts/Game/Buildings/Automation/FermenterBuilding.cs @@ -1,7 +1,11 @@ -namespace Fruitomation.Game +using UnityEngine; + +namespace Fruitomation.Game { public class FermenterBuilding : Building { - + [Header("Fermenter Specific")] + [SerializeField] private RectTransform OutputLocation; + [SerializeField] private TriggerDetector Trigger; } } diff --git a/Assets/Scripts/Game/Buildings/Automation/GrinderBuilding.cs b/Assets/Scripts/Game/Buildings/Automation/GrinderBuilding.cs index 78f4577..a0a77be 100644 --- a/Assets/Scripts/Game/Buildings/Automation/GrinderBuilding.cs +++ b/Assets/Scripts/Game/Buildings/Automation/GrinderBuilding.cs @@ -1,7 +1,11 @@ -namespace Fruitomation.Game +using UnityEngine; + +namespace Fruitomation.Game { public class GrinderBuilding : Building { - + [Header("Grinder Specific")] + [SerializeField] private RectTransform OutputLocation; + [SerializeField] private TriggerDetector Trigger; } } diff --git a/Assets/Scripts/Game/Buildings/Automation/HeatExchangerBuilding.cs b/Assets/Scripts/Game/Buildings/Automation/HeatExchangerBuilding.cs index 0dd689a..843c06c 100644 --- a/Assets/Scripts/Game/Buildings/Automation/HeatExchangerBuilding.cs +++ b/Assets/Scripts/Game/Buildings/Automation/HeatExchangerBuilding.cs @@ -1,7 +1,10 @@ -namespace Fruitomation.Game +using UnityEngine; + +namespace Fruitomation.Game { public class HeatExchangerBuilding : Building { - + [Header("Heat Exchanger Specific")] + [SerializeField] private TriggerDetector Trigger; } } diff --git a/Assets/Scripts/Game/Buildings/Automation/MixerBuilding.cs b/Assets/Scripts/Game/Buildings/Automation/MixerBuilding.cs index 3e923e2..b9225a6 100644 --- a/Assets/Scripts/Game/Buildings/Automation/MixerBuilding.cs +++ b/Assets/Scripts/Game/Buildings/Automation/MixerBuilding.cs @@ -1,7 +1,11 @@ -namespace Fruitomation.Game +using UnityEngine; + +namespace Fruitomation.Game { public class MixerBuilding : Building { - + [Header("Mixer Specific")] + [SerializeField] private RectTransform OutputLocation; + [SerializeField] private TriggerDetector Trigger; } } diff --git a/Assets/Scripts/Game/Buildings/Automation/PeelerBuilding.cs b/Assets/Scripts/Game/Buildings/Automation/PeelerBuilding.cs index 9d350b9..e593271 100644 --- a/Assets/Scripts/Game/Buildings/Automation/PeelerBuilding.cs +++ b/Assets/Scripts/Game/Buildings/Automation/PeelerBuilding.cs @@ -1,8 +1,11 @@ -namespace Fruitomation.Game +using UnityEngine; + +namespace Fruitomation.Game { public class PeelerBuilding : Building { - - + [Header("Grinder Specific")] + [SerializeField] private RectTransform OutputLocation; + [SerializeField] private TriggerDetector Trigger; } } diff --git a/Assets/Scripts/Game/Buildings/Automation/PresserBuilding.cs b/Assets/Scripts/Game/Buildings/Automation/PresserBuilding.cs index 7128afc..e45de72 100644 --- a/Assets/Scripts/Game/Buildings/Automation/PresserBuilding.cs +++ b/Assets/Scripts/Game/Buildings/Automation/PresserBuilding.cs @@ -1,16 +1,16 @@ using System.Collections.Generic; -using System.Linq; using Fruitomation.Game.Items; using JetBrains.Annotations; using UnityEngine.Scripting; using Fruitomation.Global; using UnityEngine; +using System.Linq; namespace Fruitomation.Game { public class PresserBuilding : Building { - [Header("Presser Specific Buildings")] + [Header("Presser Specific")] [SerializeField] private Animator PresserAnimator; [SerializeField] private Collider2D TopCollider; [SerializeField] private Collider2D BottomCollider;