diff --git a/Assets/Animations/MonsterAnimationController.controller b/Assets/Animations/MonsterAnimationController.controller index 297fd53..f20307e 100644 --- a/Assets/Animations/MonsterAnimationController.controller +++ b/Assets/Animations/MonsterAnimationController.controller @@ -171,6 +171,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &3895323774234557799 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {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_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: df1a5739c2bbeb740bbbd5c3a4e28906, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &7310025410107308077 AnimatorStateMachine: serializedVersion: 6 @@ -186,6 +212,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 2543178704363584614} m_Position: {x: 390, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3895323774234557799} + m_Position: {x: 475.1565, y: 240.75717, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 1407797717177975804} diff --git a/Assets/Models/Skeleton_Mage.fbx.meta b/Assets/Models/Skeleton_Mage.fbx.meta index da0e7ce..c975f8b 100644 --- a/Assets/Models/Skeleton_Mage.fbx.meta +++ b/Assets/Models/Skeleton_Mage.fbx.meta @@ -92,7 +92,7 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 globalScale: 1 - rootMotionBoneName: + rootMotionBoneName: root hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 @@ -100,7 +100,7 @@ ModelImporter: autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 importBlendShapeDeformPercent: 1 remapMaterialsIfMaterialImportModeIsNone: 0 diff --git a/Assets/Scenes/GameMain.unity b/Assets/Scenes/GameMain.unity index 8705aa1..6b2a227 100644 --- a/Assets/Scenes/GameMain.unity +++ b/Assets/Scenes/GameMain.unity @@ -1730,6 +1730,10 @@ PrefabInstance: propertyPath: m_Name value: EnemyPortal (1) objectReference: {fileID: 0} + - target: {fileID: 6859825394817103090, guid: 11e3760dda2c0164abf759c18d918893, type: 3} + propertyPath: initialCost + value: 10 + objectReference: {fileID: 0} - target: {fileID: 6859825394817103090, guid: 11e3760dda2c0164abf759c18d918893, type: 3} propertyPath: monsterEntries.Array.size value: 5 @@ -2969,6 +2973,10 @@ PrefabInstance: propertyPath: m_Name value: EnemyPortal objectReference: {fileID: 0} + - target: {fileID: 6859825394817103090, guid: 11e3760dda2c0164abf759c18d918893, type: 3} + propertyPath: initialCost + value: 10 + objectReference: {fileID: 0} - target: {fileID: 6859825394817103090, guid: 11e3760dda2c0164abf759c18d918893, type: 3} propertyPath: monsterEntries.Array.size value: 5 @@ -3383,6 +3391,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 576429380} m_Modifications: + - target: {fileID: -7869551286978933574, guid: f395fcc064a3a834ba957327f1387c19, type: 3} + propertyPath: rechargeAmount + value: 3 + objectReference: {fileID: 0} - target: {fileID: 3247786716306397435, guid: f395fcc064a3a834ba957327f1387c19, type: 3} propertyPath: m_LocalPosition.x value: -13.853991