diff --git a/Assets/_DDD/_Addressables/Environments/Prop/MeunBoard2/Mat_MeunBoard2.mat b/Assets/_DDD/_Addressables/Environments/Prop/MeunBoard2/Mat_MeunBoard2.mat index 9bd82243c..9b02b133b 100644 --- a/Assets/_DDD/_Addressables/Environments/Prop/MeunBoard2/Mat_MeunBoard2.mat +++ b/Assets/_DDD/_Addressables/Environments/Prop/MeunBoard2/Mat_MeunBoard2.mat @@ -31,7 +31,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 52e6b4c03cbf5ca46bc18776b55cdf67, type: 3} + m_Texture: {fileID: 2800000, guid: 5823ed9c30df1114dac7162f93e7211d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Emiss: diff --git a/Assets/_DDD/_Addressables/Environments/Prop/MeunBoard2/Prop_MeunBoard2.prefab b/Assets/_DDD/_Addressables/Environments/Prop/MeunBoard2/Prop_MeunBoard2.prefab index bff22bf02..7bb4a7a6e 100644 --- a/Assets/_DDD/_Addressables/Environments/Prop/MeunBoard2/Prop_MeunBoard2.prefab +++ b/Assets/_DDD/_Addressables/Environments/Prop/MeunBoard2/Prop_MeunBoard2.prefab @@ -148,15 +148,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4111453722694982297, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 4111453722694982297, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 4111453722694982297, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Name diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index 11f6a73ba..d70733e4c 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -2614,6 +2614,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} m_PrefabInstance: {fileID: 382965435} m_PrefabAsset: {fileID: 0} +--- !u!1001 &504708576 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} + propertyPath: m_LocalPosition.x + value: 1.1149255 + objectReference: {fileID: 0} + - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0020017624 + objectReference: {fileID: 0} + - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} + propertyPath: m_LocalPosition.z + value: 15.02 + objectReference: {fileID: 0} + - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6577997723757283174, guid: fa353764662051b4aa59a202b194039b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8667998208725006723, guid: fa353764662051b4aa59a202b194039b, type: 3} + propertyPath: m_Name + value: Prop_MenuBoard2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fa353764662051b4aa59a202b194039b, type: 3} --- !u!1 &531027749 GameObject: m_ObjectHideFlags: 0 @@ -4989,7 +5046,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3102649314828302494, guid: 8bbc5a3a79a43814b88e3f5c5df9fdd4, type: 3} propertyPath: m_LocalPosition.x - value: 2.52 + value: 6.13 objectReference: {fileID: 0} - target: {fileID: 3102649314828302494, guid: 8bbc5a3a79a43814b88e3f5c5df9fdd4, type: 3} propertyPath: m_LocalPosition.y @@ -5027,6 +5084,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3949272651232056691, guid: 8bbc5a3a79a43814b88e3f5c5df9fdd4, type: 3} + propertyPath: m_LocalPosition.x + value: -1.61 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5169,6 +5230,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 6689525833630355058, guid: 1ef128dbba722ec48bfa4bf6b9ddbdcf, type: 3} m_PrefabInstance: {fileID: 1458281794} m_PrefabAsset: {fileID: 0} +--- !u!1001 &852575416 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} + propertyPath: m_LocalPosition.x + value: -0.52 + objectReference: {fileID: 0} + - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0020017624 + objectReference: {fileID: 0} + - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} + propertyPath: m_LocalPosition.z + value: 15.017 + objectReference: {fileID: 0} + - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5128816417539280562, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7218816355439079511, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} + propertyPath: m_Name + value: Prop_MenuBoard4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 46e838cd9b314dd478d6bf5657e73760, type: 3} --- !u!4 &876101440 stripped Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} @@ -8403,6 +8521,63 @@ Transform: - {fileID: 1974926907} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1311760301 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1937249609879987263, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} + propertyPath: m_Name + value: Prop_MenuBoard3 + objectReference: {fileID: 0} + - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} + propertyPath: m_LocalPosition.x + value: -5.38 + objectReference: {fileID: 0} + - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} + propertyPath: m_LocalPosition.y + value: -0.01 + objectReference: {fileID: 0} + - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} + propertyPath: m_LocalPosition.z + value: 14.977709 + objectReference: {fileID: 0} + - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4170661048175434458, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6c5f62a4d64c9414293b15564d852f18, type: 3} --- !u!4 &1347266305 stripped Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 70f56d7d65d2e7842b5bd517ae7fe7fe, type: 3} @@ -14968,3 +15143,6 @@ SceneRoots: - {fileID: 612992553} - {fileID: 761682093} - {fileID: 549344125} + - {fileID: 852575416} + - {fileID: 1311760301} + - {fileID: 504708576} diff --git a/Assets/_DDD/_Raw/Environments/Prop/MeunBoard2.meta b/Assets/_DDD/_Raw/Environments/Prop/MeunBoard2.meta deleted file mode 100644 index e39df5f4a..000000000 --- a/Assets/_DDD/_Raw/Environments/Prop/MeunBoard2.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c9d8bb33854af8e4bac05e53ec318882 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Environments/Prop/MeunBoard2/MeunBoard2_basemap.png b/Assets/_DDD/_Raw/Environments/Prop/MeunBoard2/MeunBoard2_basemap.png deleted file mode 100644 index 3afa16843..000000000 --- a/Assets/_DDD/_Raw/Environments/Prop/MeunBoard2/MeunBoard2_basemap.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0bc4ecc8f792df8d2788a1e0316fcfb4c9f6f2e4db5ed852fcb2c7bd2e0963f6 -size 392371 diff --git a/Assets/_DDD/_Raw/Environments/Prop/MeunBoard2/MeunBoard2_basemap.png.meta b/Assets/_DDD/_Raw/Environments/Prop/MeunBoard2/MeunBoard2_basemap.png.meta deleted file mode 100644 index 942fb85d7..000000000 --- a/Assets/_DDD/_Raw/Environments/Prop/MeunBoard2/MeunBoard2_basemap.png.meta +++ /dev/null @@ -1,130 +0,0 @@ -fileFormatVersion: 2 -guid: 52e6b4c03cbf5ca46bc18776b55cdf67 -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: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - 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: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - 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: 4 - 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: 4 - buildTarget: iOS - 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: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: