From d5624749fe1c7a7a3a9e4345db17a143ee4893b4 Mon Sep 17 00:00:00 2001 From: Jesper <55808963+jesper2k@users.noreply.github.com> Date: Fri, 29 Oct 2021 18:21:13 +0200 Subject: [PATCH 1/2] added fauna models --- Assets/Models/fauna.fbx | 3 + Assets/Models/fauna.fbx.meta | 101 +++++++++++++ .../Prefabs/Terrain/Decor/Tree Border.prefab | 112 +++++++------- Assets/Prefabs/Terrain/Decor/Tree_1.prefab | 117 ++++++++++++++- .../Prefabs/Terrain/Decor/color palette.png | 3 + .../Terrain/Decor/color palette.png.meta | 142 ++++++++++++++++++ .../Prefabs/Terrain/Decor/fauna material.mat | 91 +++++++++++ .../Terrain/Decor/fauna material.mat.meta | 8 + 8 files changed, 513 insertions(+), 64 deletions(-) create mode 100644 Assets/Models/fauna.fbx create mode 100644 Assets/Models/fauna.fbx.meta create mode 100644 Assets/Prefabs/Terrain/Decor/color palette.png create mode 100644 Assets/Prefabs/Terrain/Decor/color palette.png.meta create mode 100644 Assets/Prefabs/Terrain/Decor/fauna material.mat create mode 100644 Assets/Prefabs/Terrain/Decor/fauna material.mat.meta diff --git a/Assets/Models/fauna.fbx b/Assets/Models/fauna.fbx new file mode 100644 index 00000000..32e75779 --- /dev/null +++ b/Assets/Models/fauna.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f18daba022a506ed1f0988bba8177409c16d8fd70b2eceb59e45bd0625880cdd +size 94364 diff --git a/Assets/Models/fauna.fbx.meta b/Assets/Models/fauna.fbx.meta new file mode 100644 index 00000000..40fb570e --- /dev/null +++ b/Assets/Models/fauna.fbx.meta @@ -0,0 +1,101 @@ +fileFormatVersion: 2 +guid: a887644395692d048ac60a2d8c07f5ce +ModelImporter: + serializedVersion: 20101 + 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 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + 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 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Terrain/Decor/Tree Border.prefab b/Assets/Prefabs/Terrain/Decor/Tree Border.prefab index 405c6bdf..f9f50884 100644 --- a/Assets/Prefabs/Terrain/Decor/Tree Border.prefab +++ b/Assets/Prefabs/Terrain/Decor/Tree Border.prefab @@ -69,19 +69,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder @@ -131,19 +131,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder @@ -193,19 +193,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder @@ -263,19 +263,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder @@ -325,19 +325,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder @@ -395,19 +395,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder @@ -457,19 +457,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder @@ -527,19 +527,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder @@ -597,19 +597,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder @@ -667,19 +667,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder @@ -737,19 +737,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder @@ -799,19 +799,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder @@ -861,19 +861,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder @@ -923,19 +923,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Prefabs/Terrain/Decor/Tree_1.prefab b/Assets/Prefabs/Terrain/Decor/Tree_1.prefab index 84cfba07..84ba6f87 100644 --- a/Assets/Prefabs/Terrain/Decor/Tree_1.prefab +++ b/Assets/Prefabs/Terrain/Decor/Tree_1.prefab @@ -1,5 +1,87 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &9163004526514434606 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2353544461877869164} + - component: {fileID: 703720693043640813} + - component: {fileID: 3374032002903924089} + m_Layer: 0 + m_Name: Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2353544461877869164 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9163004526514434606} + m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 150, y: 150, z: 150} + m_Children: [] + m_Father: {fileID: 2098172043380529853} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} +--- !u!33 &703720693043640813 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9163004526514434606} + m_Mesh: {fileID: 4781277628412113339, guid: a887644395692d048ac60a2d8c07f5ce, type: 3} +--- !u!23 &3374032002903924089 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9163004526514434606} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -7367572118140197371, guid: f1f3c301797969644a44f09686378b0b, type: 3} + - {fileID: 2100000, guid: 951aceb24a44df140b8fcc77905573ca, 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} --- !u!1001 &1915310936523504982 PrefabInstance: m_ObjectHideFlags: 0 @@ -21,19 +103,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} propertyPath: m_RootOrder @@ -53,19 +135,38 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} propertyPath: m_LocalScale.x - value: 1.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} propertyPath: m_LocalScale.y - value: 1.4999999 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} propertyPath: m_LocalScale.z - value: 1.3999999 + value: 1 objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: -7367572118140197371, guid: f1f3c301797969644a44f09686378b0b, type: 3} + - target: {fileID: -7511558181221131132, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 951aceb24a44df140b8fcc77905573ca, type: 2} + - target: {fileID: -5754084199372789682, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 4781277628412113339, guid: a887644395692d048ac60a2d8c07f5ce, type: 3} - target: {fileID: 919132149155446097, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} propertyPath: m_Name value: Tree_1 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: -5754084199372789682, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} + - {fileID: -7511558181221131132, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} +--- !u!4 &2098172043380529853 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 89090134e0890fd4ca40e4896c68ff5f, type: 3} + m_PrefabInstance: {fileID: 1915310936523504982} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Terrain/Decor/color palette.png b/Assets/Prefabs/Terrain/Decor/color palette.png new file mode 100644 index 00000000..59ec7ae9 --- /dev/null +++ b/Assets/Prefabs/Terrain/Decor/color palette.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:354face7f9dd2a1257f73d03df3990879931e86d9500cefa5bc8729be3f43baa +size 12216 diff --git a/Assets/Prefabs/Terrain/Decor/color palette.png.meta b/Assets/Prefabs/Terrain/Decor/color palette.png.meta new file mode 100644 index 00000000..1882c9af --- /dev/null +++ b/Assets/Prefabs/Terrain/Decor/color palette.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: 8ab5dfe3be7753a4b8775f574131ed23 +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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Terrain/Decor/fauna material.mat b/Assets/Prefabs/Terrain/Decor/fauna material.mat new file mode 100644 index 00000000..d2f3c3be --- /dev/null +++ b/Assets/Prefabs/Terrain/Decor/fauna material.mat @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8870270747127214692 +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: 2 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fauna material + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + 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} + - _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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, 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: [] diff --git a/Assets/Prefabs/Terrain/Decor/fauna material.mat.meta b/Assets/Prefabs/Terrain/Decor/fauna material.mat.meta new file mode 100644 index 00000000..a5ac0525 --- /dev/null +++ b/Assets/Prefabs/Terrain/Decor/fauna material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 951aceb24a44df140b8fcc77905573ca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: From a79bd31cda943be7e81c4dfc0ae24044f48dc9fc Mon Sep 17 00:00:00 2001 From: Fredrik Lillemoen Eiding Date: Wed, 3 Nov 2021 15:29:28 +0100 Subject: [PATCH 2/2] Applied material correctly, fixed size of trees on map borders. --- .../Prefabs/Terrain/Decor/Tree Border.prefab | 72 ++++++++++++++++--- Assets/Prefabs/Terrain/Decor/Tree_1.prefab | 2 +- 2 files changed, 65 insertions(+), 9 deletions(-) diff --git a/Assets/Prefabs/Terrain/Decor/Tree Border.prefab b/Assets/Prefabs/Terrain/Decor/Tree Border.prefab index f9f50884..0baad423 100644 --- a/Assets/Prefabs/Terrain/Decor/Tree Border.prefab +++ b/Assets/Prefabs/Terrain/Decor/Tree Border.prefab @@ -25,7 +25,7 @@ Transform: m_GameObject: {fileID: 1817183222925408866} 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_LocalScale: {x: 2, y: 2, z: 1} m_Children: - {fileID: 3969517770881611087} - {fileID: 5122623341053660668} @@ -99,6 +99,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.z + value: 1.4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} --- !u!4 &1249512299451965198 stripped @@ -161,6 +169,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.z + value: 1.4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} --- !u!4 &1157145877196186065 stripped @@ -181,7 +197,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.x - value: -2.14 + value: -1.43 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.y @@ -293,6 +309,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.z + value: 1.4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} --- !u!4 &288524927126583743 stripped @@ -313,7 +337,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.x - value: -2.14 + value: -1.43 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.y @@ -425,6 +449,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.z + value: 1.4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} --- !u!4 &3969517770881611087 stripped @@ -445,7 +477,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.x - value: -2.14 + value: -1.43 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.y @@ -515,7 +547,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.x - value: -2.14 + value: -1.43 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.y @@ -585,7 +617,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.x - value: -2.14 + value: -1.43 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.y @@ -655,7 +687,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.x - value: -2.14 + value: -1.43 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.y @@ -767,6 +799,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.z + value: 1.4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} --- !u!4 &5502523429519801200 stripped @@ -829,6 +869,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.z + value: 1.4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} --- !u!4 &5122623341053660668 stripped @@ -891,6 +939,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} + propertyPath: m_LocalScale.z + value: 1.4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} --- !u!4 &9206865610876726983 stripped @@ -911,7 +967,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.x - value: -2.14 + value: -1.43 objectReference: {fileID: 0} - target: {fileID: 2098172043380529853, guid: 7d70fae1f7495424bb491cb74d5acd6b, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/Prefabs/Terrain/Decor/Tree_1.prefab b/Assets/Prefabs/Terrain/Decor/Tree_1.prefab index 84ba6f87..6464cbfe 100644 --- a/Assets/Prefabs/Terrain/Decor/Tree_1.prefab +++ b/Assets/Prefabs/Terrain/Decor/Tree_1.prefab @@ -60,7 +60,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: -7367572118140197371, guid: f1f3c301797969644a44f09686378b0b, type: 3} - - {fileID: 2100000, guid: 951aceb24a44df140b8fcc77905573ca, type: 2} + - {fileID: -6478536213147159724, guid: a887644395692d048ac60a2d8c07f5ce, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0