解决冲突

This commit is contained in:
TNT
2026-05-17 22:47:33 +08:00
22 changed files with 74 additions and 17 deletions

3
.gitmodules vendored
View File

@@ -1,3 +1,6 @@
[submodule "Plugins/Dialog"]
path = Plugins/Dialog
url = https://gitea.msbzb.xyz/meishibiezb/Dialog.git
[submodule "Plugins/CharacterControl"]
path = Plugins/CharacterControl
url = https://gitea.msbzb.xyz/meishibiezb/CharacterControl

View File

@@ -0,0 +1,20 @@
;METADATA=(Diff=true, UseCommands=true)
[/Script/GameplayTags.GameplayTagsSettings]
ImportTagsFromConfig=True
WarnOnInvalidTags=True
ClearInvalidTags=False
AllowEditorTagUnloading=True
AllowGameTagUnloading=False
FastReplication=False
bDynamicReplication=False
InvalidTagCharacters="\"\',"
NumBitsForContainerSize=6
NetIndexFirstBitSegment=16
+GameplayTagList=(Tag="Gameplay.Action.Camera.Move",DevComment="")
+GameplayTagList=(Tag="Gameplay.Action.Camera.Reset",DevComment="")
+GameplayTagList=(Tag="Gameplay.Action.Camera.Rotate",DevComment="")
+GameplayTagList=(Tag="Gameplay.Action.Camera.Zoom",DevComment="")
+GameplayTagList=(Tag="Gameplay.Action.Hello",DevComment="")
+GameplayTagList=(Tag="Gameplay.Action.Move",DevComment="")
+GameplayTagList=(Tag="Gameplay.Action.Run",DevComment="")

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.

View File

@@ -11,4 +11,9 @@ APawn* AMyPlayerController::GetOwnedPawn()
void AMyPlayerController::BeginPlay()
{
Super::BeginPlay();
}
}
void AMyPlayerController::CalcCamera(float DeltaTime, FMinimalViewInfo& OutResult)
{
AActor::CalcCamera(DeltaTime, OutResult);
}

View File

@@ -20,6 +20,6 @@ public:
protected:
virtual void BeginPlay() override;
virtual void CalcCamera(float DeltaTime, FMinimalViewInfo& OutResult) override;
private:
};

View File

@@ -29,6 +29,10 @@
"Win64"
],
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/362651520df94e4fa65492dbcba44ae2"
},
{
"Name": "StructUtils",
"Enabled": true
}
]
}