From e719f342530116da231f15a35a911300b597a876 Mon Sep 17 00:00:00 2001 From: janis Date: Wed, 16 Feb 2022 20:36:55 +0100 Subject: [PATCH] Added Tree Sprite --- Assets/Aseprite Projects/tree_oak.aseprite | Bin 0 -> 2545 bytes .../Aseprite Projects/tree_oak.aseprite.meta | 7 + Assets/Prefabs.meta | 8 + Assets/Prefabs/tree_oak.prefab | 121 +++++++ Assets/Prefabs/tree_oak.prefab.meta | 7 + Assets/Scenes/SampleScene.unity | 306 +++++++++++++++++- Assets/Scripts/Interactable.cs | 24 +- Assets/Sprites/tree_oak.png | Bin 0 -> 3019 bytes Assets/Sprites/tree_oak.png.meta | 134 ++++++++ .../BurstAotSettings_StandaloneWindows.json | 17 + ProjectSettings/CommonBurstAotSettings.json | 6 + UserSettings/Layouts/default-2021.dwlt | 32 +- 12 files changed, 635 insertions(+), 27 deletions(-) create mode 100644 Assets/Aseprite Projects/tree_oak.aseprite create mode 100644 Assets/Aseprite Projects/tree_oak.aseprite.meta create mode 100644 Assets/Prefabs.meta create mode 100644 Assets/Prefabs/tree_oak.prefab create mode 100644 Assets/Prefabs/tree_oak.prefab.meta create mode 100644 Assets/Sprites/tree_oak.png create mode 100644 Assets/Sprites/tree_oak.png.meta create mode 100644 ProjectSettings/BurstAotSettings_StandaloneWindows.json create mode 100644 ProjectSettings/CommonBurstAotSettings.json diff --git a/Assets/Aseprite Projects/tree_oak.aseprite b/Assets/Aseprite Projects/tree_oak.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..6069081d12f361a9b82f6c45fd8e24fb8d803205 GIT binary patch literal 2545 zcmcIji(8Us8>cO2c3xkHHm*1jdmd%nB)FmnH2R}qEM(9FP`auR{c)D#g-feE3*w(r{Z2Ykl1y z0==kQ210`fAP3Mg5C{}yIe)E>K+Berp!Jsh|5%9@f8&hxdsl0V!Dh>`c6e|3H#@i` z-s@4tX>|N(*Q%|Hd!kd_VU|(0I*l_wYS!n#;zSy0IBoPkf-b(kx^@|Vx};; zBwbai!LO{SCUQd0jUP1EUlt_7<&GWB>N5c94tjJxE_XkDa;wy? zpiJLT2fJM@ZK!WWwx_;Hpas_%r{1jL^#06w)pi(fO2LXVm8VB1WBAP&r2&S&9WN?v z%@8c?D^Fnug(&OuHuaxsq#LOEykp!g8KZ~7C)3)(@aarb{dQU;#Fthn52~(i<8hF_ z$C~Pev1yr~TdZBQ3n!&+l&~0TZcgwMtWw7LRFm;@YFPKmV%OWbkhr2FND}Q@9S2EK zM-?zBDYU+$#fW-LR=HwO zufBb!%Rd0e3{~{RvZ^FM^>DBoJT>}m4W{Rq zTBw=DuKOu5ukd=PiiNFAFPH$|bC;kz8WV3@AK`}Of(3N+>4h5i5o|#b7UK|(5ult%kR`c6`rX0@zF-$ zR(Le4tlhhld^vL!_w;I}nVbXMG}qr@X^+Q-T$Jpxytd-&wT`%e zhhxw9fcIvxt4K69@BG;~J6pucB6jDuWgc~mv!ASBm2xyq6!+9i5o#hiv(yn%36D7M zs(T$rRYJdVq}c)A2-c{=3=GJ=4u@p@obo7CLioGky#l;3rx3MAY88D zpKs_Jh&?2^!Mz&0iZLLrR|Z$yC=a|H@6YWftG`9>GDR^uB4fdo+>(6d3wDy-pl{h{RK`wKM`GljX`RZY z_hr=sl~n0Ow66)d>>}l|&v@xI+TCweGYMnsnUaU4O#b7hMT{E5A+jK*F{4bVU$bqe zk7~hGj??Pc##o=qOdO$K(geACv!!4{mzq2%E7x-+Yvo89kf)|IZR!6@}9SAU~GLNWMc!@Jg= z2BALgHNnjALn2nNLvs!cnb_QO{m}2wPXgWB83rEF$gAKwF_`ABG4$XdqI<$x2E#a1 zx)$r-vmD(DyI(tEN+KZkvn5~ZLb7)VFw%(P$2``oNbOpM6pAYK-r&$&EJO_+osi`P z;uE$>e*0DV;x3zN){Gua5#8*Rwzs^l3kaB+o!K3B5X+Mm47RI3LDPv7^+{W^KA?Sg zqUmL01KiM`Q)^%VN?StSurI|KZ7aQE8+&)`lk?fz)LvVHRtWXSdH!7rPm0^LUoAm+ zBb%OWo?nzXjC-cLlD%=5Ev$eYbp=tJg{c|0qVM+z(Z%)3_o>7tFcm}w#aOjF%+s2D}(Hw~^^;PTuuM`0?d z&n{EmbHodS+0XMg{?;?{Wl0VEbNS&iM?nmIU3Vck9xy(ada0V94^B}f5pZ)$Jn*zm znmL6LMlc&Hw-OUBlsJKe+Q+`=1c$p literal 0 HcmV?d00001 diff --git a/Assets/Aseprite Projects/tree_oak.aseprite.meta b/Assets/Aseprite Projects/tree_oak.aseprite.meta new file mode 100644 index 0000000..ba02c9f --- /dev/null +++ b/Assets/Aseprite Projects/tree_oak.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 69863e12964da9a4aa8514db0cdd0349 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta new file mode 100644 index 0000000..d56b7e9 --- /dev/null +++ b/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 831cf7fc9533c2b429e0c8e69e10e25b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/tree_oak.prefab b/Assets/Prefabs/tree_oak.prefab new file mode 100644 index 0000000..8b8d3dc --- /dev/null +++ b/Assets/Prefabs/tree_oak.prefab @@ -0,0 +1,121 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1909482199139559741 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1909482199139559713} + - component: {fileID: 1909482199139559714} + - component: {fileID: 1909482199139559715} + - component: {fileID: 1909482199139559712} + m_Layer: 0 + m_Name: tree_oak + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1909482199139559713 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1909482199139559741} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -5.92, y: 0.79, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1909482199139559714 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1909482199139559741} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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: 518a023177499734197c97667a117512, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.4375, y: 6.6875} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 1 +--- !u!114 &1909482199139559715 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1909482199139559741} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c68a9987090906346b5bc7622cb96556, type: 3} + m_Name: + m_EditorClassIdentifier: + interactionType: 2 + holdDuration: 1 + radius: 3 + centerPoint: {fileID: 1909482199139559713} + harvestDuration: 3 +--- !u!70 &1909482199139559712 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1909482199139559741} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.20796245, y: 0.23104483} + m_Size: {x: 1.9242423, y: 0.67659634} + m_Direction: 1 diff --git a/Assets/Prefabs/tree_oak.prefab.meta b/Assets/Prefabs/tree_oak.prefab.meta new file mode 100644 index 0000000..3047758 --- /dev/null +++ b/Assets/Prefabs/tree_oak.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a51034cd9a84299479d24128aec330e6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ad09de5..79af76b 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -168,7 +168,7 @@ Transform: - {fileID: 1759039339} - {fileID: 1938035018} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &87507992 GameObject: @@ -341,7 +341,7 @@ Transform: - {fileID: 1523942492} - {fileID: 466200731} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &138750305 GameObject: @@ -542,7 +542,7 @@ Transform: m_Children: - {fileID: 519420032} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &310196955 Animator: @@ -765,6 +765,7 @@ MonoBehaviour: interactionType: 1 holdDuration: 1 radius: 3 + centerPoint: {fileID: 466200731} color: {r: 1, g: 1, b: 1, a: 0} globalLight: {fileID: 360525551} --- !u!212 &466200733 @@ -963,6 +964,63 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!1001 &653148688 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.x + value: -13.410806 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.y + value: 4.33799 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559741, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_Name + value: tree_oak (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a51034cd9a84299479d24128aec330e6, type: 3} --- !u!1 &725785167 GameObject: m_ObjectHideFlags: 0 @@ -1057,7 +1115,7 @@ RectTransform: m_Children: - {fileID: 87507993} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1113,6 +1171,7 @@ MonoBehaviour: interactionType: 1 holdDuration: 1 radius: 3 + centerPoint: {fileID: 760798427} color: {r: 0.9811321, g: 0.4931305, b: 0, a: 0} globalLight: {fileID: 360525551} --- !u!212 &760798429 @@ -1242,6 +1301,7 @@ MonoBehaviour: interactionType: 1 holdDuration: 1 radius: 3 + centerPoint: {fileID: 811951905} color: {r: 0.09919691, g: 1, b: 0, a: 0} globalLight: {fileID: 360525551} --- !u!212 &811951907 @@ -4244,7 +4304,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1335747190 MonoBehaviour: @@ -4261,6 +4321,7 @@ MonoBehaviour: interactionType: 2 holdDuration: 1 radius: 3 + centerPoint: {fileID: 0} harvestDuration: 3 --- !u!1 &1523942491 GameObject: @@ -4311,6 +4372,7 @@ MonoBehaviour: interactionType: 1 holdDuration: 1 radius: 3 + centerPoint: {fileID: 1523942492} color: {r: 0, g: 0.20715475, b: 1, a: 0} globalLight: {fileID: 360525551} --- !u!212 &1523942494 @@ -4440,6 +4502,7 @@ MonoBehaviour: interactionType: 1 holdDuration: 1 radius: 3 + centerPoint: {fileID: 1540973175} color: {r: 1, g: 0, b: 0, a: 0} globalLight: {fileID: 360525551} --- !u!212 &1540973177 @@ -4520,6 +4583,63 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!1001 &1561532225 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.x + value: 1.4564366 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.y + value: 9.728643 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559741, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_Name + value: tree_oak (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a51034cd9a84299479d24128aec330e6, type: 3} --- !u!1 &1759039338 GameObject: m_ObjectHideFlags: 0 @@ -14697,7 +14817,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1938035017 GameObject: @@ -27577,6 +27697,63 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1001 &1973802414 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.x + value: -6.0973587 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.y + value: 10.484023 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559741, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_Name + value: tree_oak (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a51034cd9a84299479d24128aec330e6, type: 3} --- !u!1 &2014753552 GameObject: m_ObjectHideFlags: 1 @@ -27659,8 +27836,65 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2032016596 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.x + value: -15.89 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.y + value: 4.81 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559741, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_Name + value: tree_oak (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a51034cd9a84299479d24128aec330e6, type: 3} --- !u!1 &2063803992 GameObject: m_ObjectHideFlags: 0 @@ -27710,6 +27944,7 @@ MonoBehaviour: interactionType: 1 holdDuration: 1 radius: 3 + centerPoint: {fileID: 2063803993} color: {r: 1, g: 0, b: 0.6604276, a: 0} globalLight: {fileID: 360525551} --- !u!212 &2063803995 @@ -27790,3 +28025,60 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!1001 &1909482199119969203 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.x + value: -10.26 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.y + value: 4.41 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1909482199139559741, guid: a51034cd9a84299479d24128aec330e6, type: 3} + propertyPath: m_Name + value: tree_oak + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a51034cd9a84299479d24128aec330e6, type: 3} diff --git a/Assets/Scripts/Interactable.cs b/Assets/Scripts/Interactable.cs index 071f3b7..3eab669 100644 --- a/Assets/Scripts/Interactable.cs +++ b/Assets/Scripts/Interactable.cs @@ -31,13 +31,22 @@ public abstract class Interactable : MonoBehaviour // Used to measure the distance between the player and the object Transform playerTransform; - Transform interactableTransform; [Tooltip("The range in which the player can interact with an object")] [Range(1f, 50f)] [SerializeField] float radius = 3f; + [SerializeField] + Transform centerPoint; + + void Awake() + { + if(centerPoint == null) + { + centerPoint = gameObject.transform; + } + } #region GETTER /// /// GetDescription gets the description of an interactable object. @@ -110,8 +119,8 @@ public abstract class Interactable : MonoBehaviour public bool isInRange() { playerTransform = GameObject.FindGameObjectWithTag("Player").gameObject.transform; // Maybe singleton later? - interactableTransform = gameObject.transform; - float distance = Vector2.Distance(interactableTransform.position, playerTransform.position); + + float distance = Vector2.Distance(centerPoint.position, playerTransform.position); if(distance <= radius) { @@ -124,12 +133,19 @@ public abstract class Interactable : MonoBehaviour } + // Show interactable range in editor but NOT IN-GAME private void OnDrawGizmosSelected() { + // Same as in "Awake()", cause the object does not get "awakend" in inspector + if (centerPoint == null) + { + centerPoint = gameObject.transform; + } + // Gizmos are only visible in the scene view -> NOT visible IN-GAME (DEBUG Reasons) Gizmos.color = Color.magenta; - Gizmos.DrawWireSphere(transform.position, radius); + Gizmos.DrawWireSphere(centerPoint.position, radius); } } diff --git a/Assets/Sprites/tree_oak.png b/Assets/Sprites/tree_oak.png new file mode 100644 index 0000000000000000000000000000000000000000..777b67ac4672a6b62381f4e77e8bc5fae777efac GIT binary patch literal 3019 zcmV;+3pDhJP)00001b5ch_0Itp) z=>Px=g-Jv~RCt{2oXc(;#}$VE;&6udAt{lPCCj!9#DHcwt7IG*)LyRWXb@f-Kf)`w()0Yjg8attcr_-TA4y zZLV)Khmja=6o0F_A(i#1wr%{Z z?pRjVE=LQALa{U(GH!h~H!NE%wO@4(RXwKbGKtE6#D*KyVyO!hfvSM16cw;&_3|5F zDzB0$p)?eqs{*TAnq*sEZ2UxbV)D`axb8eA1B(UM#%jfjkz03@@3j?GUia$jK*=si zUXK&zWoEfLYt33zs3snxd^`24$tXd>*yJ~v4p|NfJX@|eP+hoU42ArW?DxXTY$oaKir zj!hV()2Bb2Xpc7=^;XntOH)bm!yIrVw~&S(G(jzzsIi`_4kwJzY(A5Jo}c3v-4KR<8W z44QWIHw&;jNZf)&tL6IeqZ0lt8htl_-Oht}}c*H7A#n}M`w~4ie)HQ)6#>aD@J1z1mVE<%-x zlg8e-fX?Uo{x)AXE4qzxm|W|dTV!&{ zl*JnfxaV_yAFxW%fCojutO3|I{muk9Gq|5WJp}-KcY88%T^uY2C|a}^1~HJY|LcWAf_V8P%LTEnu9G3dYL3(WH&+W=f}RgJqZTaIg|!Hlm#tLmOo0XT`P|e)u`iyUVvK&(#QI6lB4EC*0~_V|&NqJx3=? z76G#)KKK4}H=88B3*UZR0bqW`qxec2QQ;b2SBd9PnvJ?M7%#&iNR-dQ33A(s(bkqr zfq3+B1&=(KTwgx#h05ua)@v+YUwd_fEdXY$QtVTDm7feqz2e83ziyjykLb;k)M&$odv6Wa_~Y)sV#LQHgaWY5bav zdaE?)jxuwH$YXTA?rq_0yn?gwG6tnG`lYfGEG01%v+kkUWSzu5K9%{RKt<^Ym>!DG zV#lYZ;Wz+e4jhL8a9pC@(~H-)JOPI>&nYu7=7fg*qh!dmV`V!3OZi@vYf$Y|>8l_6 zI6FN-X>tmG{++pVAl4}Y=A#Yesp&xD#b5vP?nxm3ERUth7R#mU3LB?0#pzg3JtW&S zVOR{M$!P$K(g1 z$+%#-bYK&u9Oc$t?hf;Pwov`KvM0yNGOu6k0C27Pe6Ei_9$hpt{M_8qRbYSK{t4@w zTeYNMRoZ=dNDlYJN|sY0RTTd#w&>zS4Zv;LW$k!?zkUI%{q~nYJpHw2wbXB}esI+X zD;-V^ETEpDr0qYaaMH+AnZ$5N1l{+n+ug^6{YNNI&G_3_Ke&RO7yt2(nHnygOu6Z$ z>$7(A7Se{B#vHL`qu%1+WQbh4{Yk)zk|Ep9rAuv6h;ZW6Cf-qS`zLP0Bm(vKO?zdJ zLtwcZi2K=VEH@Hp(2~w>%wk3(pN&|Vp7BF7zRuVMSips9xPfiyFH?mYG&#v^qpZKv z?HwPXG97;Px&GPyF96`9T$-7c+KJf1~*mKnRA!u)fC zI+=h{<(rLq?*Afco^Xx6Z+&yC);m7Dm@ei0aev!8rh7}O{V}gGwubS+iOmISTXXIh zx<`kYm~AM#X3;%5B)`BR&Z%>CiQP)paHC$JSf0Fb8L-%h$>1ZNFLh-JH}wnW zR>@6rl7M+?XSG977I0ICDw3jrauo?I5DjkTLAP3AUZ+QIFgY{lFN>&=_=0ljy(Iv^ z?!R|~2bi=hm_{Pbb_6XKxaj^e2Amvr+*D)%>5e2^S;ueerrZx(BMJA?yB8Bjrst}do};H7 z<*ku~J1QDkxKb9pzn&N1!nuWJqwZ7}7QLYc_R4VX65P