diff --git a/.DS_Store b/.DS_Store index bb0130fc..b0057b76 100755 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Assets/.DS_Store b/Assets/.DS_Store index 323cb37e..99807e45 100755 Binary files a/Assets/.DS_Store and b/Assets/.DS_Store differ diff --git a/Assets/MultiplayerPrefab/.DS_Store b/Assets/MultiplayerPrefab/.DS_Store index a349cfaa..8ec0487a 100755 Binary files a/Assets/MultiplayerPrefab/.DS_Store and b/Assets/MultiplayerPrefab/.DS_Store differ diff --git a/Assets/MultiplayerPrefab/FarmingPrefab/AnotherRock.prefab b/Assets/MultiplayerPrefab/FarmingPrefab/AnotherRock.prefab new file mode 100644 index 00000000..97b7eb14 --- /dev/null +++ b/Assets/MultiplayerPrefab/FarmingPrefab/AnotherRock.prefab @@ -0,0 +1,333 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1587284393650459871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4549531600395785802} + - component: {fileID: 8609982157339301755} + - component: {fileID: 26361907275720413} + m_Layer: 0 + m_Name: sprite (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4549531600395785802 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587284393650459871} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.25, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940257458390001736} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8609982157339301755 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587284393650459871} + 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: 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_ReceiveGI: 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: 21300444, guid: 537c371732866ca438a76cc8b649cde7, 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!61 &26361907275720413 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587284393650459871} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0.052452087, y: 0.11539364} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.6992798, y: 0.7692127} + m_EdgeRadius: 0 +--- !u!1 &2885684781881904420 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6251825663134071306} + - component: {fileID: 6961087541602032230} + m_Layer: 0 + m_Name: sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6251825663134071306 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2885684781881904420} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.25, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940257458390001736} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6961087541602032230 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2885684781881904420} + 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: 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_ReceiveGI: 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: 21300412, guid: 537c371732866ca438a76cc8b649cde7, 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!1 &6824144230845280838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1940257458390001736} + - component: {fileID: 1959078872042854584} + - component: {fileID: 5541644806510981227} + - component: {fileID: 2022797675372387047} + - component: {fileID: 2989236030854957128} + m_Layer: 0 + m_Name: AnotherRock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1940257458390001736 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6824144230845280838} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -100.88881, y: -5.450424, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6251825663134071306} + - {fileID: 4549531600395785802} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!210 &1959078872042854584 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6824144230845280838} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 45 + m_SortAtRoot: 0 +--- !u!58 &5541644806510981227 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6824144230845280838} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0.0007095337, y: 0.24698639} + serializedVersion: 2 + m_Radius: 0.69171906 +--- !u!114 &2022797675372387047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6824144230845280838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} + m_Name: + m_EditorClassIdentifier: + clientStarted: 0 + sceneId: 0 + _assetId: 3373258819 + serverOnly: 0 + visible: 0 + hasSpawned: 0 +--- !u!114 &2989236030854957128 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6824144230845280838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29959bf55db1a418ba39aac04044d9c1, type: 3} + m_Name: + m_EditorClassIdentifier: + lootDrop: Stone + farmingTime: 25 + isAvailable: 1 diff --git a/Assets/MultiplayerPrefab/FarmingPrefab/AnotherRock.prefab.meta b/Assets/MultiplayerPrefab/FarmingPrefab/AnotherRock.prefab.meta new file mode 100644 index 00000000..a7068011 --- /dev/null +++ b/Assets/MultiplayerPrefab/FarmingPrefab/AnotherRock.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d4c151ebff06447ec90bc966677d793f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MultiplayerPrefab/FarmingPrefab/Big Rock 2(Clone).prefab b/Assets/MultiplayerPrefab/FarmingPrefab/Big Rock 2(Clone).prefab index 168250ac..7a55965d 100644 --- a/Assets/MultiplayerPrefab/FarmingPrefab/Big Rock 2(Clone).prefab +++ b/Assets/MultiplayerPrefab/FarmingPrefab/Big Rock 2(Clone).prefab @@ -139,9 +139,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7864346200601165963} - - component: {fileID: 6314538332556135151} - component: {fileID: 7082568323905080697} - component: {fileID: 6967781579956014635} + - component: {fileID: 6314538332556135151} - component: {fileID: -3942421637202217376} m_Layer: 0 m_Name: Big Rock 2(Clone) @@ -169,24 +169,6 @@ Transform: - {fileID: 923439284381156362} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6314538332556135151 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2594491518497105690} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} - m_Name: - m_EditorClassIdentifier: - clientStarted: 0 - sceneId: 0 - _assetId: 2895832966 - serverOnly: 0 - visible: 0 - hasSpawned: 0 --- !u!210 &7082568323905080697 SortingGroup: m_ObjectHideFlags: 0 @@ -254,6 +236,24 @@ PolygonCollider2D: - {x: -0.17126621, y: -0.65838623} - {x: 0.04289878, y: -0.6784973} m_UseDelaunayMesh: 0 +--- !u!114 &6314538332556135151 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2594491518497105690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} + m_Name: + m_EditorClassIdentifier: + clientStarted: 0 + sceneId: 0 + _assetId: 2895832966 + serverOnly: 0 + visible: 0 + hasSpawned: 0 --- !u!114 &-3942421637202217376 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 772246c2..42f2ae73 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -325,6 +325,37 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &20794196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 20794197} + m_Layer: 0 + m_Name: pos1 (1) + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &20794197 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 20794196} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -18.47, y: -7.45, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1806727246} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &50998598 GameObject: m_ObjectHideFlags: 0 @@ -2345,6 +2376,10 @@ MonoBehaviour: prefab: {fileID: 3211890613285232087, guid: aae730f0e834e4f50986153abe934152, type: 3} spawnedItem: {fileID: 0} destroyedTime: 0 + - spawnLocation: {fileID: 692403612} + prefab: {fileID: 6824144230845280838, guid: d4c151ebff06447ec90bc966677d793f, type: 3} + spawnedItem: {fileID: 0} + destroyedTime: 0 --- !u!1 &622437270 GameObject: m_ObjectHideFlags: 0 @@ -4859,6 +4894,37 @@ Transform: m_Children: [] m_Father: {fileID: 1926063132} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &832640536 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 832640537} + m_Layer: 0 + m_Name: pos1 (3) + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &832640537 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 832640536} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -14.07, y: -5.15, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1418230366} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &832984000 GameObject: m_ObjectHideFlags: 0 @@ -6985,6 +7051,40 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1417847582} m_CullTransparentMesh: 1 +--- !u!1 &1418230365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1418230366} + m_Layer: 0 + m_Name: Wood SpawnLocations (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1418230366 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1418230365} + 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: + - {fileID: 2125492664} + - {fileID: 1551241443} + - {fileID: 832640537} + m_Father: {fileID: 2100615670} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1423725558 GameObject: m_ObjectHideFlags: 0 @@ -247353,6 +247453,37 @@ Transform: - {fileID: 8628969476656974804} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1551241442 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1551241443} + m_Layer: 0 + m_Name: pos1 (2) + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1551241443 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1551241442} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -17.91, y: -1.28, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1418230366} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1552662777 GameObject: m_ObjectHideFlags: 0 @@ -248140,7 +248271,8 @@ MonoBehaviour: - {fileID: 7314453758228745757, guid: 1b5c9a9caaab249ad81249532138171d, type: 3} - {fileID: 2594491518497105690, guid: 308d74973efa2417ca2dd03e2180d086, type: 3} - {fileID: 4134986944254134534, guid: cee69715c142a430a91cd41712c7fdc6, type: 3} - - {fileID: 0} + - {fileID: 3211890613285232087, guid: aae730f0e834e4f50986153abe934152, type: 3} + - {fileID: 6824144230845280838, guid: d4c151ebff06447ec90bc966677d793f, type: 3} exceptionsDisconnect: 1 snapshotSettings: bufferTimeMultiplier: 2 @@ -270585,6 +270717,40 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1806727245 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1806727246} + m_Layer: 0 + m_Name: Stone SpawnLocations (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1806727246 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1806727245} + 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: + - {fileID: 2088611598} + - {fileID: 20794197} + - {fileID: 1839245059} + m_Father: {fileID: 2100615670} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1820096573 GameObject: m_ObjectHideFlags: 0 @@ -291172,6 +291338,37 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &1839245058 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1839245059} + m_Layer: 0 + m_Name: pos1 (2) + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1839245059 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1839245058} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -21.02, y: -7.26, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1806727246} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1844826030 GameObject: m_ObjectHideFlags: 0 @@ -321962,6 +322159,37 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1.4293823, y: 2.8508492} m_EdgeRadius: 0 +--- !u!1 &2088611597 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2088611598} + m_Layer: 0 + m_Name: pos1 + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2088611598 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2088611597} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 42.43, y: 10.78, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1806727246} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2092632477 GameObject: m_ObjectHideFlags: 0 @@ -322157,8 +322385,10 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 601227209} + - {fileID: 1806727246} - {fileID: 71647862} - {fileID: 1926371598} + - {fileID: 1418230366} m_Father: {fileID: 264730818} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2102626279 @@ -322316,6 +322546,37 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2125492663 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2125492664} + m_Layer: 0 + m_Name: pos1 (1) + m_TagString: Untagged + m_Icon: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2125492664 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2125492663} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 45.24, y: 7.15, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1418230366} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2131209849 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/FarmingManager.cs b/Assets/Script/FarmingManager.cs index 0a460fa9..4e710546 100644 --- a/Assets/Script/FarmingManager.cs +++ b/Assets/Script/FarmingManager.cs @@ -22,6 +22,7 @@ public class FarmingManager : NetworkBehaviour } public float timeToReSpawn = 180f; + public List farmingItems; void Update()