diff --git a/Assets/Materials/Rockku.mat b/Assets/Materials/Rockku.mat new file mode 100644 index 0000000..9ef0d6f --- /dev/null +++ b/Assets/Materials/Rockku.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Rockku + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 1 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.6509434, g: 0.61333346, b: 0.5803222, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Rockku.mat.meta b/Assets/Materials/Rockku.mat.meta new file mode 100644 index 0000000..445f5c2 --- /dev/null +++ b/Assets/Materials/Rockku.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd1e210d1875fe3418bb5765f613411d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/log.fbx b/Assets/Models/log.fbx new file mode 100644 index 0000000..833fc84 Binary files /dev/null and b/Assets/Models/log.fbx differ diff --git a/Assets/Models/log.fbx.meta b/Assets/Models/log.fbx.meta new file mode 100644 index 0000000..30fa0db --- /dev/null +++ b/Assets/Models/log.fbx.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 4ea0140474f39ac47bdd8b1bcc130ea2 +ModelImporter: + serializedVersion: 19300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 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: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + 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 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Environment/Campfire.prefab b/Assets/Prefabs/Environment/Campfire.prefab index a1d78c1..b83dc2c 100644 --- a/Assets/Prefabs/Environment/Campfire.prefab +++ b/Assets/Prefabs/Environment/Campfire.prefab @@ -5181,11 +5181,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -2366222767385783472, guid: 4facd75878c39c7499d4291e717cda98, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 80996928df7a0d847bbb7a283c52976b, type: 2} - target: {fileID: -927199367670048503, guid: 4facd75878c39c7499d4291e717cda98, type: 3} propertyPath: m_Name value: campfire objectReference: {fileID: 0} + - target: {fileID: 4492701032547155838, guid: 4facd75878c39c7499d4291e717cda98, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: dd1e210d1875fe3418bb5765f613411d, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4facd75878c39c7499d4291e717cda98, type: 3} --- !u!4 &3464217916028558321 stripped diff --git a/Assets/Prefabs/Environment/Log.prefab b/Assets/Prefabs/Environment/Log.prefab new file mode 100644 index 0000000..8c64ce6 --- /dev/null +++ b/Assets/Prefabs/Environment/Log.prefab @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &110889063446132937 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1537215554624875642} + m_Layer: 0 + m_Name: Log + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1537215554624875642 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 110889063446132937} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1.245} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5208747214434309696} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &951274577046027610 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1537215554624875642} + m_Modifications: + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.014 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.43881816 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.5544716 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.55447155 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.43881807 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90.00001 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -103.283005 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_LocalScale.x + value: 261.0268 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_LocalScale.y + value: 261.0268 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_LocalScale.z + value: 261.0268 + objectReference: {fileID: 0} + - target: {fileID: -1504981713932161579, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 80996928df7a0d847bbb7a283c52976b, type: 2} + - target: {fileID: -927199367670048503, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_Name + value: log + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, type: 3} +--- !u!4 &5208747214434309696 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + m_PrefabInstance: {fileID: 951274577046027610} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Environment/Log.prefab.meta b/Assets/Prefabs/Environment/Log.prefab.meta new file mode 100644 index 0000000..7793176 --- /dev/null +++ b/Assets/Prefabs/Environment/Log.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d3251a3aedb46143931b1ea4eaa4138 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Raw Assets/Models/campfire.blend b/Raw Assets/Models/campfire.blend index b3261b1..943254a 100644 Binary files a/Raw Assets/Models/campfire.blend and b/Raw Assets/Models/campfire.blend differ diff --git a/Raw Assets/Models/campfire.blend1 b/Raw Assets/Models/campfire.blend1 index 382356b..b3261b1 100644 Binary files a/Raw Assets/Models/campfire.blend1 and b/Raw Assets/Models/campfire.blend1 differ diff --git a/Raw Assets/Models/log.blend b/Raw Assets/Models/log.blend new file mode 100644 index 0000000..82d3a35 Binary files /dev/null and b/Raw Assets/Models/log.blend differ diff --git a/Raw Assets/Models/log.blend1 b/Raw Assets/Models/log.blend1 new file mode 100644 index 0000000..78a93f3 Binary files /dev/null and b/Raw Assets/Models/log.blend1 differ