diff --git a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern01.png b/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern01.png deleted file mode 100644 index 7e84a540a..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern01.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9288419bd80bf79474c5a5ecffb6fbe6cf7fec687b4920d4e91db213b8d426a -size 54141 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern01.png.meta b/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern01.png.meta deleted file mode 100644 index 8076c791e..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern01.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: e108a38956f0caa43a1e8351a58124fe -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: 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: 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 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - 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: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern03.mat b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternButtom.mat similarity index 99% rename from Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern03.mat rename to Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternButtom.mat index d8262cfe7..048722cc1 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern03.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternButtom.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Lantern03 + m_Name: LanternButtom m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern03.mat.meta b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternButtom.mat.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern03.mat.meta rename to Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternButtom.mat.meta diff --git a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern03.png b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternButtom.png similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern03.png rename to Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternButtom.png diff --git a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern03.png.meta b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternButtom.png.meta similarity index 95% rename from Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern03.png.meta rename to Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternButtom.png.meta index 8a330aa63..5290f8660 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern03.png.meta +++ b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternButtom.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -126,7 +126,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern.mat b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.mat similarity index 91% rename from Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern.mat rename to Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.mat index e527a68e6..17c5f8917 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Lantern + m_Name: LanternLight m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -54,10 +54,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 2800000, guid: ee254bd1823d89c409fe9a653e8be3f0, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 2800000, guid: ee254bd1823d89c409fe9a653e8be3f0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -66,6 +74,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern.mat.meta b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.mat.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern.mat.meta rename to Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.mat.meta diff --git a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern02-1.png b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.png similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern02-1.png rename to Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.png diff --git a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern02-1.png.meta b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.png.meta similarity index 95% rename from Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern02-1.png.meta rename to Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.png.meta index 8b4802109..c611c365e 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern02-1.png.meta +++ b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLight.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -126,7 +126,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern02.png b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLightEmission.png similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern02.png rename to Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLightEmission.png diff --git a/Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern02.png.meta b/Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLightEmission.png.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/Lantern/Lantern02.png.meta rename to Assets/_DDD/Restaurant/Environments/Props/Lantern/LanternLightEmission.png.meta diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_Lantern.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_Lantern.prefab index 8902ef53a..5b535e7b6 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_Lantern.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_Lantern.prefab @@ -113,7 +113,7 @@ Transform: m_GameObject: {fileID: 8528460079741479690} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.5, z: 0.4} + m_LocalPosition: {x: 0, y: 0.5, z: 0.309} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab deleted file mode 100644 index bf412a578..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab +++ /dev/null @@ -1,67 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &4777358697124966162 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_Name - value: Prop_WallColumn01 - objectReference: {fileID: 0} - - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 2100000, guid: 9f1f7773b8d4c2046a7fc6e4c01fa77b, type: 2} - - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_Size.x - value: 0.21 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab.meta b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab.meta deleted file mode 100644 index 806cab439..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f9290b0e5bd91ad48bf4ba2b2de4af94 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallPartUp.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallPartUp.prefab deleted file mode 100644 index 254436dcf..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallPartUp.prefab +++ /dev/null @@ -1,63 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &4777358697124966162 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_Name - value: Prop_WallPartUp - objectReference: {fileID: 0} - - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 2100000, guid: ee5d405b37dd4fe429cee0a89060d71e, type: 2} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallPartUp.prefab.meta b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallPartUp.prefab.meta deleted file mode 100644 index 210858310..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallPartUp.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4b5f7066c87abe84fb5e7bd3f97394f4 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_Window2.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_Window.prefab similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/Prop_Window2.prefab rename to Assets/_DDD/Restaurant/Environments/Props/Prop_Window.prefab diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_Window2.prefab.meta b/Assets/_DDD/Restaurant/Environments/Props/Prop_Window.prefab.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/Prop_Window2.prefab.meta rename to Assets/_DDD/Restaurant/Environments/Props/Prop_Window.prefab.meta diff --git a/Assets/_DDD/Restaurant/Environments/Props/Rum/Rum.png.meta b/Assets/_DDD/Restaurant/Environments/Props/Rum/Rum.png.meta index 464cb150f..d6cc5f0ab 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Rum/Rum.png.meta +++ b/Assets/_DDD/Restaurant/Environments/Props/Rum/Rum.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -126,7 +126,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/_DDD/Restaurant/Environments/Props/WallPartUp/WallPartUp.mat b/Assets/_DDD/Restaurant/Environments/Props/WallColumn01/WallPartUp.mat similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/WallPartUp/WallPartUp.mat rename to Assets/_DDD/Restaurant/Environments/Props/WallColumn01/WallPartUp.mat diff --git a/Assets/_DDD/Restaurant/Environments/Props/WallPartUp/WallPartUp.mat.meta b/Assets/_DDD/Restaurant/Environments/Props/WallColumn01/WallPartUp.mat.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/WallPartUp/WallPartUp.mat.meta rename to Assets/_DDD/Restaurant/Environments/Props/WallColumn01/WallPartUp.mat.meta diff --git a/Assets/_DDD/Restaurant/Environments/Props/WallPartUp/WallPartUp.png b/Assets/_DDD/Restaurant/Environments/Props/WallColumn01/WallPartUp.png similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/WallPartUp/WallPartUp.png rename to Assets/_DDD/Restaurant/Environments/Props/WallColumn01/WallPartUp.png diff --git a/Assets/_DDD/Restaurant/Environments/Props/WallPartUp/WallPartUp.png.meta b/Assets/_DDD/Restaurant/Environments/Props/WallColumn01/WallPartUp.png.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/WallPartUp/WallPartUp.png.meta rename to Assets/_DDD/Restaurant/Environments/Props/WallColumn01/WallPartUp.png.meta diff --git a/Assets/_DDD/Restaurant/Environments/Props/WallPartUp.meta b/Assets/_DDD/Restaurant/Environments/Props/WallPartUp.meta deleted file mode 100644 index 243d88b4e..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/WallPartUp.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1e57f5554e5b6c543bf797bae3fdfd3c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/Restaurant/Environments/Props/Window2/Window2.mat b/Assets/_DDD/Restaurant/Environments/Props/Window2/Window.mat similarity index 99% rename from Assets/_DDD/Restaurant/Environments/Props/Window2/Window2.mat rename to Assets/_DDD/Restaurant/Environments/Props/Window2/Window.mat index f3132b66c..88ba360dd 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Window2/Window2.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/Window2/Window.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Window2 + m_Name: Window m_Shader: {fileID: -6465566751694194690, guid: 6548a20ac111c4a9c80cb95ed6c4c5a0, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Window2/Window2.mat.meta b/Assets/_DDD/Restaurant/Environments/Props/Window2/Window.mat.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/Window2/Window2.mat.meta rename to Assets/_DDD/Restaurant/Environments/Props/Window2/Window.mat.meta diff --git a/Assets/_DDD/Restaurant/Environments/Props/Window2/Window2.png b/Assets/_DDD/Restaurant/Environments/Props/Window2/Window.png similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/Window2/Window2.png rename to Assets/_DDD/Restaurant/Environments/Props/Window2/Window.png diff --git a/Assets/_DDD/Restaurant/Environments/Props/Window2/Window2.png.meta b/Assets/_DDD/Restaurant/Environments/Props/Window2/Window.png.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/Window2/Window2.png.meta rename to Assets/_DDD/Restaurant/Environments/Props/Window2/Window.png.meta diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index 641b02afb..b64731c78 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -631,7 +631,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 213810053471378397, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} propertyPath: m_LocalPosition.x - value: 0.07 + value: 9.46 objectReference: {fileID: 0} - target: {fileID: 213810053471378397, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} propertyPath: m_LocalPosition.y @@ -2814,8 +2814,7 @@ Transform: m_LocalPosition: {x: 2.55802, y: 0.282, z: 1.6672392} m_LocalScale: {x: 0.19, y: 0.19, z: 0.19} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 527944134} + m_Children: [] m_Father: {fileID: 1428769370} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &296314360 @@ -4028,7 +4027,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 50949da5c9906489cad4e3f39ecd615b, type: 3} propertyPath: m_LocalPosition.x - value: 1.85 + value: 2.01 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 50949da5c9906489cad4e3f39ecd615b, type: 3} propertyPath: m_LocalPosition.y @@ -5315,7 +5314,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1428769370} + m_TransformParent: {fileID: 1009820874} m_Modifications: - target: {fileID: 3782685999912116715, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_Enabled @@ -5343,43 +5342,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalScale.x - value: 2.7149663 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalScale.y - value: 2.7149663 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalScale.z - value: 2.7149663 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.x - value: 6.83 + value: 5.452369 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y - value: 1.458 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.z - value: 5.4323 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.w - value: 0.9396927 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.x - value: 0.3420201 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5402,93 +5401,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} ---- !u!1 &527944133 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 527944134} - - component: {fileID: 527944135} - m_Layer: 0 - m_Name: 01 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &527944134 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 527944133} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 113, y: -7.2987175, z: -10.6552105} - m_LocalScale: {x: 1.5397141, y: 1.5397142, z: 1.5397142} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 294137188} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &527944135 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 527944133} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 13 - m_Sprite: {fileID: 21300000, guid: a9b17d16540fd2646b933a8798e45251, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 3.35, y: 4.58} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!114 &529682363 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6289,7 +6201,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1428769370} + m_TransformParent: {fileID: 1009820874} m_Modifications: - target: {fileID: 3782685999912116715, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_Enabled @@ -6317,43 +6229,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalScale.x - value: 2.7149663 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalScale.y - value: 2.7149663 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalScale.z - value: 2.7149663 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.x - value: 14.873 + value: 8.414838 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y - value: 1.458 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.z - value: 5.4323 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.w - value: 0.9396927 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.x - value: 0.3420201 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8326,6 +8238,93 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 04cb72fe661fd534b950283199ac4a83, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &888582393 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 888582394} + - component: {fileID: 888582395} + m_Layer: 0 + m_Name: BlockLine (4)_004 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &888582394 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888582393} + serializedVersion: 2 + m_LocalRotation: {x: 0.24184473, y: -0.24184473, z: 0.66446304, w: 0.66446304} + m_LocalPosition: {x: 16.556, y: 0.25, z: 20.21} + m_LocalScale: {x: 17.137867, y: 33.112, z: 10} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 747295649438201258} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 90} +--- !u!212 &888582395 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888582393} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!114 &894880619 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9408,6 +9407,41 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 24943e78c04972c46bfd1212be293bc8, type: 3} +--- !u!1 &1009820873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1009820874} + m_Layer: 0 + m_Name: Window + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1009820874 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1009820873} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -7.9729996, y: 1.458, z: 5.4322996} + m_LocalScale: {x: 2.7149663, y: 2.7149665, z: 2.7149665} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 755638852} + - {fileID: 587776488} + - {fileID: 1259221397} + - {fileID: 774856945} + m_Father: {fileID: 1428769370} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1015166832 GameObject: m_ObjectHideFlags: 0 @@ -10009,7 +10043,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1428769370} + m_TransformParent: {fileID: 1009820874} m_Modifications: - target: {fileID: 3782685999912116715, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_Enabled @@ -10037,43 +10071,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalScale.x - value: 2.7149663 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalScale.y - value: 2.7149663 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalScale.z - value: 2.7149663 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.x - value: -2.5160499 + value: 2.009951 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y - value: 1.458 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.z - value: 5.4323 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.w - value: 0.9396927 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.x - value: 0.3420201 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -12771,10 +12805,7 @@ Transform: - {fileID: 518354838} - {fileID: 1668364414} - {fileID: 342945110} - - {fileID: 755638852} - - {fileID: 587776488} - - {fileID: 1259221397} - - {fileID: 774856945} + - {fileID: 1009820874} - {fileID: 897084956} - {fileID: 2029954630} - {fileID: 1062284734} @@ -13222,7 +13253,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1428769370} + m_TransformParent: {fileID: 1009820874} m_Modifications: - target: {fileID: 3782685999912116715, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_Enabled @@ -13250,43 +13281,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalScale.x - value: 2.7149663 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalScale.y - value: 2.7149663 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalScale.z - value: 2.7149663 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.x - value: -7.9729996 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y - value: 1.458 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.z - value: 5.4323 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.w - value: 0.9396927 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.x - value: 0.3420201 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -16013,7 +16044,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3821081434711279172, guid: 29dcda970aef9584d9b157e766b8a278, type: 3} propertyPath: m_LocalPosition.x - value: 0.028387308 + value: -0.472 objectReference: {fileID: 0} - target: {fileID: 3821081434711279172, guid: 29dcda970aef9584d9b157e766b8a278, type: 3} propertyPath: m_LocalPosition.y @@ -16021,7 +16052,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3821081434711279172, guid: 29dcda970aef9584d9b157e766b8a278, type: 3} propertyPath: m_LocalPosition.z - value: 15.144489 + value: 15.022 objectReference: {fileID: 0} - target: {fileID: 3821081434711279172, guid: 29dcda970aef9584d9b157e766b8a278, type: 3} propertyPath: m_LocalRotation.w @@ -25585,6 +25616,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 837911497365836734} + - {fileID: 888582394} - {fileID: 2138005700} - {fileID: 328040684} - {fileID: 1799134121} @@ -48393,7 +48425,7 @@ Transform: m_GameObject: {fileID: 3015334612608266903} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 0.07, y: 13.95, z: -1.47} + m_LocalPosition: {x: 9.46, y: 13.95, z: -1.47} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: []