diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index 8c84e893..1a5af398 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -4500,6 +4500,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 9b43747f03d28d44f95e39e9e2e6eab7, type: 2} - {fileID: 11400000, guid: 3eb0543909f25a94eb803cdc9bb51da0, type: 2} - {fileID: 11400000, guid: 30f6d3f1460057a46bc32df18d5f11e8, type: 2} + - {fileID: 11400000, guid: 728e63ccef88b5c46aa51971060c4b14, type: 2} - characterClass: {fileID: 11400000, guid: 504738889b9f3b14596e37f7bba80fbf, type: 2} possibleClassAbilities: - {fileID: 11400000, guid: db19571a96c2e6147a60a49bb343e08d, type: 2} @@ -7348,6 +7349,8 @@ MonoBehaviour: - {fileID: 11400000, guid: c3ce7e110eeeebf47b7af8344f0793fa, type: 2} - {fileID: 11400000, guid: b9a421f28b69be7499e354879b040b1f, type: 2} - {fileID: 11400000, guid: 3cab0af73858e9e48936aa83ba32d041, type: 2} + - {fileID: 11400000, guid: 7a897d8de80bb6c4b9f888c0121a7d59, type: 2} + - {fileID: 11400000, guid: 728e63ccef88b5c46aa51971060c4b14, type: 2} --- !u!1 &7475116341184709871 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Abilities/Tornado_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab b/Assets/Resources/Abilities/Tornado_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab new file mode 100644 index 00000000..671a70e1 --- /dev/null +++ b/Assets/Resources/Abilities/Tornado_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab @@ -0,0 +1,617 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2461700157592683349 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8778919381623172669} + - component: {fileID: 6488785894483522331} + - component: {fileID: 634576473860346969} + m_Layer: 30 + m_Name: ProjextileHitbox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8778919381623172669 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2461700157592683349} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 7681102451873883168} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6488785894483522331 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2461700157592683349} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!135 &634576473860346969 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2461700157592683349} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6229009280531850027 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3238356846573237868} + - component: {fileID: 6840079389173921910} + m_Layer: 30 + m_Name: AudioPlayer_SFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3238356846573237868 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6229009280531850027} + 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: 7681102451873883168} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &6840079389173921910 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6229009280531850027} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -5312442904998127832, guid: a2cf0a9ecb0938443b3238757f0f6db8, type: 2} + m_audioClip: {fileID: 8300000, guid: 1311960fc66f5d546b46109adf9d0902, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.4 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 20 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &6975521718323349816 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6975521718323349822} + m_Layer: 30 + m_Name: AbilityChainReaction + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6975521718323349822 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6975521718323349816} + 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: 1 + m_Children: [] + m_Father: {fileID: 7681102451873883168} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7681102451873883169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7681102451873883168} + - component: {fileID: 7681102451873883196} + - component: {fileID: 1813405135002957620} + - component: {fileID: 7681102451873883170} + - component: {fileID: 7681102451873883171} + m_Layer: 30 + m_Name: Tornado_ProjectileAreaOfEffectOverTimeWithTickEvent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7681102451873883168 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7681102451873883169} + 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: + - {fileID: 7681102452339790675} + - {fileID: 6975521718323349822} + - {fileID: 3238356846573237868} + - {fileID: 8778919381623172669} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &7681102451873883196 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7681102451873883169} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1813405135002957620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7681102451873883169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ceeb5a0f6f2e724eae9af008a0b4259, type: 3} + m_Name: + m_EditorClassIdentifier: + telegraph: {fileID: 0} + effectVisual: {fileID: 7681102452339790672} + abilityHitLayer: + serializedVersion: 2 + m_Bits: 2147483648 + impactHitVFX: {fileID: 2353600328335836179, guid: ceec7516237b4104b94300043ca39784, type: 3} + shouldDisableVisualsOnDelayedDestroyEntered: 1 + photonView: {fileID: 0} + owner: {fileID: 0} + ownerTag: {fileID: 0} + ability: {fileID: 0} + radius: 0 + shouldResizeVisuals: 0 + telegraphDelay: 0 + lifeSpan: 0 + canHitSelf: 0 + onTargetHit: + m_PersistentCalls: + m_Calls: [] + duration: 0 + followUser: 0 + followTarget: 0 + damageFollowingTarget: 0 + OptionalBoxOverlap: {fileID: 0} + hitParticlesPrefab: {fileID: 2353600328335836179, guid: ceec7516237b4104b94300043ca39784, type: 3} + projectileAbility: {fileID: 0} + onTickHappened: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &7681102451873883170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7681102451873883169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} + m_Name: + m_EditorClassIdentifier: + ObservedComponentsFoldoutOpen: 1 + Group: 0 + prefixField: -1 + Synchronization: 3 + OwnershipTransfer: 0 + observableSearch: 2 + ObservedComponents: + - {fileID: 1813405135002957620} + - {fileID: 7681102451873883171} + sceneViewId: 0 + InstantiationId: 0 + isRuntimeInstantiated: 0 +--- !u!114 &7681102451873883171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7681102451873883169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 627855c7f81362d41938ffe0b1475957, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SynchronizePosition: 1 + m_SynchronizeRotation: 1 + m_SynchronizeScale: 0 + m_UseLocal: 1 +--- !u!1 &7681102452339790672 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7681102452339790675} + - component: {fileID: 7681102452339790700} + m_Layer: 30 + m_Name: effectVisual + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7681102452339790675 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7681102452339790672} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 2650017693601061829} + - {fileID: 7910058261851551780} + m_Father: {fileID: 7681102451873883168} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7681102452339790700 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7681102452339790672} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1520939850523873529 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7681102452339790675} + m_Modifications: + - target: {fileID: 4174147558781449270, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_RenderMode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4321358288067726026, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: simulationSpeed + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4321358288067726026, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: moveWithTransform + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4321358288067726026, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: emitterVelocityMode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4321358288067726026, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: VelocityModule.z.scalar + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4321358288067726026, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: VelocityModule.z.minScalar + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 4321358288067726026, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 4321358288067726026, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: EmissionModule.rateOverTime.scalar + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 4321358288067726026, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: InitialModule.startLifetime.scalar + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 4321358288067726026, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: VelocityModule.speedModifier.scalar + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4321358288067726026, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: InitialModule.startLifetime.minScalar + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4321358288067726026, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: EmissionModule.rateOverDistance.scalar + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7966731087305637596, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_Name + value: vfx_Tornado_01 + objectReference: {fileID: 0} + - target: {fileID: 8709216932701153501, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8709216932701153501, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8709216932701153501, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8709216932701153501, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8709216932701153501, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8709216932701153501, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 8709216932701153501, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8709216932701153501, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8709216932701153501, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 8709216932701153501, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8709216932701153501, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8709216932701153501, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} +--- !u!4 &7910058261851551780 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8709216932701153501, guid: 460babe280fe4aa41adc3fefd46f0c0b, type: 3} + m_PrefabInstance: {fileID: 1520939850523873529} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6150788514191539604 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7681102452339790675} + m_Modifications: + - target: {fileID: 79701874260653238, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: stopAction + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 79701874260653238, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: cullingMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 79701874260653238, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: lengthInSec + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 79701874260653238, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: InitialModule.maxNumParticles + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 79701874260653238, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 79701874260653238, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 79701874260653238, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 521339279345268759, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1747735906954452868, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_Name + value: CharacterCircleRed (1) + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_LocalScale.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_LocalScale.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_LocalScale.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 64f97bcadc30ea54680b892789161068, type: 3} +--- !u!4 &2650017693601061829 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8186766346787694161, guid: 64f97bcadc30ea54680b892789161068, type: 3} + m_PrefabInstance: {fileID: 6150788514191539604} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Abilities/Tornado_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab.meta b/Assets/Resources/Abilities/Tornado_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab.meta new file mode 100644 index 00000000..6e571476 --- /dev/null +++ b/Assets/Resources/Abilities/Tornado_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 954fe53dfefd6834e901c7aabf4906ad +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/0-Splash.unity b/Assets/Scenes/0-Splash.unity index c1917256..ce4660b1 100644 --- a/Assets/Scenes/0-Splash.unity +++ b/Assets/Scenes/0-Splash.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.06433476, g: 0.12879543, b: 0.1344714, a: 1} + m_IndirectSpecularColor: {r: 0.05859949, g: 0.11756884, b: 0.12269087, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-TornadoProjectileStats.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-TornadoProjectileStats.asset new file mode 100644 index 00000000..ec460f6f --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-TornadoProjectileStats.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: f4ddf33e31e7c3d4e9f2078940308dfb, type: 3} + m_Name: 1-TornadoProjectileStats + m_EditorClassIdentifier: + displayName: + Icon: {fileID: 0} + targettingTags: + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} + - {fileID: 11400000, guid: 201eca8f8c72ba74dbb0854cad29be4f, type: 2} + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + - {fileID: 11400000, guid: 918ee6f8846e6a9449166ac16b6330ae, type: 2} + abilityEffects: + - {fileID: 11400000, guid: 1df87ce6145d8c8469dfb8ef5c0513c4, type: 2} + - {fileID: 11400000, guid: b6c62ca0f78f08e438620111e861bd45, type: 2} + castTime: 0 + manaCost: 0 + healthCost: 0 + classResourceCost: 0 + cooldown: 0 + castableWhileMoving: 0 + animationType: 1 + projectilePrefab: {fileID: 0} + projectileSpeed: 2 + lifeSpan: 0 + canPierce: 1 + canHitSelf: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-TornadoProjectileStats.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-TornadoProjectileStats.asset.meta new file mode 100644 index 00000000..aa6e8f0a --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-TornadoProjectileStats.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a897d8de80bb6c4b9f888c0121a7d59 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-Tornado_Projectile_AoEOverTimeWithTickEventAbility.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-Tornado_Projectile_AoEOverTimeWithTickEventAbility.asset new file mode 100644 index 00000000..b8271fdb --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-Tornado_Projectile_AoEOverTimeWithTickEventAbility.asset @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: feba897f2c808cc40a3ad5226a62b1e0, type: 3} + m_Name: 1-Tornado_Projectile_AoEOverTimeWithTickEventAbility + m_EditorClassIdentifier: + displayName: Tornado + Icon: {fileID: 21300000, guid: eced15bb959edc54c8457ab75f9a45b5, type: 3} + targettingTags: + - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + - {fileID: 11400000, guid: 918ee6f8846e6a9449166ac16b6330ae, type: 2} + abilityEffects: + - {fileID: 11400000, guid: ead0b5de8c069ca45b35ab71dca914e9, type: 2} + - {fileID: 11400000, guid: b49cc0fb89f894a42981c649afd98030, type: 2} + castTime: 0.5 + manaCost: 10 + healthCost: 0 + classResourceCost: 0 + cooldown: 0 + castableWhileMoving: 0 + animationType: 1 + aoePrefab: {fileID: 7681102451873883169, guid: 954fe53dfefd6834e901c7aabf4906ad, type: 3} + movementMask: + serializedVersion: 2 + m_Bits: 8 + lifeSpan: 2 + radius: 1.5 + shouldResizeVisuals: 0 + telegraphDelay: 0 + canHitSelf: 0 + spawnUnderUser: 0 + projectileAbility: {fileID: 11400000, guid: 7a897d8de80bb6c4b9f888c0121a7d59, type: 2} + duration: 6 + followUser: 0 + followTarget: 0 + damageFollowingTarget: 0 diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-Tornado_Projectile_AoEOverTimeWithTickEventAbility.asset.meta b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-Tornado_Projectile_AoEOverTimeWithTickEventAbility.asset.meta new file mode 100644 index 00000000..88e160e0 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Barbarian/-Naturalist/1-Tornado_Projectile_AoEOverTimeWithTickEventAbility.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 728e63ccef88b5c46aa51971060c4b14 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Vampire/2-BatSwarm_AoEOverTimeWithTickEvent.asset b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Vampire/2-BatSwarm_AoEOverTimeWithTickEvent.asset index f788b9e7..ade29c37 100644 --- a/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Vampire/2-BatSwarm_AoEOverTimeWithTickEvent.asset +++ b/Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Vampire/2-BatSwarm_AoEOverTimeWithTickEvent.asset @@ -44,6 +44,6 @@ MonoBehaviour: spawnUnderUser: 0 duration: 3 followUser: 0 - followTarget: 1 - damageFollowingTarget: 1 + followTarget: 0 + damageFollowingTarget: 0 rotateOnSpawn: 0 diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/Barb_Tornado_InstantEffect_AoETick.asset b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/Barb_Tornado_InstantEffect_AoETick.asset new file mode 100644 index 00000000..58bbf391 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/Barb_Tornado_InstantEffect_AoETick.asset @@ -0,0 +1,25 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: Barb_Tornado_InstantEffect_AoETick + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 918ee6f8846e6a9449166ac16b6330ae, type: 2} + percentInfluence: 0.2 + baseValue: 2 + damageType: 1 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 + applyToClassResourceInstead: 0 + applyToSelfResourceInsteadOfHit: 0 diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/Barb_Tornado_InstantEffect_AoETick.asset.meta b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/Barb_Tornado_InstantEffect_AoETick.asset.meta new file mode 100644 index 00000000..99ce7dc4 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/Barb_Tornado_InstantEffect_AoETick.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b49cc0fb89f894a42981c649afd98030 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/Barb_Tornado_InstantEffect_Impact.asset b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/Barb_Tornado_InstantEffect_Impact.asset new file mode 100644 index 00000000..2aba2c1e --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/Barb_Tornado_InstantEffect_Impact.asset @@ -0,0 +1,25 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: Barb_Tornado_InstantEffect_Impact + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: + - statTag: {fileID: 11400000, guid: 918ee6f8846e6a9449166ac16b6330ae, type: 2} + percentInfluence: 0.55 + baseValue: 4.5 + damageType: 1 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 + applyToClassResourceInstead: 0 + applyToSelfResourceInsteadOfHit: 0 diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/Barb_Tornado_InstantEffect_Impact.asset.meta b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/Barb_Tornado_InstantEffect_Impact.asset.meta new file mode 100644 index 00000000..d98c5580 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/Barb_Tornado_InstantEffect_Impact.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b6c62ca0f78f08e438620111e861bd45 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/P_Barb_Tornado_InstantEffectClassResource_AoE_tick.asset b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/P_Barb_Tornado_InstantEffectClassResource_AoE_tick.asset new file mode 100644 index 00000000..d0d1f389 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/P_Barb_Tornado_InstantEffectClassResource_AoE_tick.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: P_Barb_Tornado_InstantEffectClassResource_AoE_tick + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: [] + baseValue: 0.1 + damageType: 0 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 + applyToClassResourceInstead: 1 + applyToSelfResourceInsteadOfHit: 1 diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/P_Barb_Tornado_InstantEffectClassResource_AoE_tick.asset.meta b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/P_Barb_Tornado_InstantEffectClassResource_AoE_tick.asset.meta new file mode 100644 index 00000000..bcfe8c6d --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/P_Barb_Tornado_InstantEffectClassResource_AoE_tick.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ead0b5de8c069ca45b35ab71dca914e9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/P_Barb_Tornado_InstantEffectClassResource_Impact.asset b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/P_Barb_Tornado_InstantEffectClassResource_Impact.asset new file mode 100644 index 00000000..cfd9c706 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/P_Barb_Tornado_InstantEffectClassResource_Impact.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: 081df6f2fd69b7643a4844062a82871f, type: 3} + m_Name: P_Barb_Tornado_InstantEffectClassResource_Impact + m_EditorClassIdentifier: + tags: + - {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2} + influencingStats: [] + baseValue: 0.25 + damageType: 0 + AlliedTargetMultiplier: 1 + EnemyTargetMultiplier: 1 + applyToClassResourceInstead: 1 + applyToSelfResourceInsteadOfHit: 1 diff --git a/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/P_Barb_Tornado_InstantEffectClassResource_Impact.asset.meta b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/P_Barb_Tornado_InstantEffectClassResource_Impact.asset.meta new file mode 100644 index 00000000..059614b9 --- /dev/null +++ b/Assets/Scriptables/Data/Resources/Effects/Debug/Player/Barbarian/--Naturalist/1-Tornado/P_Barb_Tornado_InstantEffectClassResource_Impact.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1df87ce6145d8c8469dfb8ef5c0513c4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AbilitySystem/ProjectileAreaOfEffectOverTimeAbility.cs b/Assets/Scripts/AbilitySystem/ProjectileAreaOfEffectOverTimeAbility.cs new file mode 100644 index 00000000..9108623a --- /dev/null +++ b/Assets/Scripts/AbilitySystem/ProjectileAreaOfEffectOverTimeAbility.cs @@ -0,0 +1,88 @@ +using Photon.Pun; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "ProjectileAreaOfEffectOverTimeAbility", menuName = "RiftMayhem/AbilitySystem/Abilities/Projectile Area Of Effect Over Time Ability", order = 0)] +public class ProjectileAreaOfEffectOverTimeAbility : AreaOfEffectAbility +{ + [Header("Projectile:")] + public ProjectileAbility projectileAbility; + + [Header("AreaOfEffectOverTime:")] + public float duration; + public bool followUser; + public bool followTarget; + public bool damageFollowingTarget; + + + private NetworkedProjectileAreaOfEffectOverTimeWithTickEvent networkedAreaOfEffectOverTime; + + + public override void Execute(PhotonView user, Taggable userTag) + { + SpendResourcesNecessary(user, userTag); + + if (spawnUnderUser) + { + instantiatedArea = PhotonNetwork.Instantiate("Abilities/" + aoePrefab.name, user.transform.position, Quaternion.identity); + //instantiatedArea.transform.parent = user.transform; + networkedAreaOfEffectOverTime = instantiatedArea.GetComponent(); + + SetupValues(user, userTag); + + networkedAreaOfEffectOverTime.Init(); + return; + } + + instantiatedArea = PhotonNetwork.Instantiate("Abilities/" + aoePrefab.name, user.GetComponentInChildren().transform.position, user.GetComponentInChildren().transform.rotation); + + networkedAreaOfEffectOverTime = instantiatedArea.GetComponent(); + + SetupValues(user, userTag); + + networkedAreaOfEffectOverTime.Init(); + } + + public override void Execute(PhotonView user, Taggable userTag, Vector3 point) + { + SpendResourcesNecessary(user, userTag); + + instantiatedArea = PhotonNetwork.Instantiate("Abilities/" + aoePrefab.name, user.GetComponentInChildren().transform.position, user.GetComponentInChildren().transform.rotation); + + networkedAreaOfEffectOverTime = instantiatedArea.GetComponent(); + + SetupValues(user, userTag); + + networkedAreaOfEffectOverTime.Init(); + } + + public override void Execute(PhotonView user, Taggable userTag, Transform target) + { + SpendResourcesNecessary(user, userTag); + + instantiatedArea = PhotonNetwork.Instantiate("Abilities/" + aoePrefab.name, target.position, Quaternion.identity); + + networkedAreaOfEffectOverTime = instantiatedArea.GetComponent(); + + SetupValues(user, userTag); + + networkedAreaOfEffectOverTime.Init(target); + } + + private void SetupValues(PhotonView user, Taggable userTag) + { + networkedAreaOfEffectOverTime.owner = user; + networkedAreaOfEffectOverTime.ownerTag = userTag; + networkedAreaOfEffectOverTime.ability = this; + networkedAreaOfEffectOverTime.radius = radius; + networkedAreaOfEffectOverTime.telegraphDelay = telegraphDelay; + networkedAreaOfEffectOverTime.lifeSpan = lifeSpan; + networkedAreaOfEffectOverTime.duration = duration; + networkedAreaOfEffectOverTime.followUser = followUser; + networkedAreaOfEffectOverTime.followTarget = followTarget; + networkedAreaOfEffectOverTime.damageFollowingTarget = damageFollowingTarget; + networkedAreaOfEffectOverTime.canHitSelf = canHitSelf; + networkedAreaOfEffectOverTime.projectileAbility = projectileAbility; + } +} diff --git a/Assets/Scripts/AbilitySystem/ProjectileAreaOfEffectOverTimeAbility.cs.meta b/Assets/Scripts/AbilitySystem/ProjectileAreaOfEffectOverTimeAbility.cs.meta new file mode 100644 index 00000000..1d810089 --- /dev/null +++ b/Assets/Scripts/AbilitySystem/ProjectileAreaOfEffectOverTimeAbility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: feba897f2c808cc40a3ad5226a62b1e0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs b/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs index 6e76c8e8..f6c11f25 100644 --- a/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs +++ b/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs @@ -35,9 +35,9 @@ public class NetworkedAreaOfEffect : MonoBehaviour, IPunObservable protected Collider[] hits; - private bool waitingForDestroy = false; + protected bool waitingForDestroy = false; - private List hitSpawnedVFXs = new List(); + protected List hitSpawnedVFXs = new List(); protected GameObject hitSpawnedVFX; protected Vector3 hitPositionCorrected; diff --git a/Assets/Scripts/Networking/NetworkedAreaOfEffectOverTime.cs b/Assets/Scripts/Networking/NetworkedAreaOfEffectOverTime.cs index 54796e6b..9c269488 100644 --- a/Assets/Scripts/Networking/NetworkedAreaOfEffectOverTime.cs +++ b/Assets/Scripts/Networking/NetworkedAreaOfEffectOverTime.cs @@ -108,6 +108,7 @@ public class NetworkedAreaOfEffectOverTime : NetworkedAreaOfEffect protected override void CheckSurroundings() { + if (waitingForDestroy) return; //TODO: spread the total value over ticks, for now just apply the instant effect every tick, manage tick values on effect applied if (OptionalBoxOverlap != null) { diff --git a/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs b/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs new file mode 100644 index 00000000..16d8596d --- /dev/null +++ b/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs @@ -0,0 +1,77 @@ +using Photon.Pun; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; + +public class NetworkedProjectileAreaOfEffectOverTimeWithTickEvent : NetworkedAreaOfEffectOverTime +{ + [Header("Visuals")] + [SerializeField] private GameObject hitParticlesPrefab; + + public ProjectileAbility projectileAbility; + + public UnityEvent> onTickHappened = new UnityEvent>(); + + NetworkedAntiProjectile possibleBlock; + + private void Update() + { + if (!photonView.IsMine) return; + + if (waitingForDestroy) return; + + this.transform.position += this.transform.forward * projectileAbility.projectileSpeed * Time.deltaTime; + } + + protected override void OnTickPerformed() + { + onTickHappened.Invoke(owner, ownerTag, targets); + } + + private void OnTriggerEnter(Collider other) + { + if (waitingForDestroy) return; + + possibleTarget = other.GetComponentInParent(); + if (possibleTarget != null) + { + if (!canHitSelf) + if (possibleTarget == owner) return; + } + + target = other.GetComponentInParent(); + + if (target == null) return; + + if (!target.IsValidTarget(projectileAbility.targettingTags)) return; + + hitPositionCorrected = target.transform.position; + hitPositionCorrected.y = this.transform.position.y; + onTargetHit.Invoke(hitPositionCorrected); + + if (!photonView.IsMine) return; + + possibleBlock = target.GetComponentInParent(); + if (possibleBlock != null) + { + waitingForDestroy = true; + + possibleBlock.SendBlockNotice(); + + StartCoroutine(DelayedDestroy()); + return; + } + + foreach (BaseEffect effect in projectileAbility.abilityEffects) + { + effect.ApplyEffect(ownerTag, new List { target }); + } + + if (!projectileAbility.canPierce) + { + waitingForDestroy = true; + StartCoroutine(DelayedDestroy()); + } + } +} diff --git a/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs.meta b/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs.meta new file mode 100644 index 00000000..2472e53a --- /dev/null +++ b/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9ceeb5a0f6f2e724eae9af008a0b4259 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Starfield Skybox/Skybox.mat b/Assets/Starfield Skybox/Skybox.mat index d662e8e4..87102cf2 100644 --- a/Assets/Starfield Skybox/Skybox.mat +++ b/Assets/Starfield Skybox/Skybox.mat @@ -94,7 +94,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 18.00414 + - _Rotation: 9.589699 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1