From b4eb88634134407bea3c654052dcbbdcfd9ad4a6 Mon Sep 17 00:00:00 2001 From: IIGM1BII Date: Mon, 17 Aug 2026 14:08:13 +0200 Subject: [PATCH] Import/Fix: Bed/Tent Primitive --- .../DemoScenes/Gamescene_Chickendemo.unity | 143 ---------------- .../Moss.meta} | 6 +- .../Moss/M_Moss01.mat} | 22 ++- .../Moss/M_Moss01.mat.meta} | 0 .../Ratel/Common/Moss/T_Moss01_Basecolor.jpg | 3 + .../Moss/T_Moss01_Basecolor.jpg.meta} | 13 +- Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg | 3 + .../Moss/T_Moss01_Normal.jpg.meta} | 13 +- .../Moss/T_Moss01_SpecularSmoothness.jpg | 3 + .../T_Moss01_SpecularSmoothness.jpg.meta} | 15 +- .../Bed_Primitive/Bed_Primitive_Plants.fbx | 3 - .../Bed_Primitive/Leaf_Bed_Primitive.fbx | 3 + ...s.fbx.meta => Leaf_Bed_Primitive.fbx.meta} | 2 +- .../Bed_Primitive/M_Bed_Primitive_Plants.mat | 137 ---------------- .../Bed_Primitive/Prefab_Bed_Primitive.prefab | 155 +++++++++--------- .../T_Bed_Primitive_Plants_Basecolor.png | 3 - .../T_Bed_Primitive_Plants_Normal.png | 3 - ...Bed_Primitive_Plants_SpecularSmoothnes.png | 3 - .../Tent_Primitive/Leaf_Tent_Primitive.fbx | 3 + .../Leaf_Tent_Primitive.fbx.meta | 114 +++++++++++++ .../Prefab_Tent_Primitive.prefab | 108 ++++++------ .../Props/Tent_Primitive/Tent_Primitive.fbx | 3 - .../Tent_Primitive/Tent_Primitive_Planks.fbx | 3 + ...bx.meta => Tent_Primitive_Planks.fbx.meta} | 0 24 files changed, 295 insertions(+), 466 deletions(-) rename Imports/Ratel/{Props/Bed_Primitive/M_Bed_Primitive_Plants.mat.meta => Common/Moss.meta} (52%) rename Imports/Ratel/{Props/Tent_Primitive/M_Leaf_tent.mat => Common/Moss/M_Moss01.mat} (86%) rename Imports/Ratel/{Props/Tent_Primitive/M_Leaf_tent.mat.meta => Common/Moss/M_Moss01.mat.meta} (100%) create mode 100644 Imports/Ratel/Common/Moss/T_Moss01_Basecolor.jpg rename Imports/Ratel/{Props/Bed_Primitive/T_Bed_Primitive_Plants_SpecularSmoothnes.png.meta => Common/Moss/T_Moss01_Basecolor.jpg.meta} (91%) create mode 100644 Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg rename Imports/Ratel/{Props/Bed_Primitive/T_Bed_Primitive_Plants_Normal.png.meta => Common/Moss/T_Moss01_Normal.jpg.meta} (91%) create mode 100644 Imports/Ratel/Common/Moss/T_Moss01_SpecularSmoothness.jpg rename Imports/Ratel/{Props/Bed_Primitive/T_Bed_Primitive_Plants_Basecolor.png.meta => Common/Moss/T_Moss01_SpecularSmoothness.jpg.meta} (90%) delete mode 100644 Imports/Ratel/Props/Bed_Primitive/Bed_Primitive_Plants.fbx create mode 100644 Imports/Ratel/Props/Bed_Primitive/Leaf_Bed_Primitive.fbx rename Imports/Ratel/Props/Bed_Primitive/{Bed_Primitive_Plants.fbx.meta => Leaf_Bed_Primitive.fbx.meta} (97%) delete mode 100644 Imports/Ratel/Props/Bed_Primitive/M_Bed_Primitive_Plants.mat delete mode 100644 Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_Basecolor.png delete mode 100644 Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_Normal.png delete mode 100644 Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_SpecularSmoothnes.png create mode 100644 Imports/Ratel/Props/Tent_Primitive/Leaf_Tent_Primitive.fbx create mode 100644 Imports/Ratel/Props/Tent_Primitive/Leaf_Tent_Primitive.fbx.meta delete mode 100644 Imports/Ratel/Props/Tent_Primitive/Tent_Primitive.fbx create mode 100644 Imports/Ratel/Props/Tent_Primitive/Tent_Primitive_Planks.fbx rename Imports/Ratel/Props/Tent_Primitive/{Tent_Primitive.fbx.meta => Tent_Primitive_Planks.fbx.meta} (100%) diff --git a/Imports/Ratel/Buildings/DemoScenes/Gamescene_Chickendemo.unity b/Imports/Ratel/Buildings/DemoScenes/Gamescene_Chickendemo.unity index dd10921f..64a5cfe2 100644 --- a/Imports/Ratel/Buildings/DemoScenes/Gamescene_Chickendemo.unity +++ b/Imports/Ratel/Buildings/DemoScenes/Gamescene_Chickendemo.unity @@ -240,74 +240,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &754650460 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2299470404373875045, guid: de58b1d5035270a4c9b58bb24af843c3, - type: 3} - propertyPath: m_Name - value: Prefab_Bed_Primitive - objectReference: {fileID: 0} - - target: {fileID: 7396280425887060659, guid: de58b1d5035270a4c9b58bb24af843c3, - type: 3} - propertyPath: m_LocalPosition.x - value: 153.43204 - objectReference: {fileID: 0} - - target: {fileID: 7396280425887060659, guid: de58b1d5035270a4c9b58bb24af843c3, - type: 3} - propertyPath: m_LocalPosition.y - value: -82.705246 - objectReference: {fileID: 0} - - target: {fileID: 7396280425887060659, guid: de58b1d5035270a4c9b58bb24af843c3, - type: 3} - propertyPath: m_LocalPosition.z - value: 503.89377 - objectReference: {fileID: 0} - - target: {fileID: 7396280425887060659, guid: de58b1d5035270a4c9b58bb24af843c3, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7396280425887060659, guid: de58b1d5035270a4c9b58bb24af843c3, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7396280425887060659, guid: de58b1d5035270a4c9b58bb24af843c3, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7396280425887060659, guid: de58b1d5035270a4c9b58bb24af843c3, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7396280425887060659, guid: de58b1d5035270a4c9b58bb24af843c3, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7396280425887060659, guid: de58b1d5035270a4c9b58bb24af843c3, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7396280425887060659, guid: de58b1d5035270a4c9b58bb24af843c3, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: de58b1d5035270a4c9b58bb24af843c3, type: 3} --- !u!1 &796849365 GameObject: m_ObjectHideFlags: 0 @@ -445,79 +377,6 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 ---- !u!1001 &929297835 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, - type: 3} - propertyPath: m_LocalPosition.x - value: 163.537 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, - type: 3} - propertyPath: m_LocalPosition.y - value: -88.06842 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, - type: 3} - propertyPath: m_LocalPosition.z - value: 503.00186 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -4006076399759799387, guid: b4b9062a29af8834081d0242bf92579f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 1d54cca7bd748e1418ee96a73ca5ca4f, type: 2} - - target: {fileID: 919132149155446097, guid: b4b9062a29af8834081d0242bf92579f, - type: 3} - propertyPath: m_Name - value: Tent_Primitive - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b4b9062a29af8834081d0242bf92579f, type: 3} --- !u!1001 &2665730017538748157 PrefabInstance: m_ObjectHideFlags: 0 @@ -662,5 +521,3 @@ SceneRoots: - {fileID: 232079176} - {fileID: 3021948965500762540} - {fileID: 2665730017538748157} - - {fileID: 754650460} - - {fileID: 929297835} diff --git a/Imports/Ratel/Props/Bed_Primitive/M_Bed_Primitive_Plants.mat.meta b/Imports/Ratel/Common/Moss.meta similarity index 52% rename from Imports/Ratel/Props/Bed_Primitive/M_Bed_Primitive_Plants.mat.meta rename to Imports/Ratel/Common/Moss.meta index 7f8711fc..4555a7fd 100644 --- a/Imports/Ratel/Props/Bed_Primitive/M_Bed_Primitive_Plants.mat.meta +++ b/Imports/Ratel/Common/Moss.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 4495ae25d8e2c1543b12f897d3f96826 -NativeFormatImporter: +guid: fab2bbc546e9e9145a69f50c0a985b4d +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Imports/Ratel/Props/Tent_Primitive/M_Leaf_tent.mat b/Imports/Ratel/Common/Moss/M_Moss01.mat similarity index 86% rename from Imports/Ratel/Props/Tent_Primitive/M_Leaf_tent.mat rename to Imports/Ratel/Common/Moss/M_Moss01.mat index 51b33e06..21ec7fdc 100644 --- a/Imports/Ratel/Props/Tent_Primitive/M_Leaf_tent.mat +++ b/Imports/Ratel/Common/Moss/M_Moss01.mat @@ -20,34 +20,32 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: M_Leaf_tent + m_Name: M_Moss01 m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _ALPHATEST_ON - _METALLICSPECGLOSSMAP - _NORMALMAP - - _PARALLAXMAP - _SPECULAR_SETUP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: 2450 + m_CustomRenderQueue: 2000 stringTagMap: - RenderType: TransparentCutout + RenderType: Opaque disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: c908aae1492a4174b83f005bce6dfc5e, type: 3} + m_Texture: {fileID: 2800000, guid: 2522982e57d65bb4188787ded0b7db7c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 2800000, guid: 591d6597a6e0744468be7c879a9b0b81, type: 3} + m_Texture: {fileID: 2800000, guid: 6bd660172916c3d45b7624603f2f5b31, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -67,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: c908aae1492a4174b83f005bce6dfc5e, type: 3} + m_Texture: {fileID: 2800000, guid: 2522982e57d65bb4188787ded0b7db7c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -83,7 +81,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: - m_Texture: {fileID: 2800000, guid: 8a8f031b7db752f4bb608ac7d64f9f17, type: 3} + m_Texture: {fileID: 2800000, guid: de600c02aa7df364ba81d860abc2dbf6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -100,15 +98,15 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _AlphaClip: 1 - - _AlphaToMask: 1 + - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 0 - - _Cutoff: 0.473 + - _Cutoff: 0 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 diff --git a/Imports/Ratel/Props/Tent_Primitive/M_Leaf_tent.mat.meta b/Imports/Ratel/Common/Moss/M_Moss01.mat.meta similarity index 100% rename from Imports/Ratel/Props/Tent_Primitive/M_Leaf_tent.mat.meta rename to Imports/Ratel/Common/Moss/M_Moss01.mat.meta diff --git a/Imports/Ratel/Common/Moss/T_Moss01_Basecolor.jpg b/Imports/Ratel/Common/Moss/T_Moss01_Basecolor.jpg new file mode 100644 index 00000000..4b3c6058 --- /dev/null +++ b/Imports/Ratel/Common/Moss/T_Moss01_Basecolor.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:651bef6d95df5e43648fcc5585fad08a1b78fefc7ec914efbdb4086b165a2ec3 +size 24091827 diff --git a/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_SpecularSmoothnes.png.meta b/Imports/Ratel/Common/Moss/T_Moss01_Basecolor.jpg.meta similarity index 91% rename from Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_SpecularSmoothnes.png.meta rename to Imports/Ratel/Common/Moss/T_Moss01_Basecolor.jpg.meta index 66b01aa3..08445c0c 100644 --- a/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_SpecularSmoothnes.png.meta +++ b/Imports/Ratel/Common/Moss/T_Moss01_Basecolor.jpg.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: df38bcb6fbfad5e46b8cbf9dc6e5d73c +guid: 2522982e57d65bb4188787ded0b7db7c TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -75,6 +77,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -87,6 +90,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -103,9 +107,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg b/Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg new file mode 100644 index 00000000..687120f4 --- /dev/null +++ b/Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e326b8306f96e7a53ea4c8087da470e4c0ce803772012d1b7eb84adffe06fea1 +size 39888838 diff --git a/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_Normal.png.meta b/Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg.meta similarity index 91% rename from Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_Normal.png.meta rename to Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg.meta index 53713057..a41b7bda 100644 --- a/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_Normal.png.meta +++ b/Imports/Ratel/Common/Moss/T_Moss01_Normal.jpg.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 074c3df83ef9774499753ab4efcaf0a0 +guid: 6bd660172916c3d45b7624603f2f5b31 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -75,6 +77,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -87,6 +90,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -103,9 +107,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Imports/Ratel/Common/Moss/T_Moss01_SpecularSmoothness.jpg b/Imports/Ratel/Common/Moss/T_Moss01_SpecularSmoothness.jpg new file mode 100644 index 00000000..d4a92856 --- /dev/null +++ b/Imports/Ratel/Common/Moss/T_Moss01_SpecularSmoothness.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1204ea958b87b7d7fcc4f7c618af210aad2121bfadb9331b74b9de58acf5e879 +size 13492235 diff --git a/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_Basecolor.png.meta b/Imports/Ratel/Common/Moss/T_Moss01_SpecularSmoothness.jpg.meta similarity index 90% rename from Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_Basecolor.png.meta rename to Imports/Ratel/Common/Moss/T_Moss01_SpecularSmoothness.jpg.meta index 4bda1d4a..f25c131f 100644 --- a/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_Basecolor.png.meta +++ b/Imports/Ratel/Common/Moss/T_Moss01_SpecularSmoothness.jpg.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 29b1651b322b6e94194ce48f714014a5 +guid: de600c02aa7df364ba81d860abc2dbf6 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -51,7 +52,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - serializedVersion: 3 @@ -75,6 +77,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -87,6 +90,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -103,9 +107,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Imports/Ratel/Props/Bed_Primitive/Bed_Primitive_Plants.fbx b/Imports/Ratel/Props/Bed_Primitive/Bed_Primitive_Plants.fbx deleted file mode 100644 index 8e4e4468..00000000 --- a/Imports/Ratel/Props/Bed_Primitive/Bed_Primitive_Plants.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7197d7b7aceb52226b9f9443b48d01cc2f8dbee0756b180a39b044e219cf087c -size 3029660 diff --git a/Imports/Ratel/Props/Bed_Primitive/Leaf_Bed_Primitive.fbx b/Imports/Ratel/Props/Bed_Primitive/Leaf_Bed_Primitive.fbx new file mode 100644 index 00000000..4a54f606 --- /dev/null +++ b/Imports/Ratel/Props/Bed_Primitive/Leaf_Bed_Primitive.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:620ba7b8fbf9dee50cb28a04592de17cf949d6d683e2166a83836ccc5af490f3 +size 77499212 diff --git a/Imports/Ratel/Props/Bed_Primitive/Bed_Primitive_Plants.fbx.meta b/Imports/Ratel/Props/Bed_Primitive/Leaf_Bed_Primitive.fbx.meta similarity index 97% rename from Imports/Ratel/Props/Bed_Primitive/Bed_Primitive_Plants.fbx.meta rename to Imports/Ratel/Props/Bed_Primitive/Leaf_Bed_Primitive.fbx.meta index f94e6c1a..6edf1450 100644 --- a/Imports/Ratel/Props/Bed_Primitive/Bed_Primitive_Plants.fbx.meta +++ b/Imports/Ratel/Props/Bed_Primitive/Leaf_Bed_Primitive.fbx.meta @@ -8,7 +8,7 @@ ModelImporter: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: Bed_primitve_plants - second: {fileID: 2100000, guid: 4495ae25d8e2c1543b12f897d3f96826, type: 2} + second: {fileID: 2100000, guid: 4dc25857268bd7742b2b41b06403d6d4, type: 2} materials: materialImportMode: 2 materialName: 0 diff --git a/Imports/Ratel/Props/Bed_Primitive/M_Bed_Primitive_Plants.mat b/Imports/Ratel/Props/Bed_Primitive/M_Bed_Primitive_Plants.mat deleted file mode 100644 index 2128fab7..00000000 --- a/Imports/Ratel/Props/Bed_Primitive/M_Bed_Primitive_Plants.mat +++ /dev/null @@ -1,137 +0,0 @@ -%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: M_Bed_Primitive_Plants - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHATEST_ON - - _METALLICSPECGLOSSMAP - - _NORMALMAP - - _SPECULAR_SETUP - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2450 - stringTagMap: - RenderType: TransparentCutout - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: 29b1651b322b6e94194ce48f714014a5, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 2800000, guid: 074c3df83ef9774499753ab4efcaf0a0, 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: 29b1651b322b6e94194ce48f714014a5, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 2800000, guid: f9ddd1bd65292c7488f687d2b0a36f51, type: 3} - 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: e96a595c9ef87f34f8ab7382bdae5b17, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 2800000, guid: df38bcb6fbfad5e46b8cbf9dc6e5d73c, type: 3} - 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: 1 - - _AlphaToMask: 1 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.128 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.0448 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.045 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _WorkflowMode: 0 - - _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: [] ---- !u!114 &3884466408853039186 -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 diff --git a/Imports/Ratel/Props/Bed_Primitive/Prefab_Bed_Primitive.prefab b/Imports/Ratel/Props/Bed_Primitive/Prefab_Bed_Primitive.prefab index babbaa3b..f6c3114d 100644 --- a/Imports/Ratel/Props/Bed_Primitive/Prefab_Bed_Primitive.prefab +++ b/Imports/Ratel/Props/Bed_Primitive/Prefab_Bed_Primitive.prefab @@ -31,8 +31,8 @@ Transform: m_Children: - {fileID: 3712999253287896709} - {fileID: 1694402427006748613} - - {fileID: 1273559434439387299} - {fileID: 8891903403654136381} + - {fileID: 4165253866546954294} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1155458605390061614 @@ -114,85 +114,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1155458605390061614} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1596014741923696456 -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.053 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.7399998 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.05508423 - 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: -7511558181221131132, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 4495ae25d8e2c1543b12f897d3f96826, type: 2} - - target: {fileID: 919132149155446097, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - propertyPath: m_Name - value: Bed_Primitive_Plants - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 783abb9e69eedf8499d10f530ad36154, type: 3} ---- !u!4 &1273559434439387299 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 783abb9e69eedf8499d10f530ad36154, - type: 3} - m_PrefabInstance: {fileID: 1596014741923696456} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3750795195033674094 PrefabInstance: m_ObjectHideFlags: 0 @@ -272,6 +193,80 @@ 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/Bed_Primitive/T_Bed_Primitive_Plants_Basecolor.png b/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_Basecolor.png deleted file mode 100644 index bb30116e..00000000 --- a/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_Basecolor.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15cbe3d20b368a86274dd26c10341b68be671c22cf8c200ab41702e0fb021d85 -size 1197450 diff --git a/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_Normal.png b/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_Normal.png deleted file mode 100644 index 0319aaf2..00000000 --- a/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_Normal.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e1f206b7b43c27e5a82757eea8dfbbf0bbf184467a7884a483286a24e3a1ad3 -size 1185875 diff --git a/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_SpecularSmoothnes.png b/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_SpecularSmoothnes.png deleted file mode 100644 index b030531d..00000000 --- a/Imports/Ratel/Props/Bed_Primitive/T_Bed_Primitive_Plants_SpecularSmoothnes.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a577732d4eebebbbbbada3b5ae576b79a164ce2793c31534894a9ce1f7ca3cb4 -size 619553 diff --git a/Imports/Ratel/Props/Tent_Primitive/Leaf_Tent_Primitive.fbx b/Imports/Ratel/Props/Tent_Primitive/Leaf_Tent_Primitive.fbx new file mode 100644 index 00000000..bdc121aa --- /dev/null +++ b/Imports/Ratel/Props/Tent_Primitive/Leaf_Tent_Primitive.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1c1b457071546a79101b56774d40bca30e414d381a99d56fdf943c81d320850 +size 77500156 diff --git a/Imports/Ratel/Props/Tent_Primitive/Leaf_Tent_Primitive.fbx.meta b/Imports/Ratel/Props/Tent_Primitive/Leaf_Tent_Primitive.fbx.meta new file mode 100644 index 00000000..8b7087f1 --- /dev/null +++ b/Imports/Ratel/Props/Tent_Primitive/Leaf_Tent_Primitive.fbx.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: fe14fe9de645f8c4c8b34124a02c2f2b +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Tent_Primitive_Neaf + second: {fileID: 2100000, guid: 4dc25857268bd7742b2b41b06403d6d4, type: 2} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 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 + importPhysicalCameras: 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 + strictVertexDataChecks: 0 + 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 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Imports/Ratel/Props/Tent_Primitive/Prefab_Tent_Primitive.prefab b/Imports/Ratel/Props/Tent_Primitive/Prefab_Tent_Primitive.prefab index 4992f8ac..02f1c4ed 100644 --- a/Imports/Ratel/Props/Tent_Primitive/Prefab_Tent_Primitive.prefab +++ b/Imports/Ratel/Props/Tent_Primitive/Prefab_Tent_Primitive.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7493121102918325375 +--- !u!1 &6740468337931233630 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,7 +8,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4172624256379401560} + - component: {fileID: 2602646054100835367} m_Layer: 0 m_Name: Prefab_Tent_Primitive m_TagString: Untagged @@ -16,178 +16,168 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4172624256379401560 +--- !u!4 &2602646054100835367 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7493121102918325375} + m_GameObject: {fileID: 6740468337931233630} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 189.389, y: -17.896, z: 477.838} + m_LocalPosition: {x: 155.30849, y: -86.986, z: 497.313} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 9063087176954149101} - - {fileID: 7349634995046979340} + - {fileID: 5466562477791394994} + - {fileID: 8821590001380281791} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &7094752074100076775 +--- !u!1001 &5501033562956192601 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 4172624256379401560} + m_TransformParent: {fileID: 2602646054100835367} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 282305004a48a1747a34a56989dc044f, + - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, type: 3} propertyPath: m_LocalPosition.x - value: 0.016998291 + value: -0.009490967 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 282305004a48a1747a34a56989dc044f, + - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, type: 3} propertyPath: m_LocalPosition.y - value: 0.02199936 + value: 0.08544922 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 282305004a48a1747a34a56989dc044f, + - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, type: 3} propertyPath: m_LocalPosition.z - value: 0.16305542 + value: -0.058807373 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 282305004a48a1747a34a56989dc044f, + - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 282305004a48a1747a34a56989dc044f, + - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 282305004a48a1747a34a56989dc044f, + - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 282305004a48a1747a34a56989dc044f, + - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 282305004a48a1747a34a56989dc044f, + - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 282305004a48a1747a34a56989dc044f, + - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 282305004a48a1747a34a56989dc044f, + - target: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 282305004a48a1747a34a56989dc044f, + - target: {fileID: 919132149155446097, guid: b4b9062a29af8834081d0242bf92579f, type: 3} propertyPath: m_Name - value: Tent_Primitive_Wood + value: Tent_Primitive objectReference: {fileID: 0} - - target: {fileID: 5075309365338239103, guid: 282305004a48a1747a34a56989dc044f, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 1d54cca7bd748e1418ee96a73ca5ca4f, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 282305004a48a1747a34a56989dc044f, type: 3} ---- !u!4 &7349634995046979340 stripped + m_SourcePrefab: {fileID: 100100000, guid: b4b9062a29af8834081d0242bf92579f, type: 3} +--- !u!4 &5466562477791394994 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 282305004a48a1747a34a56989dc044f, + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b4b9062a29af8834081d0242bf92579f, type: 3} - m_PrefabInstance: {fileID: 7094752074100076775} + m_PrefabInstance: {fileID: 5501033562956192601} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8812476542581120774 +--- !u!1001 &9071987030045862484 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 4172624256379401560} + m_TransformParent: {fileID: 2602646054100835367} m_Modifications: - - target: {fileID: -8679921383154817045, guid: cbce9f031dabc5544b7f098a3fa09840, + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_LocalPosition.x - value: 0.018997192 + value: -0.012481689 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cbce9f031dabc5544b7f098a3fa09840, + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_LocalPosition.y - value: -0.0030002594 + value: 0.7460022 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cbce9f031dabc5544b7f098a3fa09840, + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_LocalPosition.z - value: 0.152 + value: 0.024017334 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cbce9f031dabc5544b7f098a3fa09840, + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_LocalRotation.w value: 0.7071067 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cbce9f031dabc5544b7f098a3fa09840, + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_LocalRotation.x value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cbce9f031dabc5544b7f098a3fa09840, + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cbce9f031dabc5544b7f098a3fa09840, + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cbce9f031dabc5544b7f098a3fa09840, + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cbce9f031dabc5544b7f098a3fa09840, + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: cbce9f031dabc5544b7f098a3fa09840, + - target: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: cbce9f031dabc5544b7f098a3fa09840, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 4dc25857268bd7742b2b41b06403d6d4, type: 2} - - target: {fileID: 919132149155446097, guid: cbce9f031dabc5544b7f098a3fa09840, + - target: {fileID: 919132149155446097, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} propertyPath: m_Name - value: Tent_Primitive_Leaf + value: Leaf_Tent_Primitive objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cbce9f031dabc5544b7f098a3fa09840, type: 3} ---- !u!4 &9063087176954149101 stripped + m_SourcePrefab: {fileID: 100100000, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} +--- !u!4 &8821590001380281791 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: cbce9f031dabc5544b7f098a3fa09840, + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: fe14fe9de645f8c4c8b34124a02c2f2b, type: 3} - m_PrefabInstance: {fileID: 8812476542581120774} + m_PrefabInstance: {fileID: 9071987030045862484} m_PrefabAsset: {fileID: 0} diff --git a/Imports/Ratel/Props/Tent_Primitive/Tent_Primitive.fbx b/Imports/Ratel/Props/Tent_Primitive/Tent_Primitive.fbx deleted file mode 100644 index 8748b69a..00000000 --- a/Imports/Ratel/Props/Tent_Primitive/Tent_Primitive.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f28d0e5285a6b6e32d8467d581e40968ff53dc7f045149dfda52ae0f60499569 -size 80972 diff --git a/Imports/Ratel/Props/Tent_Primitive/Tent_Primitive_Planks.fbx b/Imports/Ratel/Props/Tent_Primitive/Tent_Primitive_Planks.fbx new file mode 100644 index 00000000..30cedcf9 --- /dev/null +++ b/Imports/Ratel/Props/Tent_Primitive/Tent_Primitive_Planks.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a14d2f201588938b6df9b24fe59bdc03bdc30b57109dc17a6ffc07ee379d1dc6 +size 15631916 diff --git a/Imports/Ratel/Props/Tent_Primitive/Tent_Primitive.fbx.meta b/Imports/Ratel/Props/Tent_Primitive/Tent_Primitive_Planks.fbx.meta similarity index 100% rename from Imports/Ratel/Props/Tent_Primitive/Tent_Primitive.fbx.meta rename to Imports/Ratel/Props/Tent_Primitive/Tent_Primitive_Planks.fbx.meta