diff --git a/Assets/Farming Asset Pack/farming-chicken.png.meta b/Assets/Farming Asset Pack/farming-chicken.png.meta index d8d6fe7..e3b62d4 100644 --- a/Assets/Farming Asset Pack/farming-chicken.png.meta +++ b/Assets/Farming Asset Pack/farming-chicken.png.meta @@ -66,7 +66,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 16 mipBias: 0 wrapU: 1 @@ -80,7 +80,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -100,6 +100,30 @@ TextureImporter: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 1 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Icons/bucket-selected.png b/Assets/Icons/bucket-selected.png new file mode 100644 index 0000000..5a98978 Binary files /dev/null and b/Assets/Icons/bucket-selected.png differ diff --git a/Assets/Icons/bucket-selected.png.meta b/Assets/Icons/bucket-selected.png.meta new file mode 100644 index 0000000..95996fc --- /dev/null +++ b/Assets/Icons/bucket-selected.png.meta @@ -0,0 +1,122 @@ +fileFormatVersion: 2 +guid: e5d260800e972cd449af5dfcca028521 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + 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: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Icons/bucket.png b/Assets/Icons/bucket.png new file mode 100644 index 0000000..ae51a26 Binary files /dev/null and b/Assets/Icons/bucket.png differ diff --git a/Assets/Icons/bucket.png.meta b/Assets/Icons/bucket.png.meta new file mode 100644 index 0000000..3123fb7 --- /dev/null +++ b/Assets/Icons/bucket.png.meta @@ -0,0 +1,122 @@ +fileFormatVersion: 2 +guid: 91b3677ea441a4d44b5bdea3f7302a30 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + 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: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Icons/chicken-selected.png b/Assets/Icons/chicken-selected.png new file mode 100644 index 0000000..a63c0c2 Binary files /dev/null and b/Assets/Icons/chicken-selected.png differ diff --git a/Assets/Icons/chicken-selected.png.meta b/Assets/Icons/chicken-selected.png.meta new file mode 100644 index 0000000..2f4f842 --- /dev/null +++ b/Assets/Icons/chicken-selected.png.meta @@ -0,0 +1,122 @@ +fileFormatVersion: 2 +guid: 5cd8e4ccae6b051418872e9b1ca5bb46 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + 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: 32 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Animations/Chicken.controller b/Assets/Resources/Animations/Chicken.controller new file mode 100644 index 0000000..3160b87 --- /dev/null +++ b/Assets/Resources/Animations/Chicken.controller @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-2428467085581259385 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: moving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2362729136151640534} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-2362729136151640534 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: chicken_run + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 304001401199322990} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 428ad11e76138ef4b9498e50900570d9, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Chicken + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: moving + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 7372018541915222104} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &304001401199322990 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: moving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5894720157980282855} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.5833334 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &5894720157980282855 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: chicken_idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2428467085581259385} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: aa9844eb2ca8dbc439c019077b5172df, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &7372018541915222104 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 5894720157980282855} + m_Position: {x: 270, y: 40, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2362729136151640534} + m_Position: {x: 270, y: 120, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 5894720157980282855} diff --git a/Assets/Resources/Animations/Chicken.controller.meta b/Assets/Resources/Animations/Chicken.controller.meta new file mode 100644 index 0000000..aaeb7f1 --- /dev/null +++ b/Assets/Resources/Animations/Chicken.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 278d5f784edd98f4cbb8875691645b24 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Animations/DayTransitionPanel.controller b/Assets/Resources/Animations/DayTransitionPanel.controller index 457a3ca..719b3ec 100644 --- a/Assets/Resources/Animations/DayTransitionPanel.controller +++ b/Assets/Resources/Animations/DayTransitionPanel.controller @@ -21,7 +21,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 4daa8bd091fad8d45b7e8df57ac7f909, type: 2} + m_Motion: {fileID: 7400000, guid: 9d881ff38c04aeb47bc53481c78adcd7, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -47,7 +47,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 9d881ff38c04aeb47bc53481c78adcd7, type: 2} + m_Motion: {fileID: 7400000, guid: 4daa8bd091fad8d45b7e8df57ac7f909, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/Animations/chicken_idle.anim b/Assets/Resources/Animations/chicken_idle.anim new file mode 100644 index 0000000..10486e5 --- /dev/null +++ b/Assets/Resources/Animations/chicken_idle.anim @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: chicken_idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 1577f106ceccd624895112215c69960a, type: 3} + - time: 0.33333334 + value: {fileID: 21300002, guid: 1577f106ceccd624895112215c69960a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 3 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 1577f106ceccd624895112215c69960a, type: 3} + - {fileID: 21300002, guid: 1577f106ceccd624895112215c69960a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Animations/chicken_idle.anim.meta b/Assets/Resources/Animations/chicken_idle.anim.meta new file mode 100644 index 0000000..1734d5a --- /dev/null +++ b/Assets/Resources/Animations/chicken_idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa9844eb2ca8dbc439c019077b5172df +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Animations/chicken_run.anim b/Assets/Resources/Animations/chicken_run.anim new file mode 100644 index 0000000..0bd953d --- /dev/null +++ b/Assets/Resources/Animations/chicken_run.anim @@ -0,0 +1,74 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: chicken_run + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300004, guid: 1577f106ceccd624895112215c69960a, type: 3} + - time: 0.2 + value: {fileID: 21300006, guid: 1577f106ceccd624895112215c69960a, type: 3} + - time: 0.4 + value: {fileID: 21300008, guid: 1577f106ceccd624895112215c69960a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 5 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300004, guid: 1577f106ceccd624895112215c69960a, type: 3} + - {fileID: 21300006, guid: 1577f106ceccd624895112215c69960a, type: 3} + - {fileID: 21300008, guid: 1577f106ceccd624895112215c69960a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Animations/chicken_run.anim.meta b/Assets/Resources/Animations/chicken_run.anim.meta new file mode 100644 index 0000000..06169a1 --- /dev/null +++ b/Assets/Resources/Animations/chicken_run.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 428ad11e76138ef4b9498e50900570d9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Chicken.prefab b/Assets/Resources/Chicken.prefab new file mode 100644 index 0000000..b791a55 --- /dev/null +++ b/Assets/Resources/Chicken.prefab @@ -0,0 +1,185 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8336664152962957100 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9120721559691392571} + - component: {fileID: 3014515124387237889} + - component: {fileID: 5993197352764583501} + - component: {fileID: 3757590040189918822} + - component: {fileID: 1650281244656501979} + - component: {fileID: 9088528460680327735} + m_Layer: 0 + m_Name: Chicken + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9120721559691392571 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8336664152962957100} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.7112876, y: -1.5435047, z: -8.102337} + 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 &3014515124387237889 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8336664152962957100} + 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: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -278359049 + m_SortingLayer: 2 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 1577f106ceccd624895112215c69960a, 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!50 &5993197352764583501 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8336664152962957100} + 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: 4 +--- !u!60 &3757590040189918822 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8336664152962957100} + 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: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -0.4375, y: -0.03125} + - {x: -0.25, y: -0.40625} + - {x: 0.21875, y: -0.40625} + - {x: 0.4375, y: -0.3125} + - {x: 0.4375, y: 0.03125} + - {x: 0.3125, y: 0.25} + - {x: -0.03125, y: 0.40625} + - {x: -0.25, y: 0.40625} + - {x: -0.4375, y: 0.09375} +--- !u!114 &1650281244656501979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8336664152962957100} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36cb7b1a78935094f84a770ea77f308c, type: 3} + m_Name: + m_EditorClassIdentifier: + producedItem: {fileID: 11400000, guid: eca7e47128c3e6e4fb93236db4a6324e, type: 2} + movementSpeed: 1 + animalPrefab: {fileID: 8336664152962957100} + defaultSprite: {fileID: 21300000, guid: 1577f106ceccd624895112215c69960a, type: 3} + selectedSprite: {fileID: 21300000, guid: 5cd8e4ccae6b051418872e9b1ca5bb46, type: 3} + displayName: Chicken + description: lays eggs, maybe some eastereggs too + price: 500 +--- !u!95 &9088528460680327735 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8336664152962957100} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 278d5f784edd98f4cbb8875691645b24, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/Assets/Resources/Chicken.prefab.meta b/Assets/Resources/Chicken.prefab.meta new file mode 100644 index 0000000..a7f9190 --- /dev/null +++ b/Assets/Resources/Chicken.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 65e8b7a776f555f40a775495903cd7fb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Cow.prefab b/Assets/Resources/Cow.prefab index 1d5d7b1..c440011 100644 --- a/Assets/Resources/Cow.prefab +++ b/Assets/Resources/Cow.prefab @@ -12,8 +12,8 @@ GameObject: - component: {fileID: 2510115116361252816} - component: {fileID: 123187747779251107} - component: {fileID: 2510115116361252818} - - component: {fileID: 4094795090309576525} - component: {fileID: 3084876974777557816} + - component: {fileID: -345647752741578242} m_Layer: 0 m_Name: Cow m_TagString: Untagged @@ -143,26 +143,6 @@ PolygonCollider2D: - {x: 0.5, y: -0.28125} - {x: 0.5, y: 0.03125} - {x: 0.375, y: 0.21875} ---- !u!114 &4094795090309576525 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2510115116361252817} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 36cb7b1a78935094f84a770ea77f308c, type: 3} - m_Name: - m_EditorClassIdentifier: - producedItem: {fileID: 11400000, guid: 510712f2d23afc147979bcd564ef7943, type: 2} - movementSpeed: 1 - animalPrefab: {fileID: 2510115116361252817} - defaultSprite: {fileID: 21300000, guid: e2bde586482642d44a270276574c0129, type: 3} - selectedSprite: {fileID: 21300000, guid: 432d303bbfc9d6f409aa93b6081306e5, type: 3} - displayName: Cow - description: Mach Milch, hat Fell - price: 1000 --- !u!95 &3084876974777557816 Animator: serializedVersion: 4 @@ -183,3 +163,23 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &-345647752741578242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2510115116361252817} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3abcd021be6e8cd429909d1140d61699, type: 3} + m_Name: + m_EditorClassIdentifier: + producedItem: {fileID: 11400000, guid: 510712f2d23afc147979bcd564ef7943, type: 2} + movementSpeed: 1 + animalPrefab: {fileID: 2510115116361252817} + defaultSprite: {fileID: 21300000, guid: e2bde586482642d44a270276574c0129, type: 3} + selectedSprite: {fileID: 21300000, guid: 432d303bbfc9d6f409aa93b6081306e5, type: 3} + displayName: Cow + description: Creates Milk in a magical way + price: 1000 diff --git a/Assets/Resources/Items/Egg.asset b/Assets/Resources/Items/Egg.asset index ba1a13f..507e43e 100644 --- a/Assets/Resources/Items/Egg.asset +++ b/Assets/Resources/Items/Egg.asset @@ -16,4 +16,4 @@ MonoBehaviour: description: You can throw this at other people's houses. selectedSprite: {fileID: 21300000, guid: ffdb15b7cd6bcb54d93bbde91bc5fa92, type: 3} defaultSprite: {fileID: 21300000, guid: 11b007ea791e7eb41b5c6aed9565e8bf, type: 3} - price: 20 + price: 30 diff --git a/Assets/Resources/Items/Usable/Bucket.asset b/Assets/Resources/Items/Usable/Bucket.asset new file mode 100644 index 0000000..9db02d8 --- /dev/null +++ b/Assets/Resources/Items/Usable/Bucket.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 761f645f009328845bc7851753024e92, type: 3} + m_Name: Bucket + m_EditorClassIdentifier: + displayName: Bucket + description: Used for milking cows + selectedSprite: {fileID: 21300000, guid: e5d260800e972cd449af5dfcca028521, type: 3} + defaultSprite: {fileID: 21300000, guid: 91b3677ea441a4d44b5bdea3f7302a30, type: 3} + price: 750 diff --git a/Assets/Resources/Items/Usable/Bucket.asset.meta b/Assets/Resources/Items/Usable/Bucket.asset.meta new file mode 100644 index 0000000..ed2f530 --- /dev/null +++ b/Assets/Resources/Items/Usable/Bucket.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0bcda05603855fd41b020c7e57fc520e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 42c2c77..24680f7 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -710,56 +710,106 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: startElements: - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} - - {fileID: 4094795090309576525, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: -345647752741578242, guid: 547dbbf4c5377dc409dfea772c096434, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} + - {fileID: 1650281244656501979, guid: 65e8b7a776f555f40a775495903cd7fb, type: 3} --- !u!1 &131335458 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Actions/ActionManager.cs b/Assets/Scripts/Actions/ActionManager.cs index 050bfe3..ba27ca8 100644 --- a/Assets/Scripts/Actions/ActionManager.cs +++ b/Assets/Scripts/Actions/ActionManager.cs @@ -29,6 +29,8 @@ namespace Actions { private void InstantiateNextDayActionHandlers() { _nextDayActionHandlers.Add(new FarmlandTileNextDayActionHandler()); + + _nextDayActionHandlers.Add(new ChickenAnimalNextDayActionHandler()); } private void InstantiateClickActionHandlers() { diff --git a/Assets/Scripts/Actions/NextDayActionHandlers.cs b/Assets/Scripts/Actions/NextDayActionHandlers.cs index a2fa4ba..4a1ce3d 100644 --- a/Assets/Scripts/Actions/NextDayActionHandlers.cs +++ b/Assets/Scripts/Actions/NextDayActionHandlers.cs @@ -70,6 +70,24 @@ namespace Actions { } } } + + public abstract class AbstractAnimalNextDayActionHandler : NextDayActionHandler{ + protected Animal _animal; + public virtual void InvokeAction(GameObject gameObject) { + throw new System.NotImplementedException(); + } + + public virtual bool Matches(GameObject gameObject) { + bool rv = false; + try { + _animal = gameObject.GetComponent(); + rv = true; + } + catch { } + + return rv; + } + } public class FarmlandTileNextDayActionHandler : AbstractFarmlandTileNextDayActionHandler { public override void InvokeAction(GameObject gameObject) { @@ -87,4 +105,18 @@ namespace Actions { return rv; } } + + public class ChickenAnimalNextDayActionHandler : AbstractAnimalNextDayActionHandler { + public override void InvokeAction(GameObject gameObject) { + Inventory.instance.AddElement(_animal.producedItem, Random.Range(1, 5)); + } + + public override bool Matches(GameObject gameObject) { + bool rv = base.Matches(gameObject); + if(rv) { + rv = _animal.displayName.Equals("Chicken"); + } + return rv; + } + } } \ No newline at end of file diff --git a/Assets/Scripts/Animal.cs b/Assets/Scripts/Animal.cs index e489a07..60910cd 100644 --- a/Assets/Scripts/Animal.cs +++ b/Assets/Scripts/Animal.cs @@ -8,8 +8,7 @@ public class Animal : MonoBehaviour { private Rigidbody2D _rigidbody; private SpriteRenderer _spriteRenderer; private Animator _animator; - private int _animMoveID; - private bool _canBeMilked; + private int _animatorMoveID; public int SellPrice => Convert.ToInt32(price * 0.8); @@ -26,13 +25,10 @@ public class Animal : MonoBehaviour { _rigidbody = gameObject.GetComponent(); _spriteRenderer = gameObject.GetComponent(); _animator = gameObject.GetComponent(); - _animMoveID = Animator.StringToHash("moving"); + _animatorMoveID = Animator.StringToHash("moving"); - _canBeMilked = true; _spriteRenderer.sprite = defaultSprite; - HouseController.NewDayEvent.AddListener(InvertCanBeMilked); - // Move the Animal in any random direction every 1-5s InvokeRepeating(nameof(MoveInRandomDirection), 2f, Random.Range(1f, 5f)); } @@ -58,29 +54,12 @@ public class Animal : MonoBehaviour { } _rigidbody.velocity = movementSpeed * direction; - _animator.SetBool(_animMoveID, true); + _animator.SetBool(_animatorMoveID, true); yield return new WaitForSeconds(randTime); _rigidbody.velocity = new Vector2(0f, 0f); - _animator.SetBool(_animMoveID, false); + _animator.SetBool(_animatorMoveID, false); } StartCoroutine(Move()); } - - /** - * Invert the _canBeMilked bool - */ - private void InvertCanBeMilked() { - _canBeMilked = !_canBeMilked; - } - - /** - * Milk cow if possible - */ - private void OnMouseDown() { - if(_canBeMilked) { - ActionManager.Instance.ClickAction(gameObject, PlayerController.instance.SelectedItem); - _canBeMilked = false; - } - } } \ No newline at end of file diff --git a/Assets/Scripts/Cow.cs b/Assets/Scripts/Cow.cs new file mode 100644 index 0000000..af749ec --- /dev/null +++ b/Assets/Scripts/Cow.cs @@ -0,0 +1,29 @@ +using Actions; +using UnityEngine; + +public class Cow : Animal { + private bool _canBeMilked; + + private void Awake() { + _canBeMilked = true; + HouseController.NewDayEvent.AddListener(UpdateCanBeMilked); + } + + /** + * Update the _canBeMilked bool + */ + private void UpdateCanBeMilked() { + Debug.Log("_ca" + _canBeMilked); + _canBeMilked = true; + } + + /** + * Get Milk if cow is able to be milked + */ + private void OnMouseDown() { + if(_canBeMilked) { + ActionManager.Instance.ClickAction(gameObject, PlayerController.instance.SelectedItem); + _canBeMilked = false; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Cow.cs.meta b/Assets/Scripts/Cow.cs.meta new file mode 100644 index 0000000..79a9f45 --- /dev/null +++ b/Assets/Scripts/Cow.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3abcd021be6e8cd429909d1140d61699 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: