diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index 92a61128a..c00a23ed4 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b979c11e4f07bdd2a3dc74b1da80d9ebe48f35ad16665e62dfb8c0b440b88c6c -size 9212 +oid sha256:c0384e7016e9f8795b79c76034b8c8334a143a2931d4a71826e4b242e236e73e +size 9172 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/BaseEnvironment.prefab b/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/BaseEnvironment.prefab index fb3009906..08dd1af6a 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/BaseEnvironment.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/BaseEnvironment.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 7986070582027999988} - component: {fileID: 8465497525880288504} - - component: {fileID: 833125971660403034} m_Layer: 8 m_Name: BaseEnvironment m_TagString: Untagged @@ -55,18 +54,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 0.5} m_Center: {x: 0, y: 0.5, z: 0.25} ---- !u!210 &833125971660403034 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3764902268943045601} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_SortAtRoot: 0 --- !u!1 &7835622629792856689 GameObject: m_ObjectHideFlags: 0 @@ -143,7 +130,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 0 m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab index 013c5ef5f..a793438d1 100644 --- a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab @@ -266,6 +266,14 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 2 objectReference: {fileID: 0} + - target: {fileID: 1741467189652270979, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: zSpacing + value: -0.0005 + objectReference: {fileID: 0} + - target: {fileID: 1741467189652270979, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: addNormals + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1741467189652270979, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: initialFlipX value: 0 @@ -348,7 +356,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_SortingLayer - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_SortingOrder @@ -356,7 +364,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_SortingLayerID - value: 966875293 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_LightProbeUsage diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index 52fdb7f9e..04154f9e1 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -3785,7 +3785,7 @@ MonoBehaviour: initialFlipY: 0 updateWhenInvisible: 3 separatorSlotNames: [] - zSpacing: 0 + zSpacing: -0.0005 useClipping: 1 immutableTriangles: 0 pmaVertexColors: 1