diff --git a/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.dll b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.dll index f75072e..8499dde 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/Binaries/Win64/UnrealEditor.modules b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules index 437a3ab..c83031a 100644 --- a/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules +++ b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules @@ -2,6 +2,6 @@ "BuildId": "37670630", "Modules": { - "DeskMode": "UnrealEditor-DeskMode.dll" + "DeskMode": "UnrealEditor-DeskMode-0003.dll" } } \ No newline at end of file diff --git a/ProjectFish/Plugins/DeskMode/Source/DeskMode/DeskMode.Build.cs b/ProjectFish/Plugins/DeskMode/Source/DeskMode/DeskMode.Build.cs index d26eea5..d792150 100644 --- a/ProjectFish/Plugins/DeskMode/Source/DeskMode/DeskMode.Build.cs +++ b/ProjectFish/Plugins/DeskMode/Source/DeskMode/DeskMode.Build.cs @@ -39,7 +39,7 @@ public class DeskMode : ModuleRules "Slate", "SlateCore", // ... add private dependencies that you statically link with here ... - "UnrealEd" + //"UnrealEd" } ); diff --git a/ProjectFish/Plugins/DeskMode/Source/DeskMode/Private/DeskMode.cpp b/ProjectFish/Plugins/DeskMode/Source/DeskMode/Private/DeskMode.cpp index 7af02bd..cb82108 100644 --- a/ProjectFish/Plugins/DeskMode/Source/DeskMode/Private/DeskMode.cpp +++ b/ProjectFish/Plugins/DeskMode/Source/DeskMode/Private/DeskMode.cpp @@ -3,8 +3,8 @@ #include "DeskMode.h" #include "WindowTransparency.h" -#include "Features/EditorFeatures.h" -#include "Features/IPluginsEditorFeature.h" +//#include "Features/EditorFeatures.h" +//#include "Features/IPluginsEditorFeature.h" DEFINE_LOG_CATEGORY_STATIC(LogDeskMode, Log, All); #define LOCTEXT_NAMESPACE "FDeskModeModule" @@ -16,10 +16,10 @@ void FDeskModeModule::StartupModule() IModularFeatures& ModularFeatures = IModularFeatures::Get(); ModularFeatures.OnModularFeatureRegistered().AddRaw(this, &FDeskModeModule::OnModularFeatureRegistered); //防止plugin模块先加载 - if (ModularFeatures.IsModularFeatureAvailable(EditorFeatures::PluginsEditor)) - { - OnModularFeatureRegistered(EditorFeatures::PluginsEditor, &ModularFeatures.GetModularFeature(EditorFeatures::PluginsEditor)); - } + // if (ModularFeatures.IsModularFeatureAvailable(EditorFeatures::PluginsEditor)) + // { + // OnModularFeatureRegistered(EditorFeatures::PluginsEditor, &ModularFeatures.GetModularFeature(EditorFeatures::PluginsEditor)); + // } } void FDeskModeModule::ShutdownModule() diff --git a/ProjectFish/Source/ProjectFish.Target.cs b/ProjectFish/Source/ProjectFish.Target.cs index 2cbd69d..5ed8801 100644 --- a/ProjectFish/Source/ProjectFish.Target.cs +++ b/ProjectFish/Source/ProjectFish.Target.cs @@ -16,6 +16,10 @@ public class ProjectFishTarget : TargetRules private void RegisterModulesCreatedByRider() { - ExtraModuleNames.AddRange(new string[] { "ProjectFishEditor" }); + if (Type == TargetType.Editor) + { + ExtraModuleNames.AddRange(new string[] { "ProjectFishEditor" }); + } + } } diff --git a/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.cpp b/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.cpp index 1d9006c..f7bd52a 100644 --- a/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.cpp +++ b/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.cpp @@ -116,6 +116,7 @@ void AShipbase::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) } } +#if WITH_EDITOR void AShipbase::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) { Super::PostEditChangeProperty(PropertyChangedEvent); @@ -123,6 +124,7 @@ void AShipbase::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyCha ApplyMovementSettings(); ApplyCameraSettings(); } +#endif void AShipbase::OnOverlapWall(UPrimitiveComponent* HitComp, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult) diff --git a/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.h b/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.h index 0df0b4a..6b7e4ad 100644 --- a/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.h +++ b/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.h @@ -31,8 +31,9 @@ public: virtual void NotifyControllerChanged() override; // Called to bind functionality to input virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; - virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override; - +#if WITH_EDITOR + virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override; +#endif UFUNCTION() void OnOverlapWall(UPrimitiveComponent* HitComp, AActor* OtherActor, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult); diff --git a/ProjectFish/Source/ProjectFish/Skill/SkillEffect.cpp b/ProjectFish/Source/ProjectFish/Skill/SkillEffect.cpp index 5d2cae5..aa37919 100644 --- a/ProjectFish/Source/ProjectFish/Skill/SkillEffect.cpp +++ b/ProjectFish/Source/ProjectFish/Skill/SkillEffect.cpp @@ -3,7 +3,7 @@ #include "SkillEffect.h" -#include "AsyncTreeDifferences.h" +//#include "AsyncTreeDifferences.h" #include "Skill.h"