Fix for Version Conflict

This commit is contained in:
Philip W 2023-01-17 08:46:31 +00:00
parent e4709f35e7
commit 82c65b3fc4
24 changed files with 31 additions and 46 deletions

View File

@ -17,7 +17,7 @@ ManualIPAddress=
+ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss")
[/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/Game/MainMenu/MainMenu.MainMenu
EditorStartupMap=/Game/Levels/Top_layer_level.Top_layer_level
LocalMapOptions=
TransitionMap=None
bUseSplitscreen=True
@ -26,7 +26,7 @@ ThreePlayerSplitscreenLayout=FavorTop
FourPlayerSplitscreenLayout=Grid
bOffsetPlayerGamepadIds=False
GameInstanceClass=/Script/Engine.GameInstance
GameDefaultMap=/Game/MainMenu/MainMenu.MainMenu
GameDefaultMap=/Game/Levels/Top_layer_level.Top_layer_level
ServerDefaultMap=/Engine/Maps/Entry.Entry
GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C
GlobalDefaultServerGameMode=None

BIN
Content/BlueprintAI/AI/AIBruh.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/BlueprintAI/AI/AIC_Enemy.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/BlueprintAI/AI/AIControllerBruh.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/BlueprintAI/AI/AI_Enemy.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/BlueprintAI/AI/BB_Bruh.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/BlueprintAI/AI/BB_Enemy.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/BlueprintAI/AI/BTT_Chase.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/BlueprintAI/AI/BTT_ChaseBruh.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/BlueprintAI/AI/BT_Bruh.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/BlueprintAI/AI/BT_Enemy.uasset (Stored with Git LFS)

Binary file not shown.

BIN
Content/BlueprintAI/BruhAI/AIBruh.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
Content/BlueprintAI/BruhAI/BB_Bruh.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/BlueprintAI/BruhAI/BT_Bruh.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
Content/Levels/Top_layer_level.umap (Stored with Git LFS)

Binary file not shown.

BIN
Content/Levels/TurnBaseSystemV2Test.umap (Stored with Git LFS)

Binary file not shown.

View File

@ -3,7 +3,6 @@
#include "EatableItems.h"
#include "BehaviorTree/BehaviorTreeTypes.h"
#include "the_twilight_abyss/BaseItems/InventoryComponent.h"
#include "the_twilight_abyss/PlayerTemp/TempCharacter.h"

View File

@ -46,6 +46,8 @@ void UHoldToInitCombat::TickComponent(float DeltaTime, ELevelTick TickType, FAct
{
//Enter Combat Mode
Cast<ATurnBaseCombatV2>(GetWorld()->GetGameState())->StartCombat(TargetEnemy);
//UBlackboardComponent* TargetEnemyBlackboard = Cast<UBlackboardComponent>(TargetEnemy->GetComponentByClass(UBlackboardComponent::StaticClass()));
//TargetEnemyBlackboard->SetValueAsBool("IsInCombat", true);
OnRightClickUp();
}
}
@ -83,6 +85,11 @@ AActor* UHoldToInitCombat::LookingAtEnemy() const
{
return HitResult.GetActor();
}
if (HitResult.GetActor()->Tags.Contains("Break"))
{
HitResult.GetActor()->Destroy();
return nullptr;
}
}
DrawDebugLine(GetWorld(), Start, End, FColor::Red, false, 5.0f, 0, 10.0f);
return nullptr;

View File

@ -10,7 +10,7 @@ public class the_twilight_abyss : ModuleRules
PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "UMG", "Niagara" });
PrivateDependencyModuleNames.AddRange(new string[] { });
PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });
// Uncomment if you are using Slate UI
// PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });