Compare commits

..

No commits in common. "cb5ac1cd589071e43c69e6cd41e951ad86c1f03f" and "6abe8a1c5f6e379586baa1a44fe7627ef6fbe0d3" have entirely different histories.

9 changed files with 2 additions and 26 deletions

View File

@ -40,7 +40,6 @@ public class Dialogue : ModuleRules
"Slate",
"SlateCore",
// ... add private dependencies that you statically link with here ...
"UMG"
}
);

View File

@ -2,7 +2,7 @@
#include "DialogueAsset.h"
#include "Runtime/UMG/Public/Blueprint/UserWidget.h"
#include "UObject/ObjectSaveContext.h"
@ -11,12 +11,6 @@ bool UDialogueConditions::IsConditionMet_Implementation()
return true;
}
UDialogueAsset::UDialogueAsset()
{
UClass* WidgetClass = LoadClass<UUserWidget>(this, TEXT("/Game/UI/Dialogue/UMG_DialogueWindow.UMG_DialogueWindow_C"));
DialogueWidget = WidgetClass;
}
void UDialogueAsset::BeginDialogue()
{
CurrentNode = NodeDatas[0];

View File

@ -102,7 +102,6 @@ class DIALOGUE_API UDialogueAsset : public UDataAsset
{
GENERATED_BODY()
public:
UDialogueAsset();
UFUNCTION(BlueprintCallable, Category = Dialogue)
void BeginDialogue();
UFUNCTION(BlueprintPure, Category = Dialogue)
@ -119,11 +118,8 @@ public:
FNeedPlayeSelectDelegate OnNeedPlayerSelect;
UPROPERTY(BlueprintAssignable, Category=Dialogue)
FOnDialogueComplete OnDialogueComplete;
UPROPERTY(BlueprintReadOnly, EditAnywhere, Category = DialogueAsset)
TSubclassOf<UUserWidget> DialogueWidget;
UPROPERTY(BlueprintReadOnly, Category = Dialogue)
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Dialogue)
TArray<UDialogueRuntimeNode*> NodeDatas;
private:
UDialogueRuntimeNode* CurrentNode = nullptr;

View File

@ -34,23 +34,11 @@ TSharedRef<SWidget> FDialogueDetailsTabSummoner::CreateTabBody(const FWorkflowTa
DetailsViewArgs.bShowModifiedPropertiesOption = false;
DetailsViewArgs.bShowScrollBar = false;
//node节点详情面板
TSharedPtr<IDetailsView> DetailsView = PropertyEditorModule.CreateDetailView(DetailsViewArgs);
DetailsView->SetObject(nullptr);
Editor->SetDetailsView(DetailsView);
//资源的详情面板
TSharedPtr<IDetailsView> DialogueAssetDetailView = PropertyEditorModule.CreateDetailView(DetailsViewArgs);
DialogueAssetDetailView->SetObject(Editor->GetDialogueBeingEdited());
return SNew(SVerticalBox)
+ SVerticalBox::Slot()
.AutoHeight()
.HAlign(HAlign_Fill)
[
DialogueAssetDetailView.ToSharedRef()
]
+ SVerticalBox::Slot()
.FillHeight(1.0f)
.HAlign(HAlign_Fill)

View File

@ -44,7 +44,6 @@ public:
// 图表选择改变回调,传递属性页需要显示的内容
void OnGraphSelectionChanged(const FGraphPanelSelectionSet& Selection);
TObjectPtr<UDialogueAsset> GetDialogueBeingEdited() {return DialogueBeingEdited;}
protected:
void SaveGraphData();
void LoadGraphData();