Compare commits
2 Commits
52a26d8f0d
...
cb90d44b33
| Author | SHA1 | Date | |
|---|---|---|---|
| cb90d44b33 | |||
| 323521d36b |
File diff suppressed because one or more lines are too long
@@ -5,7 +5,7 @@ GameName=ProjectEleri
|
|||||||
DefaultCompletionMode=KeepState
|
DefaultCompletionMode=KeepState
|
||||||
|
|
||||||
[/Script/EngineSettings.GameMapsSettings]
|
[/Script/EngineSettings.GameMapsSettings]
|
||||||
EditorStartupMap=/Game/Maps/Startmap.Startmap
|
EditorStartupMap=/Game/Maps/Persistent_GameWorld.Persistent_GameWorld
|
||||||
GameDefaultMap=/Game/Maps/Persistent_GameWorld.Persistent_GameWorld
|
GameDefaultMap=/Game/Maps/Persistent_GameWorld.Persistent_GameWorld
|
||||||
TransitionMap=
|
TransitionMap=
|
||||||
bUseSplitscreen=True
|
bUseSplitscreen=True
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1012,7 +1012,7 @@ UUserWidget *AEleriPlayerController::OpenInventory(bool JustSelecting, bool Shop
|
|||||||
UInventoryComponent *MainInv = PlayerInventory;
|
UInventoryComponent *MainInv = PlayerInventory;
|
||||||
UInventoryComponent *OtherInv = IsValid(Inventory) ? Inventory : nullptr;
|
UInventoryComponent *OtherInv = IsValid(Inventory) ? Inventory : nullptr;
|
||||||
MainGameUI->OpenWidget(MainGameUI->GetInventoryWidget());
|
MainGameUI->OpenWidget(MainGameUI->GetInventoryWidget());
|
||||||
MainGameUI->GetInventoryWidget()->ToggleWidget(true);
|
//MainGameUI->GetInventoryWidget()->ToggleWidget(true);
|
||||||
MainGameUI->GetInventoryWidget()->Setup(MainInv, OtherInv, Shop, JustSelecting, RestrictTabs, bSelectMultiple, bShowDescription, bShowPropertyMap);
|
MainGameUI->GetInventoryWidget()->Setup(MainInv, OtherInv, Shop, JustSelecting, RestrictTabs, bSelectMultiple, bShowDescription, bShowPropertyMap);
|
||||||
|
|
||||||
return MainGameUI->GetInventoryWidget();
|
return MainGameUI->GetInventoryWidget();
|
||||||
@@ -1126,25 +1126,10 @@ void AEleriPlayerController::CloseMainMenu()
|
|||||||
|
|
||||||
UEleriBaseWidget *AEleriPlayerController::ToggleAlchemyMenu(bool bOpen)
|
UEleriBaseWidget *AEleriPlayerController::ToggleAlchemyMenu(bool bOpen)
|
||||||
{
|
{
|
||||||
if (bOpen && MainGameUI->IsAlchemyOpen())
|
if (MainGameUI->AnyWidgetOpen())
|
||||||
return MainGameUI->GetAlchemyWidget();
|
return nullptr;
|
||||||
if (!bOpen && !MainGameUI->IsAlchemyOpen())
|
|
||||||
return MainGameUI->GetAlchemyWidget();
|
|
||||||
|
|
||||||
MainGameUI->GetAlchemyWidget()->ToggleWidget(bOpen);
|
MainGameUI->OpenWidget(MainGameUI->GetAlchemyWidget());
|
||||||
|
|
||||||
if (bOpen)
|
|
||||||
{
|
|
||||||
AddToMenuStack(MainGameUI->GetAlchemyWidget());
|
|
||||||
SetInputMode(FInputModeGameAndUI());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
CloseGenericMenu(MainGameUI->GetAlchemyWidget());
|
|
||||||
}
|
|
||||||
|
|
||||||
SetShowMouseCursor(bOpen);
|
|
||||||
MainGameUI->ToggleAlchemyWidget(bOpen);
|
|
||||||
|
|
||||||
return MainGameUI->GetAlchemyWidget();
|
return MainGameUI->GetAlchemyWidget();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
#include "UI/InventoryWidget.h"
|
#include "UI/InventoryWidget.h"
|
||||||
#include "UI/MainMenuWidget.h"
|
#include "UI/MainMenuWidget.h"
|
||||||
#include "UI/TradeWidget.h"
|
#include "UI/TradeWidget.h"
|
||||||
|
#include "UI/AlchemyWidget.h"
|
||||||
|
|
||||||
|
|
||||||
void UMainGameWidget::TogglePlaceableUI(bool bEnabled)
|
void UMainGameWidget::TogglePlaceableUI(bool bEnabled)
|
||||||
@@ -56,6 +57,10 @@ void UMainGameWidget::ToggleBookWidget(bool bActive)
|
|||||||
void UMainGameWidget::ToggleAlchemyWidget(bool bActive)
|
void UMainGameWidget::ToggleAlchemyWidget(bool bActive)
|
||||||
{
|
{
|
||||||
AlchemyOpen = bActive;
|
AlchemyOpen = bActive;
|
||||||
|
if (bActive)
|
||||||
|
WidgetStack.AddUnique(GetAlchemyWidget());
|
||||||
|
|
||||||
|
CheckOpenWidgets();
|
||||||
}
|
}
|
||||||
|
|
||||||
void UMainGameWidget::ToggleBigNotificationWidget(bool bActive)
|
void UMainGameWidget::ToggleBigNotificationWidget(bool bActive)
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ public class ProjectEleri : ModuleRules
|
|||||||
"InteractionSystem"
|
"InteractionSystem"
|
||||||
});
|
});
|
||||||
|
|
||||||
PrivateDependencyModuleNames.AddRange(new string[] { "OnlineSubsystem", "OnlineSubsystemUtils", "UMGEditor" });
|
PrivateDependencyModuleNames.AddRange(new string[] { "OnlineSubsystem", "OnlineSubsystemUtils" });
|
||||||
|
|
||||||
// Uncomment if you are using Slate UI
|
// Uncomment if you are using Slate UI
|
||||||
// PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });
|
// PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });
|
||||||
|
|||||||
@@ -85,10 +85,5 @@ public:
|
|||||||
// MATH
|
// MATH
|
||||||
UFUNCTION(BlueprintPure, Category = "Eleri|Math")
|
UFUNCTION(BlueprintPure, Category = "Eleri|Math")
|
||||||
static float NegateFloat(const float& Value) { return Value * -1.f; }
|
static float NegateFloat(const float& Value) { return Value * -1.f; }
|
||||||
|
|
||||||
#if WITH_EDITOR
|
|
||||||
// Editor shit
|
|
||||||
UFUNCTION(BlueprintCallable, Category = "Eleri|Audit")
|
|
||||||
static void LogAssetsUsingCommonUI();
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -208,49 +208,3 @@ void UMainBlueprintFunctionLibrary::ModifyExp(const UObject* WorldContext, const
|
|||||||
StatForgeComponent->ApplyGameplayStatEffect(ExpIncreaseEffect, DataValueMap);
|
StatForgeComponent->ApplyGameplayStatEffect(ExpIncreaseEffect, DataValueMap);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if WITH_EDITOR
|
|
||||||
#include "AssetRegistry/AssetRegistryModule.h"
|
|
||||||
#include "AssetRegistry/IAssetRegistry.h"
|
|
||||||
#include "WidgetBlueprint.h"
|
|
||||||
|
|
||||||
void UMainBlueprintFunctionLibrary::LogAssetsUsingCommonUI()
|
|
||||||
{
|
|
||||||
IAssetRegistry& AssetRegistry = FModuleManager::LoadModuleChecked<FAssetRegistryModule>("AssetRegistry").Get();
|
|
||||||
|
|
||||||
TArray<FAssetData> WidgetBlueprintAssets;
|
|
||||||
AssetRegistry.GetAssetsByClass(UWidgetBlueprint::StaticClass()->GetClassPathName(), WidgetBlueprintAssets, /*bSearchSubClasses*/ true);
|
|
||||||
|
|
||||||
TArray<FString> MatchedPaths;
|
|
||||||
|
|
||||||
for (const FAssetData& AssetData : WidgetBlueprintAssets)
|
|
||||||
{
|
|
||||||
UWidgetBlueprint* WidgetBP = Cast<UWidgetBlueprint>(AssetData.GetAsset());
|
|
||||||
if (!WidgetBP || !WidgetBP->GeneratedClass)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool bUsesCommonUI = false;
|
|
||||||
for (const UClass* Test = WidgetBP->GeneratedClass; Test; Test = Test->GetSuperClass())
|
|
||||||
{
|
|
||||||
if (Test->GetName().Contains(TEXT("Common")))
|
|
||||||
{
|
|
||||||
bUsesCommonUI = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bUsesCommonUI)
|
|
||||||
{
|
|
||||||
MatchedPaths.Add(AssetData.GetObjectPathString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
UE_LOG(LogTemp, Log, TEXT("Found %d widget asset(s) referencing a CommonUI class in their inheritance chain:"), MatchedPaths.Num());
|
|
||||||
for (const FString& Path : MatchedPaths)
|
|
||||||
{
|
|
||||||
UE_LOG(LogTemp, Log, TEXT(" %s"), *Path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user