From ed14ef0112ca9a5c6fc7ca00e44c2427beb65f1f Mon Sep 17 00:00:00 2001 From: vylion Date: Sun, 30 Oct 2016 15:29:50 +0100 Subject: [PATCH] Added archer animations --- .../ArcherSkeleton/animations/death.fbx.meta | 146 ++++++- .../ArcherSkeleton/animations/dodge.fbx.meta | 146 ++++++- .../ArcherSkeleton/animations/run.fbx.meta | 146 ++++++- Assets/3rdParty/ArcherSkeleton/prefab.meta | 9 + .../DemonImp/animations/imp_attack_1.fbx.meta | 140 ++++++- .../DemonImp/animations/imp_attack_2.fbx.meta | 140 ++++++- .../DemonImp/animations/imp_attack_3.fbx.meta | 140 ++++++- .../animations/imp_backpedal.fbx.meta | 140 ++++++- Assets/3rdParty/DemonImp/prefab.meta | 9 + Assets/UnitBehaviour.cs | 68 +++- Assets/UnitCreator.cs | 16 +- Assets/UnitCreator.cs.meta | 9 +- Assets/animControllers.meta | 9 + .../Archer_Controller.controller | 356 ++++++++++++++++++ .../Archer_Controller.controller.meta | 0 .../Imp_Controller.controller} | 36 +- .../Imp_Controller.controller.meta | 8 + .../Necro_Controller.controller | 41 ++ .../Necro_Controller.controller.meta | 8 + .../Skeleton_Controller.controller | 41 ++ .../Skeleton_Controller.controller.meta | 8 + .../Zombie_Controller.controller | 41 ++ .../Zombie_Controller.controller.meta | 8 + Assets/prefabs/CYAN_SK.prefab | 26 ++ ...er_cyan.prefab => Cyan_Necromancer.prefab} | 28 +- ...efab.meta => Cyan_Necromancer.prefab.meta} | 0 Assets/prefabs/PUKE_SK.prefab | 26 ++ Assets/prefabs/PURPLE_SK.prefab | 26 ++ ...er_puke.prefab => Puke_Necromancer.prefab} | 28 +- ...efab.meta => Puke_Necromancer.prefab.meta} | 0 ...urple.prefab => Purple_Necromancer.prefab} | 28 +- ...ab.meta => Purple_Necromancer.prefab.meta} | 0 Assets/prefabs/RED_SK.prefab | 26 ++ ...ncer_red.prefab => Red_Necromancer.prefab} | 28 +- ...refab.meta => Red_Necromancer.prefab.meta} | 0 Assets/prefabs/cyan_demon_imp.prefab | 2 +- Assets/prefabs/cyan_sk_archer.prefab | 2 +- Assets/prefabs/cyan_zombie_common.prefab | 2 +- Assets/scene1.unity | 52 +-- 39 files changed, 1831 insertions(+), 108 deletions(-) create mode 100644 Assets/3rdParty/ArcherSkeleton/prefab.meta create mode 100644 Assets/3rdParty/DemonImp/prefab.meta create mode 100644 Assets/animControllers.meta create mode 100644 Assets/animControllers/Archer_Controller.controller rename Assets/{3rdParty/ArcherSkeleton/animations => animControllers}/Archer_Controller.controller.meta (100%) rename Assets/{3rdParty/ArcherSkeleton/animations/Archer_Controller.controller => animControllers/Imp_Controller.controller} (52%) create mode 100644 Assets/animControllers/Imp_Controller.controller.meta create mode 100644 Assets/animControllers/Necro_Controller.controller create mode 100644 Assets/animControllers/Necro_Controller.controller.meta create mode 100644 Assets/animControllers/Skeleton_Controller.controller create mode 100644 Assets/animControllers/Skeleton_Controller.controller.meta create mode 100644 Assets/animControllers/Zombie_Controller.controller create mode 100644 Assets/animControllers/Zombie_Controller.controller.meta rename Assets/prefabs/{Necromancer_cyan.prefab => Cyan_Necromancer.prefab} (98%) rename Assets/prefabs/{Necromancer_cyan.prefab.meta => Cyan_Necromancer.prefab.meta} (100%) rename Assets/prefabs/{Necromancer_puke.prefab => Puke_Necromancer.prefab} (98%) rename Assets/prefabs/{Necromancer_puke.prefab.meta => Puke_Necromancer.prefab.meta} (100%) rename Assets/prefabs/{Necromancer_purple.prefab => Purple_Necromancer.prefab} (98%) rename Assets/prefabs/{Necromancer_purple.prefab.meta => Purple_Necromancer.prefab.meta} (100%) rename Assets/prefabs/{Necromancer_red.prefab => Red_Necromancer.prefab} (98%) rename Assets/prefabs/{Necromancer_red.prefab.meta => Red_Necromancer.prefab.meta} (100%) diff --git a/Assets/3rdParty/ArcherSkeleton/animations/death.fbx.meta b/Assets/3rdParty/ArcherSkeleton/animations/death.fbx.meta index f2a9e4b..b204802 100644 --- a/Assets/3rdParty/ArcherSkeleton/animations/death.fbx.meta +++ b/Assets/3rdParty/ArcherSkeleton/animations/death.fbx.meta @@ -143,7 +143,151 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Take 001 + takeName: Take 001 + firstFrame: 1 + lastFrame: 30 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: Character1_Hips + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1/Character1_LeftFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1/Character1_RightFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2/Character1_LeftHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2/Character1_LeftHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2/Character1_LeftHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2/Character1_LeftHandThumb3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/helmet + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2/Character1_RightHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2/Character1_RightHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2/Character1_RightHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2/Character1_RightHandThumb3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_left_01 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_left_01/cloak_left_02 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_left_01/cloak_left_02/cloak_left_03 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_right_01 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_right_01/cloak_right_02 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_right_01/cloak_right_02/cloak_right_03 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/quiver + weight: 1 + maskType: 0 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 30 isReadable: 1 meshes: lODScreenPercentages: [] diff --git a/Assets/3rdParty/ArcherSkeleton/animations/dodge.fbx.meta b/Assets/3rdParty/ArcherSkeleton/animations/dodge.fbx.meta index 959b71a..1044673 100644 --- a/Assets/3rdParty/ArcherSkeleton/animations/dodge.fbx.meta +++ b/Assets/3rdParty/ArcherSkeleton/animations/dodge.fbx.meta @@ -143,7 +143,151 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Take 001 + takeName: Take 001 + firstFrame: 1 + lastFrame: 45 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: Character1_Hips + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1/Character1_LeftFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1/Character1_RightFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2/Character1_LeftHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2/Character1_LeftHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2/Character1_LeftHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2/Character1_LeftHandThumb3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/helmet + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2/Character1_RightHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2/Character1_RightHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2/Character1_RightHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2/Character1_RightHandThumb3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_left_01 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_left_01/cloak_left_02 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_left_01/cloak_left_02/cloak_left_03 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_right_01 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_right_01/cloak_right_02 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_right_01/cloak_right_02/cloak_right_03 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/quiver + weight: 1 + maskType: 0 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 1 meshes: lODScreenPercentages: [] diff --git a/Assets/3rdParty/ArcherSkeleton/animations/run.fbx.meta b/Assets/3rdParty/ArcherSkeleton/animations/run.fbx.meta index fa12b02..a0e3f0f 100644 --- a/Assets/3rdParty/ArcherSkeleton/animations/run.fbx.meta +++ b/Assets/3rdParty/ArcherSkeleton/animations/run.fbx.meta @@ -143,7 +143,151 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Take 001 + takeName: Take 001 + firstFrame: 1 + lastFrame: 24 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: Character1_Hips + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1/Character1_LeftFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1/Character1_RightFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2/Character1_LeftHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2/Character1_LeftHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2/Character1_LeftHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2/Character1_LeftHandThumb3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/helmet + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2/Character1_RightHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2/Character1_RightHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2/Character1_RightHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2/Character1_RightHandThumb3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_left_01 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_left_01/cloak_left_02 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_left_01/cloak_left_02/cloak_left_03 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_right_01 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_right_01/cloak_right_02 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/cloak_right_01/cloak_right_02/cloak_right_03 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/quiver + weight: 1 + maskType: 0 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 1 meshes: lODScreenPercentages: [] diff --git a/Assets/3rdParty/ArcherSkeleton/prefab.meta b/Assets/3rdParty/ArcherSkeleton/prefab.meta new file mode 100644 index 0000000..42ddf7e --- /dev/null +++ b/Assets/3rdParty/ArcherSkeleton/prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 456228f09d87f2c4a9df7b9ef04226bc +folderAsset: yes +timeCreated: 1477752003 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3rdParty/DemonImp/animations/imp_attack_1.fbx.meta b/Assets/3rdParty/DemonImp/animations/imp_attack_1.fbx.meta index 616ed86..de22e4d 100644 --- a/Assets/3rdParty/DemonImp/animations/imp_attack_1.fbx.meta +++ b/Assets/3rdParty/DemonImp/animations/imp_attack_1.fbx.meta @@ -137,7 +137,145 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Take 001 + takeName: Take 001 + firstFrame: 1 + lastFrame: 16 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: Character1_Hips + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1/Character1_LeftFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1/Character1_RightFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2/Character1_LeftHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2/Character1_LeftHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2/Character1_LeftHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2/Character1_LeftHandThumb3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/ear_left + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/ear_right + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/eye_left + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/eye_right + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/jaw + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2/Character1_RightHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2/Character1_RightHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2/Character1_RightHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2/Character1_RightHandThumb3 + weight: 1 + maskType: 0 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 1 isReadable: 1 meshes: lODScreenPercentages: [] diff --git a/Assets/3rdParty/DemonImp/animations/imp_attack_2.fbx.meta b/Assets/3rdParty/DemonImp/animations/imp_attack_2.fbx.meta index 768a85d..0b597c6 100644 --- a/Assets/3rdParty/DemonImp/animations/imp_attack_2.fbx.meta +++ b/Assets/3rdParty/DemonImp/animations/imp_attack_2.fbx.meta @@ -137,7 +137,145 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Take 001 + takeName: Take 001 + firstFrame: 1 + lastFrame: 23 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: Character1_Hips + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1/Character1_LeftFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1/Character1_RightFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2/Character1_LeftHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2/Character1_LeftHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2/Character1_LeftHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2/Character1_LeftHandThumb3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/ear_left + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/ear_right + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/eye_left + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/eye_right + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/jaw + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2/Character1_RightHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2/Character1_RightHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2/Character1_RightHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2/Character1_RightHandThumb3 + weight: 1 + maskType: 0 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 1 isReadable: 1 meshes: lODScreenPercentages: [] diff --git a/Assets/3rdParty/DemonImp/animations/imp_attack_3.fbx.meta b/Assets/3rdParty/DemonImp/animations/imp_attack_3.fbx.meta index e1bfa89..06bdf06 100644 --- a/Assets/3rdParty/DemonImp/animations/imp_attack_3.fbx.meta +++ b/Assets/3rdParty/DemonImp/animations/imp_attack_3.fbx.meta @@ -137,7 +137,145 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Take 001 + takeName: Take 001 + firstFrame: 1 + lastFrame: 47 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: Character1_Hips + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1/Character1_LeftFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1/Character1_RightFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2/Character1_LeftHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2/Character1_LeftHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2/Character1_LeftHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2/Character1_LeftHandThumb3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/ear_left + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/ear_right + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/eye_left + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/eye_right + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/jaw + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2/Character1_RightHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2/Character1_RightHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2/Character1_RightHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2/Character1_RightHandThumb3 + weight: 1 + maskType: 0 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 1 isReadable: 1 meshes: lODScreenPercentages: [] diff --git a/Assets/3rdParty/DemonImp/animations/imp_backpedal.fbx.meta b/Assets/3rdParty/DemonImp/animations/imp_backpedal.fbx.meta index 8391112..8e2e5be 100644 --- a/Assets/3rdParty/DemonImp/animations/imp_backpedal.fbx.meta +++ b/Assets/3rdParty/DemonImp/animations/imp_backpedal.fbx.meta @@ -137,7 +137,145 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Take 001 + takeName: Take 001 + firstFrame: 1 + lastFrame: 22 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: + - path: + weight: 1 + - path: Character1_Hips + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_LeftUpLeg/Character1_LeftLeg/Character1_LeftFoot/Character1_LeftToeBase/Character1_LeftFootIndex1/Character1_LeftFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1 + weight: 1 + - path: Character1_Hips/Character1_RightUpLeg/Character1_RightLeg/Character1_RightFoot/Character1_RightToeBase/Character1_RightFootIndex1/Character1_RightFootIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandIndex1/Character1_LeftHandIndex2/Character1_LeftHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandMiddle1/Character1_LeftHandMiddle2/Character1_LeftHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandRing1/Character1_LeftHandRing2/Character1_LeftHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_LeftShoulder/Character1_LeftArm/Character1_LeftForeArm/Character1_LeftHand/Character1_LeftHandThumb1/Character1_LeftHandThumb2/Character1_LeftHandThumb3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/ear_left + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/ear_right + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/eye_left + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/eye_right + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_Neck/Character1_Head/jaw + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandIndex1/Character1_RightHandIndex2/Character1_RightHandIndex3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandMiddle1/Character1_RightHandMiddle2/Character1_RightHandMiddle3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandRing1/Character1_RightHandRing2/Character1_RightHandRing3 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2 + weight: 1 + - path: Character1_Hips/Character1_Spine/Character1_Spine1/Character1_RightShoulder/Character1_RightArm/Character1_RightForeArm/Character1_RightHand/Character1_RightHandThumb1/Character1_RightHandThumb2/Character1_RightHandThumb3 + weight: 1 + maskType: 0 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 1 isReadable: 1 meshes: lODScreenPercentages: [] diff --git a/Assets/3rdParty/DemonImp/prefab.meta b/Assets/3rdParty/DemonImp/prefab.meta new file mode 100644 index 0000000..638eafb --- /dev/null +++ b/Assets/3rdParty/DemonImp/prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f69e4ae1ab31a7b429d8d29157ff18a8 +folderAsset: yes +timeCreated: 1477757782 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UnitBehaviour.cs b/Assets/UnitBehaviour.cs index 406754c..49050bb 100644 --- a/Assets/UnitBehaviour.cs +++ b/Assets/UnitBehaviour.cs @@ -38,10 +38,16 @@ public class UnitBehaviour : MonoBehaviour { public int attackActions = 2; public Elemental attackElem = Elemental.None; - public bool attackAnim = false; - public bool moveAnim = false; - public bool castAnim = false; - public bool deathAnim = false; + bool attackAnim = false; + bool moveAnim = false; + bool castAnim = false; + bool deathAnim = false; + bool damageAnim = false; + bool dodgeAnim = false; + bool idleAnim = false; + float deathTimer = 0; + + public Animator anim; public void SetupStats (int pX, int pZ, Team id, int actions = 2, int steps = 5, int p = 50, int crit = 10, int pRange = 20, int critRange = 10) { posX = pX; @@ -82,17 +88,35 @@ public class UnitBehaviour : MonoBehaviour { return (Random.Range (0, 100) < critChance); } - void receiveDamage(int damage) { - if (health <= damage) - Die (); - else + public void receiveDamage(int damage) { + if (damage == 0) { + dodgeAnim = true; + return; + } + if (damage <= armour) { + damage = 0; + } else + damage = damage - armour; + + if (health <= damage) { + health = 0; + deathAnim = true; + } + else { health -= damage; + damageAnim = true; + } } public void moveAct() { remainingActions -= 1; if (remainingActions < 0) remainingActions = 0; + moveAnim = true; + } + + public void stopMoveAct() { + idleAnim = true; } public int attackAct() { @@ -104,17 +128,43 @@ public class UnitBehaviour : MonoBehaviour { attack = attackDamage; if (criticalHit ()) attack = Mathf.CeilToInt(attack * 1.5f); + attackAnim = true; return attack; } // Use this for initialization void Start () { remainingActions = actionsPerTurn; + + anim = GetComponent (); } // Update is called once per frame void Update () { - + if(Input.GetKeyDown("1")) { + receiveDamage (0); + } + + if (damageAnim) { + anim.Play ("hit", -1, 0f); + damageAnim = false; + } else if (dodgeAnim) { + anim.Play ("dodge", -1, 0f); + dodgeAnim = false; + } else if (deathAnim) { + anim.Play ("death", -1, 0f); + deathTimer = Time.time; + deathAnim = false; + if(idleAnim) idleAnim = false; + } else if (moveAnim) { + anim.Play ("move", -1, 0f); + moveAnim = false; + } else if (deathTimer > 0 && Time.time - deathTimer > 1.5) { + Die (); + } else if (idleAnim) { + anim.Play ("idle", -1, 0f); + idleAnim = false; + } } public void Die () { diff --git a/Assets/UnitCreator.cs b/Assets/UnitCreator.cs index 518c794..e11956a 100644 --- a/Assets/UnitCreator.cs +++ b/Assets/UnitCreator.cs @@ -4,7 +4,11 @@ using System.Collections.Generic; public class UnitCreator : MonoBehaviour { - public GameObject lichObject; + public GameObject lichNone; + public GameObject lichCyan; + public GameObject lichPurple; + public GameObject lichPuke; + public GameObject lichRed; public GameObject skeletonNone; public GameObject skeletonCyan; public GameObject skeletonPurple; @@ -39,7 +43,13 @@ public class UnitCreator : MonoBehaviour { GameObject unit = null; if (type == UnitType.Lich) { - unit = Instantiate (lichObject, new Vector3(posX, 0f, posZ), Quaternion.identity) as GameObject; + if (team == UnitBehaviour.Team.Player) + unit = Instantiate (lichCyan, new Vector3(posX, 0f, posZ), Quaternion.identity) as GameObject; + else if (team == UnitBehaviour.Team.Enemy1) + unit = Instantiate (lichRed, new Vector3(posX, 0f, posZ), Quaternion.identity) as GameObject; + else + unit = Instantiate (lichNone, new Vector3(posX, 0f, posZ), Quaternion.identity) as GameObject; + unit.GetComponent ().SetupStats (posX, posZ, team, 3, 3, 100, 0, 0, 0); unit.GetComponent ().SetupBaseAttack (4, 2, 3); @@ -95,7 +105,7 @@ public class UnitCreator : MonoBehaviour { createUnit (8, 12, UnitBehaviour.Team.Enemy1); createUnit (10, 12, UnitBehaviour.Team.Enemy1); - createUnit (9, 13, UnitBehaviour.Team.Enemy1); + createUnit (9, 17, UnitBehaviour.Team.Enemy1); createUnit (5, 17, UnitBehaviour.Team.Enemy1); createUnit (4, 18, UnitBehaviour.Team.Enemy1); createUnit (5, 19, UnitBehaviour.Team.Enemy1); diff --git a/Assets/UnitCreator.cs.meta b/Assets/UnitCreator.cs.meta index 467f1ca..37e3521 100644 --- a/Assets/UnitCreator.cs.meta +++ b/Assets/UnitCreator.cs.meta @@ -1,11 +1,16 @@ fileFormatVersion: 2 guid: 13406b49a56381848a308c08e10f47dc -timeCreated: 1477746907 +timeCreated: 1477828142 licenseType: Free MonoImporter: serializedVersion: 2 defaultReferences: - - lichObject: {fileID: 100094, guid: 8b79114391319fb4bb56f64adb410eff, type: 2} + - lichNone: {fileID: 100094, guid: 5265b9564f66d6645bd47110a5a304d2, type: 2} + - lichCyan: {fileID: 1000011792493290, guid: 8b79114391319fb4bb56f64adb410eff, type: 2} + - lichPurple: {fileID: 1000011634263304, guid: 066e441b86c1e9844bce90fc037a61c5, + type: 2} + - lichPuke: {fileID: 1000010935056404, guid: e35d5d9dcd8041540a3a65c724b35bc4, type: 2} + - lichRed: {fileID: 1000012080980634, guid: 6da3da2220b4ee141949eaf6e7a6ed7b, type: 2} - skeletonNone: {fileID: 137098, guid: c7e8a5bb79537a441836a1e2ea02a005, type: 2} - skeletonCyan: {fileID: 1000010498988072, guid: 375da41ce925bd546a34e406f609940f, type: 2} diff --git a/Assets/animControllers.meta b/Assets/animControllers.meta new file mode 100644 index 0000000..0feb118 --- /dev/null +++ b/Assets/animControllers.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d91477fc3422008438efaeb4194bb423 +folderAsset: yes +timeCreated: 1477827835 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/animControllers/Archer_Controller.controller b/Assets/animControllers/Archer_Controller.controller new file mode 100644 index 0000000..bd35b92 --- /dev/null +++ b/Assets/animControllers/Archer_Controller.controller @@ -0,0 +1,356 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Archer_Controller + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107000012904534676} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1101000011203496838 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102000013772335304} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8295455 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101000011609096140 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102000013772335304} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.91573036 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101000012291307492 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102000013772335304} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8076923 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101000012572369620 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102000013772335304} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101000012577009588 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102000013772335304} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.74137926 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102000010490751884 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: move + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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_Motion: {fileID: 7400000, guid: a28d68f9b774bc94e89afeade0d3bc7e, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: +--- !u!1102 &1102000010873809082 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: dodge + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101000011203496838} + 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_Motion: {fileID: 7400000, guid: 4be5da9c545f0ed45827ef9d0e50173b, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: +--- !u!1102 &1102000011637813196 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: hit + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101000012577009588} + 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_Motion: {fileID: 7400000, guid: 7ebc91e887a612f438ca3a9829e77154, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: +--- !u!1102 &1102000012017455962 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Take 001 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: +--- !u!1102 &1102000012407087124 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101000012291307492} + 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_Motion: {fileID: 7400000, guid: e701a86b31e320f4ea8f75b79f7b8243, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: +--- !u!1102 &1102000013183879512 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: death + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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_Motion: {fileID: 7400000, guid: dc8eca1a3b1d15a499c7ac6c1ad4f043, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: +--- !u!1102 &1102000013674637402 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: spawn + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101000011609096140} + 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_Motion: {fileID: 7400000, guid: 2290cec6dcb9d4c45aee5c52a14fd411, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: +--- !u!1102 &1102000013772335304 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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_Motion: {fileID: 7400000, guid: 6f10fd2ed85b3e54bb304361aaf21974, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: +--- !u!1107 &1107000012904534676 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102000013674637402} + m_Position: {x: 264, y: 108, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102000013772335304} + m_Position: {x: 264, y: 24, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102000011637813196} + m_Position: {x: 264, y: -60, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102000013183879512} + m_Position: {x: 780, y: 48, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102000012407087124} + m_Position: {x: 492, y: -60, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102000010490751884} + m_Position: {x: 492, y: 108, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102000010873809082} + m_Position: {x: 492, y: 24, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 1101000012572369620} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 48, y: 24, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102000013674637402} diff --git a/Assets/3rdParty/ArcherSkeleton/animations/Archer_Controller.controller.meta b/Assets/animControllers/Archer_Controller.controller.meta similarity index 100% rename from Assets/3rdParty/ArcherSkeleton/animations/Archer_Controller.controller.meta rename to Assets/animControllers/Archer_Controller.controller.meta diff --git a/Assets/3rdParty/ArcherSkeleton/animations/Archer_Controller.controller b/Assets/animControllers/Imp_Controller.controller similarity index 52% rename from Assets/3rdParty/ArcherSkeleton/animations/Archer_Controller.controller rename to Assets/animControllers/Imp_Controller.controller index 77cf07c..a365460 100644 --- a/Assets/3rdParty/ArcherSkeleton/animations/Archer_Controller.controller +++ b/Assets/animControllers/Imp_Controller.controller @@ -5,13 +5,13 @@ AnimatorController: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: Archer_Controller + m_Name: Imp_Controller serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer - m_StateMachine: {fileID: 1107000012904534676} + m_StateMachine: {fileID: 1107000012332606762} m_Mask: {fileID: 0} m_Motions: [] m_Behaviours: [] @@ -21,40 +21,14 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1102 &1102000012697971086 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Take 001 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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_Motion: {fileID: 7400000, guid: 6f10fd2ed85b3e54bb304361aaf21974, type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: ---- !u!1107 &1107000012904534676 +--- !u!1107 &1107000012332606762 AnimatorStateMachine: serializedVersion: 5 m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 1102000012697971086} - m_Position: {x: 264, y: 120, z: 0} + m_ChildStates: [] m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -64,4 +38,4 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102000012697971086} + m_DefaultState: {fileID: 0} diff --git a/Assets/animControllers/Imp_Controller.controller.meta b/Assets/animControllers/Imp_Controller.controller.meta new file mode 100644 index 0000000..42d4290 --- /dev/null +++ b/Assets/animControllers/Imp_Controller.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 10efa99af9fbf9c49ae854621856263b +timeCreated: 1477828303 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/animControllers/Necro_Controller.controller b/Assets/animControllers/Necro_Controller.controller new file mode 100644 index 0000000..afcd956 --- /dev/null +++ b/Assets/animControllers/Necro_Controller.controller @@ -0,0 +1,41 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Necro_Controller + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107000013370530064} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &1107000013370530064 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} diff --git a/Assets/animControllers/Necro_Controller.controller.meta b/Assets/animControllers/Necro_Controller.controller.meta new file mode 100644 index 0000000..a84c3fd --- /dev/null +++ b/Assets/animControllers/Necro_Controller.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f5ac84ace5e41b4ab46180c22fc54da +timeCreated: 1477828317 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/animControllers/Skeleton_Controller.controller b/Assets/animControllers/Skeleton_Controller.controller new file mode 100644 index 0000000..eea5a51 --- /dev/null +++ b/Assets/animControllers/Skeleton_Controller.controller @@ -0,0 +1,41 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Skeleton_Controller + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107000012862979174} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &1107000012862979174 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} diff --git a/Assets/animControllers/Skeleton_Controller.controller.meta b/Assets/animControllers/Skeleton_Controller.controller.meta new file mode 100644 index 0000000..af08a6a --- /dev/null +++ b/Assets/animControllers/Skeleton_Controller.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5584bee98dc4bdf409cc2e5fa016c397 +timeCreated: 1477828268 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/animControllers/Zombie_Controller.controller b/Assets/animControllers/Zombie_Controller.controller new file mode 100644 index 0000000..62c9219 --- /dev/null +++ b/Assets/animControllers/Zombie_Controller.controller @@ -0,0 +1,41 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Zombie_Controller + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107000011931436118} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &1107000011931436118 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} diff --git a/Assets/animControllers/Zombie_Controller.controller.meta b/Assets/animControllers/Zombie_Controller.controller.meta new file mode 100644 index 0000000..446dfca --- /dev/null +++ b/Assets/animControllers/Zombie_Controller.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b87b800d4547f044b84ed13f05da9f7 +timeCreated: 1477828280 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/CYAN_SK.prefab b/Assets/prefabs/CYAN_SK.prefab index 2c0ee71..afb09e8 100644 --- a/Assets/prefabs/CYAN_SK.prefab +++ b/Assets/prefabs/CYAN_SK.prefab @@ -79,6 +79,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 4000013617029748} + - 95: {fileID: 95000012152030190} - 111: {fileID: 111000011293226388} - 114: {fileID: 114000012327830544} m_Layer: 0 @@ -1232,6 +1233,23 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000012901244378} m_Mesh: {fileID: 4300002, guid: 5a712edeab9b4c24fa95680608a979d4, type: 3} +--- !u!95 &95000012152030190 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000010498988072} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5584bee98dc4bdf409cc2e5fa016c397, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!111 &111000011293226388 Animation: m_ObjectHideFlags: 1 @@ -1278,6 +1296,14 @@ MonoBehaviour: attackDamage: 1 attackActions: 2 attackElem: 0 + attackAnim: 0 + moveAnim: 0 + castAnim: 0 + deathAnim: 0 + damageAnim: 0 + dodgeAnim: 0 + deathTimer: 0 + anim: {fileID: 0} --- !u!137 &137000012256680050 SkinnedMeshRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/prefabs/Necromancer_cyan.prefab b/Assets/prefabs/Cyan_Necromancer.prefab similarity index 98% rename from Assets/prefabs/Necromancer_cyan.prefab rename to Assets/prefabs/Cyan_Necromancer.prefab index b514929..f68442f 100644 --- a/Assets/prefabs/Necromancer_cyan.prefab +++ b/Assets/prefabs/Cyan_Necromancer.prefab @@ -379,10 +379,11 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 4000014163462778} + - 95: {fileID: 95000011240083792} - 111: {fileID: 111000010278389236} - 114: {fileID: 114000013427779086} m_Layer: 0 - m_Name: Necromancer_cyan + m_Name: Cyan_Necromancer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1446,6 +1447,23 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000013980811726} m_Mesh: {fileID: 4300002, guid: 013ee0a8b56bacd44b928eab033163af, type: 3} +--- !u!95 &95000011240083792 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000011792493290} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8f5ac84ace5e41b4ab46180c22fc54da, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!111 &111000010278389236 Animation: m_ObjectHideFlags: 1 @@ -1502,6 +1520,14 @@ MonoBehaviour: attackDamage: 1 attackActions: 2 attackElem: 0 + attackAnim: 0 + moveAnim: 0 + castAnim: 0 + deathAnim: 0 + damageAnim: 0 + dodgeAnim: 0 + deathTimer: 0 + anim: {fileID: 0} --- !u!137 &137000012258628500 SkinnedMeshRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/prefabs/Necromancer_cyan.prefab.meta b/Assets/prefabs/Cyan_Necromancer.prefab.meta similarity index 100% rename from Assets/prefabs/Necromancer_cyan.prefab.meta rename to Assets/prefabs/Cyan_Necromancer.prefab.meta diff --git a/Assets/prefabs/PUKE_SK.prefab b/Assets/prefabs/PUKE_SK.prefab index 455007d..da7b098 100644 --- a/Assets/prefabs/PUKE_SK.prefab +++ b/Assets/prefabs/PUKE_SK.prefab @@ -383,6 +383,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 4000011437976836} + - 95: {fileID: 95000010435198976} - 111: {fileID: 111000013460478436} - 114: {fileID: 114000010703646424} m_Layer: 0 @@ -1232,6 +1233,23 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000011514464338} m_Mesh: {fileID: 4300000, guid: 0ba58477d7691e144a0a24c07f308a44, type: 3} +--- !u!95 &95000010435198976 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000012859847482} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5584bee98dc4bdf409cc2e5fa016c397, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!111 &111000013460478436 Animation: m_ObjectHideFlags: 1 @@ -1278,6 +1296,14 @@ MonoBehaviour: attackDamage: 1 attackActions: 2 attackElem: 0 + attackAnim: 0 + moveAnim: 0 + castAnim: 0 + deathAnim: 0 + damageAnim: 0 + dodgeAnim: 0 + deathTimer: 0 + anim: {fileID: 0} --- !u!137 &137000013860254720 SkinnedMeshRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/prefabs/PURPLE_SK.prefab b/Assets/prefabs/PURPLE_SK.prefab index 99ff478..052d8ee 100644 --- a/Assets/prefabs/PURPLE_SK.prefab +++ b/Assets/prefabs/PURPLE_SK.prefab @@ -491,6 +491,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 4000010250036752} + - 95: {fileID: 95000013473596514} - 111: {fileID: 111000014159040658} - 114: {fileID: 114000011001498622} m_Layer: 0 @@ -1232,6 +1233,23 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000012358289832} m_Mesh: {fileID: 4300000, guid: 0ba58477d7691e144a0a24c07f308a44, type: 3} +--- !u!95 &95000013473596514 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000013814300192} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5584bee98dc4bdf409cc2e5fa016c397, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!111 &111000014159040658 Animation: m_ObjectHideFlags: 1 @@ -1278,6 +1296,14 @@ MonoBehaviour: attackDamage: 1 attackActions: 2 attackElem: 0 + attackAnim: 0 + moveAnim: 0 + castAnim: 0 + deathAnim: 0 + damageAnim: 0 + dodgeAnim: 0 + deathTimer: 0 + anim: {fileID: 0} --- !u!137 &137000011446506828 SkinnedMeshRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/prefabs/Necromancer_puke.prefab b/Assets/prefabs/Puke_Necromancer.prefab similarity index 98% rename from Assets/prefabs/Necromancer_puke.prefab rename to Assets/prefabs/Puke_Necromancer.prefab index 10f9efc..4f086ec 100644 --- a/Assets/prefabs/Necromancer_puke.prefab +++ b/Assets/prefabs/Puke_Necromancer.prefab @@ -170,10 +170,11 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 4000010358697140} + - 95: {fileID: 95000010552149128} - 111: {fileID: 111000010314315360} - 114: {fileID: 114000010295839516} m_Layer: 0 - m_Name: Necromancer_puke + m_Name: Puke_Necromancer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1446,6 +1447,23 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000012025306730} m_Mesh: {fileID: 4300002, guid: 013ee0a8b56bacd44b928eab033163af, type: 3} +--- !u!95 &95000010552149128 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000010935056404} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8f5ac84ace5e41b4ab46180c22fc54da, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!111 &111000010314315360 Animation: m_ObjectHideFlags: 1 @@ -1502,6 +1520,14 @@ MonoBehaviour: attackDamage: 1 attackActions: 2 attackElem: 0 + attackAnim: 0 + moveAnim: 0 + castAnim: 0 + deathAnim: 0 + damageAnim: 0 + dodgeAnim: 0 + deathTimer: 0 + anim: {fileID: 0} --- !u!137 &137000010199047148 SkinnedMeshRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/prefabs/Necromancer_puke.prefab.meta b/Assets/prefabs/Puke_Necromancer.prefab.meta similarity index 100% rename from Assets/prefabs/Necromancer_puke.prefab.meta rename to Assets/prefabs/Puke_Necromancer.prefab.meta diff --git a/Assets/prefabs/Necromancer_purple.prefab b/Assets/prefabs/Purple_Necromancer.prefab similarity index 98% rename from Assets/prefabs/Necromancer_purple.prefab rename to Assets/prefabs/Purple_Necromancer.prefab index e0f84b4..7fd1b85 100644 --- a/Assets/prefabs/Necromancer_purple.prefab +++ b/Assets/prefabs/Purple_Necromancer.prefab @@ -261,10 +261,11 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 4000011211850516} + - 95: {fileID: 95000013793945044} - 111: {fileID: 111000012331136788} - 114: {fileID: 114000011679296210} m_Layer: 0 - m_Name: Necromancer_purple + m_Name: Purple_Necromancer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1446,6 +1447,23 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000010952518802} m_Mesh: {fileID: 4300002, guid: 013ee0a8b56bacd44b928eab033163af, type: 3} +--- !u!95 &95000013793945044 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000011634263304} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8f5ac84ace5e41b4ab46180c22fc54da, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!111 &111000012331136788 Animation: m_ObjectHideFlags: 1 @@ -1502,6 +1520,14 @@ MonoBehaviour: attackDamage: 1 attackActions: 2 attackElem: 0 + attackAnim: 0 + moveAnim: 0 + castAnim: 0 + deathAnim: 0 + damageAnim: 0 + dodgeAnim: 0 + deathTimer: 0 + anim: {fileID: 0} --- !u!137 &137000013200933730 SkinnedMeshRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/prefabs/Necromancer_purple.prefab.meta b/Assets/prefabs/Purple_Necromancer.prefab.meta similarity index 100% rename from Assets/prefabs/Necromancer_purple.prefab.meta rename to Assets/prefabs/Purple_Necromancer.prefab.meta diff --git a/Assets/prefabs/RED_SK.prefab b/Assets/prefabs/RED_SK.prefab index ce49219..1e3a755 100644 --- a/Assets/prefabs/RED_SK.prefab +++ b/Assets/prefabs/RED_SK.prefab @@ -324,6 +324,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 4000012963689890} + - 95: {fileID: 95000012581309898} - 111: {fileID: 111000014174848104} - 114: {fileID: 114000013940748292} m_Layer: 0 @@ -1232,6 +1233,23 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000010275971594} m_Mesh: {fileID: 4300002, guid: ef35170461c69074f8bebd29edc0240a, type: 3} +--- !u!95 &95000012581309898 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000011928221278} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5584bee98dc4bdf409cc2e5fa016c397, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!111 &111000014174848104 Animation: m_ObjectHideFlags: 1 @@ -1278,6 +1296,14 @@ MonoBehaviour: attackDamage: 1 attackActions: 2 attackElem: 0 + attackAnim: 0 + moveAnim: 0 + castAnim: 0 + deathAnim: 0 + damageAnim: 0 + dodgeAnim: 0 + deathTimer: 0 + anim: {fileID: 0} --- !u!137 &137000010082171024 SkinnedMeshRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/prefabs/Necromancer_red.prefab b/Assets/prefabs/Red_Necromancer.prefab similarity index 98% rename from Assets/prefabs/Necromancer_red.prefab rename to Assets/prefabs/Red_Necromancer.prefab index b9a2e3b..4e2b091 100644 --- a/Assets/prefabs/Necromancer_red.prefab +++ b/Assets/prefabs/Red_Necromancer.prefab @@ -351,10 +351,11 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 4000014283200462} + - 95: {fileID: 95000010099396604} - 111: {fileID: 111000010183650526} - 114: {fileID: 114000010251968528} m_Layer: 0 - m_Name: Necromancer_red + m_Name: Red_Necromancer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1446,6 +1447,23 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000011616049872} m_Mesh: {fileID: 4300002, guid: 013ee0a8b56bacd44b928eab033163af, type: 3} +--- !u!95 &95000010099396604 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000012080980634} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8f5ac84ace5e41b4ab46180c22fc54da, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!111 &111000010183650526 Animation: m_ObjectHideFlags: 1 @@ -1502,6 +1520,14 @@ MonoBehaviour: attackDamage: 1 attackActions: 2 attackElem: 0 + attackAnim: 0 + moveAnim: 0 + castAnim: 0 + deathAnim: 0 + damageAnim: 0 + dodgeAnim: 0 + deathTimer: 0 + anim: {fileID: 0} --- !u!137 &137000011556203980 SkinnedMeshRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/prefabs/Necromancer_red.prefab.meta b/Assets/prefabs/Red_Necromancer.prefab.meta similarity index 100% rename from Assets/prefabs/Necromancer_red.prefab.meta rename to Assets/prefabs/Red_Necromancer.prefab.meta diff --git a/Assets/prefabs/cyan_demon_imp.prefab b/Assets/prefabs/cyan_demon_imp.prefab index 391e169..0744019 100644 --- a/Assets/prefabs/cyan_demon_imp.prefab +++ b/Assets/prefabs/cyan_demon_imp.prefab @@ -1675,7 +1675,7 @@ Animator: m_GameObject: {fileID: 1000012424904804} m_Enabled: 1 m_Avatar: {fileID: 9000000, guid: 4b2e016f28d343e4192214b25ab90c9e, type: 3} - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 10efa99af9fbf9c49ae854621856263b, type: 2} m_CullingMode: 1 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/Assets/prefabs/cyan_sk_archer.prefab b/Assets/prefabs/cyan_sk_archer.prefab index e48803e..425cb63 100644 --- a/Assets/prefabs/cyan_sk_archer.prefab +++ b/Assets/prefabs/cyan_sk_archer.prefab @@ -2030,7 +2030,7 @@ Animator: m_GameObject: {fileID: 1000013156676680} m_Enabled: 1 m_Avatar: {fileID: 9000000, guid: 9de7769f6cb5acf4b9d41c7ff0c61327, type: 3} - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000, guid: a72e98b5ca66583468fd673575c6beec, type: 2} m_CullingMode: 1 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/Assets/prefabs/cyan_zombie_common.prefab b/Assets/prefabs/cyan_zombie_common.prefab index 0dca2e9..417fc8b 100644 --- a/Assets/prefabs/cyan_zombie_common.prefab +++ b/Assets/prefabs/cyan_zombie_common.prefab @@ -1851,7 +1851,7 @@ Animator: m_GameObject: {fileID: 1000010633918362} m_Enabled: 1 m_Avatar: {fileID: 9000000, guid: 15da26ef70ce2fa41a31923720b366ae, type: 3} - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 0b87b800d4547f044b84ed13f05da9f7, type: 2} m_CullingMode: 1 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/Assets/scene1.unity b/Assets/scene1.unity index a3165a3..587483f 100644 --- a/Assets/scene1.unity +++ b/Assets/scene1.unity @@ -233,57 +233,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4000011097406802, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &1117580099 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4000012281901458, guid: 1f7cfb8336a0dac4ca9fe31ac3f00e2a, type: 2} - propertyPath: m_LocalPosition.x - value: 1.2937016 - objectReference: {fileID: 0} - - target: {fileID: 4000012281901458, guid: 1f7cfb8336a0dac4ca9fe31ac3f00e2a, type: 2} - propertyPath: m_LocalPosition.y - value: -1.822968 - objectReference: {fileID: 0} - - target: {fileID: 4000012281901458, guid: 1f7cfb8336a0dac4ca9fe31ac3f00e2a, type: 2} - propertyPath: m_LocalPosition.z - value: 3.9006882 - objectReference: {fileID: 0} - - target: {fileID: 4000012281901458, guid: 1f7cfb8336a0dac4ca9fe31ac3f00e2a, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000012281901458, guid: 1f7cfb8336a0dac4ca9fe31ac3f00e2a, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000012281901458, guid: 1f7cfb8336a0dac4ca9fe31ac3f00e2a, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000012281901458, guid: 1f7cfb8336a0dac4ca9fe31ac3f00e2a, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4000012281901458, guid: 1f7cfb8336a0dac4ca9fe31ac3f00e2a, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1000010949094726, guid: 1f7cfb8336a0dac4ca9fe31ac3f00e2a, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 1f7cfb8336a0dac4ca9fe31ac3f00e2a, type: 2} - m_IsPrefabParent: 0 --- !u!1 &1159618687 stripped GameObject: m_PrefabParentObject: {fileID: 1000012666769054, guid: 5fe675c564d71cc44945f6ca7e09e827, @@ -441,7 +395,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -482,7 +436,7 @@ Transform: m_Children: - {fileID: 1478118647} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 --- !u!81 &1724536058 AudioListener: m_ObjectHideFlags: 0