diff --git a/Assets/Hovl Studio/Magic effects pack/Prefabs/Character auras/Healing.prefab b/Assets/Hovl Studio/Magic effects pack/Prefabs/Character auras/Healing.prefab
index 403d87cf16bbc0c43928cebce08d848984ce3014..ff954f7a675d874783924be7227c6b0bb65d5359 100644
--- a/Assets/Hovl Studio/Magic effects pack/Prefabs/Character auras/Healing.prefab
+++ b/Assets/Hovl Studio/Magic effects pack/Prefabs/Character auras/Healing.prefab
@@ -25,12 +25,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2888190874679557127}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8144037599045065202}
- m_RootOrder: 1
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!198 &9061006324790107658
ParticleSystem:
@@ -39,19 +40,19 @@ ParticleSystem:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2888190874679557127}
- serializedVersion: 7
+ serializedVersion: 8
lengthInSec: 4
simulationSpeed: 1
stopAction: 0
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
+ emitterVelocityMode: 0
looping: 1
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 1
- useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@@ -250,6 +251,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -279,6 +281,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
startSize:
@@ -600,7 +603,9 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
randomizeRotationDirection: 0
+ gravitySource: 0
maxNumParticles: 1000
+ customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
rotation3D: 0
gravityModifier:
@@ -1337,6 +1342,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 3
minGradient:
@@ -1366,6 +1372,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
UVModule:
@@ -3586,6 +3593,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -3615,6 +3623,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
range: {x: 0, y: 1}
@@ -3992,6 +4001,7 @@ ParticleSystem:
m_RotationOrder: 4
minVertexDistance: 0.2
textureMode: 0
+ textureScale: {x: 1, y: 1}
ribbonCount: 1
shadowBias: 0.5
worldSpace: 0
@@ -4034,6 +4044,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4063,6 +4074,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
widthOverTrail:
@@ -4150,6 +4162,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4179,6 +4192,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
CustomDataModule:
@@ -4217,6 +4231,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4246,6 +4261,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel0: Color
@@ -4499,6 +4515,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4528,6 +4545,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel1: Color
@@ -4759,6 +4777,7 @@ ParticleSystemRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
@@ -4789,6 +4808,7 @@ ParticleSystemRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_RenderMode: 0
+ m_MeshDistribution: 0
m_SortMode: 0
m_MinParticleSize: 0
m_MaxParticleSize: 4
@@ -4801,17 +4821,23 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
- m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 1
m_ApplyActiveColorSpace: 1
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
+ m_UseCustomVertexStreams: 0
m_VertexStreams: 00010304
+ m_UseCustomTrailVertexStreams: 0
+ m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
+ m_MeshWeighting: 1
+ m_MeshWeighting1: 1
+ m_MeshWeighting2: 1
+ m_MeshWeighting3: 1
m_MaskInteraction: 0
--- !u!1 &7673815009525246064
GameObject:
@@ -4838,12 +4864,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7673815009525246064}
+ serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8144037599045065202}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!198 &5858841876001134857
ParticleSystem:
@@ -4852,19 +4879,19 @@ ParticleSystem:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7673815009525246064}
- serializedVersion: 7
+ serializedVersion: 8
lengthInSec: 4
simulationSpeed: 1
stopAction: 0
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
+ emitterVelocityMode: 0
looping: 1
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 1
- useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@@ -5063,6 +5090,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -5092,6 +5120,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
startSize:
@@ -5413,7 +5442,9 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
randomizeRotationDirection: 0
+ gravitySource: 0
maxNumParticles: 1000
+ customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
rotation3D: 0
gravityModifier:
@@ -6150,6 +6181,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -6179,6 +6211,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
UVModule:
@@ -8399,6 +8432,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -8428,6 +8462,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
range: {x: 0, y: 1}
@@ -8805,6 +8840,7 @@ ParticleSystem:
m_RotationOrder: 4
minVertexDistance: 0.2
textureMode: 0
+ textureScale: {x: 1, y: 1}
ribbonCount: 1
shadowBias: 0.5
worldSpace: 0
@@ -8847,6 +8883,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -8876,6 +8913,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
widthOverTrail:
@@ -8963,6 +9001,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -8992,6 +9031,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
CustomDataModule:
@@ -9030,6 +9070,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -9059,6 +9100,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel0: Color
@@ -9312,6 +9354,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -9341,6 +9384,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel1: Color
@@ -9572,6 +9616,7 @@ ParticleSystemRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
@@ -9602,6 +9647,7 @@ ParticleSystemRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_RenderMode: 1
+ m_MeshDistribution: 0
m_SortMode: 0
m_MinParticleSize: 0
m_MaxParticleSize: 0.5
@@ -9614,17 +9660,23 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
- m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 1
m_ApplyActiveColorSpace: 1
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
+ m_UseCustomVertexStreams: 0
m_VertexStreams: 00010304
+ m_UseCustomTrailVertexStreams: 0
+ m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
+ m_MeshWeighting: 1
+ m_MeshWeighting1: 1
+ m_MeshWeighting2: 1
+ m_MeshWeighting3: 1
m_MaskInteraction: 0
--- !u!1 &9017484664307500583
GameObject:
@@ -9651,15 +9703,16 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017484664307500583}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+ m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6473147762260024843}
- {fileID: 5329450421456403366}
m_Father: {fileID: 0}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &4678103677468820507
ParticleSystem:
m_ObjectHideFlags: 0
@@ -9667,19 +9720,19 @@ ParticleSystem:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9017484664307500583}
- serializedVersion: 7
- lengthInSec: 4
+ serializedVersion: 8
+ lengthInSec: 0.5
simulationSpeed: 1
stopAction: 0
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
- looping: 1
+ emitterVelocityMode: 0
+ looping: 0
prewarm: 0
playOnAwake: 1
useUnscaledTime: 0
autoRandomSeed: 1
- useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
@@ -9878,6 +9931,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -9907,6 +9961,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
startSize:
@@ -10228,7 +10283,9 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
randomizeRotationDirection: 0
+ gravitySource: 0
maxNumParticles: 1000
+ customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
rotation3D: 0
gravityModifier:
@@ -10965,6 +11022,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -10994,6 +11052,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
UVModule:
@@ -13214,6 +13273,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -13243,6 +13303,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
range: {x: 0, y: 1}
@@ -13620,6 +13681,7 @@ ParticleSystem:
m_RotationOrder: 4
minVertexDistance: 0.2
textureMode: 0
+ textureScale: {x: 1, y: 1}
ribbonCount: 1
shadowBias: 0.5
worldSpace: 0
@@ -13662,6 +13724,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -13691,6 +13754,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
widthOverTrail:
@@ -13778,6 +13842,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -13807,6 +13872,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
CustomDataModule:
@@ -13845,6 +13911,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -13874,6 +13941,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel0: Color
@@ -14127,6 +14195,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -14156,6 +14225,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
+ m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel1: Color
@@ -14387,6 +14457,7 @@ ParticleSystemRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
@@ -14417,6 +14488,7 @@ ParticleSystemRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_RenderMode: 0
+ m_MeshDistribution: 0
m_SortMode: 0
m_MinParticleSize: 0
m_MaxParticleSize: 0.5
@@ -14429,15 +14501,21 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
- m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 1
m_ApplyActiveColorSpace: 1
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
+ m_UseCustomVertexStreams: 0
m_VertexStreams: 00010304
+ m_UseCustomTrailVertexStreams: 0
+ m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
+ m_MeshWeighting: 1
+ m_MeshWeighting1: 1
+ m_MeshWeighting2: 1
+ m_MeshWeighting3: 1
m_MaskInteraction: 0
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
index b4b48a838026d9b9d41548543bcdfc03eb9d5bfe..7a405a2cfe01092daa23ba8b5071f5165a5f4288 100644
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@@ -5305,7 +5305,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6c83720df9acb89488dbf2c0dbd3ad78, type: 3}
m_Name:
m_EditorClassIdentifier:
- damagePerShot: 20
timeBetweenBullets: 0.12
range: 120
grenade: {fileID: 1105787354104060, guid: 41a4c48eef428174cb5039adb608d30c, type: 3}
@@ -5413,6 +5412,7 @@ Transform:
m_Children:
- {fileID: 400000}
- {fileID: 8762545912576295216}
+ - {fileID: 6694385228572080769}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &9500000
@@ -5448,7 +5448,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9b2268f9c7df8764aa2e92dbf55b5ae1, type: 3}
m_Name:
m_EditorClassIdentifier:
- speed: 6
--- !u!114 &11400004
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5469,6 +5468,7 @@ MonoBehaviour:
flashSpeed: 5
flashColour: {r: 1, g: 0, b: 0, a: 0.6666667}
godMode: 0
+ healParticles: {fileID: 7856989608856446824}
isDead: 0
--- !u!54 &5400000
Rigidbody:
@@ -11343,3 +11343,138 @@ Transform:
m_CorrespondingSourceObject: {fileID: 4072197404026632, guid: eedb02d5022eae8419dfe61ce8b8db75, type: 3}
m_PrefabInstance: {fileID: 3127538168943154591}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &3306298438331179891
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 400006}
+ m_Modifications:
+ - target: {fileID: 2888190874679557127, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4678103677468820507, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4678103677468820507, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: InitialModule.maxNumParticles
+ value: 1000
+ objectReference: {fileID: 0}
+ - target: {fileID: 4678103677468820507, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: InitialModule.startSpeed.scalar
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4678103677468820507, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: InitialModule.startLifetime.scalar
+ value: 0.1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5329450421456403366, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5329450421456403366, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5329450421456403366, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5858841876001134857, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: looping
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5858841876001134857, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: lengthInSec
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5858841876001134857, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: -90
+ objectReference: {fileID: 0}
+ - target: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9017484664307500583, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: m_Name
+ value: HealParticles
+ objectReference: {fileID: 0}
+ - target: {fileID: 9061006324790107658, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: looping
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9061006324790107658, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: lengthInSec
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 9061006324790107658, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+--- !u!4 &6694385228572080769 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 8144037599045065202, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ m_PrefabInstance: {fileID: 3306298438331179891}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &7856989608856446824 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 4678103677468820507, guid: 1245b8d2997d5b34fb1637be70a7eb05, type: 3}
+ m_PrefabInstance: {fileID: 3306298438331179891}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Quirky Series Ultimate/FREE/Prefabs/Gecko.prefab b/Assets/Quirky Series Ultimate/FREE/Prefabs/Gecko.prefab
index 6fc7f6f94f29a6b604108f8ff0d9c31304ac9d59..816e12ef6756cf0a003dcd477b16f81d4b425866 100644
--- a/Assets/Quirky Series Ultimate/FREE/Prefabs/Gecko.prefab
+++ b/Assets/Quirky Series Ultimate/FREE/Prefabs/Gecko.prefab
@@ -399,6 +399,7 @@ GameObject:
- component: {fileID: 557639743442462014}
- component: {fileID: 645013070751802181}
- component: {fileID: 244745341400185104}
+ - component: {fileID: 8511865338824139242}
m_Layer: 6
m_Name: Gecko
m_TagString: Untagged
@@ -712,6 +713,20 @@ MonoBehaviour:
idleTimeRange: {x: 0.5, y: 2}
psychicLevels: 0.65
timer: 0
+--- !u!114 &8511865338824139242
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6842458599697738422}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d356b5bc3af63da45a21cef7cf7ce28d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ healingAmount: 5
+ healingInterval: 2
--- !u!1 &7657876676996022963
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Pet/PetAttack.cs.meta b/Assets/Scripts/Pet/PetAttack.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..2b04900a8b0a572805e2c4af4a544ea3a4798c6f
--- /dev/null
+++ b/Assets/Scripts/Pet/PetAttack.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 859c371378ede044baa5c0fa3887b006
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Pet/PetHealer.cs b/Assets/Scripts/Pet/PetHealer.cs
new file mode 100644
index 0000000000000000000000000000000000000000..98e7447ec067c8906f659dc145495f38b2b54119
--- /dev/null
+++ b/Assets/Scripts/Pet/PetHealer.cs
@@ -0,0 +1,44 @@
+using UnityEngine;
+using System.Collections;
+using System.Diagnostics;
+
+namespace Nightmare
+{
+ public class PetHealer : MonoBehaviour
+ {
+ public int healingAmount = 5;
+ public float healingInterval = 2f;
+
+ private PlayerHealth playerHealth;
+
+ void Start()
+ {
+ // Assuming the player is tagged as "Player"
+ GameObject playerObject = GameObject.FindGameObjectWithTag("Player");
+ if (playerObject != null)
+ {
+ playerHealth = playerObject.GetComponent<PlayerHealth>();
+ }
+
+ if (playerHealth == null)
+ {
+ UnityEngine.Debug.LogError("PlayerHealth component not found on the player object.");
+ }
+
+ StartCoroutine(HealPlayerRoutine());
+ }
+
+ IEnumerator HealPlayerRoutine()
+ {
+ while (true)
+ {
+ yield return new WaitForSeconds(healingInterval);
+
+ if (playerHealth != null)
+ {
+ playerHealth.Heal(healingAmount);
+ }
+ }
+ }
+ }
+}
diff --git a/Assets/Scripts/Pet/PetHealer.cs.meta b/Assets/Scripts/Pet/PetHealer.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..ebb3c055ef28de0efec6bdc55d985931612b11e9
--- /dev/null
+++ b/Assets/Scripts/Pet/PetHealer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d356b5bc3af63da45a21cef7cf7ce28d
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Player/PlayerHealth.cs b/Assets/Scripts/Player/PlayerHealth.cs
index f1f60909723981b68b4f92b0c95c517d262a2d4c..f0e39358da28a3d4c3bddfa6a5e8dc94ccc7aaa5 100644
--- a/Assets/Scripts/Player/PlayerHealth.cs
+++ b/Assets/Scripts/Player/PlayerHealth.cs
@@ -15,6 +15,7 @@ namespace Nightmare
public float flashSpeed = 5f;
public Color flashColour = new Color(1f, 0f, 0f, 0.1f);
public bool godMode = false;
+ public ParticleSystem healParticles;
Animator anim;
AudioSource playerAudio;
@@ -119,5 +120,20 @@ namespace Nightmare
{
EventManager.TriggerEvent("GameOver");
}
+
+ public void Heal(int healAmount)
+ {
+ if (currentHealth + healAmount > startingHealth)
+ {
+ currentHealth = startingHealth;
+ healthSlider.value = currentHealth;
+ }
+ else
+ {
+ currentHealth += healAmount;
+ healthSlider.value = currentHealth;
+ }
+ healParticles.Play();
+ }
}
}
\ No newline at end of file