diff --git a/Content/Blueprints/Character/JungleRaider/Animations/PistolFireAnimation.uasset b/Content/Blueprints/Character/JungleRaider/Animations/PistolFireAnimation.uasset new file mode 100644 index 000000000..bc253eade Binary files /dev/null and b/Content/Blueprints/Character/JungleRaider/Animations/PistolFireAnimation.uasset differ diff --git a/Content/Blueprints/Character/JungleRaider/Animations/RifleFireAnimation.uasset b/Content/Blueprints/Character/JungleRaider/Animations/RifleFireAnimation.uasset new file mode 100644 index 000000000..45585399c Binary files /dev/null and b/Content/Blueprints/Character/JungleRaider/Animations/RifleFireAnimation.uasset differ diff --git a/Content/Blueprints/Character/JungleRaider/Animations/TAnimation.uasset b/Content/Blueprints/Character/JungleRaider/Animations/TAnimation.uasset index 769c645de..5435c8e1d 100644 Binary files a/Content/Blueprints/Character/JungleRaider/Animations/TAnimation.uasset and b/Content/Blueprints/Character/JungleRaider/Animations/TAnimation.uasset differ diff --git a/Content/Maps/warmup.umap b/Content/Maps/warmup.umap index a12aa455d..720fce70f 100644 Binary files a/Content/Maps/warmup.umap and b/Content/Maps/warmup.umap differ diff --git a/Docs/Unreal/CreateAnimBlueprintFunc.MD b/Docs/Unreal/CreateAnimBlueprintFunc.MD new file mode 100644 index 000000000..e1b7d3e99 --- /dev/null +++ b/Docs/Unreal/CreateAnimBlueprintFunc.MD @@ -0,0 +1,3 @@ +# Создание "функций" с параметрами в Animation Blueprint + +[Видео на YouTube](https://www.youtube.com/watch?v=hpZEGFimGYA) \ No newline at end of file diff --git a/Importing/tm_jungle_raider_variantb2_fire.blend b/Importing/tm_jungle_raider_variantb2_fire.blend index 23ac56648..0c16ed421 100644 Binary files a/Importing/tm_jungle_raider_variantb2_fire.blend and b/Importing/tm_jungle_raider_variantb2_fire.blend differ diff --git a/Source/Cloud9/Character/Components/Cloud9Inventory.cpp b/Source/Cloud9/Character/Components/Cloud9Inventory.cpp index 3fe0361fc..6772b5999 100644 --- 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 index 91bb01293..b3b559f33 100644 --- 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 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; };