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

bugfix default unlocked abilities on lvl up

Browse Source
This commit is contained in:
Pedro Gomes 2025-06-13 18:11:48 +01:00
parent 3406b6bfc8
commit 226eae666e
26 changed files with 21623 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Assets/1-Packs/3D/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/CharacterAnimatorNecroUpdate.controller
View File

@ -597,97 +597,97 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: throw
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: throwingTime
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: castingTime
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: cast
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: melee
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: spinning
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: dead
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: revived
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: summon
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: fish
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: pickup
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: potion
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: spellcasting
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: HorizontalAxis
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: VerticalAxis
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -971,7 +971,7 @@ BlendTree:
m_Motion: {fileID: -6411013857362534180, guid: e1e4fb5684939bb479c83e16bac91038, type: 3}
m_Threshold: 1
m_Position: {x: 0, y: -1}
m_TimeScale: 1
m_TimeScale: 1.4
m_CycleOffset: 0
m_DirectBlendParameter: movementSpeed
m_Mirror: 0

100
Assets/1-Packs/3D/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/Skeleton.controller → Assets/1-Packs/3D/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/Skeleton_Enemy.controller
View File

@ -69,6 +69,33 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-7094606454041514897
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: GetHit
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 7935996317807482022}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 44db4b4bd52c40b4bae8350833cc9921, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-6583358953875725460
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -140,12 +167,16 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 8488278609978172101}
m_Position: {x: 270, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: -7094606454041514897}
m_Position: {x: 270, y: 180, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: -4261361684640507111}
- {fileID: -6583358953875725460}
- {fileID: -3316037427580542980}
- {fileID: -8898158581012930404}
- {fileID: -4261361684640507111}
- {fileID: -961885149527338363}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
@ -323,13 +354,38 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-961885149527338363
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: hurt
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7094606454041514897}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.025
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Skeleton
m_Name: Skeleton_Enemy
serializedVersion: 5
m_AnimatorParameters:
- m_Name: movementSpeed
@ -337,37 +393,43 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: throw
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: cast
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: melee
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: throwingTime
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: dead
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: hurt
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -488,6 +550,28 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &7935996317807482022
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: -2563821287706019269}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.2
m_TransitionOffset: 0
m_ExitTime: 0.8
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &8488278609978172101
AnimatorState:
serializedVersion: 6

0
Assets/1-Packs/3D/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/Skeleton.controller.meta → Assets/1-Packs/3D/CharactersPack/KayKit_Adventurers_1.0_FREE/Characters/Skeleton_Enemy.controller.meta
View File

21040
Assets/1-Packs/3D/CharactersPack/Models/GetHit.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/1-Packs/3D/CharactersPack/Models/GetHit.anim.meta Normal file
View File

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

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

