From d98ad9d9cddd5a9bdbcf8256cfa3fbb2bcb43540 Mon Sep 17 00:00:00 2001 From: MB Date: Sun, 27 Jan 2019 12:02:59 +1100 Subject: [PATCH] Music added, bugs fixed --- Assets/Scenes/MainScene.unity | 30 ++- Assets/Scipts/CharacterMovement.cs | 10 +- .../Scipts/PlayerControllers/LocalPlayer.cs | 6 + Assets/Scipts/SoundManager.cs | 36 +++ Assets/Scipts/SoundManager.cs.meta | 11 + Assets/VeggieSpots/Mushroom spot.prefab | 28 +++ Assets/VeggieSpots/carrot_02.fbx | 3 + Assets/VeggieSpots/carrot_02.fbx.meta | 103 +++++++++ Assets/VeggieSpots/carrot_02.prefab | 216 ++++++++++++++++++ Assets/VeggieSpots/carrot_02.prefab.meta | 8 + Assets/VeggieSpots/potato_01.fbx | 3 + Assets/VeggieSpots/potato_01.fbx.meta | 94 ++++++++ Assets/VeggieSpots/potato_01.prefab | 113 +++++++++ Assets/VeggieSpots/potato_01.prefab.meta | 8 + Assets/VeggieSpots/pumpkin.prefab | 115 ++++++++++ Assets/VeggieSpots/pumpkin.prefab.meta | 8 + 16 files changed, 783 insertions(+), 9 deletions(-) create mode 100644 Assets/Scipts/SoundManager.cs create mode 100644 Assets/Scipts/SoundManager.cs.meta create mode 100644 Assets/VeggieSpots/carrot_02.fbx create mode 100644 Assets/VeggieSpots/carrot_02.fbx.meta create mode 100644 Assets/VeggieSpots/carrot_02.prefab create mode 100644 Assets/VeggieSpots/carrot_02.prefab.meta create mode 100644 Assets/VeggieSpots/potato_01.fbx create mode 100644 Assets/VeggieSpots/potato_01.fbx.meta create mode 100644 Assets/VeggieSpots/potato_01.prefab create mode 100644 Assets/VeggieSpots/potato_01.prefab.meta create mode 100644 Assets/VeggieSpots/pumpkin.prefab create mode 100644 Assets/VeggieSpots/pumpkin.prefab.meta diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 7071b51..6749d19 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -809,6 +809,7 @@ GameObject: - component: {fileID: 340012151} - component: {fileID: 340012152} - component: {fileID: 340012155} + - component: {fileID: 340012156} m_Layer: 0 m_Name: GameManager m_TagString: Untagged @@ -873,13 +874,13 @@ MonoBehaviour: - {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} - - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} - - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} - - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} - - {fileID: 1764259581180914, guid: 052dd7263458ca946b48b08ee2f36654, type: 2} + - {fileID: 1920492649654550, guid: 99097c2a41ae18240a0d95f1a93cc214, type: 2} + - {fileID: 1507904707863932, guid: d5ee26df5800f8745830b0ae25b626ee, type: 2} + - {fileID: 1116618855275128, guid: 1483dfc0af431664bab3d817b9f7bc2d, type: 2} + - {fileID: 1420467368236124, guid: bdc66d0f6076df140aeef41a2805a9a8, type: 2} + - {fileID: 1771015549225716, guid: 40069da53c4f564469bb5d4cc4a23494, type: 2} + - {fileID: 1865412863028234, guid: 63c5103bd47f04141993be1bc51323b9, type: 2} + - {fileID: 1979100733614630, guid: 14c7a63c4b68f2a4aae1077f7ed5303f, type: 2} TileSize: 100 MapDimensions: {x: 3, y: 3} --- !u!114 &340012152 @@ -961,6 +962,21 @@ MonoBehaviour: Players: [] Nearby: DistanceToWin: 10 +--- !u!114 &340012156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 340012148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26caf68f28b9fb4489b3b770e46cd2d9, type: 3} + m_Name: + m_EditorClassIdentifier: + Startmusic: {fileID: 0} + loopMusic: {fileID: 0} + endMusic: {fileID: 0} + gameLength: 120 --- !u!1 &413141712 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scipts/CharacterMovement.cs b/Assets/Scipts/CharacterMovement.cs index b1274f2..9b43b66 100644 --- a/Assets/Scipts/CharacterMovement.cs +++ b/Assets/Scipts/CharacterMovement.cs @@ -12,6 +12,8 @@ public class CharacterMovement : MonoBehaviour { public float DistanceToWin; Camera cam; + + public AudioSource Cheer; private void Start() { localPlayer = Multiplayer.PlayersManager.Instance.LocalPlayer; @@ -25,23 +27,27 @@ public class CharacterMovement : MonoBehaviour { public bool CheckNearby() { + bool found = false; for (int i = 0; i < Players.Count; i++) { if ((localPlayer.transform.position - Players[i].transform.position).magnitude < DistanceToWin) { Greet(); + found = true; } else - { + { Player playerScript = Players[i].GetComponent(); foreach (GameObject dummy in playerScript.dummies) { if ((localPlayer.transform.position - dummy.transform.position).magnitude < DistanceToWin) { Greet(); + found = true; } } } + Nearby[i] = found; } return CheckWin(); } @@ -60,7 +66,7 @@ public class CharacterMovement : MonoBehaviour { public void Greet() { - //Play audio + Cheer.Play(); //Trigger animation } } diff --git a/Assets/Scipts/PlayerControllers/LocalPlayer.cs b/Assets/Scipts/PlayerControllers/LocalPlayer.cs index f027a05..9370e22 100644 --- a/Assets/Scipts/PlayerControllers/LocalPlayer.cs +++ b/Assets/Scipts/PlayerControllers/LocalPlayer.cs @@ -12,6 +12,8 @@ public class LocalPlayer : Player { private float animWalkSpeed = 0; public Recipe recipe; + public AudioSource WalkingSounds; + protected override void Update() { ApplyGravity(); @@ -50,6 +52,10 @@ public class LocalPlayer : Player { } Animator.SetFloat("WalkSpeed", animWalkSpeed); + if (WalkingSounds.isPlaying != true) + { + WalkingSounds.Play(); + } } void Teleport() diff --git a/Assets/Scipts/SoundManager.cs b/Assets/Scipts/SoundManager.cs new file mode 100644 index 0000000..3bf9509 --- /dev/null +++ b/Assets/Scipts/SoundManager.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SoundManager : MonoBehaviour { + + public AudioSource Startmusic; + public AudioSource loopMusic; + public AudioSource endMusic; + + public float gameLength = 120; + AudioSource curMusic; + public void Start() + { + Startmusic.Play(); + StartCoroutine(ChangeMusic(loopMusic, Startmusic.clip.length)); + StartCoroutine(ChangeMusic(loopMusic, gameLength - 10.0f)); + } + + private void Update() + { + + } + + IEnumerator ChangeMusic(AudioSource music, float musicTime) + { + while (musicTime > 0) + { + musicTime -= 1.0f * Time.deltaTime; + yield return new WaitForEndOfFrame(); + } + curMusic.Stop(); + curMusic = music; + music.Play(); + } +} diff --git a/Assets/Scipts/SoundManager.cs.meta b/Assets/Scipts/SoundManager.cs.meta new file mode 100644 index 0000000..f3d989e --- /dev/null +++ b/Assets/Scipts/SoundManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 26caf68f28b9fb4489b3b770e46cd2d9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VeggieSpots/Mushroom spot.prefab b/Assets/VeggieSpots/Mushroom spot.prefab index f6c3b3f..7ef8eb1 100644 --- a/Assets/VeggieSpots/Mushroom spot.prefab +++ b/Assets/VeggieSpots/Mushroom spot.prefab @@ -21,6 +21,8 @@ GameObject: - component: {fileID: 4771560102479004} - component: {fileID: 33161411682848188} - component: {fileID: 23066903033166784} + - component: {fileID: 65576532979852656} + - component: {fileID: 114486742490627892} m_Layer: 0 m_Name: Mushroom spot m_TagString: Untagged @@ -84,3 +86,29 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1920492649654550} m_Mesh: {fileID: 4300000, guid: 79212885923a8b04fbe9237207a285f6, type: 3} +--- !u!65 &65576532979852656 +BoxCollider: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1920492649654550} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2.6963196, y: 2.5419624, z: 2.5048807} + m_Center: {x: 0, y: 0, z: 1.2524403} +--- !u!114 &114486742490627892 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1920492649654550} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 996fad47be976214f978e808ecaf30b7, type: 3} + m_Name: + m_EditorClassIdentifier: + thisVeg: + Name: Mushroom + Image: {fileID: 0} diff --git a/Assets/VeggieSpots/carrot_02.fbx b/Assets/VeggieSpots/carrot_02.fbx new file mode 100644 index 0000000..625bda8 --- /dev/null +++ b/Assets/VeggieSpots/carrot_02.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:222e493b0a5626e478ab49dfa51075bf245cff1e406c9616a69b78205fecebc9 +size 45936 diff --git a/Assets/VeggieSpots/carrot_02.fbx.meta b/Assets/VeggieSpots/carrot_02.fbx.meta new file mode 100644 index 0000000..a793e88 --- /dev/null +++ b/Assets/VeggieSpots/carrot_02.fbx.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: 17fce145d99490b4293e7b1e3ab97185 +ModelImporter: + serializedVersion: 23 + fileIDToRecycleName: + 100000: carrot + 100002: //RootNode + 100004: potato + 400000: carrot + 400002: //RootNode + 400004: potato + 2100000: lambert3 + 2100002: lambert4 + 2100004: lambert5 + 2300000: carrot + 2300002: potato + 3300000: carrot + 3300002: potato + 4300000: carrot + 4300002: potato + 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/VeggieSpots/carrot_02.prefab b/Assets/VeggieSpots/carrot_02.prefab new file mode 100644 index 0000000..b215d3f --- /dev/null +++ b/Assets/VeggieSpots/carrot_02.prefab @@ -0,0 +1,216 @@ +%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: 1507904707863932} + m_IsPrefabAsset: 1 +--- !u!1 &1299243923031594 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4121938311380124} + - component: {fileID: 33966115456832688} + - component: {fileID: 23712034607101652} + m_Layer: 0 + m_Name: potato + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1507904707863932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4365294101830012} + - component: {fileID: 65285727482329386} + - component: {fileID: 114730137093934732} + m_Layer: 0 + m_Name: carrot_02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1691079951970104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4224880173686552} + - component: {fileID: 33497670937041306} + - component: {fileID: 23948054871297300} + m_Layer: 0 + m_Name: carrot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4121938311380124 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1299243923031594} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.00737719, z: 0} + m_LocalScale: {x: 1.1943321, y: 1.1943321, z: 2.149752} + m_Children: [] + m_Father: {fileID: 4365294101830012} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4224880173686552 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1691079951970104} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4365294101830012} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4365294101830012 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1507904707863932} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.84856, y: -0.63446, z: -0.70239} + m_LocalScale: {x: 134.83574, y: 134.83574, z: 134.83574} + m_Children: + - {fileID: 4224880173686552} + - {fileID: 4121938311380124} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23712034607101652 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1299243923031594} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 2100004, guid: 17fce145d99490b4293e7b1e3ab97185, 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!23 &23948054871297300 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1691079951970104} + 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: 17fce145d99490b4293e7b1e3ab97185, type: 3} + - {fileID: 2100002, guid: 17fce145d99490b4293e7b1e3ab97185, 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 &33497670937041306 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1691079951970104} + m_Mesh: {fileID: 4300000, guid: 17fce145d99490b4293e7b1e3ab97185, type: 3} +--- !u!33 &33966115456832688 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1299243923031594} + m_Mesh: {fileID: 4300002, guid: 17fce145d99490b4293e7b1e3ab97185, type: 3} +--- !u!65 &65285727482329386 +BoxCollider: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1507904707863932} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &114730137093934732 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1507904707863932} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 996fad47be976214f978e808ecaf30b7, type: 3} + m_Name: + m_EditorClassIdentifier: + thisVeg: + Name: Carrot + Image: {fileID: 21300000, guid: 9523c282f382fdc488317be713536f43, type: 3} diff --git a/Assets/VeggieSpots/carrot_02.prefab.meta b/Assets/VeggieSpots/carrot_02.prefab.meta new file mode 100644 index 0000000..2a9bd96 --- /dev/null +++ b/Assets/VeggieSpots/carrot_02.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5ee26df5800f8745830b0ae25b626ee +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VeggieSpots/potato_01.fbx b/Assets/VeggieSpots/potato_01.fbx new file mode 100644 index 0000000..b067964 --- /dev/null +++ b/Assets/VeggieSpots/potato_01.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5065d9a7bd82c50f782af9bdd74d6b610d9bda05ab2506d4be89fbed9f8c4a8 +size 22288 diff --git a/Assets/VeggieSpots/potato_01.fbx.meta b/Assets/VeggieSpots/potato_01.fbx.meta new file mode 100644 index 0000000..0d161f6 --- /dev/null +++ b/Assets/VeggieSpots/potato_01.fbx.meta @@ -0,0 +1,94 @@ +fileFormatVersion: 2 +guid: 63cf58fd2474f0e498c599433ea47a80 +ModelImporter: + serializedVersion: 23 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2100000: lambert5 + 2300000: //RootNode + 3300000: //RootNode + 4300000: potato + 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/VeggieSpots/potato_01.prefab b/Assets/VeggieSpots/potato_01.prefab new file mode 100644 index 0000000..8b6c712 --- /dev/null +++ b/Assets/VeggieSpots/potato_01.prefab @@ -0,0 +1,113 @@ +%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: 1116618855275128} + m_IsPrefabAsset: 1 +--- !u!1 &1116618855275128 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4620234204000772} + - component: {fileID: 33288310770489376} + - component: {fileID: 23385680880581990} + - component: {fileID: 65470407959044724} + - component: {fileID: 114909207236204264} + m_Layer: 0 + m_Name: potato_01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4620234204000772 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1116618855275128} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.66493, y: 3.5159, z: -12.026813} + m_LocalScale: {x: 57.981243, y: 57.981243, z: 104.364006} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23385680880581990 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1116618855275128} + 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: 63cf58fd2474f0e498c599433ea47a80, 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 &33288310770489376 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1116618855275128} + m_Mesh: {fileID: 4300000, guid: 63cf58fd2474f0e498c599433ea47a80, type: 3} +--- !u!65 &65470407959044724 +BoxCollider: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1116618855275128} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.019396927, y: 0.01952519, z: 0.019696157} + m_Center: {x: -0.00030153617, y: 0.009762595, z: -4.656613e-10} +--- !u!114 &114909207236204264 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1116618855275128} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 996fad47be976214f978e808ecaf30b7, type: 3} + m_Name: + m_EditorClassIdentifier: + thisVeg: + Name: Potato + Image: {fileID: 21300000, guid: aa4e8a09715bc6d499d28c773728dc3a, type: 3} diff --git a/Assets/VeggieSpots/potato_01.prefab.meta b/Assets/VeggieSpots/potato_01.prefab.meta new file mode 100644 index 0000000..3812661 --- /dev/null +++ b/Assets/VeggieSpots/potato_01.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1483dfc0af431664bab3d817b9f7bc2d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VeggieSpots/pumpkin.prefab b/Assets/VeggieSpots/pumpkin.prefab new file mode 100644 index 0000000..4ed04b2 --- /dev/null +++ b/Assets/VeggieSpots/pumpkin.prefab @@ -0,0 +1,115 @@ +%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: 1420467368236124} + m_IsPrefabAsset: 1 +--- !u!1 &1420467368236124 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4296375980201268} + - component: {fileID: 33001905673138320} + - component: {fileID: 23233777779250244} + - component: {fileID: 65564087199631914} + - component: {fileID: 114991623911943832} + m_Layer: 0 + m_Name: pumpkin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4296375980201268 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1420467368236124} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 255.76149, y: 560.73267, z: -552.0315} + 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 &23233777779250244 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1420467368236124} + 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 &33001905673138320 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1420467368236124} + m_Mesh: {fileID: 4300000, guid: 1519966c3bc488d45b1242c614e77ca5, type: 3} +--- !u!65 &65564087199631914 +BoxCollider: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1420467368236124} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 5.614971, y: 6.4836135, z: 5.172702} + m_Center: {x: 0, y: 0, z: 2.586351} +--- !u!114 &114991623911943832 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1420467368236124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 996fad47be976214f978e808ecaf30b7, type: 3} + m_Name: + m_EditorClassIdentifier: + thisVeg: + Name: Pumpkin + Image: {fileID: 21300000, guid: 8648849067aa0a643bafa5bfee9d02a5, type: 3} diff --git a/Assets/VeggieSpots/pumpkin.prefab.meta b/Assets/VeggieSpots/pumpkin.prefab.meta new file mode 100644 index 0000000..b32de55 --- /dev/null +++ b/Assets/VeggieSpots/pumpkin.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bdc66d0f6076df140aeef41a2805a9a8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: