Fix with new models and lightning

This commit is contained in:
Ignacio Gómez Puga
2025-03-04 21:43:22 -06:00
parent 5847d844a5
commit 5e13c128a5
23 changed files with 497 additions and 287 deletions

View File

@@ -1,19 +1,9 @@
fileFormatVersion: 2
guid: 44015e9407a49424da7321a4678e1ce6
guid: e43b07362fa01834384c4c5ec519a8ca
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects:
- first:
type: UnityEngine:Texture2D
assembly: UnityEngine.CoreModule
name: SUMO Color
second: {fileID: 2800000, guid: 2082c471f208c7c4cad8b2599bded5af, type: 3}
- first:
type: UnityEngine:Texture2D
assembly: UnityEngine.CoreModule
name: SUMO Roughness
second: {fileID: 2800000, guid: efc940418ae122f49bee6b56916b937e, type: 3}
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0

BIN
Assets/Models/Sandia.fbx (Stored with Git LFS)

Binary file not shown.

View File

@@ -3,27 +3,7 @@ guid: a159887176eca8843a8a9a42b862cbee
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects:
- first:
type: UnityEngine:Texture2D
assembly: UnityEngine.CoreModule
name: SANDIA Color
second: {fileID: 2800000, guid: 6e76c4d817a272e49a5ccf62d28d6b6a, type: 3}
- first:
type: UnityEngine:Texture2D
assembly: UnityEngine.CoreModule
name: SANDIA Color alt
second: {fileID: 2800000, guid: 1c0b245274f7df248b23e4b8c56eba25, type: 3}
- first:
type: UnityEngine:Texture2D
assembly: UnityEngine.CoreModule
name: SANDIA Roughness
second: {fileID: 2800000, guid: c38403d9801b01f4fb14a436284a229a, type: 3}
- first:
type: UnityEngine:Texture2D
assembly: UnityEngine.CoreModule
name: SANDIA UV
second: {fileID: 2800000, guid: 5dd40be1042720048892d0ca30b70df1, type: 3}
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0

BIN
Assets/Models/TOTU Coffe Table 103.fbx (Stored with Git LFS)

Binary file not shown.

View File

@@ -8,17 +8,17 @@ ModelImporter:
type: UnityEngine:Texture2D
assembly: UnityEngine.CoreModule
name: BRUSHED GUN METAL_ I304S
second: {fileID: 2800000, guid: 75b18e068c1fd3c45b81ba21ada61e07, type: 3}
second: {fileID: 2800000, guid: 7e8c14de5ea67034597e2d4bc9c2a585, type: 3}
- first:
type: UnityEngine:Texture2D
assembly: UnityEngine.CoreModule
name: CARNICO GREY GLOSSY_ M203L
second: {fileID: 2800000, guid: 34f74ee811daf9e42a947505cc1332b8, type: 3}
second: {fileID: 2800000, guid: 62392b673cea8e94c9bc4b2885aa289c, type: 3}
- first:
type: UnityEngine:Texture2D
assembly: UnityEngine.CoreModule
name: OLD BRONZE_ I311V
second: {fileID: 2800000, guid: 13f2ecee82b9fd548a25f9719e89abe2, type: 3}
second: {fileID: 2800000, guid: b1ee3daeef1c31b4c8ce034a2da629e8, type: 3}
materials:
materialImportMode: 2
materialName: 0

BIN
Assets/Models/TOTU Coffe Table 104.fbx (Stored with Git LFS)

Binary file not shown.

View File

@@ -3,22 +3,7 @@ guid: 6d7886c474484de4eb1fb6da8450d072
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects:
- first:
type: UnityEngine:Texture2D
assembly: UnityEngine.CoreModule
name: BRUSHED GUN METAL_ I304S
second: {fileID: 2800000, guid: 09701fadfaaea834fb4636d582d1190e, type: 3}
- first:
type: UnityEngine:Texture2D
assembly: UnityEngine.CoreModule
name: MARMO PATAGONIA CLEARER
second: {fileID: 2800000, guid: 626c65308dddb804abfdc4615d813f31, type: 3}
- first:
type: UnityEngine:Texture2D
assembly: UnityEngine.CoreModule
name: OLD BRONZE_ I311V
second: {fileID: 2800000, guid: 14823c40ed5a5a94e855786206f601e8, type: 3}
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 605 KiB

