Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Updated Build for Pick Up Book & Gun Quest

Browse Source
This commit is contained in:
Philip W 2023-05-11 04:47:59 +01:00
parent 53126c6b10
commit 88f73fe5db
9 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Assets/Gun/GunMaterialNoDrawOver.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Gun/SM_MERGED_Gun_Book.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Gun/SM_MERGED_Gun_Book_Blueprint.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Combat_UI/CombatCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Quests/Quest_Start.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dialogue/SM_Merchant_Blueprint.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Levels/Build.umap (Stored with Git LFS)
View File

Binary file not shown.

1
Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp
View File

@ -64,6 +64,7 @@ void UHoldToInitCombat::TickComponent(float DeltaTime, ELevelTick TickType, FAct
void UHoldToInitCombat::OnClickDown() void UHoldToInitCombat::OnClickDown()
{ {
if (!bHasBookAndGun) return;
if (Cast<ATurnBaseCombatV2>(GetWorld()->GetGameState())->bIsInCombat) return; if (Cast<ATurnBaseCombatV2>(GetWorld()->GetGameState())->bIsInCombat) return;
if (ReloadTimer > 0.0f) return; if (ReloadTimer > 0.0f) return;
if (GunEffect) if (GunEffect)

2
Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.h
View File

@ -24,6 +24,8 @@ public:
UUserWidget* InitCombatWidget; UUserWidget* InitCombatWidget;
UPROPERTY() UPROPERTY()
TSubclassOf<UUserWidget> InitCombatWidgetClass; TSubclassOf<UUserWidget> InitCombatWidgetClass;
UPROPERTY(BlueprintReadWrite)
bool bHasBookAndGun = false;
UPROPERTY() UPROPERTY()
UNiagaraSystem* GunEffect; UNiagaraSystem* GunEffect;