pedrogomes/RiftMayhem
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Melee Punch/kick human abilities

Browse Source 
- Frontal punch ability
- Uppercut ability
- kick ability
- new animations for unharmed combat
- updated cast state on melee/unharmed ability casts
This commit is contained in:
Pedro Gomes 2025-01-26 19:12:04 +00:00
parent 614f4d92c5
commit b7a7f32fbd
65 changed files with 192142 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

268
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/CharacterAnimatorRogueUpdate.controller
View File

@ -103,6 +103,33 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-8306817163803737551
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Punch_A
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -2644581647791110944}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 1
m_MirrorParameterActive: 1
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 646f8c18b4967ac40b9e6dfdfcd14ef3, type: 2}
m_Tag:
m_SpeedParameter: throwingTime
m_MirrorParameter: mirror
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-8135722390722792138
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -397,7 +424,7 @@ AnimatorStateTransition:
m_TransitionOffset: 0
m_ExitTime: 0.625
m_HasExitTime: 1
m_HasFixedDuration: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
@ -426,6 +453,33 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-4139562546067654436
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Punch_B
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 8716891754789677107}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 1
m_MirrorParameterActive: 1
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: ccc06f41ca0ab1f419089503e40c3494, type: 2}
m_Tag:
m_SpeedParameter: throwingTime
m_MirrorParameter: mirror
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-3609341490177184666
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -478,6 +532,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter: throwingTime
--- !u!1101 &-3423679215055685277
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1955213380481053044}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.2
m_TransitionOffset: 0.14207903
m_ExitTime: 0.8
m_HasExitTime: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-2748198142735823690
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -503,6 +579,28 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-2644581647791110944
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1955213380481053044}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.5
m_HasExitTime: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-2174624838372380439
AnimatorState:
serializedVersion: 6
@ -716,6 +814,30 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: puncha
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: punchb
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: kick
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: mirror
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -784,6 +906,31 @@ AnimatorStateTransition:
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1063190978464391171
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: kick
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 5356794990617405999}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
@ -896,7 +1043,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -1955213380481053044}
m_Position: {x: 510, y: -10, z: 0}
m_Position: {x: 570, y: 80, z: 0}
- serializedVersion: 1
m_State: {fileID: -913893964855726072}
m_Position: {x: 240, y: -100, z: 0}
@ -908,10 +1055,10 @@ AnimatorStateMachine:
m_Position: {x: 240, y: 60, z: 0}
- serializedVersion: 1
m_State: {fileID: -8650859205514491780}
m_Position: {x: 170, y: 570, z: 0}
m_Position: {x: 120, y: 660, z: 0}
- serializedVersion: 1
m_State: {fileID: 8135064696877389327}
m_Position: {x: 360, y: 550, z: 0}
m_Position: {x: 350, y: 660, z: 0}
- serializedVersion: 1
m_State: {fileID: -4432625991716992693}
m_Position: {x: 240, y: 130, z: 0}
@ -939,6 +1086,15 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 5102462321478977330}
m_Position: {x: 240, y: -230, z: 0}
- serializedVersion: 1
m_State: {fileID: -8306817163803737551}
m_Position: {x: 240, y: 390, z: 0}
- serializedVersion: 1
m_State: {fileID: -4139562546067654436}
m_Position: {x: 240, y: 450, z: 0}
- serializedVersion: 1
m_State: {fileID: 5356794990617405999}
m_Position: {x: 240, y: 510, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: -5718744200409098312}
@ -951,10 +1107,13 @@ AnimatorStateMachine:
- {fileID: -2748198142735823690}
- {fileID: -8518047029049158150}
- {fileID: 2135828952175218385}
- {fileID: 8485754016464608430}
- {fileID: 4996370096942081894}
- {fileID: 1063190978464391171}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: -20, y: 0, z: 0}
m_AnyStatePosition: {x: -50, y: 70, z: 0}
m_EntryPosition: {x: 740, y: -10, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
@ -984,6 +1143,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &4996370096942081894
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: punchb
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4139562546067654436}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &5102462321478977330
AnimatorState:
serializedVersion: 6
@ -1066,6 +1250,33 @@ BlendTree:
m_UseAutomaticThresholds: 1
m_NormalizedBlendValues: 0
m_BlendType: 3
--- !u!1102 &5356794990617405999
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Kick
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -3423679215055685277}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 1
m_MirrorParameterActive: 1
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 699ed265ee005c340824aa692da179e2, type: 2}
m_Tag:
m_SpeedParameter: throwingTime
m_MirrorParameter: mirror
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &5990272421327647975
AnimatorState:
serializedVersion: 6
@ -1288,3 +1499,50 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &8485754016464608430
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: puncha
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -8306817163803737551}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &8716891754789677107
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1955213380481053044}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.5
m_HasExitTime: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

