Feat: Enemy 피격할때마다 피격 애니메이션 출력 하도록 변경

Author: heosumin518

VPEngine/AnimationSystem.cpp

@@ -35,7 +35,7 @@ void AnimationSystem::OnChangeAnimation(std::any aniBlendData)
 		auto aniComp = GetSceneManager()->GetComponent<AnimationComponent>(aniblenddata.EntityID);
 		aniComp->isLoop = aniblenddata.Loop;
 
-		if (aniComp->curAni != aniblenddata.Index)	//애니메이션이 다를때만 변경 같으면 그대로
+		if (aniComp->curAni != aniblenddata.Index || aniblenddata.IsAgain)	//애니메이션이 다를때만 변경 같으면 그대로
 		{
 			aniComp->preAni = aniComp->curAni;
 			aniComp->curAni = aniblenddata.Index;

VPEngine/EngineStructs.h

@@ -10,6 +10,7 @@ namespace VisPred
 			float Speed{};
 			float TransitionTime{};
 			bool Loop;
+			bool IsAgain = false;
 		};
 
 		enum class Skill

VisionpredatorProcess/EnemyChaseState.cpp

@@ -43,9 +43,12 @@ void EnemyChaseState::Update(const std::shared_ptr<Component>& component, float
 	{
 		navComp->IsChase = false;
 
-		if (animationComp->IsBlending == false)
+		//if (animationComp->IsBlending == false)
 			if (enemyComp->OnHit == true)
 			{
+				if (enemyComp->MovementState == &EnemyMovementState::s_HitReaction)
+					enemyComp->MovementState->Enter(enemyComp);
+
 				ChangeCurrentState(enemyComp, &EnemyMovementState::s_HitReaction);
 				enemyComp->HeatComplete = false;
 			}

VisionpredatorProcess/EnemyIdleMovementState.cpp

@@ -13,7 +13,7 @@ void EnemyIdleMovementState::Enter(const std::shared_ptr<Component>& component)
 	auto enemyComp = std::dynamic_pointer_cast<EnemyComponent>(component);
 
 	if(dynamic_cast<EnemyDeadState*>(enemyComp->BehaviorState) == &EnemyBehaviorState::s_Dead)
-		ChangeCurrentAnimation(*enemyComp, VisPred::Game::EnemyAni::DIE, 2.f, 0.f, false);
+		ChangeCurrentAnimation(*enemyComp, VisPred::Game::EnemyAni::DIE, 2.f, 0.01f, false);
 	else
 		ChangeCurrentAnimation(*enemyComp, VisPred::Game::EnemyAni::IDLE, 2.f);
 }

VisionpredatorProcess/EnemyState.cpp

@@ -79,6 +79,11 @@ float EnemyState::DetectTarget(EnemyComponent& enemyComp, float deltaTime)
 		{
 			enemyComp.OnHit = false;
 
+			const std::shared_ptr<EnemyComponent> temp(&enemyComp, null_deleter{});
+
+			if (enemyComp.MovementState == &EnemyMovementState::s_HitReaction)
+				enemyComp.MovementState->Enter(temp);
+
 			ChangeCurrentState(enemyComp, &EnemyMovementState::s_HitReaction);
 		}
 		//else
@@ -265,7 +270,7 @@ void EnemyState::ChangeCurrentAnimation(const std::shared_ptr<EnemyComponent>& e
 
 	enemyComp->CurrentAni = animation;
 
-	VisPred::Engine::AniBlendData temp{ enemyComp->GetEntityID(), static_cast<int>(animation), speed, transitionTime, isLoop };
+	VisPred::Engine::AniBlendData temp{ enemyComp->GetEntityID(), static_cast<int>(animation), speed, transitionTime, isLoop, isAgain };
 
 	const std::any data = temp;
 	if (true == isImmediate)