From 8f414271311f6eed100b5bde73c2cb026cb5b373 Mon Sep 17 00:00:00 2001 From: Williams Date: Tue, 18 Aug 2026 10:26:08 +0200 Subject: [PATCH] Add shelter --- .../Meshes/Materials/M_Pine_mushrooms.mat | 17 ++- Imports/Ratel/Common/Moss/M_LeafCover01.mat | 135 ++++++++++++++++++ ...Moss01.mat.meta => M_LeafCover01.mat.meta} | 0 .../Moss/{M_Moss01.mat => M_Moss01 1.mat} | 15 +- Imports/Ratel/Common/Moss/M_Moss01 1.mat.meta | 8 ++ Imports/Ratel/Common/Moss/T_LeafCover01.jpg | 3 + .../Ratel/Common/Moss/T_LeafCover01.jpg.meta | 114 +++++++++++++++ .../Ratel/Common/Moss/T_Moss01_Basecolor.jpg | 4 +- Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg | 3 - .../Common/Moss/T_Moss01_Normal_4096.png | 3 + ...jpg.meta => T_Moss01_Normal_4096.png.meta} | 2 +- .../Bed_Primitive/M_Bed_Primitive_Planks.mat | 4 +- .../Bed_Primitive/Prefab_Bed_Primitive.prefab | 75 ---------- .../Tent_Primitive/M_Tent_Primitive_Wood.mat | 6 +- .../Prefab_Tent_Primitive.prefab | 31 +++- .../ToriaAnims_Human_Sit4.anim.meta | 2 +- Sources/Materials/M_fern_01.mat | 11 +- 17 files changed, 329 insertions(+), 104 deletions(-) create mode 100644 Imports/Ratel/Common/Moss/M_LeafCover01.mat rename Imports/Ratel/Common/Moss/{M_Moss01.mat.meta => M_LeafCover01.mat.meta} (100%) rename Imports/Ratel/Common/Moss/{M_Moss01.mat => M_Moss01 1.mat} (90%) create mode 100644 Imports/Ratel/Common/Moss/M_Moss01 1.mat.meta create mode 100644 Imports/Ratel/Common/Moss/T_LeafCover01.jpg create mode 100644 Imports/Ratel/Common/Moss/T_LeafCover01.jpg.meta delete mode 100644 Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg create mode 100644 Imports/Ratel/Common/Moss/T_Moss01_Normal_4096.png rename Imports/Ratel/Common/Moss/{T_Moss01_Normal.jpg.meta => T_Moss01_Normal_4096.png.meta} (98%) diff --git a/Imports/# NatureManufacture Assets/Mountain Environment/Mushrooms/Meshes/Materials/M_Pine_mushrooms.mat b/Imports/# NatureManufacture Assets/Mountain Environment/Mushrooms/Meshes/Materials/M_Pine_mushrooms.mat index ad3bbdf0..6d3b1157 100644 --- a/Imports/# NatureManufacture Assets/Mountain Environment/Mushrooms/Meshes/Materials/M_Pine_mushrooms.mat +++ b/Imports/# NatureManufacture Assets/Mountain Environment/Mushrooms/Meshes/Materials/M_Pine_mushrooms.mat @@ -22,9 +22,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_Pine_mushrooms m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ENVIRONMENTREFLECTIONS_OFF - _METALLICSPECGLOSSMAP - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 @@ -38,6 +42,7 @@ Material: - TransparentDepthPrepass - TransparentDepthPostpass - TransparentBackface + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -192,9 +197,11 @@ Material: - _AlphaCutoffShadow: 0.5 - _AlphaDstBlend: 0 - _AlphaSrcBlend: 1 + - _AlphaToMask: 0 - _Anisotropy: 0 - _Blend: 0 - _BlendMode: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -231,6 +238,7 @@ Material: - _DoubleSidedEnable: 0 - _DoubleSidedNormalMode: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -240,7 +248,7 @@ Material: - _EnableGeometricSpecularAA: 0 - _EnableSpecularOcclusion: 0 - _EnergyConservingSpecularColor: 1 - - _EnvironmentReflections: 1 + - _EnvironmentReflections: 0 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -281,9 +289,10 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularAAScreenSpaceVariance: 0 - _SpecularAAThreshold: 0 - - _SpecularHighlights: 1 + - _SpecularHighlights: 0 - _SpecularOcclusionMode: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilRef: 0 - _StencilRefDepth: 8 - _StencilRefDistortionVec: 4 @@ -322,9 +331,9 @@ Material: - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 1} - _DiffusionProfileAsset: {r: 0.0000000018238335, g: 8.720024e-27, b: 0.07043165, a: 1.1969789e-26} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} diff --git a/Imports/Ratel/Common/Moss/M_LeafCover01.mat b/Imports/Ratel/Common/Moss/M_LeafCover01.mat new file mode 100644 index 00000000..afd9792e --- /dev/null +++ b/Imports/Ratel/Common/Moss/M_LeafCover01.mat @@ -0,0 +1,135 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1881610841216296014 +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: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_LeafCover01 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + - _SPECULAR_SETUP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 980d788b199b28a4985612c99ad339a8, type: 3} + m_Scale: {x: 1.75, y: 1.75} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 6bd660172916c3d45b7624603f2f5b31, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 980d788b199b28a4985612c99ad339a8, type: 3} + m_Scale: {x: 1.75, y: 1.75} + 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: 2800000, guid: 45890696fb40cf74cb27939e98e28963, type: 3} + 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 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 0 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 0 + - _Cutoff: 0 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.0093 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 1 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + - _Color: {r: 0.7169812, g: 0.7169812, b: 0.7169812, 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/Imports/Ratel/Common/Moss/M_Moss01.mat.meta b/Imports/Ratel/Common/Moss/M_LeafCover01.mat.meta similarity index 100% rename from Imports/Ratel/Common/Moss/M_Moss01.mat.meta rename to Imports/Ratel/Common/Moss/M_LeafCover01.mat.meta diff --git a/Imports/Ratel/Common/Moss/M_Moss01.mat b/Imports/Ratel/Common/Moss/M_Moss01 1.mat similarity index 90% rename from Imports/Ratel/Common/Moss/M_Moss01.mat rename to Imports/Ratel/Common/Moss/M_Moss01 1.mat index 4d86d769..63b6acde 100644 --- a/Imports/Ratel/Common/Moss/M_Moss01.mat +++ b/Imports/Ratel/Common/Moss/M_Moss01 1.mat @@ -20,12 +20,13 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: M_Moss01 + m_Name: M_Moss01 1 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _NORMALMAP + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A - _SPECULAR_SETUP m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -41,10 +42,10 @@ Material: m_TexEnvs: - _BaseMap: m_Texture: {fileID: 2800000, guid: 2522982e57d65bb4188787ded0b7db7c, type: 3} - m_Scale: {x: 1, y: 1} + m_Scale: {x: 2, y: 2} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 2800000, guid: 6bd660172916c3d45b7624603f2f5b31, type: 3} + m_Texture: {fileID: 2800000, guid: 044debe5163f40149aaab19654efdb2a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -65,7 +66,7 @@ Material: m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 2522982e57d65bb4188787ded0b7db7c, type: 3} - m_Scale: {x: 1, y: 1} + m_Scale: {x: 2, y: 2} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -120,7 +121,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0 - - _SmoothnessTextureChannel: 0 + - _SmoothnessTextureChannel: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 @@ -128,8 +129,8 @@ Material: - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.6037736, g: 0.6037736, b: 0.6037736, a: 1} + - _Color: {r: 0.6037736, g: 0.6037736, b: 0.6037736, 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/Imports/Ratel/Common/Moss/M_Moss01 1.mat.meta b/Imports/Ratel/Common/Moss/M_Moss01 1.mat.meta new file mode 100644 index 00000000..f7596b00 --- /dev/null +++ b/Imports/Ratel/Common/Moss/M_Moss01 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b35960d4cd0a95947b123dcc03d909a3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Imports/Ratel/Common/Moss/T_LeafCover01.jpg b/Imports/Ratel/Common/Moss/T_LeafCover01.jpg new file mode 100644 index 00000000..ce8f5386 --- /dev/null +++ b/Imports/Ratel/Common/Moss/T_LeafCover01.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:384ffa44f08fff378c8b9c34c6403be9da45d8b701ad43af246b84417034eeee +size 6888376 diff --git a/Imports/Ratel/Common/Moss/T_LeafCover01.jpg.meta b/Imports/Ratel/Common/Moss/T_LeafCover01.jpg.meta new file mode 100644 index 00000000..9f9fbbb7 --- /dev/null +++ b/Imports/Ratel/Common/Moss/T_LeafCover01.jpg.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 980d788b199b28a4985612c99ad339a8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Imports/Ratel/Common/Moss/T_Moss01_Basecolor.jpg b/Imports/Ratel/Common/Moss/T_Moss01_Basecolor.jpg index 4b3c6058..f5d22016 100644 --- a/Imports/Ratel/Common/Moss/T_Moss01_Basecolor.jpg +++ b/Imports/Ratel/Common/Moss/T_Moss01_Basecolor.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:651bef6d95df5e43648fcc5585fad08a1b78fefc7ec914efbdb4086b165a2ec3 -size 24091827 +oid sha256:c744300d5bcf13988deb1a449d1269fc0bdd2506661a8a24dbc0f0253eab5ed6 +size 7779347 diff --git a/Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg b/Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg deleted file mode 100644 index 687120f4..00000000 --- a/Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e326b8306f96e7a53ea4c8087da470e4c0ce803772012d1b7eb84adffe06fea1 -size 39888838 diff --git a/Imports/Ratel/Common/Moss/T_Moss01_Normal_4096.png b/Imports/Ratel/Common/Moss/T_Moss01_Normal_4096.png new file mode 100644 index 00000000..070dd1e1 --- /dev/null +++ b/Imports/Ratel/Common/Moss/T_Moss01_Normal_4096.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62ca576826fb577d602de418e9c4656a96592acf0938b17d89560353197a3801 +size 22032350 diff --git a/Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg.meta b/Imports/Ratel/Common/Moss/T_Moss01_Normal_4096.png.meta similarity index 98% rename from Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg.meta rename to Imports/Ratel/Common/Moss/T_Moss01_Normal_4096.png.meta index a41b7bda..f9a54bc0 100644 --- a/Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg.meta +++ b/Imports/Ratel/Common/Moss/T_Moss01_Normal_4096.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6bd660172916c3d45b7624603f2f5b31 +guid: 044debe5163f40149aaab19654efdb2a TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Imports/Ratel/Props/Bed_Primitive/M_Bed_Primitive_Planks.mat b/Imports/Ratel/Props/Bed_Primitive/M_Bed_Primitive_Planks.mat index 51180a78..2d6561be 100644 --- a/Imports/Ratel/Props/Bed_Primitive/M_Bed_Primitive_Planks.mat +++ b/Imports/Ratel/Props/Bed_Primitive/M_Bed_Primitive_Planks.mat @@ -128,8 +128,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 1} + - _Color: {r: 0.5660378, g: 0.5660378, b: 0.5660378, 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/Imports/Ratel/Props/Bed_Primitive/Prefab_Bed_Primitive.prefab b/Imports/Ratel/Props/Bed_Primitive/Prefab_Bed_Primitive.prefab index f6c3114d..123b3a3a 100644 --- a/Imports/Ratel/Props/Bed_Primitive/Prefab_Bed_Primitive.prefab +++ b/Imports/Ratel/Props/Bed_Primitive/Prefab_Bed_Primitive.prefab @@ -32,7 +32,6 @@ Transform: - {fileID: 3712999253287896709} - {fileID: 1694402427006748613} - {fileID: 8891903403654136381} - - {fileID: 4165253866546954294} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1155458605390061614 @@ -193,80 +192,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3750795195033674094} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4487640421251934173 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7396280425887060659} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_LocalPosition.x - value: -0.05949402 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.5995941 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.024475098 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071067 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_Name - value: Leaf_Bed_Primitive - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 783abb9e69eedf8499d10f530ad36154, type: 3} ---- !u!4 &4165253866546954294 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - m_PrefabInstance: {fileID: 4487640421251934173} - m_PrefabAsset: {fileID: 0} --- !u!1001 &9001809954362435030 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Imports/Ratel/Props/Tent_Primitive/M_Tent_Primitive_Wood.mat b/Imports/Ratel/Props/Tent_Primitive/M_Tent_Primitive_Wood.mat index 19d483c8..c94ccaaa 100644 --- a/Imports/Ratel/Props/Tent_Primitive/M_Tent_Primitive_Wood.mat +++ b/Imports/Ratel/Props/Tent_Primitive/M_Tent_Primitive_Wood.mat @@ -101,7 +101,7 @@ Material: - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 + - _BumpScale: 0 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 @@ -128,8 +128,8 @@ Material: - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.6509434, g: 0.63075393, b: 0.623309, a: 1} + - _Color: {r: 0.6509434, g: 0.63075393, b: 0.62330896, 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/Imports/Ratel/Props/Tent_Primitive/Prefab_Tent_Primitive.prefab b/Imports/Ratel/Props/Tent_Primitive/Prefab_Tent_Primitive.prefab index 02f1c4ed..c81868f6 100644 --- a/Imports/Ratel/Props/Tent_Primitive/Prefab_Tent_Primitive.prefab +++ b/Imports/Ratel/Props/Tent_Primitive/Prefab_Tent_Primitive.prefab @@ -26,8 +26,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 155.30849, y: -86.986, z: 497.313} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 5466562477791394994} - {fileID: 8821590001380281791} @@ -115,6 +115,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2602646054100835367} m_Modifications: + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, + type: 3} + propertyPath: m_LocalScale.x + value: 105.99999 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, + type: 3} + propertyPath: m_LocalScale.y + value: 105.99999 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, + type: 3} + propertyPath: m_LocalScale.z + value: 105.99999 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_LocalPosition.x @@ -123,7 +138,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_LocalPosition.y - value: 0.7460022 + value: 0.74 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} @@ -165,6 +180,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: fe14fe9de645f8c4c8b34124a02c2f2b, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: b35960d4cd0a95947b123dcc03d909a3, type: 2} - target: {fileID: 919132149155446097, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_Name diff --git a/Sources/Animations/ToriaAnims_Human_Sit4.anim.meta b/Sources/Animations/ToriaAnims_Human_Sit4.anim.meta index 731b0364..4af2b3e6 100644 --- a/Sources/Animations/ToriaAnims_Human_Sit4.anim.meta +++ b/Sources/Animations/ToriaAnims_Human_Sit4.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8129293754cbeba4db975217fd24eb22 +guid: 9b3e0286ea1999f45830061a15f5af43 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Sources/Materials/M_fern_01.mat b/Sources/Materials/M_fern_01.mat index abdb6a5e..fe4d2d0c 100644 --- a/Sources/Materials/M_fern_01.mat +++ b/Sources/Materials/M_fern_01.mat @@ -2,20 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: M_fern_01 m_Shader: {fileID: 4800000, guid: adce0b63bca75a84e9f786201b7d7b0b, type: 3} - m_ShaderKeywords: _DISTANCEBLEND_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _DISTANCEBLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -142,7 +147,7 @@ Material: - _WINDCOLORMIX: 0 - _WindColorInfluence: 0.03 - _WindColorMix: 1 - - _WindColorThreshold: 0.052 + - _WindColorThreshold: 0.05 - _WindNoisePower: 3 - _WindNormalInfluence: 0 - _WindPowerDirectionX: 1