View File

@@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: 7e8c14de5ea67034597e2d4bc9c2a585
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
- serializedVersion: 3
buildTarget: Android
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 796 KiB

View File

@@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: 62392b673cea8e94c9bc4b2885aa289c
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
- serializedVersion: 3
buildTarget: Android
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 576 KiB

View File

@@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: b1ee3daeef1c31b4c8ce034a2da629e8
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
- serializedVersion: 3
buildTarget: Android
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:

View File

@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &2709788062781342979
--- !u!1001 &2247369590524706888
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -8,79 +8,75 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_LocalScale.x
value: 0.009
value: 0.023
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_LocalScale.y
value: 0.009
value: 0.0099
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_LocalScale.z
value: 0.009
value: 0.023
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: -5330287902570191112, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -5330287902570191112, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: -1978375887256046412, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: -1978375887256046412, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: 919132149155446097, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_Name
value: SUMO Cofee Table 102
value: SUMO Coffe Table 102
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: 919132149155446097, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- target: {fileID: 919132149155446097, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
propertyPath: m_TagString
value: Selectable
objectReference: {fileID: 0}
@@ -88,28 +84,36 @@ PrefabInstance:
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
insertIndex: -1
addedObject: {fileID: 8972819650157869427}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
addedObject: {fileID: 5049362775388934297}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
insertIndex: -1
addedObject: {fileID: 8044796390494583360}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
addedObject: {fileID: 3877149481188827060}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
insertIndex: -1
addedObject: {fileID: 2683586434225115}
m_SourcePrefab: {fileID: 100100000, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
--- !u!1 &2979817468721117266 stripped
addedObject: {fileID: 9030462377936049714}
m_SourcePrefab: {fileID: 100100000, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
--- !u!1 &1436977506181758233 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
m_PrefabInstance: {fileID: 2709788062781342979}
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
m_PrefabInstance: {fileID: 2247369590524706888}
m_PrefabAsset: {fileID: 0}
--- !u!23 &8972819650157869427
--- !u!33 &5049362775388934297
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1436977506181758233}
m_Mesh: {fileID: 7349959616800066885, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3}
--- !u!23 &3877149481188827060
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2979817468721117266}
m_GameObject: {fileID: 1436977506181758233}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
@@ -145,13 +149,13 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &8044796390494583360
--- !u!65 &9030462377936049714
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2979817468721117266}
m_GameObject: {fileID: 1436977506181758233}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
@@ -164,13 +168,5 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 45.796417, y: 56.68443, z: 46.315723}
m_Center: {x: -0.31109154, y: 27.842218, z: -4.1993}
--- !u!33 &2683586434225115
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2979817468721117266}
m_Mesh: {fileID: 7349959616800066885, guid: 44015e9407a49424da7321a4678e1ce6, type: 3}
m_Size: {x: 45.301495, y: 56.287235, z: 45.361786}
m_Center: {x: -0.06457256, y: 27.643608, z: -4.227783}

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: feab3b25df08c8f4aa5c4c3b41dbe32d
guid: 5d852d0f90f588547b2ca56c0dd1340a
PrefabImporter:
externalObjects: {}
userData:

View File

