Added assaulter

11 months ago · f94f555fd3
parent deac8dc163
commit f94f555fd3
59 changed files with 171 additions and 15 deletions
--- a/Content/Audio/Common/bladeslash.uasset
+++ b/Content/Audio/Common/bladeslash.uasset
--- a/Content/Audio/Units/EM_CQB/swordswing.uasset
+++ b/Content/Audio/Units/EM_CQB/swordswing.uasset
--- a/Content/Blueprints/BP_PlayerController.uasset
+++ b/Content/Blueprints/BP_PlayerController.uasset
--- a/Content/Blueprints/Units/Common/BP_Unit.uasset
+++ b/Content/Blueprints/Units/Common/BP_Unit.uasset
--- a/Content/Blueprints/Units/Common/DT_Blade.uasset
+++ b/Content/Blueprints/Units/Common/DT_Blade.uasset
--- a/Content/Blueprints/Units/Common/Projectiles/DT_Melee.uasset
+++ b/Content/Blueprints/Units/Common/Projectiles/DT_Melee.uasset
--- a/Content/Blueprints/Units/EM_CQB/ABP_EM_CQB.uasset
+++ b/Content/Blueprints/Units/EM_CQB/ABP_EM_CQB.uasset
--- a/Content/Blueprints/Units/EM_CQB/BP_EM_CQB.uasset
+++ b/Content/Blueprints/Units/EM_CQB/BP_EM_CQB.uasset
--- a/Content/Blueprints/Units/EM_CQB/DA_EM_CQB.uasset
+++ b/Content/Blueprints/Units/EM_CQB/DA_EM_CQB.uasset
--- a/Content/Blueprints/Units/EM_CQB/M_Attack.uasset
+++ b/Content/Blueprints/Units/EM_CQB/M_Attack.uasset
--- a/Content/Blueprints/Units/M_Mite/BP_Mite.uasset
+++ b/Content/Blueprints/Units/M_Mite/BP_Mite.uasset
--- a/Content/Blueprints/Units/M_Mite/DA_M_Mite.uasset
+++ b/Content/Blueprints/Units/M_Mite/DA_M_Mite.uasset
--- a/Content/Blueprints/Units/M_Mite/SC_Impact.uasset
+++ b/Content/Blueprints/Units/M_Mite/SC_Impact.uasset
--- a/Content/Levels/MainMenu.umap
+++ b/Content/Levels/MainMenu.umap
--- a/Content/Models/PlayerUnits/ExoCQB/IKR_CQB.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/IKR_CQB.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Materials/ArmorBase.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Materials/ArmorBase.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Materials/ArmorShell.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Materials/ArmorShell.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Materials/Blade.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Materials/Blade.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Materials/Boots.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Materials/Boots.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Materials/Handle.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Materials/Handle.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Materials/HelmetBase.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Materials/HelmetBase.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Materials/Tank.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Materials/Tank.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Materials/Visor.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Materials/Visor.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Rifle_Idle.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Rifle_Idle.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Rig_CQB.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Rig_CQB.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Run_With_Sword.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Run_With_Sword.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Sword_And_Shield_Slash.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Sword_And_Shield_Slash.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_ArmorBase_BaseColor.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_ArmorBase_BaseColor.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_ArmorBase_Normal.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_ArmorBase_Normal.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_ArmorBase_OcclusionRoughnessMetallic.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_ArmorBase_OcclusionRoughnessMetallic.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_ArmorShell_BaseColor.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_ArmorShell_BaseColor.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_ArmorShell_Normal.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_ArmorShell_Normal.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_ArmorShell_OcclusionRoughnessMetallic.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_ArmorShell_OcclusionRoughnessMetallic.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Blade_BaseColor.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Blade_BaseColor.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Blade_Emissive.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Blade_Emissive.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Blade_Normal.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Blade_Normal.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Blade_OcclusionRoughnessMetallic.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Blade_OcclusionRoughnessMetallic.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Boots_BaseColor.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Boots_BaseColor.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Boots_Normal.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Boots_Normal.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Boots_OcclusionRoughnessMetallic.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Boots_OcclusionRoughnessMetallic.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Handle_BaseColor.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Handle_BaseColor.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Handle_Emissive.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Handle_Emissive.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Handle_Normal.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Handle_Normal.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Handle_OcclusionRoughnessMetallic.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Handle_OcclusionRoughnessMetallic.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_HelmetBase_BaseColor.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_HelmetBase_BaseColor.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_HelmetBase_Normal.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_HelmetBase_Normal.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_HelmetBase_OcclusionRoughnessMetallic.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_HelmetBase_OcclusionRoughnessMetallic.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Tank_BaseColor.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Tank_BaseColor.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Tank_Normal.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Tank_Normal.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Tank_OcclusionRoughnessMetallic.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Tank_OcclusionRoughnessMetallic.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Visor_BaseColor.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Visor_BaseColor.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Visor_Normal.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Visor_Normal.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Visor_OcclusionRoughnessMetallic.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/Textures/exocqb_Visor_OcclusionRoughnessMetallic.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/exocqb.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/exocqb.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/exocqb_PhysicsAsset.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/exocqb_PhysicsAsset.uasset
--- a/Content/Models/PlayerUnits/ExoCQB/exocqb_Skeleton.uasset
+++ b/Content/Models/PlayerUnits/ExoCQB/exocqb_Skeleton.uasset
--- a/Content/Models/YBot/Run_With_Sword.uasset
+++ b/Content/Models/YBot/Run_With_Sword.uasset
--- a/Content/Models/YBot/Sword_And_Shield_Slash.uasset
+++ b/Content/Models/YBot/Sword_And_Shield_Slash.uasset
--- a/Source/SpaceBattler/Public/UnitInfo.h
+++ b/Source/SpaceBattler/Public/UnitInfo.h
@ -54,6 +54,12 @@ protected:
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="Classes")
 	TSubclassOf<AActor> CharacterClass;

+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="Melee Info")
+	TSubclassOf<UDamageType> MeleeDamageType;
+
+	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="Melee Info")
+	UAnimMontage* MeleeMontage;
+	
 	UPROPERTY(BlueprintReadWrite, EditAnywhere, Category="Ranged Info")
 	TSubclassOf<AActor> RangedProjectile;