@ -1548,7 +1548,7 @@ Canvas:
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_SortingOrder: 5
m_TargetDisplay: 0
--- !u!114 &6787032289279707503
MonoBehaviour:
@ -8386,10 +8386,10 @@ MonoBehaviour:
- characterClass: {fileID: 11400000, guid: 504738889b9f3b14596e37f7bba80fbf, type: 2}
possibleClassAbilities:
- {fileID: 11400000, guid: db19571a96c2e6147a60a49bb343e08d, type: 2}
- {fileID: 11400000, guid: f78ff85297eeec34a941affb095f27f4, type: 2}
- {fileID: 11400000, guid: fe98f38f1a3841844a391b5ff4637669, type: 2}
- {fileID: 11400000, guid: da1fbcda369605140b8241d12c165bc4, type: 2}
- {fileID: 11400000, guid: b696826a7a31a58409292d48c32f862e, type: 2}
- {fileID: 11400000, guid: da1fbcda369605140b8241d12c165bc4, type: 2}
- {fileID: 11400000, guid: f78ff85297eeec34a941affb095f27f4, type: 2}
- {fileID: 11400000, guid: 093abebde2ce57648bc676fdedcdd026, type: 2}
- characterClass: {fileID: 11400000, guid: 8dffc501620b33a45b2aef5527d400bf, type: 2}
possibleClassAbilities:
@ -8418,10 +8418,10 @@ MonoBehaviour:
- characterClass: {fileID: 11400000, guid: 0a3bb425d50c35b409b74a648c994aac, type: 2}
possibleClassAbilities:
- {fileID: 11400000, guid: 41ce9d138621d414787fd48998b3ad0d, type: 2}
- {fileID: 11400000, guid: 65d6401bb544f4a4faa3169cde9d9bd0, type: 2}
- {fileID: 11400000, guid: 80407ff808963814798f148b07dbf576, type: 2}
- {fileID: 11400000, guid: f2c34fbff4781f84aa75dcc83f2fe57b, type: 2}
- {fileID: 11400000, guid: 3cab0af73858e9e48936aa83ba32d041, type: 2}
- {fileID: 11400000, guid: f2c34fbff4781f84aa75dcc83f2fe57b, type: 2}
- {fileID: 11400000, guid: 65d6401bb544f4a4faa3169cde9d9bd0, type: 2}
- {fileID: 11400000, guid: 445df66fd514f9640b3f2f228a7b4aee, type: 2}
- characterClass: {fileID: 11400000, guid: 334f27400a4a01e4caceed2c6b63bee9, type: 2}
possibleClassAbilities:
@ -8438,7 +8438,6 @@ MonoBehaviour:
- characterClass: {fileID: 11400000, guid: 292f720fb1a62f44c9d54c8ab56bc660, type: 2}
possibleClassAbilities:
- {fileID: 11400000, guid: 8476123513cabfe4c92edb83943222dd, type: 2}
- {fileID: 11400000, guid: fb2829af881bafe4aa4561c2c8edb0fa, type: 2}
- {fileID: 11400000, guid: 2b0bbebd842f1d94db336642767e1062, type: 2}
- {fileID: 11400000, guid: 3b796291bbf82db4c80fe16058fa90af, type: 2}
abilityTomeInstances: []
@ -14591,6 +14590,7 @@ Transform:
- {fileID: 7624448236951792051}
- {fileID: 2491171992559046387}
- {fileID: 4313186750705857994}
- {fileID: 3475843492364284939}
- {fileID: 7475116341184709870}
- {fileID: 7475116340900335231}
- {fileID: 7475116342680308986}
@ -14619,7 +14619,6 @@ Transform:
- {fileID: 882613633191811684}
- {fileID: 8612537344861635202}
- {fileID: 2447033682763886562}
- {fileID: 3475843492364284939}
- {fileID: 1380778743}
- {fileID: 315999698282489082}
- {fileID: 2800905167933415666}

19
Assets/Resources/Abilities/TaintedStar_AreaOfEffectOverTimePrefab (1) Variant.prefab
View File

