feat : 줍기 매너니즘 변경.

ehdgb97 · ehdgb97 · commit ca4543051eda · 2024-11-12T11:24:33.000+09:00
diff --git a/VisionpredatorProcess/AutoPickSystem.cpp b/VisionpredatorProcess/AutoPickSystem.cpp
@@ -5,7 +5,7 @@
 #include <limits>
 #include <cmath>
 #include <algorithm>
-AutoPickSystem::AutoPickSystem(std::shared_ptr<SceneManager> scenemnager):System(scenemnager)
+AutoPickSystem::AutoPickSystem(std::shared_ptr<SceneManager> scenemnager) :System(scenemnager)
 {
 	EventManager::GetInstance().Subscribe("OnAutoPickup", CreateSubscriber(&AutoPickSystem::OnAutoPickup));
 }
@@ -40,7 +40,7 @@ void AutoPickSystem::AddPickup(AutoPickComponent* autopick, GunComponent* pickup
 	}
 }
 
-void AutoPickSystem::ReleasePickup(AutoPickComponent* autopick, GunComponent* pickuped) 
+void AutoPickSystem::ReleasePickup(AutoPickComponent* autopick, GunComponent* pickuped)
 {
 	auto it = std::find(autopick->PickUps.begin(), autopick->PickUps.end(), pickuped->GetEntityID());
 	if (it != autopick->PickUps.end())
@@ -60,15 +60,22 @@ void AutoPickSystem::OnAutoPickup(std::any pcomp)
 void AutoPickSystem::FixedUpdate(float deltaTime)
 {
 
-	COMPLOOP(AutoPickComponent, pickupcomp) 
+	COMPLOOP(AutoPickComponent, pickupcomp)
 	{
 		if (pickupcomp.ParentPlayer
 			&& pickupcomp.IsAuto
 			&& !pickupcomp.ParentPlayer->HasGun
 			&& !pickupcomp.ParentPlayer->IsVPMode
-			&& pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->curAni == static_cast<int>(VisPred::Game::PlayerAni::ToIdle02_Sword)
+			&& (pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->curAni == static_cast<int>(VisPred::Game::PlayerAni::ToIdle02_Sword)
+				|| pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->curAni == static_cast<int>(VisPred::Game::PlayerAni::ToIdle01_Sword)
+				|| pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->curAni == static_cast<int>(VisPred::Game::PlayerAni::ToAttack1_Sword)
+				|| pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->curAni == static_cast<int>(VisPred::Game::PlayerAni::ToAttack2_Sword)
+				|| pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->curAni == static_cast<int>(VisPred::Game::PlayerAni::ToAttack3_Sword)	)
 			&& !pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->IsBlending)
 		{
+
+			pickupcomp.ParentPlayer->IsAttacking = false;
+
 			AutoPickUp(&pickupcomp);
 		}
 	}
@@ -148,7 +155,7 @@ void AutoPickSystem::RemoveInvalidEntities(AutoPickComponent* autopick)
 		{
 			it = autopick->PickUps.erase(it);
 		}
-		else if (entity->HasComponent<GunComponent>()&& entity->GetComponent<GunComponent>()->IsEmpty)
+		else if (entity->HasComponent<GunComponent>() && entity->GetComponent<GunComponent>()->IsEmpty)
 		{
 			it = autopick->PickUps.erase(it);
 		}
@@ -161,7 +168,7 @@ void AutoPickSystem::RemoveInvalidEntities(AutoPickComponent* autopick)
 bool AutoPickSystem::IsValidPickupEntity(uint32_t entityID)
 {
 	auto entity = GetSceneManager()->GetEntity(entityID);
-	if (!entity || !m_PhysicsEngine->IsDynamic(entityID)) 
+	if (!entity || !m_PhysicsEngine->IsDynamic(entityID))
 		return false;
 
 	auto guncomp = entity->GetComponent<GunComponent>();
diff --git a/VisionpredatorProcess/GunSystem.cpp b/VisionpredatorProcess/GunSystem.cpp
@@ -12,7 +12,7 @@ void GunSystem::Update(float deltaTime)
 {
 	COMPLOOP(GunComponent, guncomp)
 	{
-		if (guncomp.CurrentBullet==0)
+		if (guncomp.CurrentBullet == 0)
 			guncomp.IsEmpty = true;
 	}
 }
@@ -115,6 +115,11 @@ void GunSystem::Interected_Gun(GunComponent& guncomp, PlayerComponent& playercom
 		&& anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToAttack1_Sword
 		&& anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToAttack2_Sword
 		&& anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToAttack3_Sword
+		&& anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToIdle01_Sword
+		&& anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToIdle01_Pistol
+		&& anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToIdle01_Rifle
+		&& anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToIdle01_ShotGun
+
 		)
 		return;
 
@@ -168,6 +173,6 @@ void GunSystem::Interected_Gun(GunComponent& guncomp, PlayerComponent& playercom
 	EventManager::GetInstance().ImmediateEvent("OnChangeAnimation", data);
 	GetSceneManager()->SpawnSoundEntity(soundcomp->SoundKey_GunDraw, soundcomp->Volume_GunDraw, true, false, {});
 	EventManager::GetInstance().ImmediateEvent("OnUpdateWeaponUI");
-			
+
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#include <limits>`
`6`	`6`	`#include <cmath>`
`7`	`7`	`#include <algorithm>`
`8`		`-AutoPickSystem::AutoPickSystem(std::shared_ptr<SceneManager> scenemnager):System(scenemnager)`
	`8`	`+AutoPickSystem::AutoPickSystem(std::shared_ptr<SceneManager> scenemnager) :System(scenemnager)`
`9`	`9`	`{`
`10`	`10`	`EventManager::GetInstance().Subscribe("OnAutoPickup", CreateSubscriber(&AutoPickSystem::OnAutoPickup));`
`11`	`11`	`}`
`@@ -40,7 +40,7 @@ void AutoPickSystem::AddPickup(AutoPickComponent* autopick, GunComponent* pickup`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`-void AutoPickSystem::ReleasePickup(AutoPickComponent* autopick, GunComponent* pickuped)`
	`43`	`+void AutoPickSystem::ReleasePickup(AutoPickComponent* autopick, GunComponent* pickuped)`
`44`	`44`	`{`
`45`	`45`	`auto it = std::find(autopick->PickUps.begin(), autopick->PickUps.end(), pickuped->GetEntityID());`
`46`	`46`	`if (it != autopick->PickUps.end())`
`@@ -60,15 +60,22 @@ void AutoPickSystem::OnAutoPickup(std::any pcomp)`
`60`	`60`	`void AutoPickSystem::FixedUpdate(float deltaTime)`
`61`	`61`	`{`
`62`	`62`
`63`		`- COMPLOOP(AutoPickComponent, pickupcomp)`
	`63`	`+ COMPLOOP(AutoPickComponent, pickupcomp)`
`64`	`64`	`{`
`65`	`65`	`if (pickupcomp.ParentPlayer`
`66`	`66`	`&& pickupcomp.IsAuto`
`67`	`67`	`&& !pickupcomp.ParentPlayer->HasGun`
`68`	`68`	`&& !pickupcomp.ParentPlayer->IsVPMode`
`69`		`- && pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->curAni == static_cast<int>(VisPred::Game::PlayerAni::ToIdle02_Sword)`
	`69`	`+ && (pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->curAni == static_cast<int>(VisPred::Game::PlayerAni::ToIdle02_Sword)`
	`70`	`+ \|\| pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->curAni == static_cast<int>(VisPred::Game::PlayerAni::ToIdle01_Sword)`
	`71`	`+ \|\| pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->curAni == static_cast<int>(VisPred::Game::PlayerAni::ToAttack1_Sword)`
	`72`	`+ \|\| pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->curAni == static_cast<int>(VisPred::Game::PlayerAni::ToAttack2_Sword)`
	`73`	`+ \|\| pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->curAni == static_cast<int>(VisPred::Game::PlayerAni::ToAttack3_Sword) )`
`70`	`74`	`&& !pickupcomp.ParentPlayer->HandEntity.lock()->GetComponent<AnimationComponent>()->IsBlending)`
`71`	`75`	`{`
	`76`	`+`
	`77`	`+ pickupcomp.ParentPlayer->IsAttacking = false;`
	`78`	`+`
`72`	`79`	`AutoPickUp(&pickupcomp);`
`73`	`80`	`}`
`74`	`81`	`}`
`@@ -148,7 +155,7 @@ void AutoPickSystem::RemoveInvalidEntities(AutoPickComponent* autopick)`
`148`	`155`	`{`
`149`	`156`	`it = autopick->PickUps.erase(it);`
`150`	`157`	`}`
`151`		`- else if (entity->HasComponent<GunComponent>()&& entity->GetComponent<GunComponent>()->IsEmpty)`
	`158`	`+ else if (entity->HasComponent<GunComponent>() && entity->GetComponent<GunComponent>()->IsEmpty)`
`152`	`159`	`{`
`153`	`160`	`it = autopick->PickUps.erase(it);`
`154`	`161`	`}`
`@@ -161,7 +168,7 @@ void AutoPickSystem::RemoveInvalidEntities(AutoPickComponent* autopick)`
`161`	`168`	`bool AutoPickSystem::IsValidPickupEntity(uint32_t entityID)`
`162`	`169`	`{`
`163`	`170`	`auto entity = GetSceneManager()->GetEntity(entityID);`
`164`		`- if (!entity \|\| !m_PhysicsEngine->IsDynamic(entityID))`
	`171`	`+ if (!entity \|\| !m_PhysicsEngine->IsDynamic(entityID))`
`165`	`172`	`return false;`
`166`	`173`
`167`	`174`	`auto guncomp = entity->GetComponent<GunComponent>();`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ void GunSystem::Update(float deltaTime)`
`12`	`12`	`{`
`13`	`13`	`COMPLOOP(GunComponent, guncomp)`
`14`	`14`	`{`
`15`		`- if (guncomp.CurrentBullet==0)`
	`15`	`+ if (guncomp.CurrentBullet == 0)`
`16`	`16`	`guncomp.IsEmpty = true;`
`17`	`17`	`}`
`18`	`18`	`}`
`@@ -115,6 +115,11 @@ void GunSystem::Interected_Gun(GunComponent& guncomp, PlayerComponent& playercom`
`115`	`115`	`&& anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToAttack1_Sword`
`116`	`116`	`&& anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToAttack2_Sword`
`117`	`117`	`&& anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToAttack3_Sword`
	`118`	`+ && anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToIdle01_Sword`
	`119`	`+ && anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToIdle01_Pistol`
	`120`	`+ && anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToIdle01_Rifle`
	`121`	`+ && anicomp->PlayerCurAni != VisPred::Game::PlayerAni::ToIdle01_ShotGun`
	`122`	`+`
`118`	`123`	`)`
`119`	`124`	`return;`
`120`	`125`
`@@ -168,6 +173,6 @@ void GunSystem::Interected_Gun(GunComponent& guncomp, PlayerComponent& playercom`
`168`	`173`	`EventManager::GetInstance().ImmediateEvent("OnChangeAnimation", data);`
`169`	`174`	`GetSceneManager()->SpawnSoundEntity(soundcomp->SoundKey_GunDraw, soundcomp->Volume_GunDraw, true, false, {});`
`170`	`175`	`EventManager::GetInstance().ImmediateEvent("OnUpdateWeaponUI");`
`171`		`-`
	`176`	`+`
`172`	`177`	`}`
`173`	`178`