#77 Fire animation move to separated BP

xthebat · Dec 18, 2023 · 8e993cc · 8e993cc
1 parent 2bd9414
commit 8e993cc
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 33 deletions.
diff --git a/Content/Blueprints/Character/JungleRaider/Animations/PistolFireAnimation.uasset b/Content/Blueprints/Character/JungleRaider/Animations/PistolFireAnimation.uasset
diff --git a/Content/Blueprints/Character/JungleRaider/Animations/RifleFireAnimation.uasset b/Content/Blueprints/Character/JungleRaider/Animations/RifleFireAnimation.uasset
diff --git a/Content/Blueprints/Character/JungleRaider/Animations/TAnimation.uasset b/Content/Blueprints/Character/JungleRaider/Animations/TAnimation.uasset
diff --git a/Content/Maps/warmup.umap b/Content/Maps/warmup.umap
diff --git a/Docs/Unreal/CreateAnimBlueprintFunc.MD b/Docs/Unreal/CreateAnimBlueprintFunc.MD
@@ -0,0 +1,3 @@
+# Создание "функций" с параметрами в Animation Blueprint 
+
+[Видео на YouTube](https://www.youtube.com/watch?v=hpZEGFimGYA)
diff --git a/Importing/tm_jungle_raider_variantb2_fire.blend b/Importing/tm_jungle_raider_variantb2_fire.blend
diff --git a/Source/Cloud9/Character/Components/Cloud9Inventory.cpp b/Source/Cloud9/Character/Components/Cloud9Inventory.cpp
@@ -201,19 +201,3 @@ ACloud9WeaponBase* UCloud9Inventory::GetSelectedWeapon() const { return GetWeapo
 ACloud9WeaponBase* UCloud9Inventory::GetPendingWeapon() const { return GetWeaponAt(PendingWeaponSlot); }
 
 bool UCloud9Inventory::IsWeaponChanging() const { return SelectedWeaponSlot != PendingWeaponSlot; }
-
-EWeaponType UCloud9Inventory::GetSelectedWeaponType() const
-{
-	let Weapon = GetWeaponAt(SelectedWeaponSlot);
-	return IsValid(Weapon) ? Weapon->GetWeaponType() : EWeaponType::NoWeapon;
-}
-
-EWeaponType UCloud9Inventory::GetPendingWeaponType() const
-{
-	let Weapon = GetWeaponAt(PendingWeaponSlot);
-	return IsValid(Weapon) ? Weapon->GetWeaponType() : EWeaponType::NoWeapon;
-}
-
-EWeaponSlot UCloud9Inventory::GetSelectedWeaponSlot() const { return SelectedWeaponSlot; }
-
-EWeaponSlot UCloud9Inventory::GetPendingWeaponSlot() const { return PendingWeaponSlot; }
diff --git a/Source/Cloud9/Character/Components/Cloud9Inventory.h b/Source/Cloud9/Character/Components/Cloud9Inventory.h
@@ -30,7 +30,6 @@
 #include "Cloud9/Weapon/Enums/FirearmNames.h"
 #include "Cloud9/Weapon/Enums/MeleeNames.h"
 #include "Cloud9/Weapon/Enums/WeaponSlot.h"
-#include "Cloud9/Weapon/Enums/WeaponType.h"
 #include "Cloud9Inventory.generated.h"
 
 class ACloud9WeaponBase;
@@ -50,18 +49,6 @@ class CLOUD9_API UCloud9Inventory
 	UFUNCTION(BlueprintCallable)
 	bool SelectWeapon(EWeaponSlot Slot);
 
-	UFUNCTION(BlueprintCallable)
-	EWeaponType GetSelectedWeaponType() const;
-
-	UFUNCTION(BlueprintCallable)
-	EWeaponType GetPendingWeaponType() const;
-
-	UFUNCTION(BlueprintCallable)
-	EWeaponSlot GetSelectedWeaponSlot() const;
-
-	UFUNCTION(BlueprintCallable)
-	EWeaponSlot GetPendingWeaponSlot() const;
-
 	UFUNCTION(BlueprintCallable)
 	ACloud9WeaponBase* GetWeaponAt(EWeaponSlot Slot) const;
 
@@ -107,15 +94,15 @@ class CLOUD9_API UCloud9Inventory
 	UPROPERTY()
 	TArray<ACloud9WeaponBase*> WeaponSlots;
 
-	UPROPERTY(Category=Weapon, BlueprintReadOnly, meta=(AllowPrivateAccess))
+	UPROPERTY(Category=Weapon, BlueprintReadOnly)
 	EWeaponSlot SelectedWeaponSlot;
 
-	UPROPERTY(Category=Weapon, BlueprintReadOnly, meta=(AllowPrivateAccess))
+	UPROPERTY(Category=Weapon, BlueprintReadOnly)
 	EWeaponSlot PendingWeaponSlot;
 
-	UPROPERTY(Category=Weapon, EditDefaultsOnly, meta=(AllowPrivateAccess))
+	UPROPERTY(Category=Weapon, EditDefaultsOnly)
 	EMelee DefaultKnifeName;
 
-	UPROPERTY(Category=Weapon, EditDefaultsOnly, meta=(AllowPrivateAccess))
+	UPROPERTY(Category=Weapon, EditDefaultsOnly)
 	EFirearm DefaultPistolName;
 };
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Создание "функций" с параметрами в Animation Blueprint

		[Видео на YouTube](https://www.youtube.com/watch?v=hpZEGFimGYA)