diff --git a/Assets/AddressableAssetsData/AssetGroups/Group.asset b/Assets/AddressableAssetsData/AssetGroups/Group.asset index d1044cd9d..bdd54dda2 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Group.asset @@ -21,6 +21,12 @@ MonoBehaviour: m_SerializedLabels: - Atlas FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 02f8fce3eeac2a84b8a1573686abdd50 + m_Address: Cookwares + m_ReadOnly: 0 + m_SerializedLabels: + - Atlas + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 034ac52b4c3fe854193b7c9c2d353be5 m_Address: Foods m_ReadOnly: 0 diff --git a/Assets/_DDD/Common/Shaders/Shader Graphs_WorldGridShader.mat b/Assets/_DDD/Common/Shaders/Shader Graphs_WorldGridShader.mat index 956fda55d..79e12c243 100644 --- a/Assets/_DDD/Common/Shaders/Shader Graphs_WorldGridShader.mat +++ b/Assets/_DDD/Common/Shaders/Shader Graphs_WorldGridShader.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Shader Graphs_WorldGridShader - m_Shader: {fileID: -6465566751694194690, guid: 751d5e3beaa1c4d8ab1bdb6fdc7a7f1f, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 9b5ebdd09c8f1447f912bc7fcee64423, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -55,19 +55,19 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _AlphaNoiseSpeed: 0.002 - - _ColorNoiseSpeed: 0.001 + - _AlphaNoiseSpeed: 0 + - _ColorNoiseSpeed: 0 - _DiagonalMode: 1 - - _DistortionIntensity: 0.2 - - _DistortionSpeed: 0.02 + - _DistortionIntensity: 0 + - _DistortionSpeed: 0 - _DistortionTiling: 1 - _GridAngle: 45 - _GridScale: 1 - - _LineWidth: 0.02 + - _LineWidth: 0.05 - _QueueControl: 0 - _QueueOffset: 0 m_Colors: - - _GridLineColor: {r: 0.5, g: 1, b: 1, a: 1} + - _GridLineColor: {r: 0.4292453, g: 1, b: 0.45913547, a: 1} - _Offset: {r: 0.5, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Build/Build.png.meta b/Assets/_DDD/Restaurant/Environments/Props/Build/Build.png.meta index a55f7b5c1..fbbc24b2e 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Build/Build.png.meta +++ b/Assets/_DDD/Restaurant/Environments/Props/Build/Build.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/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index b64731c78..7cc00869d 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -1168,7 +1168,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.x - value: -21.770203 + value: -24.756893 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.y @@ -3877,7 +3877,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.x - value: -21.46331 + value: -24.45 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.y @@ -9836,6 +9836,115 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 04cb72fe661fd534b950283199ac4a83, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1056730799 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1056730803} + - component: {fileID: 1056730802} + - component: {fileID: 1056730801} + - component: {fileID: 1056730800} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &1056730800 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1056730799} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1056730801 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1056730799} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b184f17c25515420e82c24fa2d554484, 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: 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 &1056730802 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1056730799} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1056730803 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1056730799} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5.68, y: 0.12, z: 19.78} + m_LocalScale: {x: 8, y: 6, z: 6} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1061208738 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11669,7 +11778,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.x - value: -21.1 + value: -24.08669 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c83ffd37e01a8a43ae9d7dc2e5ab180, type: 3} propertyPath: m_LocalPosition.y @@ -22950,7 +23059,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 4c1b114fe5106bd4787ed86b5628170c, type: 2} + - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -54970,7 +55079,7 @@ Transform: m_GameObject: {fileID: 9123030887888451443} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -0.001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: [] @@ -91884,7 +91993,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 4c1b114fe5106bd4787ed86b5628170c, type: 2} + - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -96865,3 +96974,4 @@ SceneRoots: - {fileID: 621189298} - {fileID: 1428769370} - {fileID: 1823598003} + - {fileID: 1056730803}