Updated Quests for Final Kill Boss Quest
This commit is contained in:
		
							parent
							
								
									c46dcdecf7
								
							
						
					
					
						commit
						3b828bb01c
					
				
							
								
								
									
										
											BIN
										
									
								
								Content/Assets/Characters/Merchant/AMerchant.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Assets/Characters/Merchant/AMerchant.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Combat_UI/CombatCharacter.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Combat_UI/CombatCharacter.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Combat_UI/EndDialogue.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Combat_UI/EndDialogue.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_FinalMain.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_FinalMain.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_SistersPendant.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_SistersPendant.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_Start.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_Start.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_Start2.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_Start2.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Dialogue/SM_Merchant_Blueprint.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Dialogue/SM_Merchant_Blueprint.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Levels/Build.umap
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Levels/Build.umap
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Levels/Testing/BreakableWall_BP_ExitCave.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Levels/Testing/BreakableWall_BP_ExitCave.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -95,6 +95,9 @@ void UDialogueNPC::NextDialogue() | ||||
| 		} | ||||
| 		GetWorld()->GetTimerManager().PauseTimer(TextAnimationTimerHandle); | ||||
| 		DialogueText->SetText(FText::FromString("")); | ||||
| 		Choice1Text->SetText(CurrentDialoguePath->ChoiceText1); | ||||
| 		Choice2Text->SetText(CurrentDialoguePath->ChoiceText2); | ||||
| 		Choice3Text->SetText(CurrentDialoguePath->ChoiceText3); | ||||
| 		Choice1Button->SetVisibility(ESlateVisibility::Visible); | ||||
| 		if (Choice2Text->GetText().ToString() != "") Choice2Button->SetVisibility(ESlateVisibility::Visible); | ||||
| 		if (Choice3Text->GetText().ToString() != "") Choice3Button->SetVisibility(ESlateVisibility::Visible); | ||||
| @ -206,9 +209,9 @@ void UDialogueNPC::AddChoices(UDialoguePath* ParentPath, FText ChoiceText1, FTex | ||||
| 	Out_ChoicePath1 = ParentPath->Choices[0]; | ||||
| 	Out_ChoicePath2 = ParentPath->Choices[1]; | ||||
| 	Out_ChoicePath3 = ParentPath->Choices[2]; | ||||
| 	Choice1Text->SetText(ChoiceText1); | ||||
| 	Choice2Text->SetText(ChoiceText2); | ||||
| 	Choice3Text->SetText(ChoiceText3); | ||||
| 	ParentPath->ChoiceText1 = ChoiceText1; | ||||
| 	ParentPath->ChoiceText2 = ChoiceText2; | ||||
| 	ParentPath->ChoiceText3 = ChoiceText3; | ||||
| } | ||||
| 
 | ||||
| UDialoguePath* UDialogueNPC::AddQuest(UDialoguePath* DialoguePath, UQuest* Quest) | ||||
|  | ||||
| @ -21,6 +21,13 @@ public: | ||||
| 
 | ||||
| 	UPROPERTY(BlueprintReadWrite) | ||||
| 	TArray<UDialoguePath*> Choices; | ||||
| 
 | ||||
| 	UPROPERTY() | ||||
| 	FText ChoiceText1; | ||||
| 	UPROPERTY() | ||||
| 	FText ChoiceText2; | ||||
| 	UPROPERTY() | ||||
| 	FText ChoiceText3; | ||||
| }; | ||||
| 
 | ||||
| UCLASS(ClassGroup=(Custom), meta=(BlueprintSpawnableComponent)) | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user