@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &1309172814482533527
--- !u!1001 &3262274873550086986
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -8,18 +8,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3}
propertyPath: m_LocalScale.x
value: 0.007
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3}
propertyPath: m_LocalScale.y
value: 0.009
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3}
propertyPath: m_LocalScale.z
value: 0.009
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@@ -98,26 +86,34 @@ PrefabInstance:
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a159887176eca8843a8a9a42b862cbee, type: 3}
insertIndex: -1
addedObject: {fileID: 4845414631601302259}
addedObject: {fileID: 4985626987982584186}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a159887176eca8843a8a9a42b862cbee, type: 3}
insertIndex: -1
addedObject: {fileID: 6538236969999274005}
addedObject: {fileID: 1496596181943451962}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a159887176eca8843a8a9a42b862cbee, type: 3}
insertIndex: -1
addedObject: {fileID: 6624501244282305507}
addedObject: {fileID: 1532020908932792285}
m_SourcePrefab: {fileID: 100100000, guid: a159887176eca8843a8a9a42b862cbee, type: 3}
--- !u!1 &2227720976799977926 stripped
--- !u!1 &2415200880001261083 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: a159887176eca8843a8a9a42b862cbee, type: 3}
m_PrefabInstance: {fileID: 1309172814482533527}
m_PrefabInstance: {fileID: 3262274873550086986}
m_PrefabAsset: {fileID: 0}
--- !u!23 &4845414631601302259
--- !u!33 &4985626987982584186
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2415200880001261083}
m_Mesh: {fileID: 1671890006431517106, guid: a159887176eca8843a8a9a42b862cbee, type: 3}
--- !u!23 &1496596181943451962
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2227720976799977926}
m_GameObject: {fileID: 2415200880001261083}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
@@ -153,21 +149,13 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &6538236969999274005
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2227720976799977926}
m_Mesh: {fileID: 1671890006431517106, guid: a159887176eca8843a8a9a42b862cbee, type: 3}
--- !u!65 &6624501244282305507
--- !u!65 &1532020908932792285
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2227720976799977926}
m_GameObject: {fileID: 2415200880001261083}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
@@ -180,5 +168,5 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 272.76212, y: 74.74, z: 124.8839}
m_Center: {x: 54.847996, y: 69.058426, z: -9.428667}
m_Size: {x: 2.7012548, y: 0.70999986, z: 1.2113101}
m_Center: {x: 0.005261004, y: 0.3606567, z: -0.046916336}

View File

@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &2588866899229331121
--- !u!1001 &2014136808166680183
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -8,29 +8,17 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
propertyPath: m_LocalScale.x
value: 0.009
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
propertyPath: m_LocalScale.y
value: 0.009
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
propertyPath: m_LocalScale.z
value: 0.009
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
propertyPath: m_LocalPosition.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: 0.17602158
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: -0.15351045
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
propertyPath: m_LocalRotation.w
@@ -38,7 +26,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
propertyPath: m_LocalRotation.x
value: -0.00000003774895
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
propertyPath: m_LocalRotation.y
@@ -46,7 +34,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -60,10 +48,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
propertyPath: m_Name
value: TOTU Coffe Table 103
@@ -82,20 +66,20 @@ PrefabInstance:
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
insertIndex: -1
addedObject: {fileID: 5878778471840140796}
addedObject: {fileID: 5971932524352072402}
m_SourcePrefab: {fileID: 100100000, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
--- !u!1 &3399348467202126816 stripped
--- !u!1 &1671626081882168102 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3}
m_PrefabInstance: {fileID: 2588866899229331121}
m_PrefabInstance: {fileID: 2014136808166680183}
m_PrefabAsset: {fileID: 0}
--- !u!65 &5878778471840140796
--- !u!65 &5971932524352072402
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3399348467202126816}
m_GameObject: {fileID: 1671626081882168102}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
@@ -108,5 +92,5 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.5999985, y: 0.36, z: 0.5999825}
m_Center: {x: -0.0000007301569, y: -0.15400001, z: 0.000000834465}
m_Size: {x: 59.99985, y: 59.99825, z: 35.999996}
m_Center: {x: -0.000073432915, y: 0.00008392333, z: 15.4}

View File