13
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/UnharmedFighterOverride.overrideController Normal file
View File

@ -0,0 +1,13 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!221 &22100000
AnimatorOverrideController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UnharmedFighterOverride
m_Controller: {fileID: 9100000, guid: 75a004e7eb40cb14fa514f13b2a1177d, type: 2}
m_Clips:
- m_OriginalClip: {fileID: -3100369314251171874, guid: e1e4fb5684939bb479c83e16bac91038, type: 3}
m_OverrideClip: {fileID: -6277497387356478362, guid: e1e4fb5684939bb479c83e16bac91038, type: 3}

8
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/UnharmedFighterOverride.overrideController.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: aaa4a2072b42ed24c8b297529eaeeb7e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 22100000
userData:
assetBundleName:
assetBundleVariant:

10
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/1H_Melee_Attack_DiagonalSlash_WithEvent.anim → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-1H_Melee_Attack_DiagonalSlash_WithEvent.anim
View File

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: 1H_Melee_Attack_DiagonalSlash_WithEvent
m_Name: -1H_Melee_Attack_DiagonalSlash_WithEvent
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
@ -14056,10 +14056,10 @@ AnimationClip:
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_LoopBlendOrientation: 1
m_LoopBlendPositionY: 1
m_LoopBlendPositionXZ: 1
m_KeepOriginalOrientation: 1
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0

0
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/1H_Melee_Attack_DiagonalSlash_WithEvent.anim.meta → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-1H_Melee_Attack_DiagonalSlash_WithEvent.anim.meta
View File

10
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/1H_Melee_Attack_DiagonalSlash_WithEvent_Minion.anim → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-1H_Melee_Attack_DiagonalSlash_WithEvent_Minion.anim
View File

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: 1H_Melee_Attack_DiagonalSlash_WithEvent_Minion
m_Name: -1H_Melee_Attack_DiagonalSlash_WithEvent_Minion
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
@ -14056,10 +14056,10 @@ AnimationClip:
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_LoopBlendOrientation: 1
m_LoopBlendPositionY: 1
m_LoopBlendPositionXZ: 1
m_KeepOriginalOrientation: 1
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0

0
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/1H_Melee_Attack_DiagonalSlash_WithEvent_Minion.anim.meta → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-1H_Melee_Attack_DiagonalSlash_WithEvent_Minion.anim.meta
View File

2
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/2H_Ranged_Shoot_WithEvent.anim → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-2H_Ranged_Shoot_WithEvent.anim
View File

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: 2H_Ranged_Shoot_WithEvent
m_Name: -2H_Ranged_Shoot_WithEvent
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0

0
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/2H_Ranged_Shoot_WithEvent.anim.meta → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-2H_Ranged_Shoot_WithEvent.anim.meta
View File

2
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/Death_A_Event.anim → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-Death_A_Event.anim
View File

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Death_A_Event
m_Name: -Death_A_Event
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0

0
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/Death_A_Event.anim.meta → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-Death_A_Event.anim.meta
View File

2
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/PickUp_Event.anim → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-PickUp_Event.anim
View File

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PickUp_Event
m_Name: -PickUp_Event
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0

0
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/PickUp_Event.anim.meta → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-PickUp_Event.anim.meta
View File

2
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/Spellcast_Long_Event.anim → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-Spellcast_Long_Event.anim
View File

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Spellcast_Long_Event
m_Name: -Spellcast_Long_Event
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0

0
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/Spellcast_Long_Event.anim.meta → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-Spellcast_Long_Event.anim.meta
View File

2
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/Throw_Event.anim → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-Throw_Event.anim
View File

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Throw_Event
m_Name: -Throw_Event
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0

0
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/Throw_Event.anim.meta → Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-Throw_Event.anim.meta
View File

25296
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-Unarmed_Melee_Attack_Kick_Event.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-Unarmed_Melee_Attack_Kick_Event.anim.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 699ed265ee005c340824aa692da179e2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

32100
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-Unarmed_Melee_Attack_Punch_A_Event.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-Unarmed_Melee_Attack_Punch_A_Event.anim.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 646f8c18b4967ac40b9e6dfdfcd14ef3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

32640
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-Unarmed_Melee_Attack_Punch_B_Event.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/-Unarmed_Melee_Attack_Punch_B_Event.anim.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ccc06f41ca0ab1f419089503e40c3494
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

920
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/1H_Melee_Attack_Slice_Horizontal.anim
View File

