diff --git a/FlufflParty/Assets/BlenderFiles/DriedTree2.blend b/FlufflParty/Assets/BlenderFiles/DriedTree2.blend new file mode 100644 index 0000000..03991f5 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/DriedTree2.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/DriedTree2.blend.meta b/FlufflParty/Assets/BlenderFiles/DriedTree2.blend.meta new file mode 100644 index 0000000..2a9c520 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/DriedTree2.blend.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 1357f602b2ef4074aa4b1d33475d1a16 +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/Textures.meta b/FlufflParty/Assets/BlenderFiles/Textures.meta new file mode 100644 index 0000000..a26bc61 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ea3348789490e8147bbd13d42ae3b506 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/3Coins.blend b/FlufflParty/Assets/BlenderFiles/Textures/3Coins.blend similarity index 100% rename from FlufflParty/Assets/BlenderFiles/3Coins.blend rename to FlufflParty/Assets/BlenderFiles/Textures/3Coins.blend diff --git a/FlufflParty/Assets/BlenderFiles/3Coins.blend.meta b/FlufflParty/Assets/BlenderFiles/Textures/3Coins.blend.meta similarity index 100% rename from FlufflParty/Assets/BlenderFiles/3Coins.blend.meta rename to FlufflParty/Assets/BlenderFiles/Textures/3Coins.blend.meta diff --git a/FlufflParty/Assets/BlenderFiles/CactusSpikes.png b/FlufflParty/Assets/BlenderFiles/Textures/CactusSpikes.png similarity index 100% rename from FlufflParty/Assets/BlenderFiles/CactusSpikes.png rename to FlufflParty/Assets/BlenderFiles/Textures/CactusSpikes.png diff --git a/FlufflParty/Assets/BlenderFiles/CactusSpikes.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/CactusSpikes.png.meta similarity index 100% rename from FlufflParty/Assets/BlenderFiles/CactusSpikes.png.meta rename to FlufflParty/Assets/BlenderFiles/Textures/CactusSpikes.png.meta diff --git a/FlufflParty/Assets/BlenderFiles/Cactus_2Spikes.png b/FlufflParty/Assets/BlenderFiles/Textures/Cactus_2Spikes.png similarity index 100% rename from FlufflParty/Assets/BlenderFiles/Cactus_2Spikes.png rename to FlufflParty/Assets/BlenderFiles/Textures/Cactus_2Spikes.png diff --git a/FlufflParty/Assets/BlenderFiles/Cactus_2Spikes.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/Cactus_2Spikes.png.meta similarity index 100% rename from FlufflParty/Assets/BlenderFiles/Cactus_2Spikes.png.meta rename to FlufflParty/Assets/BlenderFiles/Textures/Cactus_2Spikes.png.meta diff --git a/FlufflParty/Assets/BlenderFiles/CoinSprite.png b/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png similarity index 100% rename from FlufflParty/Assets/BlenderFiles/CoinSprite.png rename to FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png diff --git a/FlufflParty/Assets/BlenderFiles/CoinSprite.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png.meta similarity index 100% rename from FlufflParty/Assets/BlenderFiles/CoinSprite.png.meta rename to FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png.meta diff --git a/FlufflParty/Assets/BlenderFiles/DriedGrassTexture.png b/FlufflParty/Assets/BlenderFiles/Textures/DriedGrassTexture.png similarity index 100% rename from FlufflParty/Assets/BlenderFiles/DriedGrassTexture.png rename to FlufflParty/Assets/BlenderFiles/Textures/DriedGrassTexture.png diff --git a/FlufflParty/Assets/BlenderFiles/DriedGrassTexture.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/DriedGrassTexture.png.meta similarity index 100% rename from FlufflParty/Assets/BlenderFiles/DriedGrassTexture.png.meta rename to FlufflParty/Assets/BlenderFiles/Textures/DriedGrassTexture.png.meta diff --git a/FlufflParty/Assets/BlenderFiles/DriedTree.png b/FlufflParty/Assets/BlenderFiles/Textures/DriedTree.png similarity index 100% rename from FlufflParty/Assets/BlenderFiles/DriedTree.png rename to FlufflParty/Assets/BlenderFiles/Textures/DriedTree.png diff --git a/FlufflParty/Assets/BlenderFiles/DriedTree.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/DriedTree.png.meta similarity index 100% rename from FlufflParty/Assets/BlenderFiles/DriedTree.png.meta rename to FlufflParty/Assets/BlenderFiles/Textures/DriedTree.png.meta diff --git a/FlufflParty/Assets/BlenderFiles/PalmTreeLeaf.png b/FlufflParty/Assets/BlenderFiles/Textures/PalmTreeLeaf.png similarity index 100% rename from FlufflParty/Assets/BlenderFiles/PalmTreeLeaf.png rename to FlufflParty/Assets/BlenderFiles/Textures/PalmTreeLeaf.png diff --git a/FlufflParty/Assets/BlenderFiles/PalmTreeLeaf.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/PalmTreeLeaf.png.meta similarity index 100% rename from FlufflParty/Assets/BlenderFiles/PalmTreeLeaf.png.meta rename to FlufflParty/Assets/BlenderFiles/Textures/PalmTreeLeaf.png.meta diff --git a/FlufflParty/Assets/BlenderFiles/PalmTrunk.png b/FlufflParty/Assets/BlenderFiles/Textures/PalmTrunk.png similarity index 100% rename from FlufflParty/Assets/BlenderFiles/PalmTrunk.png rename to FlufflParty/Assets/BlenderFiles/Textures/PalmTrunk.png diff --git a/FlufflParty/Assets/BlenderFiles/PalmTrunk.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/PalmTrunk.png.meta similarity index 100% rename from FlufflParty/Assets/BlenderFiles/PalmTrunk.png.meta rename to FlufflParty/Assets/BlenderFiles/Textures/PalmTrunk.png.meta diff --git a/FlufflParty/Assets/BlenderFiles/PlayerFieldCoins.png b/FlufflParty/Assets/BlenderFiles/Textures/PlayerFieldCoins.png similarity index 100% rename from FlufflParty/Assets/BlenderFiles/PlayerFieldCoins.png rename to FlufflParty/Assets/BlenderFiles/Textures/PlayerFieldCoins.png diff --git a/FlufflParty/Assets/BlenderFiles/PlayerFieldCoins.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/PlayerFieldCoins.png.meta similarity index 100% rename from FlufflParty/Assets/BlenderFiles/PlayerFieldCoins.png.meta rename to FlufflParty/Assets/BlenderFiles/Textures/PlayerFieldCoins.png.meta diff --git a/FlufflParty/Assets/BlenderFiles/StoneTexture_1.png b/FlufflParty/Assets/BlenderFiles/Textures/StoneTexture_1.png similarity index 100% rename from FlufflParty/Assets/BlenderFiles/StoneTexture_1.png rename to FlufflParty/Assets/BlenderFiles/Textures/StoneTexture_1.png diff --git a/FlufflParty/Assets/BlenderFiles/StoneTexture_1.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/StoneTexture_1.png.meta similarity index 100% rename from FlufflParty/Assets/BlenderFiles/StoneTexture_1.png.meta rename to FlufflParty/Assets/BlenderFiles/Textures/StoneTexture_1.png.meta diff --git a/FlufflParty/Assets/BlenderFiles/StoneTexture_2.png b/FlufflParty/Assets/BlenderFiles/Textures/StoneTexture_2.png similarity index 100% rename from FlufflParty/Assets/BlenderFiles/StoneTexture_2.png rename to FlufflParty/Assets/BlenderFiles/Textures/StoneTexture_2.png diff --git a/FlufflParty/Assets/BlenderFiles/StoneTexture_2.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/StoneTexture_2.png.meta similarity index 100% rename from FlufflParty/Assets/BlenderFiles/StoneTexture_2.png.meta rename to FlufflParty/Assets/BlenderFiles/Textures/StoneTexture_2.png.meta diff --git a/FlufflParty/Assets/BlenderFiles/StoneTexture_3.png b/FlufflParty/Assets/BlenderFiles/Textures/StoneTexture_3.png similarity index 100% rename from FlufflParty/Assets/BlenderFiles/StoneTexture_3.png rename to FlufflParty/Assets/BlenderFiles/Textures/StoneTexture_3.png diff --git a/FlufflParty/Assets/BlenderFiles/StoneTexture_3.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/StoneTexture_3.png.meta similarity index 100% rename from FlufflParty/Assets/BlenderFiles/StoneTexture_3.png.meta rename to FlufflParty/Assets/BlenderFiles/Textures/StoneTexture_3.png.meta diff --git a/FlufflParty/Assets/BlenderFiles/Water1.png b/FlufflParty/Assets/BlenderFiles/Textures/Water1.png similarity index 100% rename from FlufflParty/Assets/BlenderFiles/Water1.png rename to FlufflParty/Assets/BlenderFiles/Textures/Water1.png diff --git a/FlufflParty/Assets/BlenderFiles/Water1.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/Water1.png.meta similarity index 100% rename from FlufflParty/Assets/BlenderFiles/Water1.png.meta rename to FlufflParty/Assets/BlenderFiles/Textures/Water1.png.meta diff --git a/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend b/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend index dcf902f..c44d528 100644 Binary files a/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend and b/FlufflParty/Assets/BlenderFiles/TreePlantTop.blend differ diff --git a/FlufflParty/Assets/Materials/DriedTree/DriedTree.mat b/FlufflParty/Assets/Materials/DriedTree/DriedTree.mat index bfb3b50..24ef71c 100644 --- a/FlufflParty/Assets/Materials/DriedTree/DriedTree.mat +++ b/FlufflParty/Assets/Materials/DriedTree/DriedTree.mat @@ -63,7 +63,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.079 + - _Glossiness: 0 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 diff --git a/FlufflParty/Assets/Materials/PlantTop.mat b/FlufflParty/Assets/Materials/PlantTop.mat new file mode 100644 index 0000000..88a7477 --- /dev/null +++ b/FlufflParty/Assets/Materials/PlantTop.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: PlantTop + 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: 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_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _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.7169812, g: 0.57155573, b: 0.57155573, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Materials/PlantTop.mat.meta b/FlufflParty/Assets/Materials/PlantTop.mat.meta new file mode 100644 index 0000000..2fb2a0f --- /dev/null +++ b/FlufflParty/Assets/Materials/PlantTop.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 553cd74823792624481c24d6c6eaa307 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Prefabs/DriedTree2.prefab b/FlufflParty/Assets/Prefabs/DriedTree2.prefab new file mode 100644 index 0000000..87c1b2d --- /dev/null +++ b/FlufflParty/Assets/Prefabs/DriedTree2.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5629284403982850189 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4995878451819512375} + - component: {fileID: 8285276888481664402} + - component: {fileID: 6133832491802622296} + m_Layer: 0 + m_Name: DriedTree2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4995878451819512375 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5629284403982850189} + m_LocalRotation: {x: -0.53308874, y: 0.46456042, z: 0.46456033, w: 0.53308886} + m_LocalPosition: {x: 95.82, y: -0.0000023841858, z: 107.23} + m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 82.141} +--- !u!33 &8285276888481664402 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5629284403982850189} + m_Mesh: {fileID: 8999911773206952699, guid: 1357f602b2ef4074aa4b1d33475d1a16, type: 3} +--- !u!23 &6133832491802622296 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5629284403982850189} + 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: 1e78b95adda38c84592276a5fa593b1d, 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/DriedTree2.prefab.meta b/FlufflParty/Assets/Prefabs/DriedTree2.prefab.meta new file mode 100644 index 0000000..d40199d --- /dev/null +++ b/FlufflParty/Assets/Prefabs/DriedTree2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d69691ce9db049442848ba367670c069 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Prefabs/TreePlantTop.prefab b/FlufflParty/Assets/Prefabs/TreePlantTop.prefab new file mode 100644 index 0000000..b22a13b --- /dev/null +++ b/FlufflParty/Assets/Prefabs/TreePlantTop.prefab @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4672658726411314313 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5445783194010943027} + - component: {fileID: 8952194411821756822} + - component: {fileID: 6618147588955669852} + m_Layer: 0 + m_Name: TreePlantTop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5445783194010943027 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4672658726411314313} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: 96.38, y: -0.00000333786, z: 104.67} + m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8952194411821756822 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4672658726411314313} + m_Mesh: {fileID: -2124705421725058983, guid: 10018ab1262c2ab41aa3561d3fb16b27, type: 3} +--- !u!23 &6618147588955669852 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4672658726411314313} + 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: 553cd74823792624481c24d6c6eaa307, type: 2} + - {fileID: 2100000, guid: b0eb785c0e3aa1c4dafd5872e840f067, type: 2} + - {fileID: 2100000, guid: 1e78b95adda38c84592276a5fa593b1d, 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/TreePlantTop.prefab.meta b/FlufflParty/Assets/Prefabs/TreePlantTop.prefab.meta new file mode 100644 index 0000000..3cf7607 --- /dev/null +++ b/FlufflParty/Assets/Prefabs/TreePlantTop.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 38e99aa56206e634b83e1dcd05f0be6a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Scenes/Test.unity b/FlufflParty/Assets/Scenes/Test.unity index 1271772..3e742a3 100644 --- a/FlufflParty/Assets/Scenes/Test.unity +++ b/FlufflParty/Assets/Scenes/Test.unity @@ -349,7 +349,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 543450652832208303} - {fileID: 543450652221036485} - {fileID: 543450652970684065} - {fileID: 543450652951801009} @@ -374,6 +373,9 @@ Transform: - {fileID: 543450651741855857} - {fileID: 2041259436246033217} - {fileID: 2139568768} + - {fileID: 1400632171} + - {fileID: 543450653096789260} + - {fileID: 543450653628136511} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -471,6 +473,68 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 30.973, y: 49.515, z: 103.288} +--- !u!1001 &1400632170 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 523664306} + m_Modifications: + - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + propertyPath: m_RootOrder + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + propertyPath: m_LocalPosition.x + value: -33.26 + objectReference: {fileID: 0} + - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + propertyPath: m_LocalPosition.y + value: 38.707916 + objectReference: {fileID: 0} + - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + propertyPath: m_LocalPosition.z + value: 5.99 + objectReference: {fileID: 0} + - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + propertyPath: m_LocalRotation.w + value: 0.66194373 + objectReference: {fileID: 0} + - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + propertyPath: m_LocalRotation.x + value: -0.03175454 + objectReference: {fileID: 0} + - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + propertyPath: m_LocalRotation.y + value: -0.04436132 + objectReference: {fileID: 0} + - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + propertyPath: m_LocalRotation.z + value: 0.74756557 + objectReference: {fileID: 0} + - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5375891882135231629, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + propertyPath: m_Name + value: DriedGrass (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} +--- !u!4 &1400632171 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + m_PrefabInstance: {fileID: 1400632170} + m_PrefabAsset: {fileID: 0} --- !u!1 &1607968977 GameObject: m_ObjectHideFlags: 0 @@ -819,11 +883,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} m_PrefabInstance: {fileID: 7645439968679386787} m_PrefabAsset: {fileID: 0} ---- !u!4 &543450652832208303 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} - m_PrefabInstance: {fileID: 5069479774719005592} - m_PrefabAsset: {fileID: 0} --- !u!4 &543450652951801009 stripped Transform: m_CorrespondingSourceObject: {fileID: 3236109498566566965, guid: 9df1281bec48f1c40a35dfa77c718b77, type: 3} @@ -834,6 +893,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5819133972839638946, guid: 04532602dcbfa4946b4b30a12173fb12, type: 3} m_PrefabInstance: {fileID: 6290137768048077059} m_PrefabAsset: {fileID: 0} +--- !u!4 &543450653096789260 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} + m_PrefabInstance: {fileID: 4818382688961611579} + m_PrefabAsset: {fileID: 0} --- !u!4 &543450653384893021 stripped Transform: m_CorrespondingSourceObject: {fileID: 2972129319899864026, guid: e96b020884c733e40a35ed59c1ebe355, type: 3} @@ -849,6 +913,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} m_PrefabInstance: {fileID: 6828052402524322104} m_PrefabAsset: {fileID: 0} +--- !u!4 &543450653628136511 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} + m_PrefabInstance: {fileID: 5483686198623142412} + m_PrefabAsset: {fileID: 0} --- !u!1001 &621000483461340796 PrefabInstance: m_ObjectHideFlags: 0 @@ -1434,63 +1503,128 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 616c4d7a7df3216439e209b540a24966, type: 3} ---- !u!1001 &5069479774719005592 +--- !u!1001 &4818382688961611579 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 523664306} m_Modifications: - - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} propertyPath: m_RootOrder - value: 0 + value: 25 objectReference: {fileID: 0} - - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} + propertyPath: m_LocalScale.x + value: 0.90000004 + objectReference: {fileID: 0} + - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} + propertyPath: m_LocalScale.y + value: 0.9000001 + objectReference: {fileID: 0} + - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} propertyPath: m_LocalPosition.x - value: -31.74 + value: -37.155663 objectReference: {fileID: 0} - - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} propertyPath: m_LocalPosition.y - value: 38.707916 + value: 38.707912 objectReference: {fileID: 0} - - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} propertyPath: m_LocalPosition.z - value: 7.09 + value: 9.241043 objectReference: {fileID: 0} - - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} propertyPath: m_LocalRotation.w - value: 0.66194373 + value: 0.12925622 objectReference: {fileID: 0} - - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} propertyPath: m_LocalRotation.x - value: -0.03175454 + value: -0.12925608 objectReference: {fileID: 0} - - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} propertyPath: m_LocalRotation.y - value: -0.04436132 + value: 0.69519293 objectReference: {fileID: 0} - - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} propertyPath: m_LocalRotation.z - value: 0.74756557 + value: 0.69519246 objectReference: {fileID: 0} - - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 158.935 + objectReference: {fileID: 0} + - target: {fileID: 5629284403982850189, guid: d69691ce9db049442848ba367670c069, type: 3} + propertyPath: m_Name + value: DriedTree2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d69691ce9db049442848ba367670c069, type: 3} +--- !u!1001 &5483686198623142412 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 523664306} + m_Modifications: + - target: {fileID: 4672658726411314313, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} + propertyPath: m_Name + value: TreePlantTop + objectReference: {fileID: 0} + - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} + propertyPath: m_RootOrder + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} + propertyPath: m_LocalPosition.x + value: -36.595665 + objectReference: {fileID: 0} + - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} + propertyPath: m_LocalPosition.y + value: 38.707912 + objectReference: {fileID: 0} + - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} + propertyPath: m_LocalPosition.z + value: 6.681038 + objectReference: {fileID: 0} + - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5375891882135231629, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} - propertyPath: m_Name - value: DriedGrass - objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} --- !u!1001 &5494333161697802017 PrefabInstance: m_ObjectHideFlags: 0