diff --git a/Assets/Materials/Props/ExplodingBarrel.mat b/Assets/Materials/Props/ExplodingBarrel.mat index c92484f42..048d5bfc1 100644 --- a/Assets/Materials/Props/ExplodingBarrel.mat +++ b/Assets/Materials/Props/ExplodingBarrel.mat @@ -8,12 +8,12 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ExplodingBarrel - m_Shader: {fileID: -6465566751694194690, guid: f8ec4cafbe9538b4aa600770a5a8bf02, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 47658d4b501a04a40a24c4eec631a846, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - MAIN_LIGHT_CALCULATE_SHADOWS - - _MAIN_LIGHT_SHADOWS_CASCADE + - _SHADOWS_CASCADE - _SHADOWS_SOFT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -58,6 +58,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Metallic_Map: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _Metallic_Texture: m_Texture: {fileID: 2800000, guid: a352cc10e02c3b74fab6d96cbf170298, type: 3} m_Scale: {x: 1, y: 1} @@ -122,9 +126,11 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _PulseStrength: 0.7 - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _SHADOWS_CASCADE: 1 - _SHADOWS_SOFT: 1 - _Shadow_Texture: 0 - _Smoothness: 0.51 @@ -142,6 +148,7 @@ Material: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _PulseColor: {r: 0.9339623, g: 0.20617655, b: 0.20617655, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _Texture_Tiling: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/Interactables/ExplodingBarrel.prefab b/Assets/Prefabs/Interactables/ExplodingBarrel.prefab index e0e810f68..1de039149 100644 --- a/Assets/Prefabs/Interactables/ExplodingBarrel.prefab +++ b/Assets/Prefabs/Interactables/ExplodingBarrel.prefab @@ -1,5 +1,227 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &377742622784135468 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4694568006731126422} + - component: {fileID: 6540107188175794531} + - component: {fileID: 4810777316562900307} + m_Layer: 0 + m_Name: DustOff (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4694568006731126422 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 377742622784135468} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.155, y: 1.169, z: -0.918} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7135334762222197563} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!2083052967 &6540107188175794531 +VisualEffect: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 377742622784135468} + m_Enabled: 1 + m_Asset: {fileID: 8926484042661614526, guid: 10b1b283682a5b441aedc0c79863f949, type: 3} + m_InitialEventName: OnPlay + m_InitialEventNameOverriden: 0 + m_StartSeed: 0 + m_ResetSeedOnPlay: 1 + m_AllowInstancing: 1 + m_ResourceVersion: 1 + m_PropertySheet: + m_Float: + m_Array: [] + m_Vector2f: + m_Array: [] + m_Vector3f: + m_Array: [] + m_Vector4f: + m_Array: [] + m_Uint: + m_Array: [] + m_Int: + m_Array: [] + m_Matrix4x4f: + m_Array: [] + m_AnimationCurve: + m_Array: [] + m_Gradient: + m_Array: [] + m_NamedObject: + m_Array: [] + m_Bool: + m_Array: [] +--- !u!73398921 &4810777316562900307 +VFXRenderer: + serializedVersion: 1 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 377742622784135468} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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 +--- !u!1 &1036079300693734787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 148497133627080135} + - component: {fileID: 4417408986711109654} + - component: {fileID: 6229438252418586969} + m_Layer: 0 + m_Name: DustOff + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &148497133627080135 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1036079300693734787} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.321, y: 1.952, z: 0.476} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7135334762222197563} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!2083052967 &4417408986711109654 +VisualEffect: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1036079300693734787} + m_Enabled: 1 + m_Asset: {fileID: 8926484042661614526, guid: 10b1b283682a5b441aedc0c79863f949, type: 3} + m_InitialEventName: OnPlay + m_InitialEventNameOverriden: 0 + m_StartSeed: 0 + m_ResetSeedOnPlay: 1 + m_AllowInstancing: 1 + m_ResourceVersion: 1 + m_PropertySheet: + m_Float: + m_Array: [] + m_Vector2f: + m_Array: [] + m_Vector3f: + m_Array: [] + m_Vector4f: + m_Array: [] + m_Uint: + m_Array: [] + m_Int: + m_Array: [] + m_Matrix4x4f: + m_Array: [] + m_AnimationCurve: + m_Array: [] + m_Gradient: + m_Array: [] + m_NamedObject: + m_Array: [] + m_Bool: + m_Array: [] +--- !u!73398921 &6229438252418586969 +VFXRenderer: + serializedVersion: 1 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1036079300693734787} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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 --- !u!1 &1198066077926093598 GameObject: m_ObjectHideFlags: 0 @@ -35,6 +257,9 @@ Transform: - {fileID: 1845071784657073821} - {fileID: 6664999429958091405} - {fileID: 2110111142015496130} + - {fileID: 148497133627080135} + - {fileID: 4694568006731126422} + - {fileID: 3438866000413540673} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -57,6 +282,10 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 4294967295 explosionMarkLifeTime: 60 + dynamiteSmokes: + - {fileID: 4417408986711109654} + - {fileID: 6540107188175794531} + - {fileID: 6841871061930912810} --- !u!114 &7022526964992712187 MonoBehaviour: m_ObjectHideFlags: 0 @@ -173,6 +402,117 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &6105547331134920815 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3438866000413540673} + - component: {fileID: 6841871061930912810} + - component: {fileID: 4667256305059428081} + m_Layer: 0 + m_Name: DustOff (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3438866000413540673 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6105547331134920815} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.94, y: 0.443, z: 0.046} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7135334762222197563} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!2083052967 &6841871061930912810 +VisualEffect: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6105547331134920815} + m_Enabled: 1 + m_Asset: {fileID: 8926484042661614526, guid: 10b1b283682a5b441aedc0c79863f949, type: 3} + m_InitialEventName: OnPlay + m_InitialEventNameOverriden: 0 + m_StartSeed: 0 + m_ResetSeedOnPlay: 1 + m_AllowInstancing: 1 + m_ResourceVersion: 1 + m_PropertySheet: + m_Float: + m_Array: [] + m_Vector2f: + m_Array: [] + m_Vector3f: + m_Array: [] + m_Vector4f: + m_Array: [] + m_Uint: + m_Array: [] + m_Int: + m_Array: [] + m_Matrix4x4f: + m_Array: [] + m_AnimationCurve: + m_Array: [] + m_Gradient: + m_Array: [] + m_NamedObject: + m_Array: [] + m_Bool: + m_Array: [] +--- !u!73398921 &4667256305059428081 +VFXRenderer: + serializedVersion: 1 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6105547331134920815} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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 --- !u!1 &7635192815534540289 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Interactables/ExplodingBarrel.cs b/Assets/Scripts/Interactables/ExplodingBarrel.cs index 6408baf3c..d57b9c52f 100644 --- a/Assets/Scripts/Interactables/ExplodingBarrel.cs +++ b/Assets/Scripts/Interactables/ExplodingBarrel.cs @@ -1,6 +1,7 @@ using System.Linq; using UnityEngine; using UnityEngine.Rendering.Universal; +using UnityEngine.VFX; public class ExplodingBarrel : MonoBehaviour { @@ -14,6 +15,8 @@ public class ExplodingBarrel : MonoBehaviour [SerializeField] private float explosionMarkLifeTime = 60; + [SerializeField] private VisualEffect[] dynamiteSmokes; + private HealthController healthController; private bool isAlive = true; @@ -36,6 +39,7 @@ private void Explode(HealthController controller, float damage, DamageInfo info) return; barrelMesh.enabled = false; GetComponentsInChildren().ToList().ForEach(c => c.enabled = false); + dynamiteSmokes.ToList().ForEach(smoke => smoke.enabled = false); explosion.Explode(info.sourcePlayer); LeaveMark(); Destroy(gameObject, 4); diff --git a/Assets/VFX/DustOff.vfx b/Assets/VFX/DustOff.vfx index 438a203cb..997a874c6 100644 --- a/Assets/VFX/DustOff.vfx +++ b/Assets/VFX/DustOff.vfx @@ -17,10 +17,10 @@ MonoBehaviour: categories: [] uiBounds: serializedVersion: 2 - x: 710 - y: -379 - width: 657 - height: 1678 + x: 942 + y: -240 + width: 424 + height: 1630 --- !u!114 &114350483966674976 MonoBehaviour: m_ObjectHideFlags: 1 @@ -40,7 +40,6 @@ MonoBehaviour: - {fileID: 8926484042661614558} - {fileID: 8926484042661614583} - {fileID: 8926484042661614585} - - {fileID: 8926484042661614610} m_UIPosition: {x: 0, y: 0} m_UICollapsed: 1 m_UISuperCollapsed: 0 @@ -88,8 +87,8 @@ MonoBehaviour: m_UIIgnoredErrors: [] m_Parent: {fileID: 114350483966674976} m_Children: - - {fileID: 8926484042661614606} - m_UIPosition: {x: 941, y: -190} + - {fileID: 8926484042661614612} + m_UIPosition: {x: 942, y: -240} m_UICollapsed: 0 m_UISuperCollapsed: 0 m_InputSlots: [] @@ -97,9 +96,7 @@ MonoBehaviour: m_Label: Spawn system m_Data: {fileID: 8926484042661614595} m_InputFlowSlot: - - link: - - context: {fileID: 8926484042661614610} - slotIndex: 0 + - link: [] - link: [] m_OutputFlowSlot: - link: @@ -126,7 +123,7 @@ MonoBehaviour: m_Children: - {fileID: 8926484042661614569} - {fileID: 8926484042661614580} - m_UIPosition: {x: 941.3827, y: 114.57214} + m_UIPosition: {x: 942, y: 205} m_UICollapsed: 0 m_UISuperCollapsed: 0 m_InputSlots: @@ -473,7 +470,7 @@ MonoBehaviour: - {fileID: 8926484042661614583} - {fileID: 8926484042661614585} dataType: 0 - capacity: 32 + capacity: 150 stripCapacity: 16 particlePerStripCount: 16 needsComputeBounds: 0 @@ -902,7 +899,7 @@ MonoBehaviour: m_Type: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: 1 + m_SerializableObject: 0.5 m_Space: 2147483647 m_Property: name: A @@ -936,7 +933,7 @@ MonoBehaviour: m_Type: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: 1.2 + m_SerializableObject: 0.8 m_Space: 2147483647 m_Property: name: B @@ -960,7 +957,7 @@ MonoBehaviour: m_UIIgnoredErrors: [] m_Parent: {fileID: 114350483966674976} m_Children: [] - m_UIPosition: {x: 942, y: 548} + m_UIPosition: {x: 942, y: 639} m_UICollapsed: 0 m_UISuperCollapsed: 0 m_InputSlots: [] @@ -998,7 +995,7 @@ MonoBehaviour: - {fileID: 8926484042661614589} - {fileID: 8926484042661614591} - {fileID: 8926484042661614593} - m_UIPosition: {x: 942, y: 701} + m_UIPosition: {x: 942, y: 792} m_UICollapsed: 0 m_UISuperCollapsed: 0 m_InputSlots: @@ -1567,7 +1564,7 @@ MonoBehaviour: PublicKeyToken=b77a5c561934e089 m_Direction: 0 m_LinkedSlots: [] ---- !u!114 &8926484042661614606 +--- !u!114 &8926484042661614612 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1586,15 +1583,15 @@ MonoBehaviour: m_UICollapsed: 0 m_UISuperCollapsed: 0 m_InputSlots: - - {fileID: 8926484042661614607} - - {fileID: 8926484042661614608} + - {fileID: 8926484042661614619} + - {fileID: 8926484042661614614} m_OutputSlots: [] m_Disabled: 0 - m_ActivationSlot: {fileID: 8926484042661614609} - repeat: 0 + m_ActivationSlot: {fileID: 8926484042661614615} + repeat: 1 spawnMode: 0 delayMode: 0 ---- !u!114 &8926484042661614607 +--- !u!114 &8926484042661614614 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1612,23 +1609,23 @@ MonoBehaviour: m_UIPosition: {x: 0, y: 0} m_UICollapsed: 1 m_UISuperCollapsed: 0 - m_MasterSlot: {fileID: 8926484042661614607} + m_MasterSlot: {fileID: 8926484042661614614} m_MasterData: - m_Owner: {fileID: 8926484042661614606} + m_Owner: {fileID: 8926484042661614612} m_Value: m_Type: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: 32 + m_SerializableObject: 0.1 m_Space: 2147483647 m_Property: - name: Count + name: Delay m_serializedType: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_Direction: 0 m_LinkedSlots: [] ---- !u!114 &8926484042661614608 +--- !u!114 &8926484042661614615 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1637,7 +1634,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3} + m_Script: {fileID: 11500000, guid: b4c11ff25089a324daf359f4b0629b33, type: 3} m_Name: m_EditorClassIdentifier: m_UIIgnoredErrors: [] @@ -1646,23 +1643,23 @@ MonoBehaviour: m_UIPosition: {x: 0, y: 0} m_UICollapsed: 1 m_UISuperCollapsed: 0 - m_MasterSlot: {fileID: 8926484042661614608} + m_MasterSlot: {fileID: 8926484042661614615} m_MasterData: - m_Owner: {fileID: 8926484042661614606} + m_Owner: {fileID: 8926484042661614612} m_Value: m_Type: - m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + m_SerializableType: System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: 0 + m_SerializableObject: True m_Space: 2147483647 m_Property: - name: Delay + name: _vfx_enabled m_serializedType: - m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + m_SerializableType: System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_Direction: 0 m_LinkedSlots: [] ---- !u!114 &8926484042661614609 +--- !u!114 &8926484042661614619 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1671,7 +1668,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b4c11ff25089a324daf359f4b0629b33, type: 3} + m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3} m_Name: m_EditorClassIdentifier: m_UIIgnoredErrors: [] @@ -1680,69 +1677,19 @@ MonoBehaviour: m_UIPosition: {x: 0, y: 0} m_UICollapsed: 1 m_UISuperCollapsed: 0 - m_MasterSlot: {fileID: 8926484042661614609} + m_MasterSlot: {fileID: 8926484042661614619} m_MasterData: - m_Owner: {fileID: 8926484042661614606} + m_Owner: {fileID: 8926484042661614612} m_Value: m_Type: - m_SerializableType: System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: True + m_SerializableObject: 2 m_Space: 2147483647 m_Property: - name: _vfx_enabled + name: Count m_serializedType: - m_SerializableType: System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_Direction: 0 m_LinkedSlots: [] ---- !u!114 &8926484042661614610 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2461f61b3c026d54db1951a4e17ab20e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UIIgnoredErrors: [] - m_Parent: {fileID: 114350483966674976} - m_Children: [] - m_UIPosition: {x: 709, y: -379} - m_UICollapsed: 0 - m_UISuperCollapsed: 0 - m_InputSlots: [] - m_OutputSlots: [] - m_Label: - m_Data: {fileID: 8926484042661614611} - m_InputFlowSlot: - - link: [] - m_OutputFlowSlot: - - link: - - context: {fileID: 8926484042661614555} - slotIndex: 0 - eventName: OnPlay ---- !u!114 &8926484042661614611 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f68759077adc0b143b6e1c101e82065e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UIIgnoredErrors: [] - m_Parent: {fileID: 114350483966674976} - m_Children: [] - m_UIPosition: {x: 0, y: 0} - m_UICollapsed: 1 - m_UISuperCollapsed: 0 - title: - m_Owners: - - {fileID: 8926484042661614610}