@ -14203,7 +14203,917 @@ AnimationClip:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
genericBindings:
- serializedVersion: 2
path: 0
attribute: 7
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 8
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 9
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 10
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 11
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 12
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 13
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 14
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 15
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 16
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 17
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 18
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 19
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 20
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 21
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 22
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 23
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 24
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 25
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 26
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 27
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 28
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 29
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 30
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 31
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 32
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 33
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 34
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 35
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 36
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 37
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 38
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 39
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 40
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 41
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 42
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 43
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 44
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 54
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 55
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 56
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 63
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 64
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 65
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 66
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 67
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 68
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 69
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 70
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 71
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 72
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 73
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 74
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 75
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 76
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 77
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 78
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 81
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 82
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 83
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 84
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 85
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 86
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 87
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 90
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 91
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 92
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 93
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 94
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 95
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 96
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 45
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 46
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 47
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 48
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 49
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 50
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 51
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 52
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 53
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 57
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 58
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 59
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 60
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 61
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 62
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 79
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 80
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 88
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 89
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 97
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 98
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 99
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 100
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 101
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 102
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 103
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 104
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 105
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 106
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 107
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 108
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 109
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 110
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 111
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 112
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 113
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 114
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 115
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 116
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 117
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 118
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 119
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 120
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 121
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 122
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 123
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 124
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 125
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 126
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 127
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 128
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 129
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 130
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 131
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 132
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 133
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 134
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 135
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 136
script: {fileID: 0}
typeID: 95
customType: 8
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@ -14217,10 +15127,10 @@ AnimationClip:
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_LoopBlendOrientation: 1
m_LoopBlendPositionY: 1
m_LoopBlendPositionXZ: 1
m_KeepOriginalOrientation: 1
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0

52
Assets/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/fbx/Mage/Mage.fbx.meta
View File

@ -1571,12 +1571,12 @@ ModelImporter:
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
loopTime: 1
loopBlend: 1
loopBlendOrientation: 1
loopBlendPositionY: 1
loopBlendPositionXZ: 1
keepOriginalOrientation: 1
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
@ -1631,10 +1631,10 @@ ModelImporter:
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
loopBlendOrientation: 1
loopBlendPositionY: 1
loopBlendPositionXZ: 1
keepOriginalOrientation: 1
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
@ -1660,10 +1660,10 @@ ModelImporter:
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
loopBlendOrientation: 1
loopBlendPositionY: 1
loopBlendPositionXZ: 1
keepOriginalOrientation: 1
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
@ -1689,10 +1689,10 @@ ModelImporter:
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
loopBlendOrientation: 1
loopBlendPositionY: 1
loopBlendPositionXZ: 1
keepOriginalOrientation: 1
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
@ -2124,10 +2124,10 @@ ModelImporter:
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
loopBlendOrientation: 1
loopBlendPositionY: 1
loopBlendPositionXZ: 1
keepOriginalOrientation: 1
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
@ -2153,10 +2153,10 @@ ModelImporter:
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 1
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
loopBlendOrientation: 1
loopBlendPositionY: 1
loopBlendPositionXZ: 1
keepOriginalOrientation: 1
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0

124
Assets/Developer/Prefabs/Persistent Objects.prefab
View File

@ -8110,6 +8110,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a6105fbf344721f498bc2340c3c793a7, type: 3}
m_Name:
m_EditorClassIdentifier:
humanCanLearnAll: 0
onAbilityTomePageLearned: {fileID: 11400000, guid: 672e2337eaae0c1408a50a9e9bb3e143, type: 2}
onAbilityUnlocked: {fileID: 11400000, guid: ec3b1796477672542a701eed400eeb0c, type: 2}
abilityTomePageTemplate: {fileID: 11400000, guid: 81d43461cb6d9004a9373db85282473f, type: 2}
@ -8118,6 +8119,9 @@ MonoBehaviour:
classBuildLibraries:
- characterClass: {fileID: 11400000, guid: 5c805e25513e9734da3920fd1157656c, type: 2}
possibleClassAbilities:
- {fileID: 11400000, guid: de3172e441d9dba42bc24b5ecb4d0bf2, type: 2}
- {fileID: 11400000, guid: 4027803ec5dbf5543be72b92a6083b86, type: 2}
- {fileID: 11400000, guid: 45233ddc9683185429ca7af22b3056e1, type: 2}
- {fileID: 11400000, guid: 3cb8d7161315a384586026a48385b0b1, type: 2}
- {fileID: 11400000, guid: 4a43c80e0cffd1447b4bf2e849ce0c59, type: 2}
- {fileID: 11400000, guid: ccd77f16c41fa1f46b3ea52b598b781a, type: 2}
@ -8184,7 +8188,6 @@ MonoBehaviour:
- {fileID: 11400000, guid: f35636078aa06a448bead42af714b933, type: 2}
- {fileID: 11400000, guid: 8db358ce2e880d4448781465c8b4b20f, type: 2}
- {fileID: 11400000, guid: 0b73b57ca7c920f4995050e42164560e, type: 2}
- {fileID: 11400000, guid: 4a43c80e0cffd1447b4bf2e849ce0c59, type: 2}
- {fileID: 11400000, guid: b98492af4276f0c44986d559b5320619, type: 2}
abilityTomeInstances: []
currentPlayerClass: {fileID: 0}
@ -10062,6 +10065,122 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
--- !u!1 &6001753816787427263
GameObject:
m_ObjectHideFlags: 0
@ -12825,6 +12944,9 @@ MonoBehaviour:
- {fileID: 11400000, guid: 5f182e00a40fa0f47a204be0fde67888, type: 2}
- {fileID: 11400000, guid: ace8637ced2804a41a5739bd2e390c75, type: 2}
- {fileID: 11400000, guid: 093abebde2ce57648bc676fdedcdd026, type: 2}
- {fileID: 11400000, guid: de3172e441d9dba42bc24b5ecb4d0bf2, type: 2}
- {fileID: 11400000, guid: 45233ddc9683185429ca7af22b3056e1, type: 2}
- {fileID: 11400000, guid: 4027803ec5dbf5543be72b92a6083b86, type: 2}
--- !u!1 &7475116341184709871
GameObject:
m_ObjectHideFlags: 0

