From 0a86db46f2d8706765757103bef1df9af367e042 Mon Sep 17 00:00:00 2001 From: MB Date: Sun, 27 Jan 2019 11:33:27 +1100 Subject: [PATCH] Veggies added, other stuffd done --- .../FBX/LandMarks/meshes/mushroom_brown.fbx | 3 + .../LandMarks/meshes/mushroom_brown.fbx.meta | 95 ++++++++++++++++++ Assets/FBX/LandMarks/meshes/pumpkin.fbx | 3 + Assets/FBX/LandMarks/meshes/pumpkin.fbx.meta | 96 +++++++++++++++++++ Assets/FBX/LandMarks/mushroom_brown.prefab | 86 +++++++++++++++++ .../LandMarks/mushroom_brown.prefab.meta} | 6 +- Assets/FBX/LandMarks/pumpkin.prefab | 87 +++++++++++++++++ Assets/FBX/LandMarks/pumpkin.prefab.meta | 8 ++ Assets/FBX/terrainPieces/terrainMat.mat | 2 +- .../terrainPieces/terrainPieces_openLand.png | 3 + .../terrainPieces_openLand.png.meta | 88 +++++++++++++++++ Assets/LocalPlayer.cs | 11 +++ Assets/Prefabs/RealLocalPlayer.prefab | 11 ++- Assets/Scenes/MainScene.unity | 31 +++--- Assets/Scipts/Map.cs | 22 ++--- Assets/Scipts/Recipe.cs | 1 + Assets/Scipts/Tile.cs | 17 +++- Assets/Scipts/VegetableSpawner.cs | 15 +++ Assets/Scipts/VegetableSpawner.cs.meta | 11 +++ Assets/Sprites/carrot_2D_button.png | 3 + Assets/Sprites/carrot_2D_button.png.meta | 88 +++++++++++++++++ Assets/Sprites/potato_2D_02.png | 3 + Assets/Sprites/potato_2D_02.png.meta | 88 +++++++++++++++++ Assets/Sprites/pumpkin_2D_02.png | 3 + Assets/Sprites/pumpkin_2D_02.png.meta | 88 +++++++++++++++++ Assets/Sprites/received_662261197539302.png | 3 + .../Sprites/received_662261197539302.png.meta | 88 +++++++++++++++++ Assets/Sprites/tiny_forest_button.png | 3 + Assets/Sprites/tiny_forest_button.png.meta | 88 +++++++++++++++++ Assets/{Shaders.meta => VeggieSpots.meta} | 2 +- Assets/VeggieSpots/Mushroom spot.prefab | 86 +++++++++++++++++ Assets/VeggieSpots/Mushroom spot.prefab.meta | 8 ++ 32 files changed, 1116 insertions(+), 31 deletions(-) create mode 100644 Assets/FBX/LandMarks/meshes/mushroom_brown.fbx create mode 100644 Assets/FBX/LandMarks/meshes/mushroom_brown.fbx.meta create mode 100644 Assets/FBX/LandMarks/meshes/pumpkin.fbx create mode 100644 Assets/FBX/LandMarks/meshes/pumpkin.fbx.meta create mode 100644 Assets/FBX/LandMarks/mushroom_brown.prefab rename Assets/{WorldAssets/Models.meta => FBX/LandMarks/mushroom_brown.prefab.meta} (52%) create mode 100644 Assets/FBX/LandMarks/pumpkin.prefab create mode 100644 Assets/FBX/LandMarks/pumpkin.prefab.meta create mode 100644 Assets/FBX/terrainPieces/terrainPieces_openLand.png create mode 100644 Assets/FBX/terrainPieces/terrainPieces_openLand.png.meta create mode 100644 Assets/Scipts/VegetableSpawner.cs create mode 100644 Assets/Scipts/VegetableSpawner.cs.meta create mode 100644 Assets/Sprites/carrot_2D_button.png create mode 100644 Assets/Sprites/carrot_2D_button.png.meta create mode 100644 Assets/Sprites/potato_2D_02.png create mode 100644 Assets/Sprites/potato_2D_02.png.meta create mode 100644 Assets/Sprites/pumpkin_2D_02.png create mode 100644 Assets/Sprites/pumpkin_2D_02.png.meta create mode 100644 Assets/Sprites/received_662261197539302.png create mode 100644 Assets/Sprites/received_662261197539302.png.meta create mode 100644 Assets/Sprites/tiny_forest_button.png create mode 100644 Assets/Sprites/tiny_forest_button.png.meta rename Assets/{Shaders.meta => VeggieSpots.meta} (77%) create mode 100644 Assets/VeggieSpots/Mushroom spot.prefab create mode 100644 Assets/VeggieSpots/Mushroom spot.prefab.meta diff --git a/Assets/FBX/LandMarks/meshes/mushroom_brown.fbx b/Assets/FBX/LandMarks/meshes/mushroom_brown.fbx new file mode 100644 index 0000000..f44a885 --- /dev/null +++ b/Assets/FBX/LandMarks/meshes/mushroom_brown.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5823bf6996cfdabc19cbad45278315f10c51dd3406fc7aac4518808fdd6a23d3 +size 23440 diff --git a/Assets/FBX/LandMarks/meshes/mushroom_brown.fbx.meta b/Assets/FBX/LandMarks/meshes/mushroom_brown.fbx.meta new file mode 100644 index 0000000..5c07c22 --- /dev/null +++ b/Assets/FBX/LandMarks/meshes/mushroom_brown.fbx.meta @@ -0,0 +1,95 @@ +fileFormatVersion: 2 +guid: 2a91f94595e854146b93871824cadac3 +ModelImporter: + serializedVersion: 23 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2100000: mushroom_brown_natureKit__defaultMat + 2100002: mushroom_brown_natureKit_wood + 2300000: //RootNode + 3300000: //RootNode + 4300000: mushroom_brown + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + previousCalculatedGlobalScale: 1 + hasPreviousCalculatedGlobalScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FBX/LandMarks/meshes/pumpkin.fbx b/Assets/FBX/LandMarks/meshes/pumpkin.fbx new file mode 100644 index 0000000..fc39128 --- /dev/null +++ b/Assets/FBX/LandMarks/meshes/pumpkin.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:795ec9f20524099a7c06a690c1dca400936c75729a0ca16c48e37578f8b383fe +size 26432 diff --git a/Assets/FBX/LandMarks/meshes/pumpkin.fbx.meta b/Assets/FBX/LandMarks/meshes/pumpkin.fbx.meta new file mode 100644 index 0000000..c18ea72 --- /dev/null +++ b/Assets/FBX/LandMarks/meshes/pumpkin.fbx.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 1519966c3bc488d45b1242c614e77ca5 +ModelImporter: + serializedVersion: 23 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2100000: pumpkin_natureKit_leavesFall + 2100002: pumpkin_natureKit_leavesGreen + 2100004: pumpkin_natureKit__defaultMat + 2300000: //RootNode + 3300000: //RootNode + 4300000: pumpkin + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + previousCalculatedGlobalScale: 1 + hasPreviousCalculatedGlobalScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FBX/LandMarks/mushroom_brown.prefab b/Assets/FBX/LandMarks/mushroom_brown.prefab new file mode 100644 index 0000000..8a3ec4a --- /dev/null +++ b/Assets/FBX/LandMarks/mushroom_brown.prefab @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 0} + m_RootGameObject: {fileID: 1524072568946206} + m_IsPrefabAsset: 1 +--- !u!1 &1524072568946206 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4183707925000820} + - component: {fileID: 33813293398645658} + - component: {fileID: 23903502474799746} + m_Layer: 0 + m_Name: mushroom_brown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4183707925000820 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1524072568946206} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -45.14, y: 0, z: -17.64} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23903502474799746 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1524072568946206} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 2100000, guid: 2a91f94595e854146b93871824cadac3, type: 3} + - {fileID: 2100002, guid: 2a91f94595e854146b93871824cadac3, type: 3} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33813293398645658 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1524072568946206} + m_Mesh: {fileID: 4300000, guid: 2a91f94595e854146b93871824cadac3, type: 3} diff --git a/Assets/WorldAssets/Models.meta b/Assets/FBX/LandMarks/mushroom_brown.prefab.meta similarity index 52% rename from Assets/WorldAssets/Models.meta rename to Assets/FBX/LandMarks/mushroom_brown.prefab.meta index a4d7756..dd8342a 100644 --- a/Assets/WorldAssets/Models.meta +++ b/Assets/FBX/LandMarks/mushroom_brown.prefab.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: c207356b78ec8e8499bb6047218dd104 -folderAsset: yes -DefaultImporter: +guid: c7b233d599a929e46b4dd4cb0e0c5ca4 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 100100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/FBX/LandMarks/pumpkin.prefab b/Assets/FBX/LandMarks/pumpkin.prefab new file mode 100644 index 0000000..1edde84 --- /dev/null +++ b/Assets/FBX/LandMarks/pumpkin.prefab @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 0} + m_RootGameObject: {fileID: 1010454072769698} + m_IsPrefabAsset: 1 +--- !u!1 &1010454072769698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4162515904612794} + - component: {fileID: 33690313161758358} + - component: {fileID: 23850867726630026} + m_Layer: 0 + m_Name: pumpkin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4162515904612794 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1010454072769698} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -47.92, y: 0, z: -10.36} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23850867726630026 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1010454072769698} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 2100000, guid: 1519966c3bc488d45b1242c614e77ca5, type: 3} + - {fileID: 2100002, guid: 1519966c3bc488d45b1242c614e77ca5, type: 3} + - {fileID: 2100004, guid: 1519966c3bc488d45b1242c614e77ca5, type: 3} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33690313161758358 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1010454072769698} + m_Mesh: {fileID: 4300000, guid: 1519966c3bc488d45b1242c614e77ca5, type: 3} diff --git a/Assets/FBX/LandMarks/pumpkin.prefab.meta b/Assets/FBX/LandMarks/pumpkin.prefab.meta new file mode 100644 index 0000000..fb69682 --- /dev/null +++ b/Assets/FBX/LandMarks/pumpkin.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c715fe92da2f0e6408a115888d5ffb3f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/FBX/terrainPieces/terrainMat.mat b/Assets/FBX/terrainPieces/terrainMat.mat index ed36994..d9945b6 100644 --- a/Assets/FBX/terrainPieces/terrainMat.mat +++ b/Assets/FBX/terrainPieces/terrainMat.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 93363df287b47f547b2b0001c6f4612d, type: 3} + m_Texture: {fileID: 2800000, guid: c7b46358fd4d1bb48ad47cd79614bd20, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/FBX/terrainPieces/terrainPieces_openLand.png b/Assets/FBX/terrainPieces/terrainPieces_openLand.png new file mode 100644 index 0000000..49a60dc --- /dev/null +++ b/Assets/FBX/terrainPieces/terrainPieces_openLand.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62f5a429d76442e53594bfd651edd022f7017988b1ec440321e8cd0c1e18ac50 +size 1702247 diff --git a/Assets/FBX/terrainPieces/terrainPieces_openLand.png.meta b/Assets/FBX/terrainPieces/terrainPieces_openLand.png.meta new file mode 100644 index 0000000..60c52ac --- /dev/null +++ b/Assets/FBX/terrainPieces/terrainPieces_openLand.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: c7b46358fd4d1bb48ad47cd79614bd20 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LocalPlayer.cs b/Assets/LocalPlayer.cs index ea579dd..f027a05 100644 --- a/Assets/LocalPlayer.cs +++ b/Assets/LocalPlayer.cs @@ -11,6 +11,7 @@ public class LocalPlayer : Player { private float animWalkSpeed = 0; + public Recipe recipe; protected override void Update() { ApplyGravity(); @@ -73,4 +74,14 @@ public class LocalPlayer : Player { transform.position = new Vector3(transform.position.x, transform.position.y, map.maxZ); } } + + public void PickupVeggie(Vegetable vegIn) + { + if (heldVeggie != null) + { + recipe.friendlyPickup(heldVeggie.Name, -1); + } + heldVeggie = vegIn; + recipe.friendlyPickup(vegIn.Name, 1); + } } diff --git a/Assets/Prefabs/RealLocalPlayer.prefab b/Assets/Prefabs/RealLocalPlayer.prefab index a0d2132..f714c08 100644 --- a/Assets/Prefabs/RealLocalPlayer.prefab +++ b/Assets/Prefabs/RealLocalPlayer.prefab @@ -73,7 +73,7 @@ GameObject: - component: {fileID: 143426586791887808} m_Layer: 0 m_Name: RealLocalPlayer - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1200,9 +1200,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 890fed67893ffdd44a4cef0b351ae1f0, type: 3} m_Name: m_EditorClassIdentifier: + dummies: [] + heldVeggie: + Name: + Image: {fileID: 0} + playerModel: {fileID: 0} + scale: 0.1 charControl: {fileID: 143426586791887808} Animator: {fileID: 95598162639253862} - Model: {fileID: 4517359647573962} Speed: 5 --- !u!114 &114470274098260950 MonoBehaviour: @@ -1219,6 +1224,8 @@ MonoBehaviour: heldVeggie: Name: Image: {fileID: 0} + playerModel: {fileID: 0} + scale: 0.1 --- !u!114 &114874876091907484 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index f8db2fb..7071b51 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -534,7 +534,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -76} - m_SizeDelta: {x: 15, y: 15} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &264010776 MonoBehaviour: @@ -555,7 +555,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: c055fcda7709c374189c6a72b5a56e6c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -862,9 +862,17 @@ MonoBehaviour: - {fileID: 1826403842147774, guid: 07a4dee3623ac5d4c845b6123b25b8c0, type: 2} - {fileID: 1577805789422060, guid: 987e0107a846c1f4ebbdef315d2a0e03, type: 2} Landmarks: - - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} - - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} - - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} + - {fileID: 1901724256481308, guid: cbe846a199ea1014b9faca04c0d536ff, type: 2} + - {fileID: 1422404471343568, guid: 8105903d0650e604aa3485262d468b2a, type: 2} + - {fileID: 1979100733614630, guid: 14c7a63c4b68f2a4aae1077f7ed5303f, type: 2} + - {fileID: 1118807460158846, guid: 00ae67d3661ad604f8e28345b77b1802, type: 2} + - {fileID: 1226806743324978, guid: 9759bfe3647d01c4392804b2ea040b2a, type: 2} + - {fileID: 1391931725963818, guid: b1d75b278ada91f48b1a9cfd1fe98859, type: 2} + - {fileID: 1771015549225716, guid: 40069da53c4f564469bb5d4cc4a23494, type: 2} + - {fileID: 1837890494469408, guid: 86e9ecea2904dd845bd21e968ab92f26, type: 2} + - {fileID: 1374314220734608, guid: 569da2a514e4ffe4aa11b17843eaa9ba, type: 2} + - {fileID: 1865412863028234, guid: 63c5103bd47f04141993be1bc51323b9, type: 2} + - {fileID: 1470186944116456, guid: 8f4abbcf6230dc94283278aefdf1f583, type: 2} - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} @@ -874,7 +882,6 @@ MonoBehaviour: - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} TileSize: 100 MapDimensions: {x: 3, y: 3} - Veggies: [] --- !u!114 &340012152 MonoBehaviour: m_ObjectHideFlags: 0 @@ -887,14 +894,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Veggies: - - Name: Asparagus - Image: {fileID: 0} + - Name: Potato + Image: {fileID: 21300000, guid: aa4e8a09715bc6d499d28c773728dc3a, type: 3} - Name: Pumpkin - Image: {fileID: 0} + Image: {fileID: 21300000, guid: 8648849067aa0a643bafa5bfee9d02a5, type: 3} - Name: Carrot - Image: {fileID: 0} + Image: {fileID: 21300000, guid: 9523c282f382fdc488317be713536f43, type: 3} - Name: Mushroom - Image: {fileID: 0} + Image: {fileID: 21300000, guid: fcda3393a8f19cd45947860ea3beabac, type: 3} Frames: - VegetableSpot: {fileID: 1293333582} Qty: {fileID: 275025830} @@ -2429,7 +2436,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1146806697 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scipts/Map.cs b/Assets/Scipts/Map.cs index b88c0d9..91559f0 100644 --- a/Assets/Scipts/Map.cs +++ b/Assets/Scipts/Map.cs @@ -14,7 +14,6 @@ public class Map : MonoBehaviour public int TileSize = 100; public Vector2 MapDimensions; - public List Veggies; //Minimum and maximum values for the map public float minX { get { return (-MapDimensions.x * (TileSize / 2)); } } public float maxX { get { return (MapDimensions.x * (TileSize / 2)); } } @@ -65,13 +64,13 @@ public class Map : MonoBehaviour Tile.transform.position = position; Tile.transform.Rotate(Vector3.up, RandomRotation); Tile.name = "Tile [" + x + "," + z + "]"; - + PopulateTile(Tile.GetComponent()); if (x == 0) { Vector3 newPos = position; newPos.x += TileSize * MapDimensions.x; - GameObject MirrorTile = Instantiate(Tiles[randIndex]); + GameObject MirrorTile = Instantiate(Tile); MirrorTile.transform.position = newPos; MirrorTile.transform.Rotate(Vector3.up, RandomRotation); MirrorTile.name = Tile.name + "(Mirror)"; @@ -82,7 +81,7 @@ public class Map : MonoBehaviour Vector3 newPos = position; newPos.z += TileSize * MapDimensions.y; - GameObject MirrorTile = Instantiate(Tiles[randIndex]); + GameObject MirrorTile = Instantiate(Tile); MirrorTile.transform.position = newPos; MirrorTile.transform.Rotate(Vector3.up, RandomRotation); MirrorTile.name = Tile.name + "(Mirror)"; @@ -94,7 +93,7 @@ public class Map : MonoBehaviour newPos.x += TileSize * MapDimensions.x; newPos.z += TileSize * MapDimensions.y; - GameObject MirrorTile = Instantiate(Tiles[randIndex]); + GameObject MirrorTile = Instantiate(Tile); MirrorTile.transform.position = newPos; MirrorTile.transform.Rotate(Vector3.up, RandomRotation); MirrorTile.name = Tile.name + "(Mirror)"; @@ -105,7 +104,7 @@ public class Map : MonoBehaviour Vector3 newPos = position; newPos.x -= TileSize * MapDimensions.x; - GameObject MirrorTile = Instantiate(Tiles[randIndex]); + GameObject MirrorTile = Instantiate(Tile); MirrorTile.transform.position = newPos; MirrorTile.transform.Rotate(Vector3.up, RandomRotation); MirrorTile.name = Tile.name + "(Mirror)"; @@ -116,7 +115,7 @@ public class Map : MonoBehaviour Vector3 newPos = position; newPos.z -= TileSize * MapDimensions.y; - GameObject MirrorTile = Instantiate(Tiles[randIndex]); + GameObject MirrorTile = Instantiate(Tile); MirrorTile.transform.position = newPos; MirrorTile.transform.Rotate(Vector3.up, RandomRotation); MirrorTile.name = Tile.name + "(Mirror)"; @@ -128,7 +127,7 @@ public class Map : MonoBehaviour newPos.x -= TileSize * MapDimensions.x; newPos.z -= TileSize * MapDimensions.y; - GameObject MirrorTile = Instantiate(Tiles[randIndex]); + GameObject MirrorTile = Instantiate(Tile); MirrorTile.transform.position = newPos; MirrorTile.transform.Rotate(Vector3.up, RandomRotation); MirrorTile.name = Tile.name + "(Mirror)"; @@ -140,7 +139,7 @@ public class Map : MonoBehaviour newPos.x += TileSize * MapDimensions.x; newPos.z -= TileSize * MapDimensions.y; - GameObject MirrorTile = Instantiate(Tiles[randIndex]); + GameObject MirrorTile = Instantiate(Tile); MirrorTile.transform.position = newPos; MirrorTile.transform.Rotate(Vector3.up, RandomRotation); MirrorTile.name = Tile.name + "(Mirror)"; @@ -152,7 +151,7 @@ public class Map : MonoBehaviour newPos.x -= TileSize * MapDimensions.x; newPos.z += TileSize * MapDimensions.y; - GameObject MirrorTile = Instantiate(Tiles[randIndex]); + GameObject MirrorTile = Instantiate(Tile); MirrorTile.transform.position = newPos; MirrorTile.transform.Rotate(Vector3.up, RandomRotation); MirrorTile.name = Tile.name + "(Mirror)"; @@ -164,12 +163,13 @@ public class Map : MonoBehaviour //Populate the tile with landmarks void PopulateTile(Tile tile) { - foreach (GameObject LP in tile.LandmarkPoints) + foreach (Transform LP in tile.LandMarkLocations) { if (Landmarks.Count > 0) { int rand = Random.Range(0, Landmarks.Count); Instantiate(Landmarks[rand], LP.transform.position, Quaternion.identity, tile.transform.parent); + Landmarks.Remove(Landmarks[rand]); } } diff --git a/Assets/Scipts/Recipe.cs b/Assets/Scipts/Recipe.cs index 0664835..5dc642c 100644 --- a/Assets/Scipts/Recipe.cs +++ b/Assets/Scipts/Recipe.cs @@ -34,6 +34,7 @@ public class Recipe : MonoBehaviour { localPlayer = Multiplayer.PlayersManager.Instance.LocalPlayer.GetComponent(); PlayerCount = Multiplayer.PlayersManager.Instance.RemotePlayers.Count + 1; + localPlayer.GetComponent().recipe = this; } diff --git a/Assets/Scipts/Tile.cs b/Assets/Scipts/Tile.cs index 9a85ab9..dafff92 100644 --- a/Assets/Scipts/Tile.cs +++ b/Assets/Scipts/Tile.cs @@ -4,5 +4,20 @@ using UnityEngine; public class Tile : MonoBehaviour { - public GameObject[] LandmarkPoints; + public Transform[] LandMarkLocations; + + + public void AddHotSpots(GameObject[] hotSpots) + { + foreach (Transform location in LandMarkLocations) + { + int randIndex = Random.Range(0, hotSpots.Length); + float RandomRotation = Random.Range(0, 3) * 90; + + GameObject temp = Instantiate(hotSpots[randIndex], transform); + temp.transform.position = location.position; + temp.transform.Rotate(Vector3.up, RandomRotation); + temp.name = "LandMark"; + } + } } diff --git a/Assets/Scipts/VegetableSpawner.cs b/Assets/Scipts/VegetableSpawner.cs new file mode 100644 index 0000000..5a7c87a --- /dev/null +++ b/Assets/Scipts/VegetableSpawner.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class VegetableSpawner : MonoBehaviour { + + public Vegetable thisVeg; + public void OnCollisionEnter(Collision other) + { + if (other.gameObject.tag == "Player") + { + other.gameObject.GetComponent().PickupVeggie(thisVeg); + } + } +} diff --git a/Assets/Scipts/VegetableSpawner.cs.meta b/Assets/Scipts/VegetableSpawner.cs.meta new file mode 100644 index 0000000..090afdf --- /dev/null +++ b/Assets/Scipts/VegetableSpawner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 996fad47be976214f978e808ecaf30b7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/carrot_2D_button.png b/Assets/Sprites/carrot_2D_button.png new file mode 100644 index 0000000..f4b07aa --- /dev/null +++ b/Assets/Sprites/carrot_2D_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ca82d1c47199f8b9a101bfcae73d6ef622897334b318e3d5ab91c48956e9ffb +size 84353 diff --git a/Assets/Sprites/carrot_2D_button.png.meta b/Assets/Sprites/carrot_2D_button.png.meta new file mode 100644 index 0000000..96a354c --- /dev/null +++ b/Assets/Sprites/carrot_2D_button.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 9523c282f382fdc488317be713536f43 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + 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: 0c20a009bd6d8a44e955149a9c0a2549 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/potato_2D_02.png b/Assets/Sprites/potato_2D_02.png new file mode 100644 index 0000000..791cc5f --- /dev/null +++ b/Assets/Sprites/potato_2D_02.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8404fe65c8f5ec134a799c90970f8a0be23cee48926ba3d00ca4b3c5f8829e1b +size 41863 diff --git a/Assets/Sprites/potato_2D_02.png.meta b/Assets/Sprites/potato_2D_02.png.meta new file mode 100644 index 0000000..4a5c79f --- /dev/null +++ b/Assets/Sprites/potato_2D_02.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: aa4e8a09715bc6d499d28c773728dc3a +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + 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: 186b600062ebc0140b5a33e5f791bdd8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/pumpkin_2D_02.png b/Assets/Sprites/pumpkin_2D_02.png new file mode 100644 index 0000000..8a48ff1 --- /dev/null +++ b/Assets/Sprites/pumpkin_2D_02.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6871f45412a1e8e9c7123b7bedf4612a5c2bb5e76cb8ee14256d8b5924b021f +size 43932 diff --git a/Assets/Sprites/pumpkin_2D_02.png.meta b/Assets/Sprites/pumpkin_2D_02.png.meta new file mode 100644 index 0000000..5c315b2 --- /dev/null +++ b/Assets/Sprites/pumpkin_2D_02.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 8648849067aa0a643bafa5bfee9d02a5 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + 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: f700d223aa6d52d4dba751ab239ade2c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/received_662261197539302.png b/Assets/Sprites/received_662261197539302.png new file mode 100644 index 0000000..9276946 --- /dev/null +++ b/Assets/Sprites/received_662261197539302.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6bbb910b641200d0a95d65c6d889c94945b4b315c6a087eb81dbcd338d2b8772 +size 46316 diff --git a/Assets/Sprites/received_662261197539302.png.meta b/Assets/Sprites/received_662261197539302.png.meta new file mode 100644 index 0000000..3247272 --- /dev/null +++ b/Assets/Sprites/received_662261197539302.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: fcda3393a8f19cd45947860ea3beabac +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + 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: dcb5c7320f88d4f4c81b389f4812f5d9 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/tiny_forest_button.png b/Assets/Sprites/tiny_forest_button.png new file mode 100644 index 0000000..cd6bee2 --- /dev/null +++ b/Assets/Sprites/tiny_forest_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9be4aa48080fb8072bf8069f01c8644fe5cace697013f749b77f406fe5178e68 +size 112537 diff --git a/Assets/Sprites/tiny_forest_button.png.meta b/Assets/Sprites/tiny_forest_button.png.meta new file mode 100644 index 0000000..6896ef8 --- /dev/null +++ b/Assets/Sprites/tiny_forest_button.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: c055fcda7709c374189c6a72b5a56e6c +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + 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: fba6efd4ea143404eac1f51dcbfaa691 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders.meta b/Assets/VeggieSpots.meta similarity index 77% rename from Assets/Shaders.meta rename to Assets/VeggieSpots.meta index 472bf46..1b2973e 100644 --- a/Assets/Shaders.meta +++ b/Assets/VeggieSpots.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f87a054963b01dc4c8aa2e3ffedcca21 +guid: fe426df65c15b4a49969611c8cbcff04 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/VeggieSpots/Mushroom spot.prefab b/Assets/VeggieSpots/Mushroom spot.prefab new file mode 100644 index 0000000..f6c3b3f --- /dev/null +++ b/Assets/VeggieSpots/Mushroom spot.prefab @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 0} + m_RootGameObject: {fileID: 1920492649654550} + m_IsPrefabAsset: 1 +--- !u!1 &1920492649654550 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4771560102479004} + - component: {fileID: 33161411682848188} + - component: {fileID: 23066903033166784} + m_Layer: 0 + m_Name: Mushroom spot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4771560102479004 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1920492649654550} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 336.3763, y: 397.99, z: -16.19441} + m_LocalScale: {x: 2.9190772, y: 2.9190772, z: 2.9190772} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23066903033166784 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1920492649654550} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 2100000, guid: 79212885923a8b04fbe9237207a285f6, type: 3} + - {fileID: 2100002, guid: 79212885923a8b04fbe9237207a285f6, type: 3} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33161411682848188 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1920492649654550} + m_Mesh: {fileID: 4300000, guid: 79212885923a8b04fbe9237207a285f6, type: 3} diff --git a/Assets/VeggieSpots/Mushroom spot.prefab.meta b/Assets/VeggieSpots/Mushroom spot.prefab.meta new file mode 100644 index 0000000..daa32e8 --- /dev/null +++ b/Assets/VeggieSpots/Mushroom spot.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99097c2a41ae18240a0d95f1a93cc214 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: