diff --git a/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab b/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab index 82813dd93..94e8f5152 100644 --- a/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab +++ b/Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab @@ -81998,6 +81998,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 minDamage: damageValue: 15 staminaBlockCost: 5 @@ -82013,6 +82014,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 maxDamage: damageValue: 15 staminaBlockCost: 5 @@ -82028,6 +82030,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 overrideDamageSender: {fileID: 0} hitBoxes: - {fileID: 9202663234700498133} @@ -104885,6 +104888,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 minDamage: damageValue: 15 staminaBlockCost: 5 @@ -104900,6 +104904,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 maxDamage: damageValue: 15 staminaBlockCost: 5 @@ -104915,6 +104920,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 overrideDamageSender: {fileID: 0} hitBoxes: - {fileID: 3157817243778252271} @@ -105773,6 +105779,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 hitProperties: hitDamageTags: - Enemy @@ -118353,6 +118360,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 minDamage: damageValue: 15 staminaBlockCost: 5 @@ -118368,6 +118376,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 maxDamage: damageValue: 15 staminaBlockCost: 5 @@ -118383,6 +118392,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 overrideDamageSender: {fileID: 0} hitBoxes: - {fileID: 3157817242016584094} @@ -135308,6 +135318,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 minDamage: damageValue: 15 staminaBlockCost: 5 @@ -135323,6 +135334,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 maxDamage: damageValue: 15 staminaBlockCost: 5 @@ -135338,6 +135350,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 overrideDamageSender: {fileID: 0} hitBoxes: - {fileID: 3157817244105814045} @@ -135484,6 +135497,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 overrideDamageSender: {fileID: 0} layerToCollide: serializedVersion: 2 diff --git a/Assets/Prefabs/Characters/Beasiculus/Bascileus_set1_BaseModel_CutScene.prefab b/Assets/Prefabs/Characters/Beasiculus/Bascileus_set1_BaseModel_CutScene.prefab index f84f8a607..91dda018d 100644 --- a/Assets/Prefabs/Characters/Beasiculus/Bascileus_set1_BaseModel_CutScene.prefab +++ b/Assets/Prefabs/Characters/Beasiculus/Bascileus_set1_BaseModel_CutScene.prefab @@ -854,6 +854,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 minDamage: damageValue: 15 staminaBlockCost: 5 @@ -869,6 +870,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 maxDamage: damageValue: 15 staminaBlockCost: 5 @@ -884,6 +886,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 overrideDamageSender: {fileID: 0} hitBoxes: - {fileID: 4367795707781829252} @@ -3615,6 +3618,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 minDamage: damageValue: 15 staminaBlockCost: 5 @@ -3630,6 +3634,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 maxDamage: damageValue: 15 staminaBlockCost: 5 @@ -3645,6 +3650,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 overrideDamageSender: {fileID: 0} hitBoxes: - {fileID: 4367795705692615431} @@ -6820,6 +6826,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 minDamage: damageValue: 15 staminaBlockCost: 5 @@ -6835,6 +6842,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 maxDamage: damageValue: 15 staminaBlockCost: 5 @@ -6850,6 +6858,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 overrideDamageSender: {fileID: 0} hitBoxes: - {fileID: 4367795706479253541} @@ -8693,6 +8702,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 minDamage: damageValue: 15 staminaBlockCost: 5 @@ -8708,6 +8718,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 maxDamage: damageValue: 15 staminaBlockCost: 5 @@ -8723,6 +8734,7 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + ignoreAllHitEffects: 0 overrideDamageSender: {fileID: 0} hitBoxes: - {fileID: 4367795706020118261} diff --git a/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity index 35ecf9dff..89763db90 100644 --- a/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity +++ b/Assets/Scenes/Land_01/Land_of_Death_River1_Valley02.unity @@ -127,171 +127,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 799459968} m_PrefabAsset: {fileID: 0} ---- !u!43 &1629847 -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!4 &2313443 stripped Transform: m_CorrespondingSourceObject: {fileID: 8930177148768166850, guid: 0550f18443b9ce441a1028040156642a, @@ -5471,7 +5306,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 412720129} + objectReference: {fileID: 1252431549} - target: {fileID: 2614899761469592910, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Name @@ -29606,6 +29441,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d8f8b708eb440ce4da5b77fb4f0d8e4c, type: 3} +--- !u!43 &208335962 +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 &208602444 PrefabInstance: m_ObjectHideFlags: 0 @@ -47518,6 +47518,171 @@ Transform: m_Children: [] m_Father: {fileID: 988234039} m_LocalEulerAnglesHint: {x: 113.226, y: 77.15, z: 72.779} +--- !u!43 &359684587 +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 &361469677 PrefabInstance: m_ObjectHideFlags: 0 @@ -48019,7 +48184,7 @@ PrefabInstance: - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, type: 3} propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.size - value: 7 + value: 9 objectReference: {fileID: 0} - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, type: 3} @@ -48031,6 +48196,16 @@ PrefabInstance: propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[6].m_Mode value: 6 objectReference: {fileID: 0} + - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, + type: 3} + propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[7].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, + type: 3} + propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[8].m_Mode + value: 6 + objectReference: {fileID: 0} - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, type: 3} propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[1].m_Target @@ -48046,6 +48221,16 @@ PrefabInstance: propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[6].m_Target value: objectReference: {fileID: 676912008} + - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, + type: 3} + propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[7].m_Target + value: + objectReference: {fileID: 1909679939} + - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, + type: 3} + propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[8].m_Target + value: + objectReference: {fileID: 603560490} - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, type: 3} propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[5].m_CallState @@ -48056,6 +48241,16 @@ PrefabInstance: propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[6].m_CallState value: 2 objectReference: {fileID: 0} + - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, + type: 3} + propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[7].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, + type: 3} + propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[8].m_CallState + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, type: 3} propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName @@ -48071,6 +48266,16 @@ PrefabInstance: propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[6].m_MethodName value: SetActive objectReference: {fileID: 0} + - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, + type: 3} + propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[7].m_MethodName + value: Stop + objectReference: {fileID: 0} + - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, + type: 3} + propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[8].m_MethodName + value: SetActive + objectReference: {fileID: 0} - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, type: 3} propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName @@ -48086,6 +48291,16 @@ PrefabInstance: propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[6].m_TargetAssemblyTypeName value: UnityEngine.GameObject, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, + type: 3} + propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[7].m_TargetAssemblyTypeName + value: UnityEngine.ParticleSystem, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, + type: 3} + propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[8].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, type: 3} propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -48096,6 +48311,16 @@ PrefabInstance: propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[6].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, + type: 3} + propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[7].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7397554738665875514, guid: e0402218295b495438786c5ee96c208d, + type: 3} + propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[8].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 8538364527326545888, guid: e0402218295b495438786c5ee96c208d, type: 3} propertyPath: m_Name @@ -48120,7 +48345,11 @@ PrefabInstance: - {fileID: 7873365413744856222, guid: e0402218295b495438786c5ee96c208d, type: 3} m_RemovedGameObjects: - {fileID: 8502884497785710349, guid: e0402218295b495438786c5ee96c208d, type: 3} - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4944508980274447850, guid: e0402218295b495438786c5ee96c208d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 211341619} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0402218295b495438786c5ee96c208d, type: 3} --- !u!1001 &365125939 @@ -51315,39 +51544,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5200b3e50470f2b429132041250b6210, type: 3} ---- !u!21 &384808466 -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!1001 &385737052 PrefabInstance: m_ObjectHideFlags: 0 @@ -55008,171 +55204,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1404714110} m_PrefabAsset: {fileID: 0} ---- !u!43 &412720129 -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 &413257529 PrefabInstance: m_ObjectHideFlags: 0 @@ -129820,6 +129851,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 13263011} m_PrefabAsset: {fileID: 0} +--- !u!21 &858023357 +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!1001 &858464035 PrefabInstance: m_ObjectHideFlags: 0 @@ -135435,171 +135499,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 901633370} m_PrefabAsset: {fileID: 0} ---- !u!43 &902040169 -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 &902373331 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7228384153449913416, guid: b2b5974df0875904a9cb6d3284e2ffe1, @@ -148784,7 +148683,7 @@ PrefabInstance: - target: {fileID: 1385765897516864307, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: selectedToolbar - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1385765897516864307, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -163041,70 +162940,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 763748699} m_PrefabAsset: {fileID: 0} ---- !u!21 &1112340753 -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 &1112354105 stripped Transform: m_CorrespondingSourceObject: {fileID: 7505144344378748671, guid: 75e0ee3afae8427498645703968406fb, @@ -175184,6 +175019,70 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1456962560} m_PrefabAsset: {fileID: 0} +--- !u!21 &1204873032 +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!1001 &1205915292 PrefabInstance: m_ObjectHideFlags: 0 @@ -181134,6 +181033,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1766850197} m_PrefabAsset: {fileID: 0} +--- !u!43 &1252431549 +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 &1254131636 GameObject: m_ObjectHideFlags: 0 @@ -218415,13 +218479,19 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1772018477} + m_TransformParent: {fileID: 2145249720} m_Modifications: - target: {fileID: 927769488672062259, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 436f58f9c32766f4894c0d547e1727bb, type: 2} + - target: {fileID: 927769488672062260, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 3443629218296621865, guid: 0000000000000000d000000000000000, + type: 0} - target: {fileID: 927769488672062260, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: m_Name @@ -218435,52 +218505,52 @@ PrefabInstance: - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: m_LocalScale.x - value: 3.1025205 + value: 2.4326193 objectReference: {fileID: 0} - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: m_LocalScale.y - value: 3.102519 + value: 2.432618 objectReference: {fileID: 0} - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: m_LocalScale.z - value: 3.1025205 + value: 2.432619 objectReference: {fileID: 0} - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: m_LocalPosition.x - value: -2.99 + value: -9.715454 objectReference: {fileID: 0} - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: m_LocalPosition.y - value: 40.54 + value: 4.036704 objectReference: {fileID: 0} - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: m_LocalPosition.z - value: 0.81 + value: 0.11369324 objectReference: {fileID: 0} - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: m_LocalRotation.w - value: 0.4590966 + value: 0.16694842 objectReference: {fileID: 0} - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: m_LocalRotation.x - value: -0.42542025 + value: 0.033861976 objectReference: {fileID: 0} - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: m_LocalRotation.y - value: 0.53217494 + value: -0.01184739 objectReference: {fileID: 0} - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: m_LocalRotation.z - value: 0.5701209 + value: 0.98531276 objectReference: {fileID: 0} - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} @@ -223611,6 +223681,171 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!43 &1605754367 +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 &1606491207 GameObject: m_ObjectHideFlags: 0 @@ -227604,114 +227839,6 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1371728558} m_PrefabAsset: {fileID: 0} ---- !u!1 &1640234048 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1640234049} - - component: {fileID: 1640234052} - - component: {fileID: 1640234051} - - component: {fileID: 1640234050} - m_Layer: 0 - m_Name: Dead - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1640234049 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1640234048} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 13.843, y: 13.843, z: 13.843} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 603560494} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &1640234050 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1640234048} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1640234051 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1640234048} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1640234052 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1640234048} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1640288433 PrefabInstance: m_ObjectHideFlags: 0 @@ -292548,171 +292675,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4bd8414dc721cfc4ebbafc269fdcefdf, type: 3} ---- !u!43 &1715883381 -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 &1715966926 PrefabInstance: m_ObjectHideFlags: 0 @@ -301614,7 +301576,6 @@ Transform: - {fileID: 1182977264} - {fileID: 1841724017} - {fileID: 2145249720} - - {fileID: 194311284360722857} - {fileID: 1993238335} - {fileID: 363731423} - {fileID: 1228829634} @@ -301701,7 +301662,6 @@ Transform: - {fileID: 1737001112} - {fileID: 110068890} - {fileID: 1624403042} - - {fileID: 211341619} - {fileID: 131627970} - {fileID: 335972010} - {fileID: 1197697121} @@ -304684,7 +304644,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1715883381} + objectReference: {fileID: 1605754367} - target: {fileID: 2614899761469592910, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Name @@ -304696,7 +304656,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 2614899761469592901, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} insertIndex: -1 - addedObject: {fileID: 1640234049} + addedObject: {fileID: 194311284360722857} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 2614899761469592910, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} @@ -358423,12 +358383,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5889985032931491371} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -26.42, y: 43.81, z: -58.73} - m_LocalScale: {x: 8.399366, y: 4.911482, z: 8.399368} + m_LocalRotation: {x: -0.70019853, y: 0.09860049, z: -0.09860046, w: 0.70019853} + m_LocalPosition: {x: -0.105361246, y: -0.6865073, z: -31.442406} + m_LocalScale: {x: 8.95847, y: 104.768326, z: 8.958471} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1772018477} + m_Father: {fileID: 603560494} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &198007767432507963 ParticleSystem: @@ -425197,7 +425157,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 384808466} + - {fileID: 858023357} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -425290,7 +425250,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 1112340753} + overrideMaterial: {fileID: 1204873032} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 @@ -437285,20 +437245,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &4025509427034657217 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5889985032931491371} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b8f4c5f8a982ee741b546c41519c36de, type: 3} - m_Name: - m_EditorClassIdentifier: - volume: {fileID: 6208651050759726763} - fadeDuration: 5 --- !u!1001 &4130691562202254630 PrefabInstance: m_ObjectHideFlags: 0 @@ -439821,13 +439767,12 @@ GameObject: m_Component: - component: {fileID: 194311284360722857} - component: {fileID: 253791902845610707} - - component: {fileID: 4025509427034657217} - component: {fileID: 6208651050759726763} - component: {fileID: 6208651050759726764} m_Layer: 11 - m_Name: VolumTEST + m_Name: PoisonZone m_TagString: Untagged - m_Icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0} + m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 @@ -440117,14 +440062,14 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5889985032931491371} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: m_IsGlobal: 0 priority: 3 - blendDistance: 5.49 + blendDistance: 2.03 weight: 0 sharedProfile: {fileID: 11400000, guid: f282b232d2a8b1e48bfd456ba129af71, type: 2} --- !u!114 &6208651050759726764 @@ -440136,12 +440081,13 @@ MonoBehaviour: m_GameObject: {fileID: 5889985032931491371} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a475c053fa2b9dd47b002feb7bbf32a9, type: 3} + m_Script: {fileID: 11500000, guid: 42b6d889d50a4a84f9b8f341d61afdc6, type: 3} m_Name: m_EditorClassIdentifier: - m_Volume: {fileID: 6208651050759726763} - m_AnimationDuration: 5 - m_WeightCurve: + damageAmount: 5 + damageInterval: 1 + poisonVolume: {fileID: 6208651050759726763} + loopingVolumeWeightCurve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -440154,64 +440100,145 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.17722635 - value: 0.010527492 - inSlope: 1.2497582 - outSlope: 1.2497582 + time: 0.116025604 + value: 0.54053545 + inSlope: 1.7234659 + outSlope: 1.7234659 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.24287648 - value: 0.24287648 - inSlope: 1 - outSlope: 1 + time: 0.14796677 + value: 0.3230773 + inSlope: -5.854987 + outSlope: -5.854987 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28898174 - value: 0.60170174 - inSlope: 1.0000001 - outSlope: 1.0000001 + time: 0.18640932 + value: 0.10739069 + inSlope: -3.6216755 + outSlope: -3.6216755 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.38224518 - value: 0.38224518 - inSlope: 1 - outSlope: 1 + time: 0.21144643 + value: 0.23598567 + inSlope: 2.1870353 + outSlope: 2.1870353 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41849414 - value: -0.000682503 - inSlope: 0.9999999 - outSlope: 0.9999999 + time: 0.24228616 + value: 0.015793622 + inSlope: 0.059689514 + outSlope: 0.059689514 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.58365315 - value: 0.6106107 - inSlope: 1.896403 - outSlope: 1.896403 + time: 0.2948951 + value: 0.30291575 + inSlope: 2.6165597 + outSlope: 2.6165597 tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.9526367 - value: 0.058963776 - inSlope: 1 - outSlope: 1 + time: 0.31683955 + value: 0.65370107 + inSlope: 3.0651908 + outSlope: 3.0651908 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.42162755 + value: 0.17743689 + inSlope: 1.2576894 + outSlope: 1.2576894 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.8 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5367214 + value: 0.5307089 + inSlope: -0.5000882 + outSlope: -0.5000882 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.57061833 + value: 0.7566331 + inSlope: -1.1643732 + outSlope: -1.1643732 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.64827234 + value: 0.18392396 + inSlope: -1.8875428 + outSlope: -1.8875428 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6996332 + value: 0.3774749 + inSlope: -2.2965946 + outSlope: -2.2965946 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8188774 + value: 0.022004738 + inSlope: -1.664911 + outSlope: -1.664911 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.86642694 + value: 0.07383313 + inSlope: -0.30559543 + outSlope: -0.30559543 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 0 weightedMode: 0 inWeight: 0 @@ -440219,7 +440246,10 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - m_Speed: 3.32 + loopCycleDuration: 2 + volumeFadeDuration: 1 + coughSound: {fileID: 8300000, guid: 08f8ddcc9fadca44b88de3155aa75c5e, type: 3} + coughInterval: 4 --- !u!1001 &6309478752935014852 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Characters/PoisonZone.cs b/Assets/Scripts/Characters/PoisonZone.cs index a31f8ad88..d62defd8b 100644 --- a/Assets/Scripts/Characters/PoisonZone.cs +++ b/Assets/Scripts/Characters/PoisonZone.cs @@ -38,7 +38,7 @@ public class PoisonZone : MonoBehaviour private Player currentPlayerInZone; private float timeSinceLastDamage = 0f; private float timeSinceLastCough = 0f; - private bool playerCurrentlyInZone = false; // Ta flaga jest kluczowa dla logiki ponownego wejścia + private bool playerCurrentlyInZone = false; private float currentLoopProgress = 0f; private float currentFadeProgress = 0f; @@ -108,7 +108,7 @@ public class PoisonZone : MonoBehaviour } } - if (playerCurrentlyInZone && currentPlayerInZone != null) // Upewnij się, że currentPlayerInZone nie jest null + if (playerCurrentlyInZone && currentPlayerInZone != null) { timeSinceLastDamage += Time.deltaTime; if (timeSinceLastDamage >= damageInterval) @@ -134,26 +134,22 @@ public class PoisonZone : MonoBehaviour Player enteredPlayer = other.GetComponent(); if (enteredPlayer != null) { - // Ta logika powinna poprawnie obsługiwać ponowne wejście tego samego gracza - // oraz wejście nowego gracza. if (currentPlayerInZone != enteredPlayer || !playerCurrentlyInZone) { - // Jeśli to faktycznie nowy gracz LUB ten sam gracz, ale nie był 'aktywny' (playerCurrentlyInZone było false) if (currentPlayerInZone != enteredPlayer) { - currentPlayerInZone = enteredPlayer; // Zaktualizuj referencję tylko jeśli to inny gracz + currentPlayerInZone = enteredPlayer; } - playerCurrentlyInZone = true; // Zawsze ustawiaj na true przy "aktywnym" wejściu + playerCurrentlyInZone = true; timeSinceLastDamage = 0f; timeSinceLastCough = 0f; - currentLoopProgress = 0f; // Resetuj pętlę animacji Volume + currentLoopProgress = 0f; if (coughSound != null) { PlayCoughSound(); } - // Debug.Log($"{enteredPlayer.name} ENTERED/RE-ENTERED zone. playerCurrentlyInZone: {playerCurrentlyInZone}"); } } } @@ -161,12 +157,9 @@ public class PoisonZone : MonoBehaviour void OnTriggerExit(Collider other) { Player exitedPlayer = other.GetComponent(); - // Sprawdzamy, czy to TEN gracz, który był aktywnie śledzony w strefie i właśnie opuszcza. if (exitedPlayer != null && exitedPlayer == currentPlayerInZone && playerCurrentlyInZone) { - playerCurrentlyInZone = false; // Oznacz, że gracz (ten konkretny) już nie jest aktywnie w strefie - // Debug.Log($"{exitedPlayer.name} EXITED zone. playerCurrentlyInZone: {playerCurrentlyInZone}"); - // Nie zerujemy currentPlayerInZone, aby OnTriggerEnter mogło poprawnie wykryć powrót tego samego gracza. + playerCurrentlyInZone = false; } } @@ -177,13 +170,13 @@ public class PoisonZone : MonoBehaviour var healthController = currentPlayerInZone.ThirdPersonController; if (healthController != null && !healthController.isDead) { - // Ta linia jest kluczowa dla pomijania animacji hita. - // Zakłada, że masz zmodyfikowany vDamage.cs (z polem ignoreHitEffects) - // oraz odpowiednie warunki w Player.cs i vHealthController.cs. + // >>> TUTAJ ZMIANA <<< + // Używamy konstruktora vDamage(int damageAmount, bool ignoreReactionAndAllEffects) + // Przekazujemy 'true', aby zasygnalizować, że chcemy pominąć wszystkie efekty trafienia. vDamage damageInstance = new vDamage(damageAmount, true); - // Jeśli vDamage(int, bool) nie istnieje, a vDamage.cs jest zmodyfikowane: - // vDamage damageInstance = new vDamage(damageAmount); - // damageInstance.ignoreHitEffects = true; + + // Opcjonalnie: ustaw typ obrażeń dla dodatkowej logiki lub debugowania + damageInstance.damageType = "Poison"; healthController.TakeDamage(damageInstance); } diff --git a/Assets/ThirdParty/Foot_Step_Water_Splashes/FBX/Materials/Poison_foot.mat b/Assets/ThirdParty/Foot_Step_Water_Splashes/FBX/Materials/Poison_foot.mat index 2e03e5c10..9eaf62996 100644 --- a/Assets/ThirdParty/Foot_Step_Water_Splashes/FBX/Materials/Poison_foot.mat +++ b/Assets/ThirdParty/Foot_Step_Water_Splashes/FBX/Materials/Poison_foot.mat @@ -9,7 +9,14 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Poison_foot m_Shader: {fileID: 4800000, guid: 4775e5a8f344d6348adf934e722da85d, type: 3} - m_ValidKeywords: [] + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - BlendAlpha + - Clip_OFF + - FrameBlend_OFF + - FresnelFade_OFF + - VertLight_OFF m_InvalidKeywords: - SoftParticles_OFF m_LightmapFlags: 1 @@ -18,6 +25,7 @@ Material: m_CustomRenderQueue: 2450 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -86,3 +94,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _TintColor: {r: 0.135141, g: 1.7207954, b: 0, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ThirdParty/Foot_Step_Water_Splashes/FBX/Materials/Poison_splash.mat b/Assets/ThirdParty/Foot_Step_Water_Splashes/FBX/Materials/Poison_splash.mat index c1b0347d7..06785139e 100644 --- a/Assets/ThirdParty/Foot_Step_Water_Splashes/FBX/Materials/Poison_splash.mat +++ b/Assets/ThirdParty/Foot_Step_Water_Splashes/FBX/Materials/Poison_splash.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Poison_splash m_Shader: {fileID: 4800000, guid: 4775e5a8f344d6348adf934e722da85d, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - BlendAlpha - Clip_OFF @@ -25,6 +27,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -127,3 +130,4 @@ Material: - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _TintColor: {r: 0.16041078, g: 1.319508, b: 0, a: 0.5} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/Generic/Health/vHealthController.cs b/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/Generic/Health/vHealthController.cs index eece1cd05..16e542d67 100644 --- a/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/Generic/Health/vHealthController.cs +++ b/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/Generic/Health/vHealthController.cs @@ -1,75 +1,69 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Linq.Expressions; using UnityEngine; -using UnityEngine.Events; +using UnityEngine.Events; // Nadal potrzebne dla UnityEvent ogĂłlnego uĹĽytku namespace Invector { + // Prawdopodobnie te typy sÄ… zdefiniowane gdzieĹ› globalnie w namespace Invector + // lub w plikach interfejsĂłw. JeĹ›li nie, trzeba by je tu zdefiniować, + // ale zakĹ‚adam, ĹĽe kompilator je znajdzie, skoro vDamageReceiver ich uĹĽywa. + // [System.Serializable] public class OnReceiveDamage : UnityEvent { } // JeĹ›li potrzebna definicja + // [System.Serializable] public class OnDead : UnityEvent { } // JeĹ›li potrzebna definicja + [vClassHeader("HealthController", iconName = "HealthControllerIcon")] - public class vHealthController : vMonoBehaviour, vIHealthController + public class vHealthController : vMonoBehaviour, vIHealthController // Upewnij siÄ™, ĹĽe to jest poprawny interfejs { #region Variables [vEditorToolbar("Health", order = 0)] - [SerializeField] [vReadOnly] protected bool _isDead; - [vBarDisplay("maxHealth")] [SerializeField] protected float _currentHealth; + [SerializeField][vReadOnly] protected bool _isDead; + [vBarDisplay("maxHealth")][SerializeField] protected float _currentHealth; public bool isImmortal = false; [vHelpBox("If you want to start with different value, uncheck this and make sure that the current health has a value greater zero")] public bool fillHealthOnStart = true; public int maxHealth = 100; public int MaxHealth { - get - { - return maxHealth; - } - protected set - { - maxHealth = value; - } + get { return maxHealth; } + protected set { maxHealth = value; } } public float currentHealth { - get - { - return _currentHealth; - } + get { return _currentHealth; } protected set { if (_currentHealth != value) { _currentHealth = value; - onChangeHealth.Invoke(_currentHealth); - } - - if (!_isDead && _currentHealth <= 0) - { - //_isDead = true; - isDead = true; - onDead.Invoke(gameObject); - } - else if (isDead && _currentHealth > 0) - { - isDead = false; + if (onChangeHealth != null) onChangeHealth.Invoke(_currentHealth); } + if (!_isDead && _currentHealth <= 0) { isDead = true; } + else if (isDead && _currentHealth > 0) { isDead = false; } } } public virtual bool isDead { get { - if (!_isDead && currentHealth <= 0) + if (!_isDead && _currentHealth <= 0) { _isDead = true; - onDead.Invoke(gameObject); + if (_onDead != null) _onDead.Invoke(gameObject); } return _isDead; } set { - _isDead = value; + if (_isDead != value) + { + _isDead = value; + if (_isDead) + { + if (_onDead != null) _onDead.Invoke(gameObject); + } + } } } public float healthRecovery = 0f; @@ -78,38 +72,46 @@ namespace Invector public float currentHealthRecoveryDelay; [vEditorToolbar("Events", order = 100)] public List checkHealthEvents = new List(); + + // UĹĽywamy typĂłw zdarzeĹ„ zdefiniowanych przez Invector (OnReceiveDamage, OnDead) [SerializeField] protected OnReceiveDamage _onStartReceiveDamage = new OnReceiveDamage(); [SerializeField] protected OnReceiveDamage _onReceiveDamage = new OnReceiveDamage(); - [SerializeField] protected OnDead _onDead = new OnDead(); - public ValueChangedEvent onChangeHealth; + [SerializeField] protected OnDead _onDead = new OnDead(); // ZakĹ‚adajÄ…c, ĹĽe typ OnDead istnieje + + [System.Serializable] + public class ValueChangedEvent : UnityEvent { } + public ValueChangedEvent onChangeHealth = new ValueChangedEvent(); + public UnityEvent onResetHealth = new UnityEvent(); // Standardowy UnityEvent - public OnReceiveDamage onStartReceiveDamage { get { return _onStartReceiveDamage; } protected set { _onStartReceiveDamage = value; } } - public OnReceiveDamage onReceiveDamage { get { return _onReceiveDamage; } protected set { _onReceiveDamage = value; } } - public OnDead onDead { get { return _onDead; } protected set { _onDead = value; } } - public UnityEvent onResetHealth; internal bool inHealthRecovery; + // WĹ‚aĹ›ciwoĹ›ci implementujÄ…ce interfejs, uĹĽywajÄ…c typĂłw Invectora + public OnReceiveDamage onStartReceiveDamage { get { return _onStartReceiveDamage; } } // UsuniÄ™to 'protected set' aby pasowaĹ‚o do get-only interfejsu + public OnReceiveDamage onReceiveDamage { get { return _onReceiveDamage; } } // UsuniÄ™to 'protected set' + public OnDead onDead { get { return _onDead; } } // UsuniÄ™to 'protected set' + #endregion protected virtual void Start() { - if (fillHealthOnStart) - currentHealth = maxHealth; + if (fillHealthOnStart) currentHealth = maxHealth; currentHealthRecoveryDelay = healthRecoveryDelay; } protected virtual bool canRecoverHealth { - get - { - return (currentHealth >= 0 && healthRecovery > 0 && currentHealth < maxHealth); - } + get { return (_currentHealth >= 0 && healthRecovery > 0 && _currentHealth < maxHealth && !_isDead); } } - + protected virtual IEnumerator RecoverHealth() { inHealthRecovery = true; - while (canRecoverHealth && !isDead) + while (currentHealthRecoveryDelay > 0 && !_isDead) + { + currentHealthRecoveryDelay -= Time.deltaTime; + yield return null; + } + while (canRecoverHealth) { HealthRecovery(); yield return null; @@ -119,149 +121,122 @@ namespace Invector protected virtual void HealthRecovery() { - if (!canRecoverHealth||isDead) return; - if (currentHealthRecoveryDelay > 0) - currentHealthRecoveryDelay -= Time.deltaTime; - else + if (!canRecoverHealth) return; + if (_currentHealth < maxHealth) { - if (currentHealth > maxHealth) - currentHealth = maxHealth; - if (currentHealth < maxHealth) - currentHealth += healthRecovery * Time.deltaTime; + _currentHealth += healthRecovery * Time.deltaTime; + _currentHealth = Mathf.Min(_currentHealth, maxHealth); + if (onChangeHealth != null) onChangeHealth.Invoke(_currentHealth); } } - /// - /// Increase or decrease currentHealth (Positive or Negative Values) - /// - /// Value to change - public virtual void AddHealth(int value) - { - currentHealth += value; - currentHealth = Mathf.Clamp(currentHealth, 0, maxHealth); - if (!isDead && currentHealth <= 0) - { - isDead = true; - onDead.Invoke(gameObject); - } - HandleCheckHealthEvents(); - } - - /// - /// Change the currentHealth of Character - /// - /// - public virtual void ChangeHealth(int value) - { - currentHealth = value; - currentHealth = Mathf.Clamp(currentHealth, 0, maxHealth); - if (!isDead && currentHealth <= 0) - { - isDead = true; - onDead.Invoke(gameObject); - } - HandleCheckHealthEvents(); - } - - /// - /// Reset's current health to specific health value - /// - /// target health + public virtual void AddHealth(int value) { currentHealth += value; } + public virtual void ChangeHealth(int value) { currentHealth = value; } public virtual void ResetHealth(float health) { - currentHealth = health; - onResetHealth.Invoke(); - if (isDead) isDead = false; + currentHealth = Mathf.Clamp(health, 0, maxHealth); + if (onResetHealth != null) onResetHealth.Invoke(); + if (_isDead && _currentHealth > 0) isDead = false; } - /// - /// Reset's current health to max health - /// public virtual void ResetHealth() { currentHealth = maxHealth; - onResetHealth.Invoke(); - if (isDead) isDead = false; + if (onResetHealth != null) onResetHealth.Invoke(); + if (_isDead) isDead = false; } - - /// - /// Change the MaxHealth of Character - /// - /// public virtual void ChangeMaxHealth(int value) { maxHealth += value; - if (maxHealth < 0) - maxHealth = 0; + if (maxHealth < 0) maxHealth = 0; + if (_currentHealth > maxHealth) currentHealth = maxHealth; } - - /// - /// Set a value to HealthRecovery to start recovering health - /// - /// public virtual void SetHealthRecovery(float value) { healthRecovery = value; - StartCoroutine(RecoverHealth()); + if (!inHealthRecovery && canRecoverHealth && gameObject.activeInHierarchy) + { + StartCoroutine(RecoverHealth()); + } } - /// - /// Apply Damage to Current Health - /// - /// damage public virtual void TakeDamage(vDamage damage) { - if (damage != null) - { - onStartReceiveDamage.Invoke(damage); - currentHealthRecoveryDelay = currentHealth <= 0 ? 0 : healthRecoveryDelay; + if (damage != null && !_isDead) + { + if (inHealthRecovery) + { + StopCoroutine(RecoverHealth()); + inHealthRecovery = false; + } + currentHealthRecoveryDelay = healthRecoveryDelay; - if (currentHealth > 0 && !isImmortal) - { - currentHealth -= damage.damageValue; + // UĹĽyj flagi ignoreAllHitEffects zdefiniowanej w Twoim zmodyfikowanym vDamage.cs + if (_onStartReceiveDamage != null && !damage.ignoreAllHitEffects) + { + _onStartReceiveDamage.Invoke(damage); + } + + if (_currentHealth > 0 && !isImmortal) + { + _currentHealth -= damage.damageValue; + if (onChangeHealth != null) onChangeHealth.Invoke(_currentHealth); + } + + // UĹĽyj flagi ignoreAllHitEffects zdefiniowanej w Twoim zmodyfikowanym vDamage.cs + if (damage.damageValue > 0 && _onReceiveDamage != null && !damage.ignoreAllHitEffects) + { + _onReceiveDamage.Invoke(damage); + } + + if (_currentHealth <= 0 && !_isDead) + { + isDead = true; } - if (damage.damageValue > 0) - onReceiveDamage.Invoke(damage); HandleCheckHealthEvents(); + + if (!_isDead && healthRecovery > 0 && !inHealthRecovery && gameObject.activeInHierarchy) + { + StartCoroutine(RecoverHealth()); + } } } protected virtual void HandleCheckHealthEvents() { - var events = checkHealthEvents.FindAll(e => (e.healthCompare == CheckHealthEvent.HealthCompare.Equals && currentHealth.Equals(e.healthToCheck)) || - (e.healthCompare == CheckHealthEvent.HealthCompare.HigherThan && currentHealth > (e.healthToCheck)) || - (e.healthCompare == CheckHealthEvent.HealthCompare.LessThan && currentHealth < (e.healthToCheck))); - - for (int i = 0; i < events.Count; i++) + if (checkHealthEvents == null) return; + for (int i = 0; i < checkHealthEvents.Count; i++) { - events[i].OnCheckHealth.Invoke(); + var e = checkHealthEvents[i]; + if (e == null || e.OnCheckHealth == null) continue; + bool conditionMet = false; + switch (e.healthCompare) + { + case CheckHealthEvent.HealthCompare.Equals: + conditionMet = Mathf.Approximately(_currentHealth, e.healthToCheck); + break; + case CheckHealthEvent.HealthCompare.HigherThan: + conditionMet = _currentHealth > e.healthToCheck; + break; + case CheckHealthEvent.HealthCompare.LessThan: + conditionMet = _currentHealth < e.healthToCheck; + break; + } + if (conditionMet) + { + e.OnCheckHealth.Invoke(); + } } - if (currentHealth < maxHealth && this.gameObject.activeInHierarchy && !inHealthRecovery) - StartCoroutine(RecoverHealth()); } [System.Serializable] public class CheckHealthEvent { - public int healthToCheck; + public float healthToCheck; public bool disableEventOnCheck; - - public enum HealthCompare - { - Equals, - HigherThan, - LessThan - } - + public enum HealthCompare { Equals, HigherThan, LessThan } public HealthCompare healthCompare = HealthCompare.Equals; - - public UnityEngine.Events.UnityEvent OnCheckHealth; - } - - [System.Serializable] - public class ValueChangedEvent : UnityEvent - { - + public UnityEvent OnCheckHealth = new UnityEvent(); } } -} +} \ No newline at end of file diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/ObjectDamage/vDamage.cs b/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/ObjectDamage/vDamage.cs index 3e636fea3..518f561e4 100644 --- a/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/ObjectDamage/vDamage.cs +++ b/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/ObjectDamage/vDamage.cs @@ -1,4 +1,5 @@ using UnityEngine; + namespace Invector { [System.Serializable] @@ -14,7 +15,7 @@ namespace Invector public bool ignoreDefense; [Tooltip("Activated Ragdoll when hit the Character")] public bool activeRagdoll; - [vHideInInspector("activeRagdoll"),Tooltip("Time to keep Ragdoll active")] + [vHideInInspector("activeRagdoll"), Tooltip("Time to keep Ragdoll active")] public float senselessTime; [HideInInspector] public Transform sender; @@ -22,7 +23,7 @@ namespace Invector public Transform receiver; [HideInInspector] public Vector3 hitPosition; - public bool hitReaction = true; + public bool hitReaction = true; // To pole Invectora pozostaje [HideInInspector] public int recoil_id = 0; [HideInInspector] @@ -30,32 +31,65 @@ namespace Invector public string damageType; [HideInInspector] public Vector3 force; + // >>> NASZE NOWE POLE <<< + [Tooltip("If true, will attempt to bypass standard hit reaction animations, sounds, and events like OnReceiveDamage.")] + public bool ignoreAllHitEffects = false; + public vDamage() { this.damageValue = 15; this.staminaBlockCost = 5; this.staminaRecoveryDelay = 1; this.hitReaction = true; + this.ignoreAllHitEffects = false; // DomyĹ›lnie efekty sÄ… wĹ‚Ä…czone } public vDamage(int value) { this.damageValue = value; this.hitReaction = true; + this.ignoreAllHitEffects = false; // DomyĹ›lnie efekty sÄ… wĹ‚Ä…czone } - public vDamage(int value, bool ignoreReaction) + // Ten konstruktor juĹĽ istniaĹ‚, zmodyfikujemy go lekko + // lub dodamy nowy, jeĹ›li chcemy zachować stary w niezmienionej formie. + // Dla uproszczenia, zmodyfikujmy ten, aby przyjmowaĹ‚ naszÄ… nowÄ… flagÄ™. + // JeĹ›li `ignoreReactionOrEffects` jest true, ustawiamy obie flagi. + public vDamage(int value, bool ignoreReactionAndAllEffects) { this.damageValue = value; - this.hitReaction = !ignoreReaction; - if (ignoreReaction) + this.ignoreAllHitEffects = ignoreReactionAndAllEffects; // Ustawiamy naszÄ… nowÄ… flagÄ™ + + if (ignoreReactionAndAllEffects) + { + this.hitReaction = false; // JeĹ›li ignorujemy wszystkie efekty, to reakcjÄ™ teĹĽ + this.recoil_id = -1; + this.reaction_id = -1; + } + else + { + this.hitReaction = true; // W przeciwnym razie standardowa reakcja + } + } + + // MoĹĽesz teĹĽ dodać bardziej specyficzny konstruktor tylko dla naszej flagi, + // jeĹ›li chcesz mieć wiÄ™kszÄ… kontrolÄ™: + /* + public vDamage(int value, bool setHitReaction, bool setIgnoreAllHitEffects) + { + this.damageValue = value; + this.hitReaction = setHitReaction; + this.ignoreAllHitEffects = setIgnoreAllHitEffects; + if (!setHitReaction) // JeĹ›li hitReaction jest false { this.recoil_id = -1; this.reaction_id = -1; - } + } } + */ - public vDamage(vDamage damage) + + public vDamage(vDamage damage) // Konstruktor kopiujÄ…cy { this.damageValue = damage.damageValue; this.staminaBlockCost = damage.staminaBlockCost; @@ -70,6 +104,9 @@ namespace Invector this.hitPosition = damage.hitPosition; this.senselessTime = damage.senselessTime; this.force = damage.force; + this.hitReaction = damage.hitReaction; // Skopiuj oryginalne pole hitReaction + // >>> SKOPIUJ NASZE NOWE POLE <<< + this.ignoreAllHitEffects = damage.ignoreAllHitEffects; } /// diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 1712a819c..6ea72e093 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -845,7 +845,7 @@ PlayerSettings: webWasm2023: 0 scriptingDefineSymbols: : UNITY_POST_PROCESSING_STACK_V2 - Android: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;USE_TIMELINE;USE_NEW_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;TMP_PRESENT;ENEMIES_DISABLED + Android: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;USE_TIMELINE;USE_NEW_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;TMP_PRESENT CloudRendering: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER GameCoreScarlett: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER @@ -857,12 +857,12 @@ PlayerSettings: QNX: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER ReservedCFE: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER Stadia: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER - Standalone: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;TOUCH_REACT;GAIA_2_PRESENT;INVECTOR_AI_TEMPLATE;UPPipeline;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENEMIES_DISABLED + Standalone: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;TOUCH_REACT;GAIA_2_PRESENT;INVECTOR_AI_TEMPLATE;UPPipeline;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3 VisionOS: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER WebGL: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER XboxOne: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER - iPhone: CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;GAIA_2_PRESENT;GAIA_PRO_PRESENT;UPPipeline;UNITY_POST_PROCESSING_STACK_V2;TOUCH_REACT;INVECTOR_AI_TEMPLATE;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_INVECTOR_INVENTORY;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENEMIES_DISABLED + iPhone: CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;GAIA_2_PRESENT;GAIA_PRO_PRESENT;UPPipeline;UNITY_POST_PROCESSING_STACK_V2;TOUCH_REACT;INVECTOR_AI_TEMPLATE;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_INVECTOR_INVENTORY;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3 tvOS: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER additionalCompilerArguments: {} platformArchitecture: {}