diff --git a/Assets/Fonts/IMMORTAL SDF.mat b/Assets/Fonts/IMMORTAL SDF.mat index a894aba73..407f9d32b 100644 --- a/Assets/Fonts/IMMORTAL SDF.mat +++ b/Assets/Fonts/IMMORTAL SDF.mat @@ -71,7 +71,7 @@ Material: - _OutlineWidth: 1.2 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 0.37243947 + - _ScaleRatioA: 0.3724395 - _ScaleRatioB: 0 - _ScaleRatioC: 0 - _ScaleX: 1 diff --git a/Assets/Meshes/Terrain/Terrain_Land01.asset b/Assets/Meshes/Terrain/Terrain_Land01.asset index 67328fd3d..d23e37fb8 100644 Binary files a/Assets/Meshes/Terrain/Terrain_Land01.asset and b/Assets/Meshes/Terrain/Terrain_Land01.asset differ diff --git a/Assets/Meshes/scroll/scrollRT.renderTexture b/Assets/Meshes/scroll/scrollRT.renderTexture index c1f39742d..31b6a8429 100644 --- a/Assets/Meshes/scroll/scrollRT.renderTexture +++ b/Assets/Meshes/scroll/scrollRT.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 1048 - m_Height: 588 + m_Width: 2778 + m_Height: 1284 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 0 diff --git a/Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset b/Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset index 3c81f8591..06f29f50c 100644 --- a/Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset +++ b/Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset @@ -16,5 +16,5 @@ MonoBehaviour: playmakerVersion: showWelcomeScreen: 0 showUpgradeGuide: 0 - lastAutoUpdateSignature: 2021.3.32f1__D:/projects/BeYond/BeyondGit/Assets__0.0.0.0 + lastAutoUpdateSignature: 2021.3.45f1__/Users/marcin/projects/beyondGit/Assets__0.0.0.0 useLegacyNetworking: 0 diff --git a/Assets/Prefabs/Destructable/Red_CrystalDestroy_Blue.prefab b/Assets/Prefabs/Destructable/Red_CrystalDestroy_Blue.prefab index 26aaf0592..19091ec4e 100644 --- a/Assets/Prefabs/Destructable/Red_CrystalDestroy_Blue.prefab +++ b/Assets/Prefabs/Destructable/Red_CrystalDestroy_Blue.prefab @@ -688,6 +688,7 @@ GameObject: - component: {fileID: 3869613308989366528} - component: {fileID: 3869613308989366529} - component: {fileID: 3869613308989366530} + - component: {fileID: 7154987622177331907} m_Layer: 30 m_Name: Red_CrystalDestroy_Blue m_TagString: Obstacle @@ -937,10 +938,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 - m_prefabToSpawn: - - {fileID: 7268478284668698993, guid: a7e5772ed53420341bcc2a4552d4b142, type: 3} + m_objectsToSpawn: [] + m_minObjectsToSpawn: 1 + m_maxObjectsToSpawn: 2 m_spawnPoint: {fileID: 0} explosiveDamage: 5 + randomPositionOffset: 0.2 points: 20 --- !u!65 &3869613308989366530 BoxCollider: @@ -955,6 +958,25 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1.1153543, y: 2.6258202, z: 1.1637211} m_Center: {x: -0.10402425, y: 1.0240772, z: -0.0051041334} +--- !u!114 &7154987622177331907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5752606297094980560} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03526e258566dc247a4eb8525aeeb667, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + m_mode: 1 + m_destroyMode: 0 + m_destroyedVersionPrefab: {fileID: 0} --- !u!1 &5770632220772807102 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Destructable/Red_CrystalDestroy_Light.prefab b/Assets/Prefabs/Destructable/Red_CrystalDestroy_Light.prefab index bd32b912d..a2df1c032 100644 --- a/Assets/Prefabs/Destructable/Red_CrystalDestroy_Light.prefab +++ b/Assets/Prefabs/Destructable/Red_CrystalDestroy_Light.prefab @@ -656,6 +656,7 @@ GameObject: - component: {fileID: 5682199500652998238} - component: {fileID: 5682199500652998237} - component: {fileID: 5155761497253474749} + - component: {fileID: 7296775603906084403} m_Layer: 30 m_Name: Red_CrystalDestroy_Light m_TagString: Obstacle @@ -905,8 +906,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 - m_prefabToSpawn: - - {fileID: 7268478284668698993, guid: fdf1f78f87e1c22449aaa919466f4d59, type: 3} m_objectsToSpawn: - prefab: {fileID: 7268478284668698993, guid: fdf1f78f87e1c22449aaa919466f4d59, type: 3} @@ -953,6 +952,25 @@ LODGroup: - renderer: {fileID: 2155389025053592481} - renderer: {fileID: 4115340425943094666} m_Enabled: 1 +--- !u!114 &7296775603906084403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3800411813237492879} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03526e258566dc247a4eb8525aeeb667, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: CRYSTAL_0 + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + m_mode: 1 + m_destroyMode: 0 + m_destroyedVersionPrefab: {fileID: 0} --- !u!1 &5996119916194029654 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Build.asset b/Assets/Resources/Build.asset index d9923a4ad..dd7051420 100644 --- a/Assets/Resources/Build.asset +++ b/Assets/Resources/Build.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e7af411c873524f6ba73fa8f5aa07217, type: 3} m_Name: Build m_EditorClassIdentifier: - version: 2898 + version: 2906 path: '/Users/marcin/projects/beYond ' diff --git a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity index 03c09a84d..2c435e857 100644 --- a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity +++ b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity @@ -2349,7 +2349,7 @@ PrefabInstance: - target: {fileID: 7076128167023856161, guid: 0b3e1f0239d23ce439870753c33af406, type: 3} propertyPath: m_RootOrder - value: 87 + value: 86 objectReference: {fileID: 0} - target: {fileID: 7076128167023856161, guid: 0b3e1f0239d23ce439870753c33af406, type: 3} @@ -22608,6 +22608,170 @@ Transform: type: 3} m_PrefabInstance: {fileID: 117455936} m_PrefabAsset: {fileID: 0} +--- !u!43 &117703945 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 10 + 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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + 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: 7.5, y: 7.5, z: 9} + m_MeshUsageFlags: 0 + 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 &117959536 stripped Transform: m_CorrespondingSourceObject: {fileID: 5893577156073015576, guid: ce0220777ea36aa409114ac849be0739, @@ -27561,6 +27725,11 @@ PrefabInstance: propertyPath: m_minObjectsToSpawn value: 2 objectReference: {fileID: 0} + - target: {fileID: 7296775603906084403, guid: 3479ec0f47f6e1e489d740356b02bbe4, + type: 3} + propertyPath: m_key + value: Red_CrystalDestroy_Light5_275132 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3479ec0f47f6e1e489d740356b02bbe4, type: 3} --- !u!4 &143841066 stripped @@ -43188,7 +43357,7 @@ PrefabInstance: - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} propertyPath: m_RootOrder - value: 70 + value: 69 objectReference: {fileID: 0} - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} @@ -47544,7 +47713,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 98 + value: 97 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -53342,7 +53511,7 @@ PrefabInstance: - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} propertyPath: m_RootOrder - value: 131 + value: 130 objectReference: {fileID: 0} - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} @@ -54077,7 +54246,7 @@ PrefabInstance: - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} propertyPath: m_RootOrder - value: 116 + value: 115 objectReference: {fileID: 0} - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} @@ -58146,7 +58315,7 @@ PrefabInstance: - target: {fileID: 6743559165620506787, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} propertyPath: m_RootOrder - value: 62 + value: 61 objectReference: {fileID: 0} - target: {fileID: 6743559165620506787, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} @@ -61459,7 +61628,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 112 + value: 111 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -62366,66 +62535,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 333610129} m_PrefabAsset: {fileID: 0} ---- !u!21 &333727359 -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_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - 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: [] --- !u!4 &333814712 stripped Transform: m_CorrespondingSourceObject: {fileID: 7010295873574804791, guid: 04725a9f715fb81489cf487693f4505c, @@ -64631,7 +64740,7 @@ PrefabInstance: - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} propertyPath: m_RootOrder - value: 107 + value: 106 objectReference: {fileID: 0} - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} @@ -66643,7 +66752,7 @@ PrefabInstance: - target: {fileID: 1059799105576019692, guid: 085ba9a312c11a942ab1bbbdd90f610e, type: 3} propertyPath: m_RootOrder - value: 78 + value: 77 objectReference: {fileID: 0} - target: {fileID: 1059799105576019692, guid: 085ba9a312c11a942ab1bbbdd90f610e, type: 3} @@ -68014,7 +68123,7 @@ PrefabInstance: - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} propertyPath: m_RootOrder - value: 117 + value: 116 objectReference: {fileID: 0} - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} @@ -80204,7 +80313,7 @@ PrefabInstance: - target: {fileID: 7056881920808824410, guid: 1c273a80690e2224fa08113e83d3daaf, type: 3} propertyPath: m_RootOrder - value: 66 + value: 65 objectReference: {fileID: 0} - target: {fileID: 7056881920808824410, guid: 1c273a80690e2224fa08113e83d3daaf, type: 3} @@ -80561,7 +80670,7 @@ PrefabInstance: - target: {fileID: 6685983510759542398, guid: bfb5a3b7bbfc6974cba96e9640ff04ee, type: 3} propertyPath: m_RootOrder - value: 86 + value: 85 objectReference: {fileID: 0} - target: {fileID: 6685983510759542398, guid: bfb5a3b7bbfc6974cba96e9640ff04ee, type: 3} @@ -81161,7 +81270,7 @@ PrefabInstance: - target: {fileID: 7493040091443043539, guid: 5e5be0791a7b6714da0e091ecd45d36a, type: 3} propertyPath: m_RootOrder - value: 80 + value: 79 objectReference: {fileID: 0} - target: {fileID: 7493040091443043539, guid: 5e5be0791a7b6714da0e091ecd45d36a, type: 3} @@ -81969,7 +82078,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 111 + value: 110 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -82446,6 +82555,66 @@ Transform: type: 3} m_PrefabInstance: {fileID: 260168325} m_PrefabAsset: {fileID: 0} +--- !u!21 &463210118 +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_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + 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: [] --- !u!1 &463428658 GameObject: m_ObjectHideFlags: 0 @@ -84567,7 +84736,7 @@ PrefabInstance: - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, type: 3} propertyPath: m_RootOrder - value: 74 + value: 73 objectReference: {fileID: 0} - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, type: 3} @@ -89722,7 +89891,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 121 + value: 120 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -91874,7 +92043,7 @@ PrefabInstance: - target: {fileID: 6743559165620506787, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} propertyPath: m_RootOrder - value: 68 + value: 67 objectReference: {fileID: 0} - target: {fileID: 6743559165620506787, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} @@ -104520,7 +104689,7 @@ PrefabInstance: - target: {fileID: 6045757772240389101, guid: ab71b578771f1c14d87208676659ad13, type: 3} propertyPath: m_RootOrder - value: 77 + value: 76 objectReference: {fileID: 0} - target: {fileID: 6045757772240389101, guid: ab71b578771f1c14d87208676659ad13, type: 3} @@ -108260,7 +108429,7 @@ PrefabInstance: - target: {fileID: 6834609825192720160, guid: d419e125d0071454c82743d15356b5f1, type: 3} propertyPath: m_RootOrder - value: 126 + value: 125 objectReference: {fileID: 0} - target: {fileID: 6834609825192720160, guid: d419e125d0071454c82743d15356b5f1, type: 3} @@ -114360,7 +114529,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 128 + value: 127 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -118840,7 +119009,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 89 + value: 88 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -120818,7 +120987,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 114 + value: 113 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -129592,7 +129761,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 122 + value: 121 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -137120,7 +137289,7 @@ PrefabInstance: - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, type: 3} propertyPath: m_RootOrder - value: 134 + value: 133 objectReference: {fileID: 0} - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, type: 3} @@ -138431,7 +138600,7 @@ PrefabInstance: - target: {fileID: 6743559165620506787, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} propertyPath: m_RootOrder - value: 63 + value: 62 objectReference: {fileID: 0} - target: {fileID: 6743559165620506787, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} @@ -146504,7 +146673,7 @@ PrefabInstance: - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} propertyPath: m_RootOrder - value: 102 + value: 101 objectReference: {fileID: 0} - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} @@ -155525,7 +155694,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 118 + value: 117 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -164666,7 +164835,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 105 + value: 104 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -166093,7 +166262,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 91 + value: 90 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -173003,7 +173172,7 @@ PrefabInstance: - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} propertyPath: m_RootOrder - value: 106 + value: 105 objectReference: {fileID: 0} - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} @@ -173682,7 +173851,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 127 + value: 126 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -174190,7 +174359,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 96 + value: 95 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -178728,7 +178897,7 @@ PrefabInstance: - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} propertyPath: m_RootOrder - value: 69 + value: 68 objectReference: {fileID: 0} - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} @@ -183864,7 +184033,7 @@ PrefabInstance: - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} propertyPath: m_RootOrder - value: 82 + value: 81 objectReference: {fileID: 0} - target: {fileID: 5091557404688503482, guid: c95dfd3cf8772004c8b920dfb24fe382, type: 3} @@ -184652,7 +184821,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 90 + value: 89 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -185452,7 +185621,7 @@ PrefabInstance: - target: {fileID: 4142922427689049768, guid: 8414fac93f715b346a862424967936f9, type: 3} propertyPath: m_RootOrder - value: 83 + value: 82 objectReference: {fileID: 0} - target: {fileID: 4142922427689049768, guid: 8414fac93f715b346a862424967936f9, type: 3} @@ -186183,170 +186352,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1098138407} m_PrefabAsset: {fileID: 0} ---- !u!43 &1098419939 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 10 - 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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - 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: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - 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 &1098794382 stripped Transform: m_CorrespondingSourceObject: {fileID: 6189233687218265091, guid: d99a6602251f5ea41bda7b95ff87f5d3, @@ -190995,7 +191000,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 123 + value: 122 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -191887,7 +191892,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 92 + value: 91 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -192938,7 +192943,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 109 + value: 108 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -200089,35 +200094,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1181326806} m_PrefabAsset: {fileID: 0} ---- !u!21 &1181443743 -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_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] --- !u!1001 &1183711412 PrefabInstance: m_ObjectHideFlags: 0 @@ -200896,7 +200872,7 @@ PrefabInstance: - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, type: 3} propertyPath: m_RootOrder - value: 72 + value: 71 objectReference: {fileID: 0} - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, type: 3} @@ -205226,7 +205202,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 130 + value: 129 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -207974,7 +207950,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 119 + value: 118 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -212752,7 +212728,7 @@ PrefabInstance: - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} propertyPath: m_RootOrder - value: 101 + value: 100 objectReference: {fileID: 0} - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} @@ -215841,7 +215817,7 @@ PrefabInstance: - target: {fileID: 706105354611872021, guid: a0153ee12bc47134bba42b670fe4a2d1, type: 3} propertyPath: m_RootOrder - value: 133 + value: 132 objectReference: {fileID: 0} - target: {fileID: 706105354611872021, guid: a0153ee12bc47134bba42b670fe4a2d1, type: 3} @@ -217160,7 +217136,7 @@ PrefabInstance: - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} propertyPath: m_RootOrder - value: 120 + value: 119 objectReference: {fileID: 0} - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} @@ -224070,7 +224046,7 @@ PrefabInstance: - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} propertyPath: m_RootOrder - value: 73 + value: 72 objectReference: {fileID: 0} - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} @@ -224174,7 +224150,7 @@ PrefabInstance: - target: {fileID: 2590736059692589413, guid: 3d11df1c72e008049b85fc0fa773786f, type: 3} propertyPath: m_RootOrder - value: 132 + value: 131 objectReference: {fileID: 0} - target: {fileID: 2590736059692589413, guid: 3d11df1c72e008049b85fc0fa773786f, type: 3} @@ -224263,7 +224239,7 @@ PrefabInstance: - target: {fileID: 6743559165620506787, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} propertyPath: m_RootOrder - value: 67 + value: 66 objectReference: {fileID: 0} - target: {fileID: 6743559165620506787, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} @@ -225909,7 +225885,7 @@ PrefabInstance: - target: {fileID: 6092136001238120400, guid: 249f153543576874e84df57b8bb314cd, type: 3} propertyPath: m_RootOrder - value: 79 + value: 78 objectReference: {fileID: 0} - target: {fileID: 6092136001238120400, guid: 249f153543576874e84df57b8bb314cd, type: 3} @@ -226604,7 +226580,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 113 + value: 112 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -229542,7 +229518,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 94 + value: 93 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -230158,7 +230134,7 @@ PrefabInstance: - target: {fileID: 594356830411810354, guid: 23a159559436b754a8829a1c7244eb31, type: 3} propertyPath: m_RootOrder - value: 75 + value: 74 objectReference: {fileID: 0} - target: {fileID: 594356830411810354, guid: 23a159559436b754a8829a1c7244eb31, type: 3} @@ -233142,6 +233118,35 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1430453293} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!21 &1430885128 +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_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3002 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _HeightFogGlobal: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _TITLE: 1 + - _TransparentQueue: 3000 + m_Colors: [] + m_BuildTextureStacks: [] --- !u!4 &1430933389 stripped Transform: m_CorrespondingSourceObject: {fileID: 4142922427689049768, guid: 8414fac93f715b346a862424967936f9, @@ -242454,7 +242459,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 93 + value: 92 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -252380,7 +252385,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 115 + value: 114 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -256017,7 +256022,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 108 + value: 107 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -260014,7 +260019,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 104 + value: 103 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -261199,7 +261204,7 @@ PrefabInstance: - target: {fileID: 6834609825192720160, guid: d419e125d0071454c82743d15356b5f1, type: 3} propertyPath: m_RootOrder - value: 129 + value: 128 objectReference: {fileID: 0} - target: {fileID: 6834609825192720160, guid: d419e125d0071454c82743d15356b5f1, type: 3} @@ -264958,7 +264963,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 97 + value: 96 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -267219,7 +267224,7 @@ PrefabInstance: - target: {fileID: 6743559165620506787, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} propertyPath: m_RootOrder - value: 65 + value: 64 objectReference: {fileID: 0} - target: {fileID: 6743559165620506787, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} @@ -278899,7 +278904,7 @@ PrefabInstance: - target: {fileID: 6834609825192720160, guid: d419e125d0071454c82743d15356b5f1, type: 3} propertyPath: m_RootOrder - value: 124 + value: 123 objectReference: {fileID: 0} - target: {fileID: 6834609825192720160, guid: d419e125d0071454c82743d15356b5f1, type: 3} @@ -280340,7 +280345,7 @@ PrefabInstance: - target: {fileID: 1441258328269688218, guid: 3450e11f953476a47a0d829a64eff2a2, type: 3} propertyPath: m_RootOrder - value: 76 + value: 75 objectReference: {fileID: 0} - target: {fileID: 1441258328269688218, guid: 3450e11f953476a47a0d829a64eff2a2, type: 3} @@ -285987,6 +285992,11 @@ PrefabInstance: value: objectReference: {fileID: 7268478284668698993, guid: 9c36c2ff7b444794f92ea1981d33a503, type: 3} + - target: {fileID: 7296775603906084403, guid: 3479ec0f47f6e1e489d740356b02bbe4, + type: 3} + propertyPath: m_key + value: Red_CrystalDestroy_Light_275134 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3479ec0f47f6e1e489d740356b02bbe4, type: 3} --- !u!4 &1714684643 stripped @@ -286479,7 +286489,7 @@ PrefabInstance: - target: {fileID: 6743559165620506787, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} propertyPath: m_RootOrder - value: 64 + value: 63 objectReference: {fileID: 0} - target: {fileID: 6743559165620506787, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} @@ -289143,7 +289153,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 99 + value: 98 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -294552,8 +294562,177 @@ PrefabInstance: propertyPath: randomPositionOffset value: 0.2 objectReference: {fileID: 0} + - target: {fileID: 7296775603906084403, guid: 3479ec0f47f6e1e489d740356b02bbe4, + type: 3} + propertyPath: m_key + value: Red_CrystalDestroy_Light4_275140 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3479ec0f47f6e1e489d740356b02bbe4, type: 3} +--- !u!43 &1787429623 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 10 + 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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + 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: 7.5, y: 7.5, z: 9} + m_MeshUsageFlags: 0 + 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 &1787686818 stripped Transform: m_CorrespondingSourceObject: {fileID: 7911630421611460049, guid: 2606ce401d9547348ae06dc240a0c4ab, @@ -296684,7 +296863,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 110 + value: 109 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -307149,7 +307328,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 88 + value: 87 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -316947,170 +317126,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1941886931} m_PrefabAsset: {fileID: 0} ---- !u!43 &1942162418 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 10 - 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: 7.5, y: 7.5, 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: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - 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: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - 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 &1942835315 PrefabInstance: m_ObjectHideFlags: 0 @@ -324951,7 +324966,7 @@ PrefabInstance: - target: {fileID: 6092136001238120400, guid: 249f153543576874e84df57b8bb314cd, type: 3} propertyPath: m_RootOrder - value: 81 + value: 80 objectReference: {fileID: 0} - target: {fileID: 6092136001238120400, guid: 249f153543576874e84df57b8bb314cd, type: 3} @@ -325361,7 +325376,7 @@ PrefabInstance: - target: {fileID: 4142922427689049768, guid: 8414fac93f715b346a862424967936f9, type: 3} propertyPath: m_RootOrder - value: 84 + value: 83 objectReference: {fileID: 0} - target: {fileID: 4142922427689049768, guid: 8414fac93f715b346a862424967936f9, type: 3} @@ -331042,7 +331057,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 95 + value: 94 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -338507,7 +338522,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 103 + value: 102 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -342357,7 +342372,7 @@ PrefabInstance: - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} propertyPath: m_RootOrder - value: 125 + value: 124 objectReference: {fileID: 0} - target: {fileID: 6433356455295225651, guid: 9c58eb0b3ebb9b74ca1f78df698b84c5, type: 3} @@ -404056,7 +404071,7 @@ PrefabInstance: - target: {fileID: 7876551899817066816, guid: 78de1ac34a61b244aa70c57a0af080a0, type: 3} propertyPath: m_RootOrder - value: 85 + value: 84 objectReference: {fileID: 0} - target: {fileID: 7876551899817066816, guid: 78de1ac34a61b244aa70c57a0af080a0, type: 3} @@ -434024,7 +434039,7 @@ PrefabInstance: - target: {fileID: 6338559650421939370, guid: 7ac34771240a2d247a17fe8bfe1336a9, type: 3} propertyPath: m_RootOrder - value: 71 + value: 70 objectReference: {fileID: 0} - target: {fileID: 6338559650421939370, guid: 7ac34771240a2d247a17fe8bfe1336a9, type: 3} @@ -438727,7 +438742,7 @@ PrefabInstance: - target: {fileID: 5215963843144613802, guid: 2a871b06bd936ea4a91a4276e8a2dcd9, type: 3} propertyPath: m_RootOrder - value: 135 + value: 134 objectReference: {fileID: 0} - target: {fileID: 5215963843144613802, guid: 2a871b06bd936ea4a91a4276e8a2dcd9, type: 3} @@ -439086,7 +439101,7 @@ PrefabInstance: - target: {fileID: 5682199500652998236, guid: 3479ec0f47f6e1e489d740356b02bbe4, type: 3} propertyPath: m_RootOrder - value: 100 + value: 99 objectReference: {fileID: 0} - target: {fileID: 5682199500652998236, guid: 3479ec0f47f6e1e489d740356b02bbe4, type: 3} @@ -439195,6 +439210,11 @@ PrefabInstance: propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument value: 1 objectReference: {fileID: 0} + - target: {fileID: 7296775603906084403, guid: 3479ec0f47f6e1e489d740356b02bbe4, + type: 3} + propertyPath: m_key + value: Red_CrystalDestroy_Light1_275136 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3479ec0f47f6e1e489d740356b02bbe4, type: 3} --- !u!1001 &6030635298764962815 @@ -474533,6 +474553,11 @@ PrefabInstance: propertyPath: m_Name value: Red_CrystalDestroy_Blue objectReference: {fileID: 0} + - target: {fileID: 7154987622177331907, guid: 1b019a50523771e43825128021cd8e07, + type: 3} + propertyPath: m_key + value: Red_CrystalDestroy_Blue_280678 + objectReference: {fileID: 0} - target: {fileID: 8358461290340190900, guid: 1b019a50523771e43825128021cd8e07, type: 3} propertyPath: m_IsActive