Fix for Version Conflict
This commit is contained in:
		
							parent
							
								
									e4709f35e7
								
							
						
					
					
						commit
						82c65b3fc4
					
				@ -17,7 +17,7 @@ ManualIPAddress=
 | 
				
			|||||||
+ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss")
 | 
					+ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[/Script/EngineSettings.GameMapsSettings]
 | 
					[/Script/EngineSettings.GameMapsSettings]
 | 
				
			||||||
EditorStartupMap=/Game/MainMenu/MainMenu.MainMenu
 | 
					EditorStartupMap=/Game/Levels/Top_layer_level.Top_layer_level
 | 
				
			||||||
LocalMapOptions=
 | 
					LocalMapOptions=
 | 
				
			||||||
TransitionMap=None
 | 
					TransitionMap=None
 | 
				
			||||||
bUseSplitscreen=True
 | 
					bUseSplitscreen=True
 | 
				
			||||||
@ -26,7 +26,7 @@ ThreePlayerSplitscreenLayout=FavorTop
 | 
				
			|||||||
FourPlayerSplitscreenLayout=Grid
 | 
					FourPlayerSplitscreenLayout=Grid
 | 
				
			||||||
bOffsetPlayerGamepadIds=False
 | 
					bOffsetPlayerGamepadIds=False
 | 
				
			||||||
GameInstanceClass=/Script/Engine.GameInstance
 | 
					GameInstanceClass=/Script/Engine.GameInstance
 | 
				
			||||||
GameDefaultMap=/Game/MainMenu/MainMenu.MainMenu
 | 
					GameDefaultMap=/Game/Levels/Top_layer_level.Top_layer_level
 | 
				
			||||||
ServerDefaultMap=/Engine/Maps/Entry.Entry
 | 
					ServerDefaultMap=/Engine/Maps/Entry.Entry
 | 
				
			||||||
GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C
 | 
					GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C
 | 
				
			||||||
GlobalDefaultServerGameMode=None
 | 
					GlobalDefaultServerGameMode=None
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										
											BIN
										
									
								
								Content/BlueprintAI/AI/AIBruh.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											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)
									
									
									
									
								
							
							
						
						
									
										
											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
									
								
							
							
						
						
									
										
											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)
									
									
									
									
								
							
							
						
						
									
										
											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
									
								
							
							
						
						
									
										
											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)
									
									
									
									
								
							
							
						
						
									
										
											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)
									
									
									
									
								
							
							
						
						
									
										
											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
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/BlueprintAI/AI/BTT_ChaseBruh.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/BlueprintAI/AI/BTT_FindRandomPatrol.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/BlueprintAI/AI/BTT_FindRandomPatrol.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/BlueprintAI/AI/BT_Bruh.uasset
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											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)
									
									
									
									
								
							
							
						
						
									
										
											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)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/BlueprintAI/BruhAI/AIBruh.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/BlueprintAI/BruhAI/AIControllerBruh.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/BlueprintAI/BruhAI/AIControllerBruh.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/BlueprintAI/BruhAI/BB_Bruh.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/BlueprintAI/BruhAI/BB_Bruh.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/BlueprintAI/BruhAI/BTT_ChaseBruh.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/BlueprintAI/BruhAI/BTT_ChaseBruh.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/BlueprintAI/BruhAI/BTT_FindRandomPatrol.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/BlueprintAI/BruhAI/BTT_FindRandomPatrol.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/BlueprintAI/BruhAI/BT_Bruh.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/BlueprintAI/BruhAI/BT_Bruh.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Combat_UI/CombatCharacter.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Combat_UI/CombatCharacter.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Levels/Top_layer_level.umap
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Levels/Top_layer_level.umap
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Levels/TurnBaseSystemV2Test.umap
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Levels/TurnBaseSystemV2Test.umap
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							@ -3,7 +3,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include "EatableItems.h"
 | 
					#include "EatableItems.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "BehaviorTree/BehaviorTreeTypes.h"
 | 
					 | 
				
			||||||
#include "the_twilight_abyss/BaseItems/InventoryComponent.h"
 | 
					#include "the_twilight_abyss/BaseItems/InventoryComponent.h"
 | 
				
			||||||
#include "the_twilight_abyss/PlayerTemp/TempCharacter.h"
 | 
					#include "the_twilight_abyss/PlayerTemp/TempCharacter.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -46,6 +46,8 @@ void UHoldToInitCombat::TickComponent(float DeltaTime, ELevelTick TickType, FAct
 | 
				
			|||||||
	{
 | 
						{
 | 
				
			||||||
		//Enter Combat Mode
 | 
							//Enter Combat Mode
 | 
				
			||||||
		Cast<ATurnBaseCombatV2>(GetWorld()->GetGameState())->StartCombat(TargetEnemy);
 | 
							Cast<ATurnBaseCombatV2>(GetWorld()->GetGameState())->StartCombat(TargetEnemy);
 | 
				
			||||||
 | 
							//UBlackboardComponent* TargetEnemyBlackboard = Cast<UBlackboardComponent>(TargetEnemy->GetComponentByClass(UBlackboardComponent::StaticClass()));
 | 
				
			||||||
 | 
							//TargetEnemyBlackboard->SetValueAsBool("IsInCombat", true);
 | 
				
			||||||
		OnRightClickUp();
 | 
							OnRightClickUp();
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@ -83,6 +85,11 @@ AActor* UHoldToInitCombat::LookingAtEnemy() const
 | 
				
			|||||||
		{
 | 
							{
 | 
				
			||||||
			return HitResult.GetActor();
 | 
								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);
 | 
						DrawDebugLine(GetWorld(), Start, End, FColor::Red, false, 5.0f, 0, 10.0f);
 | 
				
			||||||
	return nullptr;
 | 
						return nullptr;
 | 
				
			||||||
 | 
				
			|||||||
@ -10,7 +10,7 @@ public class the_twilight_abyss : ModuleRules
 | 
				
			|||||||
	
 | 
						
 | 
				
			||||||
		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "UMG", "Niagara" });
 | 
							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
 | 
							// Uncomment if you are using Slate UI
 | 
				
			||||||
		// PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });
 | 
							// PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user