@ -154,15 +154,15 @@ PrefabInstance:
- {fileID: 0}
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
insertIndex: 0
addedObject: {fileID: 3493041237720686549}
- targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
insertIndex: -1
addedObject: {fileID: 1412395578695396342}
- targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
insertIndex: -1
addedObject: {fileID: 7704311964326511036}
- targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
insertIndex: -1
addedObject: {fileID: 3493041237720686549}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
--- !u!4 &2208739293571583667 stripped
@ -170,18 +170,13 @@ Transform:
m_CorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
m_PrefabInstance: {fileID: 4746340150876425756}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5451622410603664854 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
m_PrefabInstance: {fileID: 4746340150876425756}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5043479866987318434
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 5451622410603664854}
m_TransformParent: {fileID: 2208739293571583667}
m_Modifications:
- target: {fileID: 1082793402966804016, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_Name
@ -229,15 +224,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

22
Assets/Resources/Abilities/Tornado_ProjectileAreaOfEffectOverTimeWithTickEvent.prefab
View File

@ -252,7 +252,6 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7192171109981835468}
- {fileID: 7681102452339790675}
- {fileID: 6975521718323349822}
- {fileID: 3238356846573237868}
@ -394,6 +393,7 @@ Transform:
m_Children:
- {fileID: 2650017693601061829}
- {fileID: 7910058261851551780}
- {fileID: 7192171109981835468}
m_Father: {fileID: 7681102451873883168}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &7681102452339790700
@ -528,7 +528,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7681102451873883168}
m_TransformParent: {fileID: 7681102452339790675}
m_Modifications:
- target: {fileID: 548295500233825645, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_Volume
@ -562,6 +562,18 @@ PrefabInstance:
propertyPath: clips.Array.data[4]
value:
objectReference: {fileID: 8300000, guid: edb6eaaf36222f9429a9b2214ec69ad0, type: 3}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalScale.x
value: 1.6666665
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalScale.y
value: 1.6666665
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalScale.z
value: 1.6666665
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@ -580,15 +592,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

37
Assets/Resources/Abilities/WhirlingAxes_AreaOfEffectOverTimePrefab Variant.prefab
View File

@ -660,7 +660,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 5286231604687820133}
m_TransformParent: {fileID: 2041114413699911168}
m_Modifications:
- target: {fileID: 1082793402966804016, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_Name
@ -708,15 +708,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@ -796,19 +796,23 @@ PrefabInstance:
propertyPath: m_Name
value: WhirlingAxes_AreaOfEffectOverTimePrefab Variant
objectReference: {fileID: 0}
- target: {fileID: 753911528859556823, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
propertyPath: impactHitVFX
value:
objectReference: {fileID: 8525990746615576120, guid: b85d21f3b8fed714bacf0c4fd50fa512, type: 3}
m_RemovedComponents:
- {fileID: 0}
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
insertIndex: 0
addedObject: {fileID: 5263841305740460681}
- targetCorrespondingSourceObject: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
insertIndex: 1
addedObject: {fileID: 3223532084018813462}
- targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
insertIndex: -1
addedObject: {fileID: 1010363569}
- targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
insertIndex: -1
addedObject: {fileID: 5263841305740460681}
- targetCorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
insertIndex: -1
addedObject: {fileID: 3223532084018813462}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
--- !u!4 &2041114413699911168 stripped
@ -816,18 +820,13 @@ Transform:
m_CorrespondingSourceObject: {fileID: 6879643804943630511, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
m_PrefabInstance: {fileID: 4839708415601315503}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5286231604687820133 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 753911528859556810, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}
m_PrefabInstance: {fileID: 4839708415601315503}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6429879204983654753
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 5286231604687820133}
m_TransformParent: {fileID: 2041114413699911168}
m_Modifications:
- target: {fileID: 1082793402966804016, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_Name
@ -875,15 +874,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8468962234435687287, guid: 7bbfd7a02f9b04a4db92a1a374338fb1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

28
Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab
View File

@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 5690275390890447421}
- component: {fileID: 6283201126310809669}
- component: {fileID: 4146203122506230047}
- component: {fileID: 8578451915293256687}
m_Layer: 31
m_Name: Skeleton
m_TagString: Untagged
@ -90,6 +91,33 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f965d6ce9b8ab3942a0f66c008c8a99c, type: 3}
m_Name:
m_EditorClassIdentifier:
onHurtAnimation:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 8578451915293256687}
m_TargetAssemblyTypeName: HitFlashEffect, Assembly-CSharp
m_MethodName: Flash
m_Mode: 4
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0.2
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &8578451915293256687
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1395015452859667197}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4242ef877b68dd04dafd9ddc4999e5cb, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2278116590711127943
GameObject:
m_ObjectHideFlags: 0

18
Assets/Resources/Bosses/BossEnemyPrefab_SkellyMage_Variant.prefab
View File