3
Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Misc/cfxr particle font.mat
View File

@ -8,8 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: cfxr particle font
m_Shader: {fileID: -6465566751694194690, guid: 1a29b4d27eb8b04479ef89c00dea533d,
type: 3}
m_Shader: {fileID: -6465566751694194690, guid: 1a29b4d27eb8b04479ef89c00dea533d, type: 3}
m_ValidKeywords:
- _ALPHABLEND_ON
- _CFXR_FONT_COLORS

35020
Assets/Resources/Abilities/SimpleKickPrefab.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/Abilities/SimpleKickPrefab.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3cf4380f385a1ab479e5a9db7ad3fcd7
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

25104
Assets/Resources/Abilities/SimplePunchAPrefab.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/Abilities/SimplePunchAPrefab.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f532516d94f2f9240bffafcc613ccd87
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

39966
Assets/Resources/Abilities/SimplePunchBPrefab.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/Abilities/SimplePunchBPrefab.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c3b63c93682ffe048acce1cb4bb8b445
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

66
Assets/Resources/PlayableCharacters/PlayerPrefab_Human Variant.prefab
View File

@ -11,6 +11,38 @@ PrefabInstance:
propertyPath: m_Name
value: Human
objectReference: {fileID: 0}
- target: {fileID: 4291157556610032653, guid: a3c8942c46a66cd468a506a92a451db5, type: 3}
propertyPath: m_SynchronizeParameters.Array.size
value: 20
objectReference: {fileID: 0}
- target: {fileID: 4291157556610032653, guid: a3c8942c46a66cd468a506a92a451db5, type: 3}
propertyPath: m_SynchronizeParameters.Array.data[17].Name
value: puncha
objectReference: {fileID: 0}
- target: {fileID: 4291157556610032653, guid: a3c8942c46a66cd468a506a92a451db5, type: 3}
propertyPath: m_SynchronizeParameters.Array.data[17].Type
value: 9
objectReference: {fileID: 0}
- target: {fileID: 4291157556610032653, guid: a3c8942c46a66cd468a506a92a451db5, type: 3}
propertyPath: m_SynchronizeParameters.Array.data[18].Name
value: punchb
objectReference: {fileID: 0}
- target: {fileID: 4291157556610032653, guid: a3c8942c46a66cd468a506a92a451db5, type: 3}
propertyPath: m_SynchronizeParameters.Array.data[18].Type
value: 9
objectReference: {fileID: 0}
- target: {fileID: 4291157556610032653, guid: a3c8942c46a66cd468a506a92a451db5, type: 3}
propertyPath: m_SynchronizeParameters.Array.data[19].Name
value: kick
objectReference: {fileID: 0}
- target: {fileID: 4291157556610032653, guid: a3c8942c46a66cd468a506a92a451db5, type: 3}
propertyPath: m_SynchronizeParameters.Array.data[19].Type
value: 9
objectReference: {fileID: 0}
- target: {fileID: 4291157556610032654, guid: a3c8942c46a66cd468a506a92a451db5, type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 22100000, guid: aaa4a2072b42ed24c8b297529eaeeb7e, type: 2}
- target: {fileID: 4291157556610032688, guid: a3c8942c46a66cd468a506a92a451db5, type: 3}
propertyPath: onFishingEnded.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
@ -207,7 +239,7 @@ PrefabInstance:
objectReference: {fileID: 11400000, guid: f35636078aa06a448bead42af714b933, type: 2}
- target: {fileID: 7471597901585849079, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: visualWeaponSlots.Array.size
value: 3
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7471597901585849079, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: visualWeaponSlots.Array.data[0].weapons.Array.size
@ -221,6 +253,10 @@ PrefabInstance:
propertyPath: visualWeaponSlots.Array.data[2].weapons.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7471597901585849079, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: visualWeaponSlots.Array.data[3].weapons.Array.size
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7471597901585849079, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: visualWeaponSlots.Array.data[0].weapons.Array.data[0]
value:
@ -237,6 +273,10 @@ PrefabInstance:
propertyPath: visualWeaponSlots.Array.data[2].weapons.Array.data[0]
value:
objectReference: {fileID: 1716587490805272502}
- target: {fileID: 7471597901585849079, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: visualWeaponSlots.Array.data[3].weapons.Array.data[0]
value:
objectReference: {fileID: 1716587490805272502}
- target: {fileID: 7471597901585849079, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: visualWeaponSlots.Array.data[0].animationTypes.Array.size
value: 7
@ -249,6 +289,18 @@ PrefabInstance:
propertyPath: visualWeaponSlots.Array.data[2].animationTypes.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7471597901585849079, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: visualWeaponSlots.Array.data[3].animationTypes.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7471597901585849079, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: visualWeaponSlots.Array.data[4].animationTypes.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7471597901585849079, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: visualWeaponSlots.Array.data[5].animationTypes.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7471597901585849079, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: visualWeaponSlots.Array.data[0].animationTypes.Array.data[1]
value: 1
@ -281,6 +333,18 @@ PrefabInstance:
propertyPath: visualWeaponSlots.Array.data[2].animationTypes.Array.data[0]
value: 7
objectReference: {fileID: 0}
- target: {fileID: 7471597901585849079, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: visualWeaponSlots.Array.data[3].animationTypes.Array.data[0]
value: 9
objectReference: {fileID: 0}
- target: {fileID: 7471597901585849079, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: visualWeaponSlots.Array.data[4].animationTypes.Array.data[0]
value: 10
objectReference: {fileID: 0}
- target: {fileID: 7471597901585849079, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: visualWeaponSlots.Array.data[5].animationTypes.Array.data[0]
value: 11
objectReference: {fileID: 0}
- target: {fileID: 7687765528848249431, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: sceneViewId
value: 0

2
Assets/Scenes/0-Splash.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.045526907, g: 0.09492388, b: 0.09925015, a: 1}
m_IndirectSpecularColor: {r: 0.06427487, g: 0.12866278, b: 0.13433248, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:

187
Assets/Scenes/Dev/Abilities.unity
View File

@ -5499,6 +5499,67 @@ ParticleSystemRenderer:
m_MeshWeighting2: 1
m_MeshWeighting3: 1
m_MaskInteraction: 0
--- !u!1001 &3686794269069733087
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2490494820205918377, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
propertyPath: m_Name
value: SimplePunchAPrefab
objectReference: {fileID: 0}
- target: {fileID: 2490494820205918379, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
propertyPath: m_RootOrder
value: 25
objectReference: {fileID: 0}
- target: {fileID: 2490494820205918379, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2490494820205918379, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2490494820205918379, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2490494820205918379, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2490494820205918379, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2490494820205918379, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2490494820205918379, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2490494820205918379, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2490494820205918379, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2490494820205918379, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2490494820205918380, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
propertyPath: sceneViewId
value: 72
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
--- !u!1001 &4020380891132381204
PrefabInstance:
m_ObjectHideFlags: 0
@ -15934,6 +15995,67 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
vectorLabel1_3: W
--- !u!1001 &6464489653909956038
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5722141525147731704, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
propertyPath: sceneViewId
value: 73
objectReference: {fileID: 0}
- target: {fileID: 5722141525147731709, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
propertyPath: m_Name
value: SimplePunchBPrefab
objectReference: {fileID: 0}
- target: {fileID: 5722141525147731711, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
propertyPath: m_RootOrder
value: 26
objectReference: {fileID: 0}
- target: {fileID: 5722141525147731711, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5722141525147731711, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5722141525147731711, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5722141525147731711, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5722141525147731711, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5722141525147731711, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5722141525147731711, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5722141525147731711, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5722141525147731711, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5722141525147731711, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
--- !u!1001 &6545462103452042218
PrefabInstance:
m_ObjectHideFlags: 0
@ -21311,6 +21433,67 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
vectorLabel1_3: W
--- !u!1001 &7708175618554638597
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4233591871518015728, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
propertyPath: m_Name
value: SimpleKickPrefab
objectReference: {fileID: 0}
- target: {fileID: 4233591871518015730, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
propertyPath: m_RootOrder
value: 27
objectReference: {fileID: 0}
- target: {fileID: 4233591871518015730, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4233591871518015730, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4233591871518015730, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4233591871518015730, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4233591871518015730, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4233591871518015730, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4233591871518015730, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4233591871518015730, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4233591871518015730, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4233591871518015730, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4233591871518015733, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
propertyPath: sceneViewId
value: 74
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
--- !u!1001 &7798416473136312074
PrefabInstance:
m_ObjectHideFlags: 0
@ -21602,6 +21785,10 @@ PrefabInstance:
propertyPath: m_Name
value: ShiningLight_AreaOfEffectPrefab Variant
objectReference: {fileID: 0}
- target: {fileID: 7678187128050361980, guid: 93cab8bcf2d72eb43ba7c70d0d61720c, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7678187128050361981, guid: 93cab8bcf2d72eb43ba7c70d0d61720c, type: 3}
propertyPath: m_RootOrder
value: 24

40
Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_FrontalPunch_SlashAbility.asset Normal file
View File

@ -0,0 +1,40 @@
%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: a5d5cf82dd5c07f438f5809f773372e2, type: 3}
m_Name: 1-Human_FrontalPunch_SlashAbility
m_EditorClassIdentifier:
displayName: FrontalPunch
Icon: {fileID: 21300000, guid: eecb85004343b0e4d8b78fd7f9877b32, type: 3}
targettingTags:
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 09eb68d1a036a1643b74420197b999bd, type: 2}
abilityEffects:
- {fileID: 11400000, guid: 4f41c3d578dc61f4baae79373a297c8b, type: 2}
- {fileID: 11400000, guid: 012e2e4ba1a64a44ca16016d040e6b25, type: 2}
castTime: 0.5
manaCost: 0
healthCost: 0
classResourceCost: 0
percentMaxManaCost: 0
percentMaxHealthCost: 0
cooldown: 0
castableWhileMoving: 0
animationType: 9
slashPrefab: {fileID: 2490494820205918377, guid: f532516d94f2f9240bffafcc613ccd87, type: 3}
regenHealthOnHit: 1
regenManaOnHit: 1
healthOnHit: 2
manaOnHit: 1
lifeSpan: 0.5
range: 2

8
Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_FrontalPunch_SlashAbility.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: de3172e441d9dba42bc24b5ecb4d0bf2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

40
Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_Kick_SlashAbility.asset Normal file
View File

@ -0,0 +1,40 @@
%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: a5d5cf82dd5c07f438f5809f773372e2, type: 3}
m_Name: 1-Human_Kick_SlashAbility
m_EditorClassIdentifier:
displayName: Kick
Icon: {fileID: 21300000, guid: ef30d715f2ca98c4c86b32e85cd798f5, type: 3}
targettingTags:
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 09eb68d1a036a1643b74420197b999bd, type: 2}
abilityEffects:
- {fileID: 11400000, guid: c7dff27eb50e12a43a8c7640ee4e745f, type: 2}
- {fileID: 11400000, guid: 012e2e4ba1a64a44ca16016d040e6b25, type: 2}
castTime: 0.5
manaCost: 1
healthCost: 0
classResourceCost: 0
percentMaxManaCost: 0.08
percentMaxHealthCost: 0
cooldown: 1
castableWhileMoving: 0
animationType: 11
slashPrefab: {fileID: 4233591871518015728, guid: 3cf4380f385a1ab479e5a9db7ad3fcd7, type: 3}
regenHealthOnHit: 1
regenManaOnHit: 0
healthOnHit: 2
manaOnHit: 1
lifeSpan: 0.5
range: 2

8
Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_Kick_SlashAbility.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4027803ec5dbf5543be72b92a6083b86
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

40
Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_Uppercut_SlashAbility.asset Normal file
View File

@ -0,0 +1,40 @@
%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: a5d5cf82dd5c07f438f5809f773372e2, type: 3}
m_Name: 1-Human_Uppercut_SlashAbility
m_EditorClassIdentifier:
displayName: Uppercut
Icon: {fileID: 21300000, guid: aeb31def086466745b570d082197ee1f, type: 3}
targettingTags:
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
- {fileID: 11400000, guid: 09eb68d1a036a1643b74420197b999bd, type: 2}
abilityEffects:
- {fileID: 11400000, guid: 128816df89922a54a89d3e8b3d0e27b9, type: 2}
- {fileID: 11400000, guid: 012e2e4ba1a64a44ca16016d040e6b25, type: 2}
castTime: 0.5
manaCost: 2
healthCost: 0
classResourceCost: 0
percentMaxManaCost: 0.1
percentMaxHealthCost: 0
cooldown: 1.5
castableWhileMoving: 0
animationType: 10
slashPrefab: {fileID: 5722141525147731709, guid: c3b63c93682ffe048acce1cb4bb8b445, type: 3}
regenHealthOnHit: 1
regenManaOnHit: 0
healthOnHit: 2
manaOnHit: 1
lifeSpan: 0.5
range: 2

8
Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Human/1-Human_Uppercut_SlashAbility.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 45233ddc9683185429ca7af22b3056e1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9edad4a373e3be74b936eda3ffd38b23
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human_Slash_InstantEffect.asset → Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Human_Slash_InstantEffect.asset
View File

0
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human_Slash_InstantEffect.asset.meta → Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Human_Slash_InstantEffect.asset.meta
View File

0
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human_Slash_InstantEffectClassResource.asset → Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Human_Slash_InstantEffectClassResource.asset
View File

0
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human_Slash_InstantEffectClassResource.asset.meta → Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Human_Slash_InstantEffectClassResource.asset.meta
View File

0
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human_SwordArt_BleedEffect.asset → Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Human_SwordArt_BleedEffect.asset
View File

0
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human_SwordArt_BleedEffect.asset.meta → Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Human_SwordArt_BleedEffect.asset.meta
View File

0
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human_SwordArt_InstantEffect.asset → Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Human_SwordArt_InstantEffect.asset
View File

0
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human_SwordArt_InstantEffect.asset.meta → Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Human_SwordArt_InstantEffect.asset.meta
View File

8
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Punches.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ecf900be5fbed06408ac59474d30a2b3
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

25
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Punches/Human_Kick_InstantEffect.asset Normal file
View File

@ -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: Human_Kick_InstantEffect
m_EditorClassIdentifier:
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
influencingStats:
- statTag: {fileID: 11400000, guid: 09eb68d1a036a1643b74420197b999bd, type: 2}
percentInfluence: 0.7
baseValue: 3
damageType: 0
AlliedTargetMultiplier: 1
EnemyTargetMultiplier: 1
applyToClassResourceInstead: 0
applyToSelfResourceInsteadOfHit: 0

8
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Punches/Human_Kick_InstantEffect.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c7dff27eb50e12a43a8c7640ee4e745f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

25
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Punches/Human_Punch_InstantEffect.asset Normal file
View File

@ -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: Human_Punch_InstantEffect
m_EditorClassIdentifier:
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
influencingStats:
- statTag: {fileID: 11400000, guid: 09eb68d1a036a1643b74420197b999bd, type: 2}
percentInfluence: 0.66
baseValue: 2
damageType: 0
AlliedTargetMultiplier: 1
EnemyTargetMultiplier: 1
applyToClassResourceInstead: 0
applyToSelfResourceInsteadOfHit: 0

8
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Punches/Human_Punch_InstantEffect.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4f41c3d578dc61f4baae79373a297c8b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

23
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Punches/Human_Punch_InstantEffectClassResource.asset Normal file
View File

@ -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: Human_Punch_InstantEffectClassResource
m_EditorClassIdentifier:
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
influencingStats: []
baseValue: 0.5
damageType: 0
AlliedTargetMultiplier: 1
EnemyTargetMultiplier: 1
applyToClassResourceInstead: 1
applyToSelfResourceInsteadOfHit: 1

8
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Punches/Human_Punch_InstantEffectClassResource.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 012e2e4ba1a64a44ca16016d040e6b25
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

25
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Punches/Human_Uppercut_InstantEffect.asset Normal file
View File

@ -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: Human_Uppercut_InstantEffect
m_EditorClassIdentifier:
tags:
- {fileID: 11400000, guid: 4e6f036fb4aad9b428694360fcc62f88, type: 2}
influencingStats:
- statTag: {fileID: 11400000, guid: 09eb68d1a036a1643b74420197b999bd, type: 2}
percentInfluence: 0.88
baseValue: 4
damageType: 0
AlliedTargetMultiplier: 1
EnemyTargetMultiplier: 1
applyToClassResourceInstead: 0
applyToSelfResourceInsteadOfHit: 0

8
Assets/Scriptables/Data/Resources/Effects/Debug/Player/-Extras/Human/Punches/Human_Uppercut_InstantEffect.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 128816df89922a54a89d3e8b3d0e27b9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

5
Assets/Scripts/AbilitySystem/Base/CastingStateController.cs
View File

@ -71,9 +71,10 @@ public class CastingStateController : MonoBehaviour
//cast animation
yield return new WaitForSeconds(ability.castTime);
if (ability.animationType != AbilityAnimationType.Melee && ability.animationType != AbilityAnimationType.Shoot)
if (!GameConstants.Animation.IsAnimationEventBasedAbility(ability.animationType))
{
abilityExecution.Invoke();
}
isCasting = false;
if (!ability.castableWhileMoving)
@ -81,7 +82,7 @@ public class CastingStateController : MonoBehaviour
movementSpeedModifier.ToggleCastPenalty(false);
//playerMovement.ToggleAgentMoving(false);
}
}
//Debug.Log("$$sCastbar Done casting");
}

4
Assets/Scripts/BuildManager/BuildLibrary.cs
View File

@ -30,6 +30,8 @@ public class BuildLibrary : MonoBehaviour
}
#endregion
[SerializeField] private bool humanCanLearnAll = false;
[SerializeField] private GameEvent_Int onAbilityTomePageLearned;
[SerializeField] private GameEvent_Int onAbilityUnlocked;
@ -89,7 +91,7 @@ public class BuildLibrary : MonoBehaviour
abilityTomeInstances.Add(initAbilityTomePageInstance);
classSpecificTomeInstances[classBuildLibraries[i].characterClass].Add(initAbilityTomePageInstance);
if (i != 0) //add non-human to possible human playable abilities
if (i != 0 && humanCanLearnAll) //add non-human to possible human playable abilities
{
if (classBuildLibraries[i].possibleClassAbilities[j] is not SimpleMeleeSlashAbility && !classAbilitiesDictionary[classBuildLibraries[0].characterClass].Contains(classBuildLibraries[i].possibleClassAbilities[j]))
classAbilitiesDictionary[classBuildLibraries[0].characterClass].Add(classBuildLibraries[i].possibleClassAbilities[j]);

49
Assets/Scripts/CharacterAnimatorController.cs
View File

@ -155,6 +155,19 @@ public class CharacterAnimatorController : MonoBehaviour
anim.SetTrigger("pickup");
}
public void SetPunchATrigger()
{
anim.SetTrigger("puncha");
}
public void SetPunchBTrigger()
{
anim.SetTrigger("punchb");
}
public void SetKickTrigger()
{
anim.SetTrigger("kick");
}
public void OnFishingEnding()
{
onFishingEnding.Invoke();
@ -178,16 +191,16 @@ public class CharacterAnimatorController : MonoBehaviour
//Debug.Log("$$melee Animation event casting true");
if (CastBarHandler.Instance.currentAbility.animationType == AbilityAnimationType.Melee)
if (GameConstants.Animation.IsAnimationEventBasedAbility(CastBarHandler.Instance.currentAbility.animationType))
{
CastBarHandler.Instance.ExecuteQueuedCastOnAnimationEvent();
parentController.castingStateController.ResetCastingOnMeleeAnimationEvent();
}
else if (CastBarHandler.Instance.currentAbility.animationType == AbilityAnimationType.Shoot)
{
CastBarHandler.Instance.ExecuteQueuedCastOnAnimationEvent();
parentController.castingStateController.ResetCastingOnMeleeAnimationEvent();
//parentController.castingStateController.ResetCastingOnMeleeAnimationEvent();
}
//else if (CastBarHandler.Instance.currentAbility.animationType == AbilityAnimationType.Shoot)
//{
// CastBarHandler.Instance.ExecuteQueuedCastOnAnimationEvent();
// parentController.castingStateController.ResetCastingOnMeleeAnimationEvent();
//}
}
public void SetTriggerBasedOnAbility(AbilityAnimationType animationType, bool spinning = false)
@ -225,11 +238,28 @@ public class CharacterAnimatorController : MonoBehaviour
case AbilityAnimationType.Shoot:
anim.SetTrigger("shoot");
break;
case AbilityAnimationType.PunchA:
anim.SetBool("mirror", MirrorAnimationAtRandom());
anim.SetTrigger("puncha");
break;
case AbilityAnimationType.PunchB:
anim.SetBool("mirror", MirrorAnimationAtRandom());
anim.SetTrigger("punchb");
break;
case AbilityAnimationType.Kick:
anim.SetBool("mirror", MirrorAnimationAtRandom());
anim.SetTrigger("kick");
break;
default:
break;
}
}
private bool MirrorAnimationAtRandom()
{
return Random.Range(0, 100) < 49;
}
}
@ -243,5 +273,8 @@ public enum AbilityAnimationType
Jump,
Casting,
Potion,
Shoot
Shoot,
PunchA,
PunchB,
Kick
}

10
Assets/Scripts/Game/GameConstants.cs
View File

@ -358,6 +358,16 @@ public static class GameConstants
public const int TotalBuildSlots = 4;
}
public static class Animation
{
public static bool IsAnimationEventBasedAbility(AbilityAnimationType anim)
{
return anim == AbilityAnimationType.Melee || anim == AbilityAnimationType.Shoot
|| anim == AbilityAnimationType.PunchA || anim == AbilityAnimationType.PunchB
|| anim == AbilityAnimationType.Kick;
}
}
public static class Scenes
{
public const string CharacterList = "2-CharacterList";

2
Assets/Starfield Skybox/Skybox.mat
View File

@ -94,7 +94,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotation: 3619.9219
- _Rotation: 5.264184
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1