diff --git a/ProjectFish/Binaries/Win64/ProjectFishEditor.target b/ProjectFish/Binaries/Win64/ProjectFishEditor.target index 1116c58..bd3949c 100644 --- a/ProjectFish/Binaries/Win64/ProjectFishEditor.target +++ b/ProjectFish/Binaries/Win64/ProjectFishEditor.target @@ -21,6 +21,38 @@ "BuildId": "37670630" }, "BuildProducts": [ + { + "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-ProjectFish.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-ProjectFish.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-ProjectFishEditor.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor.modules", + "Type": "RequiredResource" + }, + { + "Path": "$(ProjectDir)/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.dll", + "Type": "DynamicLibrary" + }, + { + "Path": "$(ProjectDir)/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.pdb", + "Type": "SymbolFile" + }, + { + "Path": "$(ProjectDir)/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules", + "Type": "RequiredResource" + }, { "Path": "$(EngineDir)/Binaries/ThirdParty/USD/UsdResources/Win64/plugins/ar/resources/plugInfo.json", "Type": "RequiredResource" @@ -8008,41 +8040,17 @@ { "Path": "$(EngineDir)/Plugins/XGEController/Binaries/Win64/UnrealEditor.modules", "Type": "RequiredResource" - }, - { - "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-ProjectFish.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-ProjectFish.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-ProjectFishEditor.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor.modules", - "Type": "RequiredResource" - }, - { - "Path": "$(ProjectDir)/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.dll", - "Type": "DynamicLibrary" - }, - { - "Path": "$(ProjectDir)/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.pdb", - "Type": "SymbolFile" - }, - { - "Path": "$(ProjectDir)/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules", - "Type": "RequiredResource" } ], "RuntimeDependencies": [ + { + "Path": "$(ProjectDir)/Plugins/DeskMode/DeskMode.uplugin", + "Type": "UFS" + }, + { + "Path": "$(ProjectDir)/ProjectFish.uproject", + "Type": "UFS" + }, { "Path": "$(EngineDir)/Binaries/ThirdParty/DbgHelp/dbghelp.dll", "Type": "NonUFS" @@ -33770,14 +33778,6 @@ { "Path": "$(EngineDir)/Plugins/XGEController/XGEController.uplugin", "Type": "UFS" - }, - { - "Path": "$(ProjectDir)/Plugins/DeskMode/DeskMode.uplugin", - "Type": "UFS" - }, - { - "Path": "$(ProjectDir)/ProjectFish.uproject", - "Type": "UFS" } ], "BuildPlugins": [ diff --git a/ProjectFish/Content/Gameplay/DeskMode/BP_DeskModeGameMode.uasset b/ProjectFish/Content/Gameplay/DeskMode/BP_DeskModeGameMode.uasset new file mode 100644 index 0000000..1e27320 Binary files /dev/null and b/ProjectFish/Content/Gameplay/DeskMode/BP_DeskModeGameMode.uasset differ diff --git a/ProjectFish/Content/Maps/DeskModeTest.umap b/ProjectFish/Content/Maps/DeskModeTest.umap index 38b39c9..57136ab 100644 Binary files a/ProjectFish/Content/Maps/DeskModeTest.umap and b/ProjectFish/Content/Maps/DeskModeTest.umap differ diff --git a/ProjectFish/Content/UI/DeskMode/UMG_DeskMode.uasset b/ProjectFish/Content/UI/DeskMode/UMG_DeskMode.uasset new file mode 100644 index 0000000..ec0be30 Binary files /dev/null and b/ProjectFish/Content/UI/DeskMode/UMG_DeskMode.uasset differ diff --git a/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.dll b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.dll index f9ae273..f75072e 100644 Binary files a/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.dll and b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.dll differ diff --git a/ProjectFish/Plugins/DeskMode/Source/DeskMode/Private/WindowTransparency.cpp b/ProjectFish/Plugins/DeskMode/Source/DeskMode/Private/WindowTransparency.cpp index 8003cdf..f1580e7 100644 --- a/ProjectFish/Plugins/DeskMode/Source/DeskMode/Private/WindowTransparency.cpp +++ b/ProjectFish/Plugins/DeskMode/Source/DeskMode/Private/WindowTransparency.cpp @@ -208,7 +208,7 @@ void UWindowTransparency::SetWIndowsTopmost(bool bSetWindowTopmost) void UWindowTransparency::Tick(float DeltaTime) { - if (!bIsClickThroughStateOS) + if (!bIsClickThroughStateOS && !bIsMouseOverOpaqueAreaLogic) { return; } @@ -280,17 +280,24 @@ FVector2D UWindowTransparency::GetMousePositionInWindow(bool& bMousePosSuccess) bool UWindowTransparency::SimulateGameRaycastUnderMouse(FVector2D MousePos) { - - UWorld* World = GetWorld(); APlayerController* PC = nullptr; - if (World) + if (GEngine && GEngine->GameViewport) { - PC = Cast(GetWorld()->GetFirstLocalPlayerFromController()); + UWorld* World = GEngine->GameViewport->GetWorld(); + if (World) + { + PC = World->GetFirstPlayerController(); + } } - if (!PC) - { + + // if (World) + // { + // PC = Cast(GetWorld()->GetFirstLocalPlayerFromController()); + // } + if (!PC) + { return false; - } + } //检测3D世界是否有碰撞 FHitResult HitResult3D; FCollisionQueryParams CollisionParams3D(SCENE_QUERY_STAT(WindowTransparencyRaycast3D), true);