@ -114,7 +114,7 @@ Transform:
m_Children:
- {fileID: 883701297}
m_Father: {fileID: 4854261591842771834}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -0.000031646465, y: 0.000034150955, z: 0.000007698198}
--- !u!1 &208040796
GameObject:
m_ObjectHideFlags: 0
@ -404,7 +404,7 @@ Transform:
- {fileID: 1221614091}
- {fileID: 758373147}
m_Father: {fileID: 191844203}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -15.72, y: -1.3199889e-15, z: -1.6760567e-15}
--- !u!1 &998603998
GameObject:
m_ObjectHideFlags: 0
@ -688,7 +688,7 @@ Transform:
- {fileID: 1067042226}
- {fileID: 1812623856}
m_Father: {fileID: 883701297}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -28.16005, y: 90.00001, z: 180}
--- !u!1 &1117225124
GameObject:
m_ObjectHideFlags: 0
@ -940,7 +940,7 @@ Transform:
- {fileID: 208040797}
- {fileID: 2107868437}
m_Father: {fileID: 883701297}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 20.865005, y: 65.928215, z: 135.9008}
--- !u!1 &1607996522
GameObject:
m_ObjectHideFlags: 0
@ -971,7 +971,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1430684330}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 61.839962, y: -179.99997, z: 90.00001}
--- !u!1 &1667623043
GameObject:
m_ObjectHideFlags: 0
@ -1143,7 +1143,9 @@ SkinnedMeshRenderer:
m_SkinnedMotionVectors: 1
m_Mesh: {fileID: 3418091426015535786, guid: c17378c69fdabda48a14e675c35d4546, type: 3}
m_Bones: []
m_BlendShapeWeights: []
m_BlendShapeWeights:
- 0
- 0
m_RootBone: {fileID: 0}
m_AABB:
m_Center: {x: 0.0023401976, y: 0.53248715, z: -0.01192829}
@ -1264,7 +1266,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1108935090}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 23.291727, y: 65.57953, z: -30.859875}
--- !u!1 &2037200327
GameObject:
m_ObjectHideFlags: 0
@ -1381,7 +1383,7 @@ Transform:
- {fileID: 1772013479}
- {fileID: 1401882046}
m_Father: {fileID: 883701297}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 15.457293, y: 4.774398e-16, z: 3.5179733e-15}
--- !u!1 &2107868436
GameObject:
m_ObjectHideFlags: 0

28
Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab
View File

@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 6853293170635492090}
- component: {fileID: 5106598912658884738}
- component: {fileID: 719420356144337027}
- component: {fileID: 214227269696773679}
m_Layer: 31
m_Name: Skeleton
m_TagString: Untagged
@ -90,6 +91,33 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f965d6ce9b8ab3942a0f66c008c8a99c, type: 3}
m_Name:
m_EditorClassIdentifier:
onHurtAnimation:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 214227269696773679}
m_TargetAssemblyTypeName: HitFlashEffect, Assembly-CSharp
m_MethodName: Flash
m_Mode: 4
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0.2
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &214227269696773679
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 193713797072636474}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4242ef877b68dd04dafd9ddc4999e5cb, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &953848037517992138
GameObject:
m_ObjectHideFlags: 0

2
Assets/Resources/PlayableCharacters/PlayerPrefab_Barbarian Variant.prefab
View File

