diff --git a/Content/Assets/LearningKit_Games/Assets/Characters/Character/Material/M_EpicCharacter_Dissolve.uasset b/Content/Assets/LearningKit_Games/Assets/Characters/Character/Material/M_EpicCharacter_Dissolve.uasset deleted file mode 100644 index 032ff8d..0000000 Binary files a/Content/Assets/LearningKit_Games/Assets/Characters/Character/Material/M_EpicCharacter_Dissolve.uasset and /dev/null differ diff --git a/Content/Assets/LearningKit_Games/Assets/Characters/Character/Texture/T_EpicCharacter_Colors_Red.uasset b/Content/Assets/LearningKit_Games/Assets/Characters/Character/Texture/T_EpicCharacter_Colors_Red.uasset new file mode 100644 index 0000000..a07faab Binary files /dev/null and b/Content/Assets/LearningKit_Games/Assets/Characters/Character/Texture/T_EpicCharacter_Colors_Red.uasset differ diff --git a/Content/Assets/Materials/CharacterMaterials/MI_BlueTeam.uasset b/Content/Assets/Materials/CharacterMaterials/MI_BlueTeam.uasset new file mode 100644 index 0000000..c0a9896 Binary files /dev/null and b/Content/Assets/Materials/CharacterMaterials/MI_BlueTeam.uasset differ diff --git a/Content/Assets/Materials/CharacterMaterials/MI_BlueTeam_Dissolve.uasset b/Content/Assets/Materials/CharacterMaterials/MI_BlueTeam_Dissolve.uasset new file mode 100644 index 0000000..e45ca20 Binary files /dev/null and b/Content/Assets/Materials/CharacterMaterials/MI_BlueTeam_Dissolve.uasset differ diff --git a/Content/Assets/LearningKit_Games/Assets/Characters/Character/Material/MI_EpicCharacter_Dissolve.uasset b/Content/Assets/Materials/CharacterMaterials/MI_EpicCharacter_Dissolve.uasset similarity index 82% rename from Content/Assets/LearningKit_Games/Assets/Characters/Character/Material/MI_EpicCharacter_Dissolve.uasset rename to Content/Assets/Materials/CharacterMaterials/MI_EpicCharacter_Dissolve.uasset index 93441ef..8be71ca 100644 Binary files a/Content/Assets/LearningKit_Games/Assets/Characters/Character/Material/MI_EpicCharacter_Dissolve.uasset and b/Content/Assets/Materials/CharacterMaterials/MI_EpicCharacter_Dissolve.uasset differ diff --git a/Content/Assets/Materials/CharacterMaterials/MI_RedTeam.uasset b/Content/Assets/Materials/CharacterMaterials/MI_RedTeam.uasset new file mode 100644 index 0000000..b657a40 Binary files /dev/null and b/Content/Assets/Materials/CharacterMaterials/MI_RedTeam.uasset differ diff --git a/Content/Assets/Materials/CharacterMaterials/MI_RedTeam_Dissolve.uasset b/Content/Assets/Materials/CharacterMaterials/MI_RedTeam_Dissolve.uasset new file mode 100644 index 0000000..c7d97d0 Binary files /dev/null and b/Content/Assets/Materials/CharacterMaterials/MI_RedTeam_Dissolve.uasset differ diff --git a/Content/Assets/Materials/CharacterMaterials/M_EpicCharacter_Dissolve.uasset b/Content/Assets/Materials/CharacterMaterials/M_EpicCharacter_Dissolve.uasset new file mode 100644 index 0000000..5fc3b20 Binary files /dev/null and b/Content/Assets/Materials/CharacterMaterials/M_EpicCharacter_Dissolve.uasset differ diff --git a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Crown.uasset b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Crown.uasset index 80cc7ce..ea50cad 100644 Binary files a/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Crown.uasset and b/Content/Assets/sA_PickupSet_1/Fx/NiagaraSystems/NS_Crown.uasset differ diff --git a/Content/Blueprints/Character/BP_BlasterCharacter.uasset b/Content/Blueprints/Character/BP_BlasterCharacter.uasset index cf71e47..799a318 100644 Binary files a/Content/Blueprints/Character/BP_BlasterCharacter.uasset and b/Content/Blueprints/Character/BP_BlasterCharacter.uasset differ diff --git a/Source/Blaster/Character/BlasterCharacter.cpp b/Source/Blaster/Character/BlasterCharacter.cpp index b9292d2..14237cd 100644 --- a/Source/Blaster/Character/BlasterCharacter.cpp +++ b/Source/Blaster/Character/BlasterCharacter.cpp @@ -210,6 +210,7 @@ void ABlasterCharacter::MulticastEliminated_Implementation(bool bPlayerLeftGame) // Disable collision GetCapsuleComponent()->SetCollisionEnabled(ECollisionEnabled::NoCollision); GetMesh()->SetCollisionEnabled(ECollisionEnabled::NoCollision); + AttachedGrenade->SetCollisionEnabled(ECollisionEnabled::NoCollision); // Elimination bot if (EliminationBotEffect) @@ -293,7 +294,7 @@ void ABlasterCharacter::MulticastGainedTheLead_Implementation() { CrownComponent = UNiagaraFunctionLibrary::SpawnSystemAttached( CrownSystem, - GetCapsuleComponent(), + GetMesh(), FName(), GetActorLocation() + FVector(0.f, 0.f, 110.f), GetActorRotation(),