diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 1e4aacb..85bf7a8 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f56264589a4aaade4ce154f18d6398d236f42fbd7e57f04fefa539883d123169 -size 5623641 +oid sha256:c46e6f3a6973952487c009db51df995221db2f16f03e541e5ed11c04082b6efe +size 5623612 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp index 69d3e2a..5c4a249 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp @@ -67,6 +67,7 @@ void UHoldToInitCombat::OnClickDown() { if (!bHasBookAndGun) return; if (Cast(GetWorld()->GetGameState())->bIsInCombat) return; + if (Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->bIsInDialogue || Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->bShopKeeperText || Cast(GetWorld()->GetFirstPlayerController()->GetPawn())->InventoryWidget->IsVisible()) return; if (ReloadTimer > 0.0f) return; if (GunEffect) {