@ -515,7 +515,7 @@ PrefabInstance:
- target: {fileID: 7454623061449465165, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: selectedBuildSlots.Array.data[2].ability
value:
objectReference: {fileID: 11400000, guid: 5095271b44cdf9c44a2d72c98a05ec52, type: 2}
objectReference: {fileID: 11400000, guid: 3eb0543909f25a94eb803cdc9bb51da0, type: 2}
- target: {fileID: 7454623061449465165, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: selectedBuildSlots.Array.data[3].ability
value:

2
Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab
View File

@ -103,7 +103,7 @@ PrefabInstance:
- target: {fileID: 7454623061449465165, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: defaultBuildSlots.Array.data[2].ability
value:
objectReference: {fileID: 11400000, guid: da1fbcda369605140b8241d12c165bc4, type: 2}
objectReference: {fileID: 11400000, guid: b696826a7a31a58409292d48c32f862e, type: 2}
- target: {fileID: 7454623061449465165, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: defaultBuildSlots.Array.data[3].ability
value:

6
Assets/Resources/PlayableCharacters/PlayerPrefab_Necromancer Variant.prefab
View File

@ -295,11 +295,11 @@ PrefabInstance:
- target: {fileID: 7454623061449465165, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: defaultBuildSlots.Array.data[1].ability
value:
objectReference: {fileID: 11400000, guid: 679598ad64000fa4aa4a8b5c1cb568e3, type: 2}
objectReference: {fileID: 11400000, guid: c602778d057001d4b929c6685f50bb59, type: 2}
- target: {fileID: 7454623061449465165, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: defaultBuildSlots.Array.data[2].ability
value:
objectReference: {fileID: 11400000, guid: 48a85da984c9762418f0badd5730672a, type: 2}
objectReference: {fileID: 11400000, guid: e8ac285f957ac924babbb299999e6dbb, type: 2}
- target: {fileID: 7454623061449465165, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: defaultBuildSlots.Array.data[3].ability
value:
@ -526,7 +526,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 2176522877944764073}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 96b7af24550accb4595e004a4977e512, type: 3}
m_Name:

2
Assets/Resources/PlayableCharacters/PlayerPrefab_Rogue Variant.prefab
View File

@ -257,7 +257,7 @@ PrefabInstance:
objectReference: {fileID: 11400000, guid: 2f597af241e09124aa5a0d69c6904f47, type: 2}
- target: {fileID: 7454623061449465165, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: defaultBuildSlots.Array.size
value: 4
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7454623061449465165, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
propertyPath: defaultBuildSlots.Array.data[0].ability

4
Assets/Resources/PlayerPrefab.prefab
View File

@ -1188,8 +1188,6 @@ MonoBehaviour:
binderSlot: 1
- ability: {fileID: 0}
binderSlot: 2
- ability: {fileID: 0}
binderSlot: 3
abilityKeyBinders:
- {fileID: 4847227750113470832}
- {fileID: 6259208590911633741}
@ -1203,8 +1201,6 @@ MonoBehaviour:
binderSlot: 1
- ability: {fileID: 0}
binderSlot: 2
- ability: {fileID: 0}
binderSlot: 3
--- !u!1 &1802766295531197535
GameObject:
m_ObjectHideFlags: 0

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

@ -2301,6 +2301,110 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 952476992021474036, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 952476992021474036, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 952476992021474036, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 952476992021474036, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 952476992021474036, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1868539959409642287, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1868539959409642287, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1868539959409642287, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1868539959409642287, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1868539959409642287, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1868539959409642287, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484889860, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484889860, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484889860, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484889860, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484889860, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484906414, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484906414, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484906414, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484906414, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484906414, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484922440, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484922440, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484922440, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484922440, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296484922440, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296485017366, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 1
@ -2313,6 +2417,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 450
objectReference: {fileID: 0}
- target: {fileID: 2959850296485017366, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2959850296485017366, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 168.74998
@ -2321,6 +2429,26 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -600
objectReference: {fileID: 0}
- target: {fileID: 3044532144327822992, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3044532144327822992, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3044532144327822992, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3044532144327822992, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3044532144327822992, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3269677882279797627, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -2345,6 +2473,66 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3641119934303568818, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3641119934303568818, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3641119934303568818, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3641119934303568818, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3641119934303568818, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4379688128455002370, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4379688128455002370, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4379688128455002370, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4379688128455002370, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4379688128455002370, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6069245676466788546, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6069245676466788546, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6069245676466788546, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6069245676466788546, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6069245676466788546, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116340865457954, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -2445,6 +2633,66 @@ PrefabInstance:
propertyPath: m_Name
value: Persistent Objects
objectReference: {fileID: 0}
- target: {fileID: 7475116342296211536, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296211536, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296211536, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296211536, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296211536, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296228278, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296228278, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296228278, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296228278, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296228278, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296244508, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296244508, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296244508, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296244508, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296244508, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296380174, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 1
@ -2457,6 +2705,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 450
objectReference: {fileID: 0}
- target: {fileID: 7475116342296380174, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7475116342296380174, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 506.24997
@ -2465,9 +2717,25 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -600
objectReference: {fileID: 0}
- target: {fileID: 7864011832780438464, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SortingOrder
value: 5
- target: {fileID: 8244038924219432218, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8244038924219432218, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8244038924219432218, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8244038924219432218, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8244038924219432218, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []

5
Assets/Scriptables/Data/Resources/Abilities/Debug/Player/Werewolf/1-Werewolf_DeepClaw_SlashAbility.asset
View File

@ -12,8 +12,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a5d5cf82dd5c07f438f5809f773372e2, type: 3}
m_Name: 1-Werewolf_DeepClaw_SlashAbility
m_EditorClassIdentifier:
displayName: Claw
Icon: {fileID: 21300000, guid: 0389074d1deba1c448d45812db40c0df, type: 3}
displayName: Deep Claw
Icon: {fileID: 21300000, guid: c2be99b0e66fff4479ffbb35df20092e, type: 3}
targettingTags:
- {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2}
tags:
@ -31,6 +31,7 @@ MonoBehaviour:
manaCost: 1
healthCost: 0
classResourceCost: 0
spiritPowerReserveCost: 0
percentMaxManaCost: 0.5
percentMaxHealthCost: 0
cooldown: 5

2
Assets/Scripts/BuildManager/BuildManagerUIController.cs
View File

@ -93,7 +93,7 @@ public class BuildManagerUIController : MonoBehaviour
abilitySlotsDropdowns[i].RefreshShownValue();
abilitySlotsDropdowns[i].value = possibleAbilities.IndexOf(buildManager.SelectedBuildSlots[i].ability);
abilitySlotsDropdowns[i].SetValueWithoutNotify(possibleAbilities.IndexOf(buildManager.SelectedBuildSlots[i].ability));
}
CheckForSlotUnlockables();

38
Assets/Scripts/CombatFeedbackExtras/HitFlashEffect.cs Normal file
View File

@ -0,0 +1,38 @@
using System.Collections;
using UnityEngine;
public class HitFlashEffect : MonoBehaviour
{
private MaterialPropertyBlock propertyBlock;
private Renderer[] renderers;
void Awake()
{
propertyBlock = new MaterialPropertyBlock();
renderers = GetComponentsInChildren<Renderer>();
}
public void Flash(float duration)
{
StartCoroutine(FlashCoroutine(duration));
}
IEnumerator FlashCoroutine(float duration)
{
// Set flash
propertyBlock.SetColor("_EmissionColor", Color.white * 2f);
foreach (var r in renderers)
{
r.GetPropertyBlock(propertyBlock);
propertyBlock.SetColor("_EmissionColor", Color.white * 2f);
r.SetPropertyBlock(propertyBlock);
}
yield return new WaitForSeconds(duration);
// Clear flash
propertyBlock.SetColor("_EmissionColor", Color.black);
foreach (var r in renderers)
r.SetPropertyBlock(propertyBlock);
}
}

11
Assets/Scripts/CombatFeedbackExtras/HitFlashEffect.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 4242ef877b68dd04dafd9ddc4999e5cb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Scripts/NPC/NPCControllers_v2/BasicEnemy/BasicEnemyNPCController.cs
View File

@ -109,7 +109,7 @@ public class BasicEnemyNPCController : NPCControllerBase
if (ability == null)
{
failedTryAttackCounter++;
if(failedTryAttackCounter >= failedTryAttackLimitToChangeTarget)
if(failedTryAttackCounter >= failedTryAttackLimitToChangeTarget && possibleTargets.Count > 1)
{
failedTryAttackCounter = 0;
UpdateCurrentTarget(GetClosestTarget());

8
Assets/Scripts/NPC/NPCControllers_v2/NPCAnimatorControllerBase.cs
View File

@ -2,6 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.AI;
using UnityEngine.Events;
public class NPCAnimatorControllerBase : MonoBehaviour
{
@ -11,6 +12,8 @@ public class NPCAnimatorControllerBase : MonoBehaviour
protected bool isLockedInAnimation = false;
public UnityEvent onHurtAnimation = new UnityEvent();
protected virtual void Awake()
{
anim = GetComponent<Animator>();
@ -41,6 +44,11 @@ public class NPCAnimatorControllerBase : MonoBehaviour
npcController.OnDeathAnimationEventTriggered();
}
protected virtual void OnHurtAnimationEvent()
{
onHurtAnimation.Invoke();
}
public void SetDead()
{
anim.SetTrigger("dead");

3
Assets/Scripts/Networking/NetworkManager.cs
View File

@ -52,6 +52,9 @@ public class NetworkManager : MonoBehaviour
CancelChangeLevelVote();
});
onJobSelected.Response.AddListener((x) => votedZone = x.zoneName);
logoType = Random.Range(0, 100);
logoType %= (int)(LoadingLogoType.Count);
}
// Start is called before the first frame update

10
Assets/Scripts/Networking/NetworkedProjectile.cs
View File

@ -135,6 +135,16 @@ public class NetworkedProjectile : MonoBehaviour
effect.ApplyEffect(ownerTag, new List<Taggable> { target });
}
try
{
target.GetComponentInChildren<Animator>()?.SetTrigger("hurt");
}
catch (System.Exception)
{
Debug.Log("No Hurt trigger");
}
if (!canPierce)
{
if (enableRicochet && ricochetCount < maxRicochets)