diff --git a/Assets/Scenes/MainScene.meta b/Assets/Scenes/MainScene.meta new file mode 100644 index 0000000000000000000000000000000000000000..fad139c12cfcbabc8dcc5959d24c3f7fab5f775b --- /dev/null +++ b/Assets/Scenes/MainScene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 829c46be4b50d504a8fd053e72cf24e3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 0749e99c59af00e4ff5f5d9823f10e1d370b0de7..11566e3a3791ba65d7b0dadc85809c658b7b76e9 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -97,7 +97,7 @@ NavMeshSettings: m_BuildSettings: serializedVersion: 2 agentTypeID: 0 - agentRadius: 0.5 + agentRadius: 0.43 agentHeight: 2 agentSlope: 45 agentClimb: 0.4 @@ -105,7 +105,7 @@ NavMeshSettings: maxJumpAcrossDistance: 0 minRegionArea: 2 manualCellSize: 0 - cellSize: 0.16666667 + cellSize: 0.14333333 manualTileSize: 0 tileSize: 256 accuratePlacement: 0 @@ -836,6 +836,7 @@ GameObject: m_Component: - component: {fileID: 471348700} - component: {fileID: 471348699} + - component: {fileID: 471348701} m_Layer: 0 m_Name: City m_TagString: Untagged @@ -899,12 +900,38 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 471348698} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.3698252, y: 0.5438592, z: 0} + m_LocalPosition: {x: 0.3698252, y: 0.5438592, z: -0.01} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &471348701 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 471348698} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.28, y: 1.28} + newSize: {x: 1.28, y: 1.28} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.28, y: 1.28} + m_EdgeRadius: 0 --- !u!1 &481173316 GameObject: m_ObjectHideFlags: 0 @@ -984,7 +1011,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &501828269 +--- !u!1 &509902886 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -992,22 +1019,22 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 501828271} - - component: {fileID: 501828270} + - component: {fileID: 509902888} + - component: {fileID: 509902887} m_Layer: 0 - m_Name: Tree + m_Name: Grass (11) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!212 &501828270 +--- !u!212 &509902887 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 501828269} + m_GameObject: {fileID: 509902886} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1038,7 +1065,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 473e801b3bc9651409881d3f975c23ef, type: 3} + m_Sprite: {fileID: 21300000, guid: dd63eeb32c7fca045a3f0552a9fb7b77, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -1049,21 +1076,21 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &501828271 +--- !u!4 &509902888 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 501828269} + m_GameObject: {fileID: 509902886} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.7628145, y: -1.7186036, z: 0} + m_LocalPosition: {x: 3.26, y: -1.26, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &509902886 +--- !u!1 &786897571 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1071,22 +1098,22 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 509902888} - - component: {fileID: 509902887} + - component: {fileID: 786897573} + - component: {fileID: 786897572} m_Layer: 0 - m_Name: Grass (11) + m_Name: Grass m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!212 &509902887 +--- !u!212 &786897572 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 509902886} + m_GameObject: {fileID: 786897571} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1128,21 +1155,21 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &509902888 +--- !u!4 &786897573 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 509902886} + m_GameObject: {fileID: 786897571} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.26, y: -1.26, z: 0} + m_LocalPosition: {x: 1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &786897571 +--- !u!1 &873516387 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1150,22 +1177,22 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 786897573} - - component: {fileID: 786897572} + - component: {fileID: 873516389} + - component: {fileID: 873516388} m_Layer: 0 - m_Name: Grass + m_Name: Grass (8) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!212 &786897572 +--- !u!212 &873516388 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 786897571} + m_GameObject: {fileID: 873516387} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1207,21 +1234,21 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &786897573 +--- !u!4 &873516389 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 786897571} + m_GameObject: {fileID: 873516387} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: 0, z: 0} + m_LocalPosition: {x: 3.26, y: -2.26, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &873516387 +--- !u!1 &932290489 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1229,22 +1256,25 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 873516389} - - component: {fileID: 873516388} + - component: {fileID: 932290491} + - component: {fileID: 932290490} + - component: {fileID: 932290492} + - component: {fileID: 932290493} + - component: {fileID: 932290494} m_Layer: 0 - m_Name: Grass (8) + m_Name: worker m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!212 &873516388 +--- !u!212 &932290490 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 873516387} + m_GameObject: {fileID: 932290489} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -1275,31 +1305,95 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: dd63eeb32c7fca045a3f0552a9fb7b77, type: 3} + m_Sprite: {fileID: 21300000, guid: e5a35659eb1cd1e47834d4d4a1db44d7, 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.28, y: 1.28} + m_Size: {x: 0.3, y: 0.3} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &873516389 +--- !u!4 &932290491 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 873516387} + m_GameObject: {fileID: 932290489} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.26, y: -2.26, z: 0} + m_LocalPosition: {x: 0.33653903, y: -0.41, z: -0.1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &932290492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 932290489} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f37862faf83d5a4f92009ca5d1c00f8, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 0} + move_to: {fileID: 0} + amount: 0 + home: {fileID: 471348698} + speed: 1 +--- !u!61 &932290493 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 932290489} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.3, y: 0.3} + newSize: {x: 0.3, y: 0.3} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.3, y: 0.3} + m_EdgeRadius: 0 +--- !u!50 &932290494 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 932290489} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &1078786685 GameObject: m_ObjectHideFlags: 0 @@ -1379,6 +1473,126 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1379725508 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1379725511} + - component: {fileID: 1379725510} + - component: {fileID: 1379725509} + - component: {fileID: 1379725512} + m_Layer: 0 + m_Name: Tree (2) + m_TagString: Resource + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1379725509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1379725508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bad3649e66714d14d94d87cd3e47c1a1, type: 3} + m_Name: + m_EditorClassIdentifier: + Amount: 20 +--- !u!212 &1379725510 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1379725508} + 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: 473e801b3bc9651409881d3f975c23ef, 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.28, y: 1.28} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1379725511 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1379725508} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.87, y: -1.7186036, z: -0.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1379725512 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1379725508} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.28, y: 1.28} + newSize: {x: 1.28, y: 1.28} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.28, y: 1.28} + m_EdgeRadius: 0 --- !u!1 &1667231311 GameObject: m_ObjectHideFlags: 0 @@ -1458,6 +1672,126 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1699889074 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1699889077} + - component: {fileID: 1699889076} + - component: {fileID: 1699889075} + - component: {fileID: 1699889078} + m_Layer: 0 + m_Name: Tree (1) + m_TagString: Resource + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1699889075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699889074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bad3649e66714d14d94d87cd3e47c1a1, type: 3} + m_Name: + m_EditorClassIdentifier: + Amount: 0 +--- !u!212 &1699889076 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699889074} + 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: 473e801b3bc9651409881d3f975c23ef, 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.28, y: 1.28} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1699889077 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699889074} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.6, y: -1.7186036, z: -0.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1699889078 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699889074} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.28, y: 1.28} + newSize: {x: 1.28, y: 1.28} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.28, y: 1.28} + m_EdgeRadius: 0 --- !u!1 &1807717001 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Collector.cs b/Assets/Scripts/Collector.cs new file mode 100644 index 0000000000000000000000000000000000000000..bc7d9aac2999054cc6a84bab00ba89289a72eacb --- /dev/null +++ b/Assets/Scripts/Collector.cs @@ -0,0 +1,71 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Collector : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + [SerializeField] + private GameObject target; + + [SerializeField] + private GameObject move_to; + + + [SerializeField] + private int amount; + + [SerializeField] + private GameObject home; + + public float speed = 1; + + + public void SetTarget(GameObject target) + { + this.target = target; + } + public void MoveTo(GameObject target) + { + this.move_to = target; + } + GameObject lastClicked; + Ray ray; + RaycastHit rayHit; + // Update is called once per frame + void Update() + { + if (Input.GetMouseButtonDown(0)) + { + Vector3 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition); + Vector2 mousePos2D = new Vector2(mousePos.x, mousePos.y); + + RaycastHit2D hit = Physics2D.Raycast(mousePos2D, Vector2.zero); + if (hit.collider != null) + { + SetTarget(hit.collider.gameObject); + MoveTo(hit.collider.gameObject); + } + } + if (target != null) + transform.position = Vector2.MoveTowards(new Vector2(transform.position.x, transform.position.y), move_to.transform.position, speed * Time.deltaTime); + } + private void OnTriggerEnter2D(Collider2D collision) + { + Debug.Log(collision.gameObject.name); + if (collision.gameObject.tag == "Resource") + StartCoroutine("goHome"); + else if (collision.gameObject.name == "City") + MoveTo(this.target); + } + IEnumerator goHome() + { + yield return new WaitForSeconds(4); + MoveTo(home); + } +} diff --git a/Assets/Scripts/Collector.cs.meta b/Assets/Scripts/Collector.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..97a2258b6e0f131b7d1798bd2f5591ad32eaa349 --- /dev/null +++ b/Assets/Scripts/Collector.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3f37862faf83d5a4f92009ca5d1c00f8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Resources.cs b/Assets/Scripts/Resources.cs new file mode 100644 index 0000000000000000000000000000000000000000..bbd543e7923a4010a01e281508bbb113c80f62d1 --- /dev/null +++ b/Assets/Scripts/Resources.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Resources : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + [SerializeField] + private int Amount; + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Resources.cs.meta b/Assets/Scripts/Resources.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..32962355c88b407ea94bf854335396495f8bb37f --- /dev/null +++ b/Assets/Scripts/Resources.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bad3649e66714d14d94d87cd3e47c1a1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/worker.png b/Assets/Sprites/worker.png new file mode 100644 index 0000000000000000000000000000000000000000..02a0f67140b5a438ffd272a14e20282a51acb83e Binary files /dev/null and b/Assets/Sprites/worker.png differ diff --git a/Assets/Sprites/worker.png.meta b/Assets/Sprites/worker.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..a3a0e8ab8ad5a1cc7c35b70d2cbd04b717db1005 --- /dev/null +++ b/Assets/Sprites/worker.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: e5a35659eb1cd1e47834d4d4a1db44d7 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6c0c24c9d9bb9954bba325185ddf68e0 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a7840ec11895c76785f65d949a3d20d53355..20167db72fbbf7048673ef6229909d9e55a05797 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,10 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - Road + - Tree + - Resource layers: - Default - TransparentFX