fixed crash on ability activation

nik3122 · Jul 4, 2017 · 2360762 · 2360762
1 parent e70d6c3
commit 2360762
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 7 deletions.
diff --git a/Config/DefaultGameplayTags.ini b/Config/DefaultGameplayTags.ini
@@ -5,14 +5,18 @@ WarnOnInvalidTags=True
 FastReplication=False
 NumBitsForContainerSize=6
 NetIndexFirstBitSegment=16
+-GameplayTagList=(Tag="Ability.Corruption",DevComment="")
 -GameplayTagList=(Tag="Ability.Rifle",DevComment="")
+-GameplayTagList=(Tag="Ability.Rifle.Damage",DevComment="")
 -GameplayTagList=(Tag="Ability.Rifle.Shoot",DevComment="")
 -GameplayTagList=(Tag="Cue.Ability.Shoot",DevComment="")
 -GameplayTagList=(Tag="Input.Gun.Shoot",DevComment="")
++GameplayTagList=(Tag="Ability.Corruption",DevComment="")
 +GameplayTagList=(Tag="Ability.Rifle",DevComment="")
 +GameplayTagList=(Tag="Ability.Rifle.Damage",DevComment="")
 +GameplayTagList=(Tag="Ability.Rifle.Shoot",DevComment="")
 +GameplayTagList=(Tag="Cue.Ability.Shoot",DevComment="")
++GameplayTagList=(Tag="Input.Ability01.Activate",DevComment="")
 +GameplayTagList=(Tag="Input.Gun.Shoot",DevComment="")
 
 
diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini
@@ -1,11 +1,5 @@
 
 [/Script/Engine.InputSettings]
--AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
--AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
--AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
--AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
--AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
--AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
 -AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
 -AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
 -AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
@@ -61,10 +55,12 @@ bDefaultViewportMouseLock=False
 DefaultViewportMouseLockMode=LockOnCapture
 -ActionMappings=(ActionName="Jump",Key=SpaceBar,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
 -ActionMappings=(ActionName="Jump",Key=Gamepad_FaceButton_Bottom,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
--ActionMappings=(ActionName="NewActionMapping_0",Key=LeftMouseButton,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
+-ActionMappings=(ActionName="Input.Gun.Shoot",Key=LeftMouseButton,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
+-ActionMappings=(ActionName="Input.Ability01.Activate",Key=None,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
 +ActionMappings=(ActionName="Jump",Key=SpaceBar,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
 +ActionMappings=(ActionName="Jump",Key=Gamepad_FaceButton_Bottom,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
 +ActionMappings=(ActionName="Input.Gun.Shoot",Key=LeftMouseButton,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
++ActionMappings=(ActionName="Input.Ability01.Activate",Key=One,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
 -AxisMappings=(AxisName="MoveForward",Key=W,Scale=1.000000)
 -AxisMappings=(AxisName="MoveForward",Key=S,Scale=-1.000000)
 -AxisMappings=(AxisName="MoveForward",Key=Up,Scale=1.000000)

diff --git a/Plugins/AbilityFramework/Source/AbilityFramework/Effects/GAGameEffect.cpp b/Plugins/AbilityFramework/Source/AbilityFramework/Effects/GAGameEffect.cpp
@@ -326,6 +326,7 @@ FGAEffectHandle FGAEffectContainer::ApplyEffect(FGAEffect* EffectIn, FGAEffectPr
 				if (InProperty.Application->ApplyEffect(InProperty.Handle,
 					EffectIn, InProperty, this, InContext))
 				{
+					Handle = InProperty.Handle;
 					InProperty.Application->ExecuteEffect(InProperty.Handle, InProperty, InContext, Modifier);
 					//	UE_LOG(GameAttributes, Log, TEXT("FGAEffectContainer::EffectApplied %s"), *HandleIn.GetEffectSpec()->GetName() );
 				}

diff --git a/Source/ActionRPGGame/Attributes/ARAbilityAttributes.cpp b/Source/ActionRPGGame/Attributes/ARAbilityAttributes.cpp
@@ -0,0 +1,7 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#include "ARAbilityAttributes.h"
+
+
+
+
diff --git a/Source/ActionRPGGame/Attributes/ARAbilityAttributes.h b/Source/ActionRPGGame/Attributes/ARAbilityAttributes.h
@@ -0,0 +1,20 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Attributes/GAAttributesBase.h"
+#include "ARAbilityAttributes.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class ACTIONRPGGAME_API UARAbilityAttributes : public UGAAttributesBase
+{
+	GENERATED_BODY()
+
+
+
+
+};
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,7 @@
		// Fill out your copyright notice in the Description page of Project Settings.

		#include "ARAbilityAttributes.h"