diff --git a/.gitignore b/.gitignore index e18279e..7a6ba0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .vs .vscode +.idea Binaries Intermediate Content/AdvancedLocomotionV4 @@ -11,6 +12,9 @@ Content/Table/*.ini Content/Script/GameConfig/Table/* Plugins/**/Binaries Plugins/**/Intermediate +Plugins/Developer +Plugins/UnLua/Source/UnLuaDefaultParamCollectorUbtPlugin + Saved *.sln *.uproject diff --git a/Content/Asset/Effect/Common/Module/NDC_FixShapeLocation.uasset b/Content/Asset/Effect/Common/Module/NDC_FixShapeLocation.uasset new file mode 100644 index 0000000..783cbcd Binary files /dev/null and b/Content/Asset/Effect/Common/Module/NDC_FixShapeLocation.uasset differ diff --git a/Content/Asset/Effect/Common/Module/NDC_FixSpriteAlignment.uasset b/Content/Asset/Effect/Common/Module/NDC_FixSpriteAlignment.uasset new file mode 100644 index 0000000..3467a7f Binary files /dev/null and b/Content/Asset/Effect/Common/Module/NDC_FixSpriteAlignment.uasset differ diff --git a/Content/Asset/Effect/Common/Module/NM_TestModule.uasset b/Content/Asset/Effect/Common/Module/NM_TestModule.uasset new file mode 100644 index 0000000..05f383d Binary files /dev/null and b/Content/Asset/Effect/Common/Module/NM_TestModule.uasset differ diff --git a/Content/Assets/Effect/Niagara/HitChannel.uasset b/Content/Asset/Effect/Niagara/HitChannel.uasset similarity index 100% rename from Content/Assets/Effect/Niagara/HitChannel.uasset rename to Content/Asset/Effect/Niagara/HitChannel.uasset diff --git a/Content/Asset/Effect/Niagara/HitSystem.uasset b/Content/Asset/Effect/Niagara/HitSystem.uasset new file mode 100644 index 0000000..9955e4b Binary files /dev/null and b/Content/Asset/Effect/Niagara/HitSystem.uasset differ diff --git a/Content/Asset/Effect/Niagara/NDCSystem.uasset b/Content/Asset/Effect/Niagara/NDCSystem.uasset new file mode 100644 index 0000000..eed569f Binary files /dev/null and b/Content/Asset/Effect/Niagara/NDCSystem.uasset differ diff --git a/Content/Assets/Effect/Niagara/HitSystem.uasset b/Content/Assets/Effect/Niagara/HitSystem.uasset deleted file mode 100644 index f07299e..0000000 Binary files a/Content/Assets/Effect/Niagara/HitSystem.uasset and /dev/null differ diff --git a/Content/Assets/Effect/Niagara/NDCSystem.uasset b/Content/Assets/Effect/Niagara/NDCSystem.uasset deleted file mode 100644 index fa0366f..0000000 Binary files a/Content/Assets/Effect/Niagara/NDCSystem.uasset and /dev/null differ diff --git a/Content/BP/Char/FXCharacter.uasset b/Content/BP/Char/FXCharacter.uasset index 0376db7..28d3a4b 100644 Binary files a/Content/BP/Char/FXCharacter.uasset and b/Content/BP/Char/FXCharacter.uasset differ diff --git a/Content/BP/CrashActor.uasset b/Content/BP/CrashActor.uasset new file mode 100644 index 0000000..8cbbc11 Binary files /dev/null and b/Content/BP/CrashActor.uasset differ diff --git a/Content/Maps/Main.umap b/Content/Maps/Main.umap index a90d180..ff86d53 100644 Binary files a/Content/Maps/Main.umap and b/Content/Maps/Main.umap differ diff --git a/Plugins/sentry-unreal/Sentry.uplugin b/Plugins/sentry-unreal/Sentry.uplugin index 4b3470e..ee61474 100644 --- a/Plugins/sentry-unreal/Sentry.uplugin +++ b/Plugins/sentry-unreal/Sentry.uplugin @@ -18,7 +18,7 @@ "Modules": [ { "Name": "Sentry", - "Type": "Runtime", + "Type": "CookedOnly", "LoadingPhase": "Default", "WhitelistPlatforms": [ "Win64", "Mac", "Android", "IOS", "Linux", "LinuxArm64" ] }, diff --git a/Source/zworld/CrashActor.cpp b/Source/zworld/CrashActor.cpp new file mode 100644 index 0000000..2627e55 --- /dev/null +++ b/Source/zworld/CrashActor.cpp @@ -0,0 +1,37 @@ +// Fill out your copyright notice in the Description page of Project Settings. +#include "CrashActor.h" +DEFINE_LOG_CATEGORY(LogCrash); +// Sets default values +ACrashActor::ACrashActor() +{ + // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. + PrimaryActorTick.bCanEverTick = true; + +} + +// Called when the game starts or when spawned +void ACrashActor::BeginPlay() +{ + Super::BeginPlay(); + +} +void TestCrash(int CrashFrame) { + auto FN = [=]() { + int* ptr = nullptr; + *ptr = CrashFrame + 6; + }; + FN(); +} + +// Called every frame +void ACrashActor::Tick(float DeltaTime) +{ + Super::Tick(DeltaTime); + CrashFrame = 200; + if (Frame++ >= CrashFrame) { + if (Frame == CrashFrame + 100) { + UE_LOG(LogTemp, Error, TEXT("ACrashActor:BeforeCrash")); + TestCrash(CrashFrame); + } + } +} diff --git a/Source/zworld/CrashActor.h b/Source/zworld/CrashActor.h new file mode 100644 index 0000000..f58d3e3 --- /dev/null +++ b/Source/zworld/CrashActor.h @@ -0,0 +1,30 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "GameFramework/Actor.h" +#include "CrashActor.generated.h" + +UCLASS() +class ZWORLD_API ACrashActor : public AActor +{ + GENERATED_BODY() + +public: + // Sets default values for this actor's properties + ACrashActor(); + +protected: + // Called when the game starts or when spawned + virtual void BeginPlay() override; + +public: + // Called every frame + virtual void Tick(float DeltaTime) override; + UPROPERTY() + int Frame = 0; + UPROPERTY() + int CrashFrame = 666; +}; +DECLARE_LOG_CATEGORY_EXTERN(LogCrash, Log, All); \ No newline at end of file diff --git a/Source/zworld/FXComponent.cpp b/Source/zworld/FXComponent.cpp index 15758d1..c02097d 100644 --- a/Source/zworld/FXComponent.cpp +++ b/Source/zworld/FXComponent.cpp @@ -48,7 +48,7 @@ UObject* UFXComponent::PlayFX(UObject* FXAsset, USceneComponent* MeshComp, FName true, true, true, *GetOwner()->GetName()); if (auto NDCWriter = Cast(FXObject)) { - NDCWriter->WriteVector(UNameRegisterLibrary::Name_Position, 0, LocalOffset); + NDCWriter->WritePosition(UNameRegisterLibrary::Name_Position, 0, LocalOffset); NDCWriter->WriteVector(UNameRegisterLibrary::Name_Rotation, 0, FVector(LocalRotation.Pitch, LocalRotation.Yaw, LocalRotation.Roll)); NDCWriter->WriteQuat(UNameRegisterLibrary::Name_Quaternion, 0, LocalRotation.Quaternion()); } diff --git a/zworld.uproject b/zworld.uproject index f28dfa6..f98c203 100644 --- a/zworld.uproject +++ b/zworld.uproject @@ -18,5 +18,19 @@ "Editor" ] } + , + { + "Name": "Sentry", + "Enabled": true, + "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/99f5c02de5fa49ab97976a3a852e5408", + "SupportedTargetPlatforms": [ + "Win64", + "Android", + "IOS" + ], + "BlacklistPlatforms": [ + "Linux" + ] + } ] } \ No newline at end of file