Compare commits
No commits in common. "224bde8e47a89483c052a172ef00b17c8c0b7bea" and "a377b9e0fc9acc3e88f4167acaf1382d4c298f2f" have entirely different histories.
224bde8e47
...
a377b9e0fc
@ -21,6 +21,38 @@
|
|||||||
"BuildId": "37670630"
|
"BuildId": "37670630"
|
||||||
},
|
},
|
||||||
"BuildProducts": [
|
"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",
|
"Path": "$(EngineDir)/Binaries/ThirdParty/USD/UsdResources/Win64/plugins/ar/resources/plugInfo.json",
|
||||||
"Type": "RequiredResource"
|
"Type": "RequiredResource"
|
||||||
@ -8008,41 +8040,17 @@
|
|||||||
{
|
{
|
||||||
"Path": "$(EngineDir)/Plugins/XGEController/Binaries/Win64/UnrealEditor.modules",
|
"Path": "$(EngineDir)/Plugins/XGEController/Binaries/Win64/UnrealEditor.modules",
|
||||||
"Type": "RequiredResource"
|
"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": [
|
"RuntimeDependencies": [
|
||||||
|
{
|
||||||
|
"Path": "$(ProjectDir)/Plugins/DeskMode/DeskMode.uplugin",
|
||||||
|
"Type": "UFS"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Path": "$(ProjectDir)/ProjectFish.uproject",
|
||||||
|
"Type": "UFS"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"Path": "$(EngineDir)/Binaries/ThirdParty/DbgHelp/dbghelp.dll",
|
"Path": "$(EngineDir)/Binaries/ThirdParty/DbgHelp/dbghelp.dll",
|
||||||
"Type": "NonUFS"
|
"Type": "NonUFS"
|
||||||
@ -33770,14 +33778,6 @@
|
|||||||
{
|
{
|
||||||
"Path": "$(EngineDir)/Plugins/XGEController/XGEController.uplugin",
|
"Path": "$(EngineDir)/Plugins/XGEController/XGEController.uplugin",
|
||||||
"Type": "UFS"
|
"Type": "UFS"
|
||||||
},
|
|
||||||
{
|
|
||||||
"Path": "$(ProjectDir)/Plugins/DeskMode/DeskMode.uplugin",
|
|
||||||
"Type": "UFS"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Path": "$(ProjectDir)/ProjectFish.uproject",
|
|
||||||
"Type": "UFS"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"BuildPlugins": [
|
"BuildPlugins": [
|
||||||
|
|||||||
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.
Binary file not shown.
Binary file not shown.
@ -39,7 +39,7 @@ public class DeskMode : ModuleRules
|
|||||||
"Slate",
|
"Slate",
|
||||||
"SlateCore",
|
"SlateCore",
|
||||||
// ... add private dependencies that you statically link with here ...
|
// ... add private dependencies that you statically link with here ...
|
||||||
//"UnrealEd"
|
"UnrealEd"
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@ -3,8 +3,8 @@
|
|||||||
#include "DeskMode.h"
|
#include "DeskMode.h"
|
||||||
|
|
||||||
#include "WindowTransparency.h"
|
#include "WindowTransparency.h"
|
||||||
//#include "Features/EditorFeatures.h"
|
#include "Features/EditorFeatures.h"
|
||||||
//#include "Features/IPluginsEditorFeature.h"
|
#include "Features/IPluginsEditorFeature.h"
|
||||||
DEFINE_LOG_CATEGORY_STATIC(LogDeskMode, Log, All);
|
DEFINE_LOG_CATEGORY_STATIC(LogDeskMode, Log, All);
|
||||||
|
|
||||||
#define LOCTEXT_NAMESPACE "FDeskModeModule"
|
#define LOCTEXT_NAMESPACE "FDeskModeModule"
|
||||||
@ -16,10 +16,10 @@ void FDeskModeModule::StartupModule()
|
|||||||
IModularFeatures& ModularFeatures = IModularFeatures::Get();
|
IModularFeatures& ModularFeatures = IModularFeatures::Get();
|
||||||
ModularFeatures.OnModularFeatureRegistered().AddRaw(this, &FDeskModeModule::OnModularFeatureRegistered);
|
ModularFeatures.OnModularFeatureRegistered().AddRaw(this, &FDeskModeModule::OnModularFeatureRegistered);
|
||||||
//防止plugin模块先加载
|
//防止plugin模块先加载
|
||||||
// if (ModularFeatures.IsModularFeatureAvailable(EditorFeatures::PluginsEditor))
|
if (ModularFeatures.IsModularFeatureAvailable(EditorFeatures::PluginsEditor))
|
||||||
// {
|
{
|
||||||
// OnModularFeatureRegistered(EditorFeatures::PluginsEditor, &ModularFeatures.GetModularFeature<IPluginsEditorFeature>(EditorFeatures::PluginsEditor));
|
OnModularFeatureRegistered(EditorFeatures::PluginsEditor, &ModularFeatures.GetModularFeature<IPluginsEditorFeature>(EditorFeatures::PluginsEditor));
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FDeskModeModule::ShutdownModule()
|
void FDeskModeModule::ShutdownModule()
|
||||||
|
|||||||
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 326 B |
Binary file not shown.
@ -1,29 +0,0 @@
|
|||||||
ProjectFish/Binaries/Win64/D3D12/D3D12Core.dll 2025-05-26T08:19:02.257Z
|
|
||||||
ProjectFish/Binaries/Win64/D3D12/d3d12SDKLayers.dll 2025-05-26T08:19:02.260Z
|
|
||||||
ProjectFish/Binaries/Win64/DML/DirectML.dll 2025-05-26T08:49:02.242Z
|
|
||||||
ProjectFish/Binaries/Win64/ProjectFish-Win64-Shipping.exe 2025-10-10T09:18:20.508Z
|
|
||||||
ProjectFish/Binaries/Win64/boost_atomic-mt-x64.dll 2025-05-26T08:49:00.605Z
|
|
||||||
ProjectFish/Binaries/Win64/boost_chrono-mt-x64.dll 2025-05-26T08:49:00.607Z
|
|
||||||
ProjectFish/Binaries/Win64/boost_filesystem-mt-x64.dll 2025-05-26T08:49:00.607Z
|
|
||||||
ProjectFish/Binaries/Win64/boost_iostreams-mt-x64.dll 2025-05-26T08:49:00.609Z
|
|
||||||
ProjectFish/Binaries/Win64/boost_program_options-mt-x64.dll 2025-05-26T08:49:00.609Z
|
|
||||||
ProjectFish/Binaries/Win64/boost_python311-mt-x64.dll 2025-05-26T08:49:00.613Z
|
|
||||||
ProjectFish/Binaries/Win64/boost_regex-mt-x64.dll 2025-05-26T08:49:00.614Z
|
|
||||||
ProjectFish/Binaries/Win64/boost_system-mt-x64.dll 2025-05-26T08:49:00.616Z
|
|
||||||
ProjectFish/Binaries/Win64/boost_thread-mt-x64.dll 2025-05-26T08:49:00.616Z
|
|
||||||
ProjectFish/Binaries/Win64/tbb.dll 2025-05-26T08:18:49.336Z
|
|
||||||
ProjectFish/Binaries/Win64/tbbmalloc.dll 2025-05-26T08:18:49.339Z
|
|
||||||
Engine/Binaries/Win64/EOSSDK-Win64-Shipping.dll 2025-05-26T08:19:13.420Z
|
|
||||||
Engine/Extras/Redist/en-us/UEPrereqSetup_x64.exe 2025-05-26T08:28:24.835Z
|
|
||||||
Engine/Binaries/ThirdParty/DbgHelp/dbghelp.dll 2025-05-26T08:17:46.608Z
|
|
||||||
Engine/Binaries/ThirdParty/MsQuic/v220/win64/msquic.dll 2025-05-26T08:18:52.398Z
|
|
||||||
Engine/Binaries/ThirdParty/NVIDIA/NVaftermath/Win64/GFSDK_Aftermath_Lib.x64.dll 2025-05-26T08:18:52.407Z
|
|
||||||
Engine/Binaries/ThirdParty/Ogg/Win64/VS2015/libogg_64.dll 2025-05-26T08:18:52.410Z
|
|
||||||
Engine/Binaries/ThirdParty/Vorbis/Win64/VS2015/libvorbis_64.dll 2025-05-26T08:18:59.130Z
|
|
||||||
Engine/Binaries/ThirdParty/Vorbis/Win64/VS2015/libvorbisfile_64.dll 2025-05-26T08:18:59.131Z
|
|
||||||
Engine/Binaries/ThirdParty/Windows/XAudio2_9/x64/xaudio2_9redist.dll 2025-05-26T08:19:02.266Z
|
|
||||||
Engine/Content/Renderer/TessellationTable.bin 2025-05-26T08:26:07.391Z
|
|
||||||
Engine/Content/Slate/Cursor/invisible.cur 2025-05-26T08:26:07.412Z
|
|
||||||
Engine/Plugins/NNE/NNERuntimeORT/Binaries/ThirdParty/Onnxruntime/Win64/onnxruntime.dll 2025-05-26T08:46:35.128Z
|
|
||||||
Engine/Config/StagedBuild_ProjectFish.ini 2025-10-10T09:20:06.859Z
|
|
||||||
ProjectFish.exe 2025-10-10T09:20:06.855Z
|
|
||||||
File diff suppressed because it is too large
Load Diff
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.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -16,10 +16,6 @@ public class ProjectFishTarget : TargetRules
|
|||||||
|
|
||||||
private void RegisterModulesCreatedByRider()
|
private void RegisterModulesCreatedByRider()
|
||||||
{
|
{
|
||||||
if (Type == TargetType.Editor)
|
ExtraModuleNames.AddRange(new string[] { "ProjectFishEditor" });
|
||||||
{
|
|
||||||
ExtraModuleNames.AddRange(new string[] { "ProjectFishEditor" });
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -116,7 +116,6 @@ void AShipbase::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if WITH_EDITOR
|
|
||||||
void AShipbase::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
|
void AShipbase::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
|
||||||
{
|
{
|
||||||
Super::PostEditChangeProperty(PropertyChangedEvent);
|
Super::PostEditChangeProperty(PropertyChangedEvent);
|
||||||
@ -124,7 +123,6 @@ void AShipbase::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyCha
|
|||||||
ApplyMovementSettings();
|
ApplyMovementSettings();
|
||||||
ApplyCameraSettings();
|
ApplyCameraSettings();
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
void AShipbase::OnOverlapWall(UPrimitiveComponent* HitComp, AActor* OtherActor, UPrimitiveComponent* OtherComp,
|
void AShipbase::OnOverlapWall(UPrimitiveComponent* HitComp, AActor* OtherActor, UPrimitiveComponent* OtherComp,
|
||||||
int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult)
|
int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult)
|
||||||
|
|||||||
@ -31,9 +31,8 @@ public:
|
|||||||
virtual void NotifyControllerChanged() override;
|
virtual void NotifyControllerChanged() override;
|
||||||
// Called to bind functionality to input
|
// Called to bind functionality to input
|
||||||
virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override;
|
virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override;
|
||||||
#if WITH_EDITOR
|
virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
|
||||||
virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override;
|
|
||||||
#endif
|
|
||||||
UFUNCTION()
|
UFUNCTION()
|
||||||
void OnOverlapWall(UPrimitiveComponent* HitComp, AActor* OtherActor, UPrimitiveComponent* OtherComp,
|
void OnOverlapWall(UPrimitiveComponent* HitComp, AActor* OtherActor, UPrimitiveComponent* OtherComp,
|
||||||
int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult);
|
int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult);
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include "SkillEffect.h"
|
#include "SkillEffect.h"
|
||||||
|
|
||||||
//#include "AsyncTreeDifferences.h"
|
#include "AsyncTreeDifferences.h"
|
||||||
#include "Skill.h"
|
#include "Skill.h"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user