diff --git a/Assets/Graphic/Meshes/Island.fbx b/Assets/Graphic/Meshes/Island.fbx index eda06a6..4273548 100644 Binary files a/Assets/Graphic/Meshes/Island.fbx and b/Assets/Graphic/Meshes/Island.fbx differ diff --git a/Assets/Graphic/Meshes/Materials/M_FarmBlock.mat b/Assets/Graphic/Meshes/Materials/M_FarmBlock.mat new file mode 100644 index 0000000..c533d88 --- /dev/null +++ b/Assets/Graphic/Meshes/Materials/M_FarmBlock.mat @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7227050784758697835 +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: 5 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_FarmBlock + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + 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} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.3066576, g: 0.17039248, b: 0.06512301, a: 1} + - _Color: {r: 0.30665758, g: 0.17039245, b: 0.065122984, 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/WorldBuilding/FarmlandBlock.prefab.meta b/Assets/Graphic/Meshes/Materials/M_FarmBlock.mat.meta similarity index 52% rename from Assets/WorldBuilding/FarmlandBlock.prefab.meta rename to Assets/Graphic/Meshes/Materials/M_FarmBlock.mat.meta index e4db0e7..9b339ee 100644 --- a/Assets/WorldBuilding/FarmlandBlock.prefab.meta +++ b/Assets/Graphic/Meshes/Materials/M_FarmBlock.mat.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: b884227253ae5b945bc2d096bffdc8ca -PrefabImporter: +guid: b4e48345b7f8b5b459ef943e82d239a8 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Graphic/Meshes/S_FarmBlock_1.fbx b/Assets/Graphic/Meshes/S_FarmBlock_3.fbx similarity index 63% rename from Assets/Graphic/Meshes/S_FarmBlock_1.fbx rename to Assets/Graphic/Meshes/S_FarmBlock_3.fbx index 21771fa..8537b88 100644 Binary files a/Assets/Graphic/Meshes/S_FarmBlock_1.fbx and b/Assets/Graphic/Meshes/S_FarmBlock_3.fbx differ diff --git a/Assets/Graphic/Meshes/S_FarmBlock_1.fbx.meta b/Assets/Graphic/Meshes/S_FarmBlock_3.fbx.meta similarity index 88% rename from Assets/Graphic/Meshes/S_FarmBlock_1.fbx.meta rename to Assets/Graphic/Meshes/S_FarmBlock_3.fbx.meta index 914d074..07492be 100644 --- a/Assets/Graphic/Meshes/S_FarmBlock_1.fbx.meta +++ b/Assets/Graphic/Meshes/S_FarmBlock_3.fbx.meta @@ -1,9 +1,14 @@ fileFormatVersion: 2 -guid: 6f0592d3dbfb64f42a3722cd9e8d1611 +guid: d38324257d724404482712ea6f6133cf ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: M_FarmBlock + second: {fileID: 2100000, guid: b4e48345b7f8b5b459ef943e82d239a8, type: 2} materials: materialImportMode: 2 materialName: 0 @@ -36,14 +41,14 @@ ModelImporter: meshes: lODScreenPercentages: [] globalScale: 1 - meshCompression: 1 + meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 importVisibility: 1 importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importCameras: 1 + importLights: 1 nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 @@ -76,7 +81,7 @@ ModelImporter: blendShapeNormalImportMode: 1 normalSmoothingSource: 0 referencedClips: [] - importAnimation: 0 + importAnimation: 1 humanDescription: serializedVersion: 3 human: [] @@ -95,7 +100,7 @@ ModelImporter: skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 0 + animationType: 2 humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 diff --git a/Assets/Graphic/Meshes/S_FarmBlock_2.fbx b/Assets/Graphic/Meshes/S_FarmBlock_4.fbx similarity index 63% rename from Assets/Graphic/Meshes/S_FarmBlock_2.fbx rename to Assets/Graphic/Meshes/S_FarmBlock_4.fbx index 04b3792..0c73777 100644 Binary files a/Assets/Graphic/Meshes/S_FarmBlock_2.fbx and b/Assets/Graphic/Meshes/S_FarmBlock_4.fbx differ diff --git a/Assets/Graphic/Meshes/S_FarmBlock_2.fbx.meta b/Assets/Graphic/Meshes/S_FarmBlock_4.fbx.meta similarity index 88% rename from Assets/Graphic/Meshes/S_FarmBlock_2.fbx.meta rename to Assets/Graphic/Meshes/S_FarmBlock_4.fbx.meta index bdddec8..2bdc5db 100644 --- a/Assets/Graphic/Meshes/S_FarmBlock_2.fbx.meta +++ b/Assets/Graphic/Meshes/S_FarmBlock_4.fbx.meta @@ -1,9 +1,14 @@ fileFormatVersion: 2 -guid: cf076550d50070f4488698d6961d704e +guid: b105bc50471d6d64ca47299e325fc58e ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: M_FarmBlock + second: {fileID: 2100000, guid: b4e48345b7f8b5b459ef943e82d239a8, type: 2} materials: materialImportMode: 2 materialName: 0 @@ -36,14 +41,14 @@ ModelImporter: meshes: lODScreenPercentages: [] globalScale: 1 - meshCompression: 1 + meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 importVisibility: 1 importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importCameras: 1 + importLights: 1 nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 @@ -76,7 +81,7 @@ ModelImporter: blendShapeNormalImportMode: 1 normalSmoothingSource: 0 referencedClips: [] - importAnimation: 0 + importAnimation: 1 humanDescription: serializedVersion: 3 human: [] @@ -95,7 +100,7 @@ ModelImporter: skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 0 + animationType: 2 humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 diff --git a/Assets/Graphic/Meshes/S_FarmBlock_5.fbx b/Assets/Graphic/Meshes/S_FarmBlock_5.fbx new file mode 100644 index 0000000..ff524b5 Binary files /dev/null and b/Assets/Graphic/Meshes/S_FarmBlock_5.fbx differ diff --git a/Assets/Graphic/Meshes/S_FarmBlock_5.fbx.meta b/Assets/Graphic/Meshes/S_FarmBlock_5.fbx.meta new file mode 100644 index 0000000..93fd1d5 --- /dev/null +++ b/Assets/Graphic/Meshes/S_FarmBlock_5.fbx.meta @@ -0,0 +1,111 @@ +fileFormatVersion: 2 +guid: 0a0422991fd67e8429b8f4abd9a0a9c4 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: M_FarmBlock + second: {fileID: 2100000, guid: b4e48345b7f8b5b459ef943e82d239a8, type: 2} + 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/Assets/Graphic/Meshes/S_Island.fbx b/Assets/Graphic/Meshes/S_Island.fbx index eda06a6..10c197d 100644 Binary files a/Assets/Graphic/Meshes/S_Island.fbx and b/Assets/Graphic/Meshes/S_Island.fbx differ diff --git a/Assets/Scenes/Base3Dgrid.unity b/Assets/Scenes/Base3Dgrid.unity index 573ccb2..0b9fcb8 100644 --- a/Assets/Scenes/Base3Dgrid.unity +++ b/Assets/Scenes/Base3Dgrid.unity @@ -16,12 +16,12 @@ RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 9 m_Fog: 1 - m_FogColor: {r: 0.41232228, g: 0.41232228, b: 0.41232228, a: 1} + m_FogColor: {r: 0.15294117, g: 0.15294117, b: 0.15294117, a: 1} m_FogMode: 3 m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.7012414, g: 0.72460425, b: 0.7837901, a: 1} + m_AmbientSkyColor: {r: 0.41960788, g: 0.4784314, b: 0.627451, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 @@ -39,7 +39,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.8560574, g: 0.33013296, b: 1.2180234, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0.08158919, b: 0.23658341, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 732a53f..cac5a6c 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -433,7 +433,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 144550469} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 50, y: -0.16026688, z: -73.82} + m_LocalPosition: {x: 39.88, y: -1.05, z: -52.62} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4933,6 +4933,68 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 1916299381, guid: b8813aae87feded42a6d91761783db3f, type: 3} + propertyPath: m_LocalPosition.x + value: -10.119999 + objectReference: {fileID: 0} + - target: {fileID: 1916299381, guid: b8813aae87feded42a6d91761783db3f, type: 3} + propertyPath: m_LocalPosition.y + value: -0.9897331 + objectReference: {fileID: 0} + - target: {fileID: 1916299381, guid: b8813aae87feded42a6d91761783db3f, type: 3} + propertyPath: m_LocalPosition.z + value: 21.2 + objectReference: {fileID: 0} + - target: {fileID: 684765938840874564, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 684765938840874564, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9948277 + objectReference: {fileID: 0} + - target: {fileID: 684765938840874564, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 684765938840874564, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.10157711 + objectReference: {fileID: 0} + - target: {fileID: 684765938840874564, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 684765938840874564, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -11.66 + objectReference: {fileID: 0} + - target: {fileID: 4003990615888787795, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.x + value: -9.22 + objectReference: {fileID: 0} + - target: {fileID: 4003990615888787795, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.z + value: 7.51 + objectReference: {fileID: 0} + - target: {fileID: 4019266785185276620, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 4019266785185276620, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.z + value: -15.09 + objectReference: {fileID: 0} - target: {fileID: 4266406728275531253, guid: b8813aae87feded42a6d91761783db3f, type: 3} propertyPath: m_StaticEditorFlags @@ -4998,6 +5060,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5459632324297785655, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5459632324689437714, guid: b8813aae87feded42a6d91761783db3f, type: 3} propertyPath: m_Mesh @@ -5013,16 +5080,116 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 441535088} + - target: {fileID: 5459632325056807904, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.x + value: 10.12 + objectReference: {fileID: 0} + - target: {fileID: 5459632325056807904, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.99 + objectReference: {fileID: 0} + - target: {fileID: 5459632325056807904, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.z + value: -21.18 + objectReference: {fileID: 0} + - target: {fileID: 5459632325342043330, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.x + value: 10.12 + objectReference: {fileID: 0} + - target: {fileID: 5459632325342043330, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.99 + objectReference: {fileID: 0} + - target: {fileID: 5459632325342043330, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.z + value: -21.18 + objectReference: {fileID: 0} - target: {fileID: 5459632325342043331, guid: b8813aae87feded42a6d91761783db3f, type: 3} propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 5498397964890002993, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6296003841292474253, guid: b8813aae87feded42a6d91761783db3f, type: 3} propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 6371413711505981049, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.x + value: 15.56 + objectReference: {fileID: 0} + - target: {fileID: 6371413711505981049, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.z + value: 35.88 + objectReference: {fileID: 0} + - target: {fileID: 7067724878886524721, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.x + value: 6.65 + objectReference: {fileID: 0} + - target: {fileID: 7067724878886524721, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.y + value: 9.01 + objectReference: {fileID: 0} + - target: {fileID: 7067724878886524721, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.z + value: -21.42 + objectReference: {fileID: 0} + - target: {fileID: 7067724878886524721, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.015707303 + objectReference: {fileID: 0} + - target: {fileID: 7067724878886524721, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7067724878886524721, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.9998767 + objectReference: {fileID: 0} + - target: {fileID: 7067724878886524721, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7067724878886524721, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 181.8 + objectReference: {fileID: 0} + - target: {fileID: 7142766674537675366, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.x + value: -10.119999 + objectReference: {fileID: 0} + - target: {fileID: 7142766674537675366, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.9897331 + objectReference: {fileID: 0} + - target: {fileID: 7142766674537675366, guid: b8813aae87feded42a6d91761783db3f, + type: 3} + propertyPath: m_LocalPosition.z + value: 21.2 + objectReference: {fileID: 0} - target: {fileID: 7491275308638316685, guid: b8813aae87feded42a6d91761783db3f, type: 3} propertyPath: m_StaticEditorFlags @@ -5050,17 +5217,17 @@ PrefabInstance: - target: {fileID: 184576385301893031, guid: 9ac281eb4af0366439a0d998dfb28a0f, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -10.119999 objectReference: {fileID: 0} - target: {fileID: 184576385301893031, guid: 9ac281eb4af0366439a0d998dfb28a0f, type: 3} propertyPath: m_LocalPosition.y - value: -2.35 + value: -3.3397331 objectReference: {fileID: 0} - target: {fileID: 184576385301893031, guid: 9ac281eb4af0366439a0d998dfb28a0f, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 21.2 objectReference: {fileID: 0} - target: {fileID: 184576385301893031, guid: 9ac281eb4af0366439a0d998dfb28a0f, type: 3} diff --git a/Assets/WorldBuilding/FarmlandBlock.prefab b/Assets/WorldBuilding/FarmlandBlock.prefab deleted file mode 100644 index bbce11a..0000000 --- a/Assets/WorldBuilding/FarmlandBlock.prefab +++ /dev/null @@ -1,299 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &5308330686170291937 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3536893488302499570} - - component: {fileID: 8415045104083070401} - - component: {fileID: 7549686723899049423} - m_Layer: 0 - m_Name: PlantGFX - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3536893488302499570 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5308330686170291937} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2936154086641303269} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8415045104083070401 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5308330686170291937} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7549686723899049423 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5308330686170291937} - 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: ccdcf3ea5471b924b9f37e02d2597637, 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!1 &5723487659513790511 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 978231723483944792} - - component: {fileID: 4980056273853534352} - - component: {fileID: -1996521856632139087} - - component: {fileID: 3483850515893479002} - m_Layer: 0 - m_Name: FarmlandBlock - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &978231723483944792 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5723487659513790511} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2936154086641303269} - - {fileID: 1866491016221012072} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &4980056273853534352 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5723487659513790511} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &-1996521856632139087 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5723487659513790511} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2d26c446388ef004d884473464762e1a, type: 3} - m_Name: - m_EditorClassIdentifier: - plantRoot: {fileID: 5902135491879594279} - healthColor: {r: 0, g: 0, b: 0, a: 0} - dryColor: {r: 0.7529412, g: 0.54901963, b: 0.08235294, a: 0.7294118} ---- !u!114 &3483850515893479002 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5723487659513790511} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4a4c71a393164dd45bdc68248d063ef1, type: 3} - m_Name: - m_EditorClassIdentifier: - Event: {fileID: 11400000, guid: 3bef81e2ce4341047b8a6196ee785432, type: 2} - Response: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: -1996521856632139087} - m_TargetAssemblyTypeName: FarmlandBlock, Assembly-CSharp - m_MethodName: OnTick - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!1 &5902135491879594279 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2936154086641303269} - m_Layer: 0 - m_Name: Plant - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2936154086641303269 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5902135491879594279} - m_LocalRotation: {x: 0.13052616, y: -0, z: -0, w: 0.9914449} - m_LocalPosition: {x: 0, y: 0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3536893488302499570} - m_Father: {fileID: 978231723483944792} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 15, y: 0, z: 0} ---- !u!1001 &2192587598456870787 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 978231723483944792} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_LocalScale.x - value: 0.49118432 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_LocalScale.y - value: 0.5227 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_LocalScale.z - value: 0.5966473 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.0083 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.015 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.0077 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.965957 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.25870273 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -29.986 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: cf076550d50070f4488698d6961d704e, - type: 3} - propertyPath: m_Name - value: S_FarmBlock_2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cf076550d50070f4488698d6961d704e, type: 3} ---- !u!4 &1866491016221012072 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: cf076550d50070f4488698d6961d704e, - type: 3} - m_PrefabInstance: {fileID: 2192587598456870787} - m_PrefabAsset: {fileID: 0}