diff --git a/FlufflParty/Assets/BlenderFiles/Cactus.blend b/FlufflParty/Assets/BlenderFiles/Cactus.blend index 8566748..7a53979 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Cactus.blend and b/FlufflParty/Assets/BlenderFiles/Cactus.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/Cactus.blend1 b/FlufflParty/Assets/BlenderFiles/Cactus.blend1 new file mode 100644 index 0000000..669025f Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Cactus.blend1 differ diff --git a/FlufflParty/Assets/Prefabs/DriedGrass.meta b/FlufflParty/Assets/BlenderFiles/Cactus.blend1.meta similarity index 67% rename from FlufflParty/Assets/Prefabs/DriedGrass.meta rename to FlufflParty/Assets/BlenderFiles/Cactus.blend1.meta index 7e884ad..febe652 100644 --- a/FlufflParty/Assets/Prefabs/DriedGrass.meta +++ b/FlufflParty/Assets/BlenderFiles/Cactus.blend1.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: b860e691c04d3f348b5d1e04ea3a3942 -folderAsset: yes +guid: 10e9dc7ddf6752741bab6788f7411e52 DefaultImporter: externalObjects: {} userData: diff --git a/FlufflParty/Assets/BlenderFiles/Cactus_2.blend b/FlufflParty/Assets/BlenderFiles/Cactus_2.blend index c4e1827..c348f54 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Cactus_2.blend and b/FlufflParty/Assets/BlenderFiles/Cactus_2.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/Cactus_2.blend1 b/FlufflParty/Assets/BlenderFiles/Cactus_2.blend1 index 2e5cfda..b342cbd 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Cactus_2.blend1 and b/FlufflParty/Assets/BlenderFiles/Cactus_2.blend1 differ diff --git a/FlufflParty/Assets/BlenderFiles/PalmTree.blend b/FlufflParty/Assets/BlenderFiles/PalmTree.blend new file mode 100644 index 0000000..65646dd Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/PalmTree.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/PalmTree.blend.meta b/FlufflParty/Assets/BlenderFiles/PalmTree.blend.meta new file mode 100644 index 0000000..c7eb905 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/PalmTree.blend.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 4f86fb997d4632245a8991b04e6bcd49 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + 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 + 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 + 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 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/PalmTree.blend1 b/FlufflParty/Assets/BlenderFiles/PalmTree.blend1 new file mode 100644 index 0000000..ca42138 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/PalmTree.blend1 differ diff --git a/FlufflParty/Assets/Prefabs/Cactus/Cactus_2.prefab.meta b/FlufflParty/Assets/BlenderFiles/PalmTree.blend1.meta similarity index 63% rename from FlufflParty/Assets/Prefabs/Cactus/Cactus_2.prefab.meta rename to FlufflParty/Assets/BlenderFiles/PalmTree.blend1.meta index 5e3c3bd..19951a5 100644 --- a/FlufflParty/Assets/Prefabs/Cactus/Cactus_2.prefab.meta +++ b/FlufflParty/Assets/BlenderFiles/PalmTree.blend1.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 1aa0ca4e044dd12488bf282f06cd1667 -PrefabImporter: +guid: 2c266e65e6161a142ad3c06a852136db +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/FlufflParty/Assets/BlenderFiles/PalmTreeLeaf.png b/FlufflParty/Assets/BlenderFiles/PalmTreeLeaf.png new file mode 100644 index 0000000..80ee617 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/PalmTreeLeaf.png differ diff --git a/FlufflParty/Assets/BlenderFiles/PalmTreeLeaf.png.meta b/FlufflParty/Assets/BlenderFiles/PalmTreeLeaf.png.meta new file mode 100644 index 0000000..fda4472 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/PalmTreeLeaf.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 3a042964eefc2444fb2a427e9b4b8800 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/PalmTrunk.png b/FlufflParty/Assets/BlenderFiles/PalmTrunk.png new file mode 100644 index 0000000..65f417f Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/PalmTrunk.png differ diff --git a/FlufflParty/Assets/BlenderFiles/PalmTrunk.png.meta b/FlufflParty/Assets/BlenderFiles/PalmTrunk.png.meta new file mode 100644 index 0000000..9e6d129 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/PalmTrunk.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: fc5cb112b2dd433478446edab3a01018 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Materials/DriedGrass/DriedGrass.mat b/FlufflParty/Assets/Materials/DriedGrass/DriedGrass.mat index 659e6e1..66b6ae9 100644 --- a/FlufflParty/Assets/Materials/DriedGrass/DriedGrass.mat +++ b/FlufflParty/Assets/Materials/DriedGrass/DriedGrass.mat @@ -75,6 +75,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.89874864, g: 1, b: 0.2783019, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Prefabs/Cactus.meta b/FlufflParty/Assets/Materials/PalmTree.meta similarity index 77% rename from FlufflParty/Assets/Prefabs/Cactus.meta rename to FlufflParty/Assets/Materials/PalmTree.meta index b276f22..44f073b 100644 --- a/FlufflParty/Assets/Prefabs/Cactus.meta +++ b/FlufflParty/Assets/Materials/PalmTree.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d5cf912d788587d4a820312b3626cd91 +guid: 8f43ca93fb1eeaa4298ec7c7c465d856 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat b/FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat new file mode 100644 index 0000000..16f541c --- /dev/null +++ b/FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PalmTreeLeaf + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + 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: 2800000, guid: 3a042964eefc2444fb2a427e9b4b8800, type: 3} + 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_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Prefabs/Cactus/Cactus.prefab.meta b/FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat.meta similarity index 52% rename from FlufflParty/Assets/Prefabs/Cactus/Cactus.prefab.meta rename to FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat.meta index 2325e4f..20c7fc2 100644 --- a/FlufflParty/Assets/Prefabs/Cactus/Cactus.prefab.meta +++ b/FlufflParty/Assets/Materials/PalmTree/PalmTreeLeaf.mat.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 752a9a9336c6032458c33961ad9ebcfa -PrefabImporter: +guid: 0c56efe1da0734e4d92ed0f239266c79 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/FlufflParty/Assets/Materials/PalmTree/PalmTreeTrunk.mat b/FlufflParty/Assets/Materials/PalmTree/PalmTreeTrunk.mat new file mode 100644 index 0000000..a31a4af --- /dev/null +++ b/FlufflParty/Assets/Materials/PalmTree/PalmTreeTrunk.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PalmTreeTrunk + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + 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: 2800000, guid: fc5cb112b2dd433478446edab3a01018, type: 3} + 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_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Materials/PalmTree/PalmTreeTrunk.mat.meta b/FlufflParty/Assets/Materials/PalmTree/PalmTreeTrunk.mat.meta new file mode 100644 index 0000000..1e8565f --- /dev/null +++ b/FlufflParty/Assets/Materials/PalmTree/PalmTreeTrunk.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b6c4494d86ad85845a7c1957f96623c8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Prefabs/Cactus/Cactus.prefab b/FlufflParty/Assets/Prefabs/Cactus/Cactus.prefab deleted file mode 100644 index 46fe63f..0000000 --- a/FlufflParty/Assets/Prefabs/Cactus/Cactus.prefab +++ /dev/null @@ -1,86 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1416487540515288672 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1793434604541996250} - - component: {fileID: 3408192270704403327} - - component: {fileID: 623928430202820533} - m_Layer: 0 - m_Name: Cactus - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1793434604541996250 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1416487540515288672} - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: 3.2928586, y: 0, z: 1.3218737} - m_LocalScale: {x: 0.7160803, y: 0.7160803, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3408192270704403327 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1416487540515288672} - m_Mesh: {fileID: 4711208715938537054, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} ---- !u!23 &623928430202820533 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1416487540515288672} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: -8751555780163154282, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} - - {fileID: 2100000, guid: 5c867c5199f9bf9498882e8cdb3ac9e5, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} diff --git a/FlufflParty/Assets/Prefabs/Cactus/Cactus_2.prefab b/FlufflParty/Assets/Prefabs/Cactus/Cactus_2.prefab deleted file mode 100644 index 9577a2e..0000000 --- a/FlufflParty/Assets/Prefabs/Cactus/Cactus_2.prefab +++ /dev/null @@ -1,86 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &6647935640211500495 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6271797473225176949} - - component: {fileID: 6964320977417697488} - - component: {fileID: 5134888962096663578} - m_Layer: 0 - m_Name: Cactus_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6271797473225176949 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6647935640211500495} - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: 3.064587, y: -0.00000023841858, z: 3.0113204} - m_LocalScale: {x: 0.5713147, y: 0.5713147, z: 0.5713147} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6964320977417697488 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6647935640211500495} - m_Mesh: {fileID: 4711208715938537054, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} ---- !u!23 &5134888962096663578 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6647935640211500495} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: -8751555780163154282, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} - - {fileID: 2100000, guid: d3270dff332dec049ba137a752c1d23a, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} diff --git a/FlufflParty/Assets/Prefabs/DriedGrass/DriedGrass.prefab b/FlufflParty/Assets/Prefabs/DriedGrass/DriedGrass.prefab deleted file mode 100644 index 9ed8301..0000000 --- a/FlufflParty/Assets/Prefabs/DriedGrass/DriedGrass.prefab +++ /dev/null @@ -1,85 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &7880342393897581807 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7356428829302662741} - - component: {fileID: 5888617720425490928} - - component: {fileID: 8528803772688293178} - m_Layer: 0 - m_Name: DriedGrass - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7356428829302662741 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7880342393897581807} - m_LocalRotation: {x: -0.03175454, y: -0.04436132, z: 0.74756557, w: 0.66194373} - m_LocalPosition: {x: 3.004569, y: 0, z: 4.6153603} - m_LocalScale: {x: 0.31921068, y: 0.31574833, z: 0.31574833} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5888617720425490928 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7880342393897581807} - m_Mesh: {fileID: 4579454407841743219, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} ---- !u!23 &8528803772688293178 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7880342393897581807} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 953d0f69e6b1be44795d45ff0dd7efa9, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} diff --git a/FlufflParty/Assets/Prefabs/DriedGrass/DriedGrass.prefab.meta b/FlufflParty/Assets/Prefabs/DriedGrass/DriedGrass.prefab.meta deleted file mode 100644 index a73ee77..0000000 --- a/FlufflParty/Assets/Prefabs/DriedGrass/DriedGrass.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5429b771b95004545a806cb8e63d41cf -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/FlufflParty/Assets/Scenes/Test.unity b/FlufflParty/Assets/Scenes/Test.unity index d7fecd0..cc771e3 100644 --- a/FlufflParty/Assets/Scenes/Test.unity +++ b/FlufflParty/Assets/Scenes/Test.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.45134532, g: 0.5009461, b: 0.5729272, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -123,6 +123,250 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &178701544 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} + propertyPath: m_LocalPosition.x + value: 2.1434538 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000023841858 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} + propertyPath: m_LocalPosition.z + value: 3.117762 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} + propertyPath: m_LocalRotation.w + value: -0.49999994 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} + propertyPath: m_LocalRotation.x + value: 0.50000006 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} + propertyPath: m_LocalRotation.y + value: 0.50000006 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} + propertyPath: m_LocalRotation.z + value: -0.49999997 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: b6c4494d86ad85845a7c1957f96623c8, type: 2} + - target: {fileID: 919132149155446097, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} + propertyPath: m_Name + value: PalmTree + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f86fb997d4632245a8991b04e6bcd49, type: 3} +--- !u!1001 &414451253 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalPosition.x + value: 1.4061761 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalPosition.z + value: 3.409605 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.w + value: 0.66194373 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.x + value: -0.03175454 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.y + value: -0.04436132 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.z + value: 0.74756557 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 953d0f69e6b1be44795d45ff0dd7efa9, type: 2} + - target: {fileID: 919132149155446097, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_Name + value: DriedGrass + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} +--- !u!1001 &532719126 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalPosition.x + value: 1.458347 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalPosition.z + value: 2.7189693 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.w + value: 0.66194373 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.x + value: -0.03175454 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.y + value: -0.04436132 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.z + value: 0.74756557 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 953d0f69e6b1be44795d45ff0dd7efa9, type: 2} + - target: {fileID: 919132149155446097, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_Name + value: DriedGrass (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} +--- !u!1001 &564239092 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} + propertyPath: m_LocalPosition.x + value: 1.8695488 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} + propertyPath: m_LocalPosition.z + value: 0.4698488 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: d3270dff332dec049ba137a752c1d23a, type: 2} + - target: {fileID: 919132149155446097, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} + propertyPath: m_Name + value: Cactus_2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c197335560ae7374b8f0ab1f8e19eb32, type: 3} --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -209,14 +453,136 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalRotation: {x: 0.4669353, y: 0.0602974, z: 0.6168538, w: 0.63073534} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 30.973, y: 49.515, z: 103.288} +--- !u!1001 &719673531 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalPosition.x + value: 2.2169204 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalPosition.z + value: 3.3274565 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.w + value: 0.66194373 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.x + value: -0.03175454 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.y + value: -0.04436132 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.z + value: 0.74756557 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 953d0f69e6b1be44795d45ff0dd7efa9, type: 2} + - target: {fileID: 919132149155446097, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_Name + value: DriedGrass (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} +--- !u!1001 &849082656 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalPosition.x + value: 2.381044 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalPosition.z + value: 2.3931148 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.w + value: 0.66194373 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.x + value: -0.03175454 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.y + value: -0.04436132 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalRotation.z + value: 0.74756557 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 953d0f69e6b1be44795d45ff0dd7efa9, type: 2} + - target: {fileID: 919132149155446097, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} + propertyPath: m_Name + value: DriedGrass (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2c9d8dc82a61fd94184c79716d3ce24e, type: 3} --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -301,3 +667,64 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1347206042 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} + propertyPath: m_LocalPosition.x + value: 1.7723069 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} + propertyPath: m_LocalPosition.z + value: 1.7983106 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 5c867c5199f9bf9498882e8cdb3ac9e5, type: 2} + - target: {fileID: 919132149155446097, guid: 947837f3024c3984bad1bbbf412481d1, type: 3} + propertyPath: m_Name + value: Cactus + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 947837f3024c3984bad1bbbf412481d1, type: 3}