@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &6409153123551468370
--- !u!1001 &1183100366607483996
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@@ -8,29 +8,13 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8700617353114198275, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_LocalScale.x
value: 0.02
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_LocalScale.y
value: 0.02
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_LocalScale.z
value: 0.02
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: 0.24038768
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_LocalPosition.z
@@ -46,11 +30,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -64,18 +48,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4193954691750240724, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 65702495048144492, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
propertyPath: m_Name
value: TOTU Coffe Table 104
@@ -89,83 +61,25 @@ PrefabInstance:
value: Selectable
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: -8700617353114198275, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
- {fileID: 65702495048144492, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
insertIndex: -1
addedObject: {fileID: 1465040188684720146}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
insertIndex: -1
addedObject: {fileID: 1575193445887123147}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
insertIndex: -1
addedObject: {fileID: 4599599948379281745}
addedObject: {fileID: 7842060265105927444}
m_SourcePrefab: {fileID: 100100000, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
--- !u!1 &6066501662998259203 stripped
--- !u!1 &2065567086344354061 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
m_PrefabInstance: {fileID: 6409153123551468370}
m_PrefabInstance: {fileID: 1183100366607483996}
m_PrefabAsset: {fileID: 0}
--- !u!23 &1465040188684720146
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6066501662998259203}
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: 0}
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!33 &1575193445887123147
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6066501662998259203}
m_Mesh: {fileID: 4311347361366712966, guid: 6d7886c474484de4eb1fb6da8450d072, type: 3}
--- !u!65 &4599599948379281745
--- !u!65 &7842060265105927444
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6066501662998259203}
m_GameObject: {fileID: 2065567086344354061}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
@@ -178,5 +92,5 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 121.6874, y: 27.673584, z: 122.13272}
m_Center: {x: 0.50191283, y: -10.376355, z: -0.44552684}
m_Size: {x: 1.1999727, y: 0.2599998, z: 1.1999636}
m_Center: {x: -0.000013053417, y: -0.10399989, z: -0.000010758638}

View File

@@ -96,7 +96,7 @@ LightmapSettings:
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingDataAsset: {fileID: 112000000, guid: c46f813b370974442b647f2bed45dc72, type: 2}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
@@ -1016,7 +1016,7 @@ Light:
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Intensity: 0.5
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
@@ -1912,7 +1912,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3}
m_Name:
m_EditorClassIdentifier:
prefabToInstance: {fileID: 6066501662998259203, guid: d5ced78f2c9acf647bc91230db65e53d, type: 3}
prefabToInstance: {fileID: 2065567086344354061, guid: d5ced78f2c9acf647bc91230db65e53d, type: 3}
--- !u!114 &1198553689
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2321,7 +2321,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3}
m_Name:
m_EditorClassIdentifier:
prefabToInstance: {fileID: 2227720976799977926, guid: 4217598f115eda443b059d1d3029157e, type: 3}
prefabToInstance: {fileID: 2415200880001261083, guid: 4217598f115eda443b059d1d3029157e, type: 3}
--- !u!114 &1510757703
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2491,7 +2491,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3}
m_Name:
m_EditorClassIdentifier:
prefabToInstance: {fileID: 2979817468721117266, guid: feab3b25df08c8f4aa5c4c3b41dbe32d, type: 3}
prefabToInstance: {fileID: 1436977506181758233, guid: 5d852d0f90f588547b2ca56c0dd1340a, type: 3}
--- !u!114 &1824976693
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2726,7 +2726,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 2661.0166, y: -101.5}
m_AnchoredPosition: {x: 2981.5166, y: -101.5}
m_SizeDelta: {x: 521, y: 327}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2016642936
@@ -2741,7 +2741,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3}
m_Name:
m_EditorClassIdentifier:
prefabToInstance: {fileID: 3399348467202126816, guid: 6749fe3471fc05847a373222f309879f, type: 3}
prefabToInstance: {fileID: 1671626081882168102, guid: 6749fe3471fc05847a373222f309879f, type: 3}
--- !u!114 &2016642937
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@@ -1909,7 +1909,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!108 &1153427914
Light:
m_ObjectHideFlags: 0

View File

@@ -809,7 +809,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!108 &1988345755
Light:
m_ObjectHideFlags: 0