diff --git a/blender/Models/Beaver.blend b/blender/Models/Beaver.blend index b2e3ca5..834fa1b 100644 --- a/blender/Models/Beaver.blend +++ b/blender/Models/Beaver.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdbf8961e3856c044630ac3d1ffec329b06ab51932cf08f54c458755ad54009d -size 1160462 +oid sha256:0810e02c2b3c901f2fe6cd795af1aaccf8fb03013ef026b6f9df15a59dfa4c2e +size 1298636 diff --git a/blender/Models/Beaver.blend2 b/blender/Models/Beaver.blend2 index 8a58296..998a6e6 100644 Binary files a/blender/Models/Beaver.blend2 and b/blender/Models/Beaver.blend2 differ diff --git a/blender/Models/DeerWithCrown.blend b/blender/Models/DeerWithCrown.blend new file mode 100644 index 0000000..70c27fb --- /dev/null +++ b/blender/Models/DeerWithCrown.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3d433423f64bf33f2393e136e6ff977c70c6af79934fba2e2a09835cfeb7981 +size 1185516 diff --git a/blender/Models/Stick.blend b/blender/Models/Stick.blend new file mode 100644 index 0000000..f0060d4 --- /dev/null +++ b/blender/Models/Stick.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fd304f76461530bb3d278fc0f582ccd20afd35e8ad2af60217a163453ad167b +size 912068 diff --git a/blender/Models/Stick.fbx b/blender/Models/Stick.fbx new file mode 100644 index 0000000..4e3c001 --- /dev/null +++ b/blender/Models/Stick.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b575cdf872aa9dc647d790ca01140d8f9229952ff1e8fa6c643338305aea46ca +size 14748 diff --git a/blender/flower.png b/blender/flower.png new file mode 100644 index 0000000..21bc792 --- /dev/null +++ b/blender/flower.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed21905d25a58e723f8f4b67f648f7c1ef03e1666067eb0329ff952b807af7b3 +size 24172 diff --git a/blueberryPeak/Assets/Materials/Forest/Stick.mat b/blueberryPeak/Assets/Materials/Forest/Stick.mat new file mode 100644 index 0000000..7962f24 --- /dev/null +++ b/blueberryPeak/Assets/Materials/Forest/Stick.mat @@ -0,0 +1,144 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1932171427855292943 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Stick + m_Shader: {fileID: -6465566751694194690, guid: 6ec9b3c213ee8974e943a7e5bfb49b7b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Texture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Max: 1 + - _Metallic: 0 + - _Min: 0.3 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _RECEIVE_SHADOWS_OFF: 0 + - _ReceiveShadows: 1 + - _Shades: 0.49 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.5943396, g: 0.23638509, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/blueberryPeak/Assets/Materials/Forest/Stick.mat.meta b/blueberryPeak/Assets/Materials/Forest/Stick.mat.meta new file mode 100644 index 0000000..fa476d6 --- /dev/null +++ b/blueberryPeak/Assets/Materials/Forest/Stick.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc894c0fbd1ce4f98b88e2907faf8b02 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Models/Stick.fbx b/blueberryPeak/Assets/Models/Stick.fbx new file mode 100644 index 0000000..4e3c001 --- /dev/null +++ b/blueberryPeak/Assets/Models/Stick.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b575cdf872aa9dc647d790ca01140d8f9229952ff1e8fa6c643338305aea46ca +size 14748 diff --git a/blueberryPeak/Assets/Models/Stick.fbx.meta b/blueberryPeak/Assets/Models/Stick.fbx.meta new file mode 100644 index 0000000..08a0954 --- /dev/null +++ b/blueberryPeak/Assets/Models/Stick.fbx.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: 02bbfb96c6828442f96c2734c907299f +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + 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: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Prefabs/Forest/Stick.prefab b/blueberryPeak/Assets/Prefabs/Forest/Stick.prefab new file mode 100644 index 0000000..a53e6e1 --- /dev/null +++ b/blueberryPeak/Assets/Prefabs/Forest/Stick.prefab @@ -0,0 +1,116 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3175039246732224973 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8584199766321833120} + m_Layer: 0 + m_Name: Stick + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8584199766321833120 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3175039246732224973} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 9.569107, y: 0.5700012, z: -2.4602785} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 88286011868707772} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &482763487495101527 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8584199766321833120} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalScale.x + value: 3.93 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalScale.y + value: 63.8454 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalScale.z + value: 3.9300003 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: bc894c0fbd1ce4f98b88e2907faf8b02, type: 2} + - target: {fileID: 919132149155446097, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + propertyPath: m_Name + value: Model + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} +--- !u!4 &88286011868707772 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 02bbfb96c6828442f96c2734c907299f, type: 3} + m_PrefabInstance: {fileID: 482763487495101527} + m_PrefabAsset: {fileID: 0} diff --git a/blueberryPeak/Assets/Prefabs/Forest/Stick.prefab.meta b/blueberryPeak/Assets/Prefabs/Forest/Stick.prefab.meta new file mode 100644 index 0000000..97f483c --- /dev/null +++ b/blueberryPeak/Assets/Prefabs/Forest/Stick.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 46e45c71fef0d43d9b58a5816f3f86b3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Scenes/Garden.unity b/blueberryPeak/Assets/Scenes/Garden.unity index c53e112..92b9e0c 100644 --- a/blueberryPeak/Assets/Scenes/Garden.unity +++ b/blueberryPeak/Assets/Scenes/Garden.unity @@ -120740,6 +120740,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 6951157000161419228, guid: 27dab0d35dec74c019e40f6fac96264d, type: 3} m_PrefabInstance: {fileID: 2146998433} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7443379002385320554 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3175039246732224973, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} + propertyPath: m_Name + value: Stick + objectReference: {fileID: 0} + - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} + propertyPath: m_LocalPosition.x + value: 9.569107 + objectReference: {fileID: 0} + - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5700012 + objectReference: {fileID: 0} + - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} + propertyPath: m_LocalPosition.z + value: -2.4602785 + objectReference: {fileID: 0} + - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8584199766321833120, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 46e45c71fef0d43d9b58a5816f3f86b3, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -120750,3 +120807,4 @@ SceneRoots: - {fileID: 1420526773} - {fileID: 1744853879} - {fileID: 109876465} + - {fileID: 7443379002385320554}