회심의 일격 롤백된 거 다시 수정
This commit is contained in:
parent
24d6600535
commit
8de7c75db1
File diff suppressed because one or more lines are too long
|
|
@ -1960,6 +1960,9 @@ AnimatorStateMachine:
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: -5940922149749640003}
|
m_State: {fileID: -5940922149749640003}
|
||||||
m_Position: {x: -240, y: -80, z: 0}
|
m_Position: {x: -240, y: -80, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: 6597468962160707002}
|
||||||
|
m_Position: {x: -240, y: 0, z: 0}
|
||||||
m_ChildStateMachines: []
|
m_ChildStateMachines: []
|
||||||
m_AnyStateTransitions: []
|
m_AnyStateTransitions: []
|
||||||
m_EntryTransitions: []
|
m_EntryTransitions: []
|
||||||
|
|
@ -2404,6 +2407,28 @@ AnimatorStateTransition:
|
||||||
m_InterruptionSource: 0
|
m_InterruptionSource: 0
|
||||||
m_OrderedInterruption: 1
|
m_OrderedInterruption: 1
|
||||||
m_CanTransitionToSelf: 1
|
m_CanTransitionToSelf: 1
|
||||||
|
--- !u!1101 &5866674570634830529
|
||||||
|
AnimatorStateTransition:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name:
|
||||||
|
m_Conditions: []
|
||||||
|
m_DstStateMachine: {fileID: 0}
|
||||||
|
m_DstState: {fileID: -5708076101590037915}
|
||||||
|
m_Solo: 0
|
||||||
|
m_Mute: 0
|
||||||
|
m_IsExit: 0
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransitionDuration: 0.25
|
||||||
|
m_TransitionOffset: 0
|
||||||
|
m_ExitTime: 0.8125
|
||||||
|
m_HasExitTime: 1
|
||||||
|
m_HasFixedDuration: 1
|
||||||
|
m_InterruptionSource: 0
|
||||||
|
m_OrderedInterruption: 1
|
||||||
|
m_CanTransitionToSelf: 1
|
||||||
--- !u!1101 &6082278240856233531
|
--- !u!1101 &6082278240856233531
|
||||||
AnimatorStateTransition:
|
AnimatorStateTransition:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
|
|
@ -2448,6 +2473,34 @@ AnimatorStateTransition:
|
||||||
m_InterruptionSource: 0
|
m_InterruptionSource: 0
|
||||||
m_OrderedInterruption: 1
|
m_OrderedInterruption: 1
|
||||||
m_CanTransitionToSelf: 1
|
m_CanTransitionToSelf: 1
|
||||||
|
--- !u!1102 &6597468962160707002
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: fatalblow
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions:
|
||||||
|
- {fileID: 5866674570634830529}
|
||||||
|
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: 7998989578573806355, guid: c833ccb2282f30c46be407a237f77648,
|
||||||
|
type: 3}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
--- !u!1102 &8500637094174956195
|
--- !u!1102 &8500637094174956195
|
||||||
AnimatorState:
|
AnimatorState:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
|
|
|
||||||
|
|
@ -792,7 +792,7 @@ public class Actor : MyCoroutine
|
||||||
m_Stat.Set_Stat(true, eStat.MP, _mp);
|
m_Stat.Set_Stat(true, eStat.MP, _mp);
|
||||||
|
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
if (UnityEngine.SceneManagement.SceneManager.GetActiveScene().name == "StatTest")
|
if (SceneManager.GetActiveScene().name == "StatTest")
|
||||||
{
|
{
|
||||||
MainToStatTest.Ins.Set_Dmglabel($"MP : {_mp}");
|
MainToStatTest.Ins.Set_Dmglabel($"MP : {_mp}");
|
||||||
return;
|
return;
|
||||||
|
|
@ -804,14 +804,12 @@ public class Actor : MyCoroutine
|
||||||
}
|
}
|
||||||
|
|
||||||
#region 스킬 동작
|
#region 스킬 동작
|
||||||
IEnumerator Co_JumpAttack()
|
IEnumerator Co_JumpAttack(float heightPos_y, float duration)
|
||||||
{
|
{
|
||||||
var startPos = Get_position(); // 현재 위치
|
var startPos = Get_position(); // 현재 위치
|
||||||
Vector3 direction = (m_Target.Get_position() - Get_position()).normalized; // 목표와 현재 위치의 방향 벡터를 구함
|
Vector3 direction = (m_Target.Get_position() - Get_position()).normalized; // 목표와 현재 위치의 방향 벡터를 구함
|
||||||
var targetPos = m_Target.Get_position() - direction * 1f; // 목표 위치에서 -1f 앞 지점 계산
|
var targetPos = m_Target.Get_position() - direction * 1f; // 목표 위치에서 -1f 앞 지점 계산
|
||||||
|
|
||||||
var heightPos_y = 1f;
|
|
||||||
var duration = 0.8f; // 전체 점프 시간
|
|
||||||
var elapsed = 0f;
|
var elapsed = 0f;
|
||||||
|
|
||||||
while (elapsed < duration)
|
while (elapsed < duration)
|
||||||
|
|
@ -1645,8 +1643,11 @@ public class Actor : MyCoroutine
|
||||||
if (m_NavMeshAgent.isOnNavMesh) m_NavMeshAgent.ResetPath();
|
if (m_NavMeshAgent.isOnNavMesh) m_NavMeshAgent.ResetPath();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_Magic.m_SkillTableData.e_Skill == eEffect.Skill_JumpAttack)
|
switch (m_Magic.m_SkillTableData.e_Skill)
|
||||||
StartCoroutine(Co_JumpAttack());
|
{
|
||||||
|
case eEffect.Skill_JumpAttack: StartCoroutine(Co_JumpAttack(1f, 0.8f)); break;
|
||||||
|
case eEffect.Skill_FatalBlow: StartCoroutine(Co_JumpAttack(0.8f, 0.6f)); break;
|
||||||
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(m_Magic.m_SkillTableData.s_CastingEffect))
|
if (!string.IsNullOrEmpty(m_Magic.m_SkillTableData.s_CastingEffect))
|
||||||
InGameInfo.Ins.Show_Effect(m_Magic.m_SkillTableData.s_CastingEffect, Get_position());
|
InGameInfo.Ins.Show_Effect(m_Magic.m_SkillTableData.s_CastingEffect, Get_position());
|
||||||
|
|
|
||||||
|
|
@ -199,7 +199,7 @@ public enum eEffect
|
||||||
Skill_Shield, Skill_Bead, Skill_ExplosionArea, Skill_SpiritBless, Skill_SwordShield, Skill_StraightBurst, Skill_Resurrection,
|
Skill_Shield, Skill_Bead, Skill_ExplosionArea, Skill_SpiritBless, Skill_SwordShield, Skill_StraightBurst, Skill_Resurrection,
|
||||||
Skill_IceBolt, Skill_Fireball, Skill_FireBolt, Skill_EnergyBall, Skill_Blizzard, Skill_Flower, Skill_Golem, Skill_EarthWorm,
|
Skill_IceBolt, Skill_Fireball, Skill_FireBolt, Skill_EnergyBall, Skill_Blizzard, Skill_Flower, Skill_Golem, Skill_EarthWorm,
|
||||||
Skill_Hurricane, Skill_EatSnack, Skill_ShieldAttack, Skill_JumpAttack, Skill_ManaBurst, Skill_DaggerThrow, Skill_OneHandCombo1,
|
Skill_Hurricane, Skill_EatSnack, Skill_ShieldAttack, Skill_JumpAttack, Skill_ManaBurst, Skill_DaggerThrow, Skill_OneHandCombo1,
|
||||||
|
Skill_FatalBlow,
|
||||||
|
|
||||||
Skill_Poison,
|
Skill_Poison,
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue