From 53fa05e246af727077e15ef0ae907adc02bd6576 Mon Sep 17 00:00:00 2001 From: szczuras4 Date: Fri, 5 Dec 2025 06:16:25 +0100 Subject: [PATCH] Ruined Town Sectors fix, Dark Wood - Sectors --- .../AddressableAssetSettings.asset | 2 +- .../Scenes/02_Ruined_Town/Ruined_Town.unity | 2075 ++++++++--------- Assets/Scenes/03_DarkWoods/DarkForest.unity | 6 +- Assets/Scripts/Optimization/BoxVolume.cs | 24 +- 4 files changed, 1005 insertions(+), 1102 deletions(-) diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 400856d58..e86be7fd2 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: bc074d00982114f0388e9c98de91d44f m_currentHash: serializedVersion: 2 - Hash: ef672e941747c2eb6b19db828d740a6a + Hash: 00000000000000000000000000000000 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity index 800a9a928..16c5e7214 100644 --- a/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity +++ b/Assets/Scenes/02_Ruined_Town/Ruined_Town.unity @@ -797,7 +797,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 650346385} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 171075308005978109, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -2587,6 +2587,70 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1102910087} m_PrefabAsset: {fileID: 0} +--- !u!21 &19600425 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Override + m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _DIRECTIONALL: 1 + - _DirectionalFalloff: 2 + - _DirectionalIntensity: 1 + - _DirectionalMode: 1 + - _FOGG: 1 + - _FogAxisMode: 1 + - _FogColorDuo: 1 + - _FogDistanceEnd: 200 + - _FogDistanceFalloff: 2 + - _FogDistanceStart: -200 + - _FogHeightEnd: 200 + - _FogHeightFalloff: 2 + - _FogHeightStart: 0 + - _FogIntensity: 1 + - _FogLayersMode: 0 + - _IsHeightFogPreset: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _NOISEE: 1 + - _NoiseDistanceEnd: 50 + - _NoiseIntensity: 1 + - _NoiseMode: 2 + - _NoiseModeBlend: 1 + - _NoiseScale: 30 + - _SKYBOXX: 1 + - _SkyboxFogFalloff: 1 + - _SkyboxFogFill: 1 + - _SkyboxFogHeight: 1 + - _SkyboxFogIntensity: 1 + - _TITLE: 1 + m_Colors: + - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} + - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} + - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} + - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} + - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} + - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &20179007 GameObject: m_ObjectHideFlags: 0 @@ -2629,6 +2693,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 708987712} m_PrefabAsset: {fileID: 0} +--- !u!43 &20963040 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &22124992 GameObject: m_ObjectHideFlags: 0 @@ -5278,7 +5507,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -6005,7 +6234,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1781307513} + objectReference: {fileID: 91908539} - target: {fileID: 2614899761469592910, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Name @@ -13788,6 +14017,171 @@ MonoBehaviour: onConditionMet: m_PersistentCalls: m_Calls: [] +--- !u!43 &91908539 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 10, z: 9} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &92244449 GameObject: m_ObjectHideFlags: 0 @@ -17876,7 +18270,6 @@ Transform: - {fileID: 315071783} - {fileID: 594493982} - {fileID: 609970993} - - {fileID: 1863222091} - {fileID: 2081902467} - {fileID: 312802251} - {fileID: 1053810477} @@ -26355,7 +26748,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -26365,7 +26758,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 3.977429 + value: 3.9774287 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -27834,7 +28227,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -27844,17 +28237,17 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 3.977429 + value: 3.9774292 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.y - value: 6.2053623 + value: 6.205361 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 3.9774294 + value: 3.9774284 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -27874,22 +28267,22 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalRotation.w - value: 0.24009377 + value: 0.24009378 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalRotation.x - value: 0.9308171 + value: 0.9308172 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalRotation.y - value: 0.27164757 + value: 0.2716476 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalRotation.z - value: 0.046281863 + value: 0.046281867 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -42535,12 +42928,12 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 121331148148775461, guid: e7168f576edc0ec45bbf20c0589ea187, type: 3} propertyPath: m_LocalScale.x - value: 1.1607513 + value: 1.1607512 objectReference: {fileID: 0} - target: {fileID: 121331148148775461, guid: e7168f576edc0ec45bbf20c0589ea187, type: 3} @@ -42550,7 +42943,7 @@ PrefabInstance: - target: {fileID: 121331148148775461, guid: e7168f576edc0ec45bbf20c0589ea187, type: 3} propertyPath: m_LocalScale.z - value: 1.1607513 + value: 1.1607512 objectReference: {fileID: 0} - target: {fileID: 121331148148775461, guid: e7168f576edc0ec45bbf20c0589ea187, type: 3} @@ -45251,7 +45644,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 730294515} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 1215006475005338875, guid: 713706c7ddd5a514f9bb7379029437a6, type: 3} @@ -45806,7 +46199,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -45821,12 +46214,12 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.y - value: 9.112575 + value: 9.112573 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 5.840855 + value: 5.840854 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -45851,7 +46244,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalRotation.x - value: 0.84903085 + value: 0.8490309 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -45861,7 +46254,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalRotation.z - value: 0.45397228 + value: 0.4539723 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -49136,6 +49529,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1287344780} m_PrefabAsset: {fileID: 0} +--- !u!21 &334412032 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Height Fog Global + m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3002 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _HeightFogGlobal: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _TITLE: 1 + - _TransparentQueue: 3000 + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!21 &334704438 Material: serializedVersion: 8 @@ -57546,7 +57972,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 650346385} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 171075308005978109, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -57561,7 +57987,7 @@ PrefabInstance: - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalScale.x - value: 3.5425968 + value: 3.542597 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -58346,70 +58772,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} ---- !u!21 &390593022 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Override - m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _DIRECTIONALL: 1 - - _DirectionalFalloff: 2 - - _DirectionalIntensity: 1 - - _DirectionalMode: 1 - - _FOGG: 1 - - _FogAxisMode: 1 - - _FogColorDuo: 1 - - _FogDistanceEnd: 200 - - _FogDistanceFalloff: 2 - - _FogDistanceStart: -200 - - _FogHeightEnd: 200 - - _FogHeightFalloff: 2 - - _FogHeightStart: 0 - - _FogIntensity: 1 - - _FogLayersMode: 0 - - _IsHeightFogPreset: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _NOISEE: 1 - - _NoiseDistanceEnd: 50 - - _NoiseIntensity: 1 - - _NoiseMode: 2 - - _NoiseModeBlend: 1 - - _NoiseScale: 30 - - _SKYBOXX: 1 - - _SkyboxFogFalloff: 1 - - _SkyboxFogFill: 1 - - _SkyboxFogHeight: 1 - - _SkyboxFogIntensity: 1 - - _TITLE: 1 - m_Colors: - - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} - - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} - - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} - - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} - - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} - - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!4 &390718685 stripped Transform: m_CorrespondingSourceObject: {fileID: 414868, guid: fbc6fec0c9b79694498fcda90f93d533, @@ -64423,7 +64785,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 730294515} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 2813819075013210402, guid: aa8088f81fa59404e9262abeb1733302, type: 3} @@ -64438,7 +64800,7 @@ PrefabInstance: - target: {fileID: 3190625680187534232, guid: aa8088f81fa59404e9262abeb1733302, type: 3} propertyPath: m_LocalScale.x - value: 1.799928 + value: 1.7999281 objectReference: {fileID: 0} - target: {fileID: 3190625680187534232, guid: aa8088f81fa59404e9262abeb1733302, type: 3} @@ -64448,7 +64810,7 @@ PrefabInstance: - target: {fileID: 3190625680187534232, guid: aa8088f81fa59404e9262abeb1733302, type: 3} propertyPath: m_LocalScale.z - value: 1.799928 + value: 1.7999281 objectReference: {fileID: 0} - target: {fileID: 3190625680187534232, guid: aa8088f81fa59404e9262abeb1733302, type: 3} @@ -72981,6 +73343,59 @@ Transform: - {fileID: 1939929433} - {fileID: 1655987472} - {fileID: 836420864} + - {fileID: 386454461} + - {fileID: 1863222091} + - {fileID: 1152384805} + - {fileID: 1838573721} + - {fileID: 1683020907} + - {fileID: 177985334} + - {fileID: 2093940212} + - {fileID: 1045796256} + - {fileID: 1277190256} + - {fileID: 787449322} + - {fileID: 1477145666} + - {fileID: 497754780} + - {fileID: 1712309098} + - {fileID: 1722635895} + - {fileID: 1300810140} + - {fileID: 6742910} + - {fileID: 866224778} + - {fileID: 541689687} + - {fileID: 1255196617} + - {fileID: 430540470} + - {fileID: 947848081} + - {fileID: 1607625715} + - {fileID: 1331420922} + - {fileID: 1323447452} + - {fileID: 1346247744} + - {fileID: 1544875326} + - {fileID: 1123079254} + - {fileID: 169437223} + - {fileID: 1819014037} + - {fileID: 43550559} + - {fileID: 703913665} + - {fileID: 1311676055} + - {fileID: 1081812306} + - {fileID: 1640439532} + - {fileID: 1785059159} + - {fileID: 301901979} + - {fileID: 2570119098172335756} + - {fileID: 8303962431425287311} + - {fileID: 2090744575934766339} + - {fileID: 513345407} + - {fileID: 1273303231} + - {fileID: 815292574} + - {fileID: 1985669133} + - {fileID: 2014207721} + - {fileID: 1358759067} + - {fileID: 1242823727} + - {fileID: 640843820} + - {fileID: 900696987} + - {fileID: 296292019} + - {fileID: 58372713} + - {fileID: 1042394537} + - {fileID: 1743663676} + - {fileID: 775411646} m_Father: {fileID: 115258996} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &482308396 @@ -74160,7 +74575,6 @@ Transform: - {fileID: 2047508769} - {fileID: 1401198894} - {fileID: 2124550989} - - {fileID: 900696987} - {fileID: 1814800346} - {fileID: 629905678} - {fileID: 915826134} @@ -74606,7 +75020,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -74616,7 +75030,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 3.977429 + value: 3.9774287 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -76521,7 +76935,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -76531,7 +76945,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 5.8408546 + value: 5.840854 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -81151,7 +81565,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -81161,7 +81575,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 3.977429 + value: 3.9774287 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -81171,7 +81585,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 3.9774294 + value: 3.9774299 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -86942,46 +87356,18 @@ Transform: - {fileID: 881311352} - {fileID: 1578581049} - {fileID: 1372709952} - - {fileID: 1123079254} - - {fileID: 1477145666} - {fileID: 701899013} - {fileID: 476347213} - {fileID: 1262267232} - {fileID: 1375085637} - - {fileID: 169437223} - {fileID: 1848695340} - - {fileID: 1323447452} - - {fileID: 787449322} - - {fileID: 497754780} - {fileID: 2117283676} - - {fileID: 1722635895} - - {fileID: 1255196617} - - {fileID: 541689687} - {fileID: 1155327362} - {fileID: 863780361} - - {fileID: 1819014037} - {fileID: 1381778018} - - {fileID: 1544875326} - - {fileID: 43550559} - - {fileID: 1838573721} - - {fileID: 1683020907} - - {fileID: 1152384805} - - {fileID: 2093940212} - - {fileID: 177985334} - - {fileID: 1346247744} - - {fileID: 1358759067} - {fileID: 66274830} - {fileID: 1637235196} - {fileID: 929196703} - - {fileID: 2014207721} - - {fileID: 1785059159} - - {fileID: 301901979} - - {fileID: 513345407} - - {fileID: 1640439532} - - {fileID: 1277190256} - - {fileID: 1045796256} - - {fileID: 947848081} - - {fileID: 1607625715} - {fileID: 2106433151} - {fileID: 99362771} - {fileID: 1688985535} @@ -87009,13 +87395,10 @@ Transform: - {fileID: 292891442} - {fileID: 1673871666} - {fileID: 1113499186} - - {fileID: 775411646} - {fileID: 525543362} - {fileID: 2018162440} - {fileID: 789589030} - - {fileID: 640843820} - {fileID: 1450419268} - - {fileID: 613152214} - {fileID: 2128947250} m_Father: {fileID: 115258996} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -99753,12 +100136,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 612969481} m_PrefabAsset: {fileID: 0} ---- !u!4 &613152214 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - m_PrefabInstance: {fileID: 8170744230716016638} - m_PrefabAsset: {fileID: 0} --- !u!4 &613208827 stripped Transform: m_CorrespondingSourceObject: {fileID: 6765959581538008605, guid: 851e8e61247888340bdec90fc8aa37f5, @@ -103553,7 +103930,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3099161007084426008, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} @@ -103583,17 +103960,17 @@ PrefabInstance: - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.x - value: -100.51 + value: -100.63 objectReference: {fileID: 0} - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.y - value: 34.64 + value: 34.48 objectReference: {fileID: 0} - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalPosition.z - value: 107.73 + value: 108.51 objectReference: {fileID: 0} - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} @@ -104450,12 +104827,7 @@ Transform: - {fileID: 1892646190} - {fileID: 614226206} - {fileID: 541243180} - - {fileID: 386454461} - - {fileID: 6742910} - - {fileID: 1300810140} - {fileID: 1833443086} - - {fileID: 1712309098} - - {fileID: 866224778} - {fileID: 697771761} - {fileID: 1500157461} - {fileID: 666492672} @@ -119131,13 +119503,18 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1910033728} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3627767628257321303, guid: 09ad5fcc134e91a4c8fc2858336cc429, type: 3} propertyPath: m_Name value: RT_House01 (1) objectReference: {fileID: 0} + - target: {fileID: 4112837332846001133, guid: 09ad5fcc134e91a4c8fc2858336cc429, + type: 3} + propertyPath: m_LocalScale.x + value: 1.7897619 + objectReference: {fileID: 0} - target: {fileID: 4112837332846001133, guid: 09ad5fcc134e91a4c8fc2858336cc429, type: 3} propertyPath: m_LocalPosition.x @@ -123302,13 +123679,9 @@ Transform: - {fileID: 470835437} - {fileID: 650346385} - {fileID: 1442401591} - - {fileID: 58372713} - {fileID: 862392166} - {fileID: 596358519} - - {fileID: 296292019} - {fileID: 2313443} - - {fileID: 1331420922} - - {fileID: 430540470} m_Father: {fileID: 158673582} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &730883724 @@ -131426,7 +131799,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -131436,17 +131809,17 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 3.977429 + value: 3.9774292 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.y - value: 5.233501 + value: 5.2335005 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 3.9774294 + value: 3.9774296 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -135481,13 +135854,23 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1910033728} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3627767628257321303, guid: 09ad5fcc134e91a4c8fc2858336cc429, type: 3} propertyPath: m_Name value: RT_House01 (4) objectReference: {fileID: 0} + - target: {fileID: 4112837332846001133, guid: 09ad5fcc134e91a4c8fc2858336cc429, + type: 3} + propertyPath: m_LocalScale.x + value: 1.7897619 + objectReference: {fileID: 0} + - target: {fileID: 4112837332846001133, guid: 09ad5fcc134e91a4c8fc2858336cc429, + type: 3} + propertyPath: m_LocalScale.y + value: 1.7897617 + objectReference: {fileID: 0} - target: {fileID: 4112837332846001133, guid: 09ad5fcc134e91a4c8fc2858336cc429, type: 3} propertyPath: m_LocalPosition.x @@ -137946,32 +138329,32 @@ PrefabInstance: - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalScale.x - value: 4.3255105 + value: 5.778449 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalScale.y - value: 4.3255124 + value: 5.778452 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalScale.z - value: 4.3255105 + value: 5.778449 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalPosition.x - value: -90.52 + value: -92.35 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalPosition.y - value: 39.97 + value: 39.98 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalPosition.z - value: 96 + value: 95.35 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -142070,7 +142453,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 650346385} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 171075308005978109, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -142090,12 +142473,12 @@ PrefabInstance: - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalScale.y - value: 4.19722 + value: 4.1972203 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalScale.z - value: 6.316377 + value: 6.3163776 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -142120,7 +142503,7 @@ PrefabInstance: - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalRotation.x - value: 0.028111294 + value: 0.028111296 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -142130,7 +142513,7 @@ PrefabInstance: - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalRotation.z - value: -0.20282982 + value: -0.20282984 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -146395,7 +146778,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 493542907} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 2540626768985676435, guid: 24b4e22eae3cdd44682bdc50832a3605, type: 3} @@ -146410,17 +146793,17 @@ PrefabInstance: - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, type: 3} propertyPath: m_LocalScale.x - value: 3.1818426 + value: 3.181843 objectReference: {fileID: 0} - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, type: 3} propertyPath: m_LocalScale.y - value: 0.5362922 + value: 0.53629214 objectReference: {fileID: 0} - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, type: 3} propertyPath: m_LocalScale.z - value: 3.1818419 + value: 3.1818416 objectReference: {fileID: 0} - target: {fileID: 6312540477703688226, guid: 24b4e22eae3cdd44682bdc50832a3605, type: 3} @@ -153550,7 +153933,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 7054030463105029163, guid: a41bdcbd4d2237d4ea1158ba8f08c293, type: 3} @@ -153570,7 +153953,7 @@ PrefabInstance: - target: {fileID: 7054030463105029163, guid: a41bdcbd4d2237d4ea1158ba8f08c293, type: 3} propertyPath: m_LocalScale.z - value: 2.2681992 + value: 2.2681994 objectReference: {fileID: 0} - target: {fileID: 7054030463105029163, guid: a41bdcbd4d2237d4ea1158ba8f08c293, type: 3} @@ -168615,6 +168998,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1041290862} m_PrefabAsset: {fileID: 0} +--- !u!4 &1042394537 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 121331148148775461, guid: e7168f576edc0ec45bbf20c0589ea187, + type: 3} + m_PrefabInstance: {fileID: 275677524} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1042603226 PrefabInstance: m_ObjectHideFlags: 0 @@ -169014,7 +169403,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -169034,7 +169423,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 3.9774294 + value: 3.9774296 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -173366,7 +173755,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1910033728} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3627767628257321303, guid: 09ad5fcc134e91a4c8fc2858336cc429, type: 3} @@ -178253,7 +178642,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -178263,17 +178652,17 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 3.274339 + value: 3.2743392 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.y - value: 2.8907044 + value: 2.8907046 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 3.2743392 + value: 3.2743394 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -182866,7 +183255,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -182881,12 +183270,12 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.y - value: 5.233501 + value: 5.2335014 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 3.9774294 + value: 3.9774296 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -195423,7 +195812,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1910033728} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3627767628257321303, guid: 09ad5fcc134e91a4c8fc2858336cc429, type: 3} @@ -195438,7 +195827,7 @@ PrefabInstance: - target: {fileID: 4112837332846001133, guid: 09ad5fcc134e91a4c8fc2858336cc429, type: 3} propertyPath: m_LocalScale.y - value: 2.074513 + value: 2.0745127 objectReference: {fileID: 0} - target: {fileID: 4112837332846001133, guid: 09ad5fcc134e91a4c8fc2858336cc429, type: 3} @@ -196742,7 +197131,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 5902290343441514530, guid: 5200b3e50470f2b429132041250b6210, type: 3} @@ -199642,7 +200031,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2019430375} + m_Father: {fileID: 482308395} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1273303232 BoxCollider: @@ -200243,7 +200632,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -200258,12 +200647,12 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.y - value: 6.2053623 + value: 6.2053614 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 3.9774294 + value: 3.9774292 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -202970,7 +203359,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 650346385} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 171075308005978109, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -202985,7 +203374,7 @@ PrefabInstance: - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalScale.x - value: 4.3255105 + value: 4.32551 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -204832,7 +205221,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1910033728} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3627767628257321303, guid: 09ad5fcc134e91a4c8fc2858336cc429, type: 3} @@ -204842,7 +205231,7 @@ PrefabInstance: - target: {fileID: 4112837332846001133, guid: 09ad5fcc134e91a4c8fc2858336cc429, type: 3} propertyPath: m_LocalScale.x - value: 1.0531183 + value: 1.0531185 objectReference: {fileID: 0} - target: {fileID: 4112837332846001133, guid: 09ad5fcc134e91a4c8fc2858336cc429, type: 3} @@ -206165,7 +206554,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -206180,7 +206569,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.y - value: 5.233501 + value: 5.2335005 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -206829,7 +207218,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 730294515} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 2813819075013210402, guid: aa8088f81fa59404e9262abeb1733302, type: 3} @@ -208472,7 +208861,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -208487,7 +208876,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.y - value: 6.2053623 + value: 6.205362 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -208902,7 +209291,6 @@ Transform: - {fileID: 729286307} - {fileID: 1157143577} - {fileID: 1279403767} - - {fileID: 1743663676} - {fileID: 709698055} - {fileID: 304088417} - {fileID: 1999682529} @@ -209856,7 +210244,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -209866,17 +210254,17 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 5.8408546 + value: 5.840854 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.y - value: 9.112575 + value: 9.112576 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 5.840855 + value: 5.8408556 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -215206,171 +215594,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1995506066} m_PrefabAsset: {fileID: 0} ---- !u!43 &1394817134 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 9.72, z: 13.65} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 9.72, z: 13.65} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1395333883 PrefabInstance: m_ObjectHideFlags: 0 @@ -226050,7 +226273,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -226060,7 +226283,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 3.977429 + value: 3.9774287 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -231056,171 +231279,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 082dcd5d953cbfc4386e50c2f35d3067, type: 3} ---- !u!43 &1509772986 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 9.72, z: 13.65} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 9.72, z: 13.65} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &1512373517 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7527537600291217443, guid: 1b1e6ad5c7db50147a373759a5c99495, @@ -236227,7 +236285,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -236247,7 +236305,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 3.9774294 + value: 3.9774292 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -245992,7 +246050,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 7054030463105029163, guid: a41bdcbd4d2237d4ea1158ba8f08c293, type: 3} @@ -250054,7 +250112,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -250064,17 +250122,17 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 5.8408546 + value: 5.840855 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.y - value: 9.112575 + value: 9.112576 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 5.840855 + value: 5.8408556 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -257830,7 +257888,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 730294515} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 1215006475005338875, guid: 713706c7ddd5a514f9bb7379029437a6, type: 3} @@ -258017,7 +258075,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -258027,7 +258085,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 3.977429 + value: 3.9774292 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -315609,7 +315667,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 650346385} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 171075308005978109, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -315624,7 +315682,7 @@ PrefabInstance: - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalScale.x - value: 4.6853547 + value: 4.685355 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -315634,7 +315692,7 @@ PrefabInstance: - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalScale.z - value: 6.316377 + value: 6.3163767 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -317262,7 +317320,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -317277,12 +317335,12 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.y - value: 5.233501 + value: 5.2335005 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 3.9774294 + value: 3.9774299 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -317307,7 +317365,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalRotation.x - value: 0.052573457 + value: 0.05257346 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -317317,7 +317375,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalRotation.z - value: -0.69991124 + value: -0.6999113 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -320848,7 +320906,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1349341285} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3729385275159174759, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} @@ -320863,32 +320921,32 @@ PrefabInstance: - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalScale.x - value: 0.84004295 + value: 0.96630144 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalScale.y - value: 0.8400428 + value: 0.9663012 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalScale.z - value: 0.8400428 + value: 0.9663013 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalPosition.x - value: -33.31 + value: -110.99649 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalPosition.y - value: 37.79 + value: 34.81984 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} propertyPath: m_LocalPosition.z - value: 72.97 + value: 109.5544 objectReference: {fileID: 0} - target: {fileID: 4074245330007164125, guid: b83a40fdffe995c4d8c7ba482fb4b2b8, type: 3} @@ -324440,171 +324498,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 599430092} m_PrefabAsset: {fileID: 0} ---- !u!43 &1761844922 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 10, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 10, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &1762444527 GameObject: m_ObjectHideFlags: 0 @@ -327745,171 +327638,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1780280921} m_PrefabAsset: {fileID: 0} ---- !u!43 &1781307513 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 10, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 000020c1000020c100001041000000800000803f000000800000803f0000803f00002041000020c100001041000000800000803f00000080000000000000803f00002041000020c1000010c1000000800000803f000000800000000000000000000020c1000020c1000010c1000000800000803f000000800000803f00000000000020c100002041000010c10000803f00000080000000800000803f0000803f000020c100002041000010410000803f0000008000000080000000000000803f000020c1000020c1000010410000803f00000080000000800000000000000000000020c1000020c1000010c10000803f00000080000000800000803f00000000000020c100002041000010410000008000000080000080bf0000803f0000803f0000204100002041000010410000008000000080000080bf000000000000803f00002041000020c1000010410000008000000080000080bf0000000000000000000020c1000020c1000010410000008000000080000080bf0000803f000000000000204100002041000010c100000080000000800000803f0000803f0000803f000020c100002041000010c100000080000000800000803f000000000000803f000020c1000020c1000010c100000080000000800000803f000000000000000000002041000020c1000010c100000080000000800000803f0000803f00000000000020410000204100001041000080bf00000080000000800000803f0000803f0000204100002041000010c1000080bf0000008000000080000000000000803f00002041000020c1000010c1000080bf0000008000000080000000000000000000002041000020c100001041000080bf00000080000000800000803f00000000000020c100002041000010c100000080000080bf000000800000803f0000803f0000204100002041000010c100000080000080bf00000080000000000000803f00002041000020410000104100000080000080bf000000800000000000000000000020c1000020410000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 10, y: 10, z: 9} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1781582500 PrefabInstance: m_ObjectHideFlags: 0 @@ -328475,7 +328203,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -328490,12 +328218,12 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.y - value: 9.112575 + value: 9.112573 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 5.840855 + value: 5.840854 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -328520,7 +328248,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalRotation.x - value: 0.84903085 + value: 0.8490309 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -328530,7 +328258,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalRotation.z - value: 0.45397228 + value: 0.4539723 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -329743,7 +329471,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -330083,7 +329811,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1509772986} + objectReference: {fileID: 1887408366} - target: {fileID: 2614899761469592910, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Name @@ -333493,7 +333221,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -333503,7 +333231,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 3.977429 + value: 3.9774292 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -333513,7 +333241,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 3.9774294 + value: 3.9774296 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -333533,7 +333261,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalRotation.w - value: -0.7459644 + value: -0.74596435 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -333543,7 +333271,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalRotation.y - value: -0.0012104856 + value: -0.0012104855 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -337087,7 +336815,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -337107,7 +336835,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 3.9774294 + value: 3.9774292 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -340537,8 +340265,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1863222091} - - component: {fileID: 1863222093} - - component: {fileID: 1863222092} m_Layer: 0 m_Name: 3=TAVERN m_TagString: Untagged @@ -340569,43 +340295,8 @@ Transform: - {fileID: 984858299} - {fileID: 691119094} - {fileID: 1274055877} - m_Father: {fileID: 115258996} + m_Father: {fileID: 482308395} m_LocalEulerAnglesHint: {x: 0, y: -75, z: 0} ---- !u!114 &1863222092 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1863222090} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01554ac8a98d75b47b443ab9a7d5f0a5, type: 3} - m_Name: - m_EditorClassIdentifier: - streamingVolume: [] - forceCloseVolume: [] ---- !u!114 &1863222093 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1863222090} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 12983bc7c88f251478e63383314b2d52, type: 3} - m_Name: - m_EditorClassIdentifier: - activationPerFrame: 100 - waitTime: 0 - useRenderers: 1 - useLights: 1 - useReflectionProbes: 1 - useSkinnedMeshRenderers: 1 - useVisualEffects: 1 - useParticleSystems: 1 - useAudioSources: 0 --- !u!4 &1863417547 stripped Transform: m_CorrespondingSourceObject: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, @@ -343268,6 +342959,171 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1887260536} m_Mesh: {fileID: 4300004, guid: d4d9a98f2db5045419ae77cb4b955242, type: 3} +--- !u!43 &1887408366 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1888099729 PrefabInstance: m_ObjectHideFlags: 0 @@ -346887,12 +346743,6 @@ Transform: - {fileID: 132060373} - {fileID: 1643004939} - {fileID: 1468605844} - - {fileID: 703913665} - - {fileID: 1081812306} - - {fileID: 1311676055} - - {fileID: 815292574} - - {fileID: 1985669133} - - {fileID: 1242823727} - {fileID: 15072080} - {fileID: 33027263} - {fileID: 728711970} @@ -350728,39 +350578,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1930718887} m_PrefabAsset: {fileID: 0} ---- !u!21 &1931028980 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Height Fog Global - m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!4 &1932364909 stripped Transform: m_CorrespondingSourceObject: {fileID: 3513894858196449930, guid: b2d52e5d6d177504f975ddbe40843c40, @@ -359376,7 +359193,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1910033728} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3627767628257321303, guid: 09ad5fcc134e91a4c8fc2858336cc429, type: 3} @@ -360973,6 +360790,171 @@ Transform: m_Children: [] m_Father: {fileID: 1533843937} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &1991694131 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 000020c11f851bc166665a41000000800000803f000000800000803f0000803f000020411f851bc166665a41000000800000803f00000080000000000000803f000020411f851bc166665ac1000000800000803f000000800000000000000000000020c11f851bc166665ac1000000800000803f000000800000803f00000000000020c11f851b4166665ac10000803f00000080000000800000803f0000803f000020c11f851b4166665a410000803f0000008000000080000000000000803f000020c11f851bc166665a410000803f00000080000000800000000000000000000020c11f851bc166665ac10000803f00000080000000800000803f00000000000020c11f851b4166665a410000008000000080000080bf0000803f0000803f000020411f851b4166665a410000008000000080000080bf000000000000803f000020411f851bc166665a410000008000000080000080bf0000000000000000000020c11f851bc166665a410000008000000080000080bf0000803f00000000000020411f851b4166665ac100000080000000800000803f0000803f0000803f000020c11f851b4166665ac100000080000000800000803f000000000000803f000020c11f851bc166665ac100000080000000800000803f0000000000000000000020411f851bc166665ac100000080000000800000803f0000803f00000000000020411f851b4166665a41000080bf00000080000000800000803f0000803f000020411f851b4166665ac1000080bf0000008000000080000000000000803f000020411f851bc166665ac1000080bf00000080000000800000000000000000000020411f851bc166665a41000080bf00000080000000800000803f00000000000020c11f851b4166665ac100000080000080bf000000800000803f0000803f000020411f851b4166665ac100000080000080bf00000080000000000000803f000020411f851b4166665a4100000080000080bf000000800000000000000000000020c11f851b4166665a4100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 10, y: 9.72, z: 13.65} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1992092204 GameObject: m_ObjectHideFlags: 0 @@ -363501,7 +363483,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -363511,7 +363493,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 5.8408546 + value: 5.8408556 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -363521,7 +363503,7 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.z - value: 5.840855 + value: 5.8408556 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -364632,7 +364614,6 @@ Transform: - {fileID: 615982600} - {fileID: 2020599033975524098} - {fileID: 6066744245335817687} - - {fileID: 1273303231} - {fileID: 925142755} - {fileID: 7667588593174269690} m_Father: {fileID: 115258996} @@ -381792,7 +381773,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 575770335} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -381802,12 +381783,12 @@ PrefabInstance: - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.x - value: 3.977429 + value: 3.9774294 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} propertyPath: m_LocalScale.y - value: 5.233501 + value: 5.2335005 objectReference: {fileID: 0} - target: {fileID: 3899764430176246018, guid: d405a1244af9fcc4e95a3f45f0547936, type: 3} @@ -440532,9 +440513,6 @@ Transform: - {fileID: 3031226045782173333} - {fileID: 7703777584089232882} - {fileID: 5721179047807587142} - - {fileID: 2090744575934766339} - - {fileID: 2570119098172335756} - - {fileID: 8303962431425287311} - {fileID: 2142628196} - {fileID: 1541762596} - {fileID: 315542251} @@ -441674,7 +441652,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1377053311650965878} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 171075308005978109, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -441699,7 +441677,7 @@ PrefabInstance: - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} propertyPath: m_LocalScale.z - value: 6.6045074 + value: 6.604508 objectReference: {fileID: 0} - target: {fileID: 654175035320776007, guid: 0c27735bb3e334847bd2eac3b79601a8, type: 3} @@ -442571,7 +442549,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1377053311650965878} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 63140519860285877, guid: a2f7d4005ac21414093793f39291af5a, type: 3} @@ -459633,7 +459611,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1931028980} + - {fileID: 334412032} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -459726,7 +459704,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 390593022} + overrideMaterial: {fileID: 19600425} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 @@ -478573,94 +478551,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 8169468482313081077} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8170744230716016638 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 575770335} - m_Modifications: - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_LocalScale.x - value: 1.3889004 - objectReference: {fileID: 0} - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_LocalScale.y - value: 1.3889 - objectReference: {fileID: 0} - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_LocalScale.z - value: 1.3889004 - objectReference: {fileID: 0} - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_LocalPosition.x - value: -103.35087 - objectReference: {fileID: 0} - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_LocalPosition.y - value: 34.882 - objectReference: {fileID: 0} - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_LocalPosition.z - value: 107.54224 - objectReference: {fileID: 0} - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.9557478 - objectReference: {fileID: 0} - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.0000000017186077 - objectReference: {fileID: 0} - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.29418728 - objectReference: {fileID: 0} - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.000000021788034 - objectReference: {fileID: 0} - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -5.518 - objectReference: {fileID: 0} - - target: {fileID: 2403283470413535275, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3031482449044521617, guid: 5e25efb916c6ad74980fea4997e16f5b, - type: 3} - propertyPath: m_Name - value: Destr_Pillar2_1 (9) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5e25efb916c6ad74980fea4997e16f5b, type: 3} --- !u!1001 &8216869488563144704 PrefabInstance: m_ObjectHideFlags: 0 @@ -478761,7 +478651,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1377053311650965878} + m_TransformParent: {fileID: 482308395} m_Modifications: - target: {fileID: 3099161007084426008, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} @@ -478776,17 +478666,17 @@ PrefabInstance: - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalScale.x - value: 0.42374733 + value: 0.42374736 objectReference: {fileID: 0} - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalScale.y - value: 0.42374718 + value: 0.42374715 objectReference: {fileID: 0} - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalScale.z - value: 0.42374733 + value: 0.4237474 objectReference: {fileID: 0} - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} @@ -478811,7 +478701,7 @@ PrefabInstance: - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.x - value: 0.0012877549 + value: 0.001287755 objectReference: {fileID: 0} - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} @@ -478821,7 +478711,7 @@ PrefabInstance: - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_LocalRotation.z - value: -0.061601996 + value: -0.061602 objectReference: {fileID: 0} - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} @@ -480038,4 +479928,3 @@ SceneRoots: - {fileID: 4510717608614986561} - {fileID: 1850181008} - {fileID: 1047104975} - - {fileID: 275677524} diff --git a/Assets/Scenes/03_DarkWoods/DarkForest.unity b/Assets/Scenes/03_DarkWoods/DarkForest.unity index aba474d96..858456e49 100644 --- a/Assets/Scenes/03_DarkWoods/DarkForest.unity +++ b/Assets/Scenes/03_DarkWoods/DarkForest.unity @@ -226392,15 +226392,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 454388, guid: 9eafe0fd75c2e264e9df989997667656, type: 3} propertyPath: m_LocalPosition.x - value: -109.738 + value: -109.739 objectReference: {fileID: 0} - target: {fileID: 454388, guid: 9eafe0fd75c2e264e9df989997667656, type: 3} propertyPath: m_LocalPosition.y - value: 18.072 + value: 18.103 objectReference: {fileID: 0} - target: {fileID: 454388, guid: 9eafe0fd75c2e264e9df989997667656, type: 3} propertyPath: m_LocalPosition.z - value: 65.225 + value: 65.224 objectReference: {fileID: 0} - target: {fileID: 454388, guid: 9eafe0fd75c2e264e9df989997667656, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scripts/Optimization/BoxVolume.cs b/Assets/Scripts/Optimization/BoxVolume.cs index 64fda74c1..542628654 100644 --- a/Assets/Scripts/Optimization/BoxVolume.cs +++ b/Assets/Scripts/Optimization/BoxVolume.cs @@ -7,6 +7,9 @@ namespace Beyond [RequireComponent(typeof(BoxCollider))] public class BoxVolume : StreamingAsset { + // DODANE: Licznik koliderów wewnątrz woluminu + private int enteredCollidersCount = 0; + protected override void Draw() { if (collider == null) @@ -49,9 +52,13 @@ namespace Beyond protected override void OnTriggerEnter(Collider other) { - if (collisionLayer == 1 << other.gameObject.layer) + // Sprawdzenie warunków kolizji + if (collisionLayer == 1 << other.gameObject.layer && tagMask.IsInTagMask(other.tag)) { - if (tagMask.IsInTagMask(other.tag)) + enteredCollidersCount++; + + // Aktywacja następuje tylko przy pierwszym wejściu (licznik = 1) + if (enteredCollidersCount == 1) { CancelDeactivationCoroutine(); SetActive(true); @@ -61,13 +68,20 @@ namespace Beyond protected override void OnTriggerExit(Collider other) { - if (collisionLayer == 1 << other.gameObject.layer) + // Sprawdzenie warunków kolizji + if (collisionLayer == 1 << other.gameObject.layer && tagMask.IsInTagMask(other.tag)) { - if (tagMask.IsInTagMask(other.tag)) + enteredCollidersCount--; + + // Zabezpieczenie na wypadek błędu fizyki + if (enteredCollidersCount < 0) enteredCollidersCount = 0; + + // Dezaktywacja następuje tylko, gdy ostatni obiekt opuści wolumin (licznik = 0) + if (enteredCollidersCount == 0) { SetActive(false); } } } } -} +} \ No newline at end of file