From 377eff645b54e5a1661deb754b48823a3a619e9c Mon Sep 17 00:00:00 2001
From: 997146918 <997146918@qq.com>
Date: Mon, 23 Jun 2025 13:52:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8A=80=E8=83=BD=E9=87=8A?=
 =?UTF-8?q?=E6=94=BElog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Content/DataTable/PawnSkills.uasset       | Bin 13301 -> 13296 bytes
 .../Source/ProjectFish/Skill/Skill.cpp        |   3 ++-
 .../Source/ProjectFish/Skill/SkillEffect.cpp  |  18 +++++++++++++++---
 .../SkillEffects/SkillEffect_ModifySpeed.cpp  |   2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ProjectFish/Content/DataTable/PawnSkills.uasset b/ProjectFish/Content/DataTable/PawnSkills.uasset
index eb543c64c0db5fb7622450f33307da9efd2a99a9..9b50995d90d442894604b33ebf2438966297c101 100644
GIT binary patch
delta 249
zcmeyG{vmyW3(FQ^28PM~obnUX1(;m9CeJcfpSXa<;vyFV12Y2y!+Ze-22LPt&d<Q`
zUXX!-9mxI-q>Y6b7=nSg#HjUGP|Rx2>8+P_`;Wa`GVxB1Vg*oqk1<do68H}UAe;Pw
zVh1*7GG1n$oWiQ4EDhwk24`pH<b)&^rKgsJR2HOKSvlt91ZAdYlrZd=FL!Tq8><sH
z(-z^$7X^eTKM-J<EYHU=SyqUB@&^GArZf>GVfM)pf&q+GlUE8}V08z&VZr7)p_4q5
W3)SXrek$L?HrZW%-e!LFXFLFM_DiDx

delta 251
zcmey6{xyAq3+ql{1_tTL7kOnTrU`O*aWOC`GB7YqUZ|`vaXzcXH6WiE$X_DBz`zNl
zZTJ}&z6dffumjl)LJSNRKpX+YhUa%wnHeQG%=CY;=cnLQ>xp-A6l;Ov2aQ1r5#T=%
zfGqR}3LV{?$#|KWQDJgCtC&zqR$_8$UP(}9dPWJu#*I@tq=3Q_oIa^(B@9l5vJW;l
zvN~}y?G&DzC@40$K#*nf1YXw3PXzp#vPF=DSSAMx1~Ar7ULtsb)dy(((#@4ZCwV64
VsLk8_K)#1<vXlJ0&0OlwcmPGCNBIB%

diff --git a/ProjectFish/Source/ProjectFish/Skill/Skill.cpp b/ProjectFish/Source/ProjectFish/Skill/Skill.cpp
index 37a16a6..d42dc62 100644
--- a/ProjectFish/Source/ProjectFish/Skill/Skill.cpp
+++ b/ProjectFish/Source/ProjectFish/Skill/Skill.cpp
@@ -104,7 +104,8 @@ void USkill::ApplyRemainingTimeOffset(int timeOffset)
 
 void USkill::ApplyRemainingRemainingEnduranceOffset(int Offset)
 {
-	this->RemainingEndurance = FMath::Max(this->RemainingEndurance + Offset, SkillData.Endurance);
+	if (SkillData.Endurance != -1)
+		this->RemainingEndurance = FMath::Max(this->RemainingEndurance + Offset, SkillData.Endurance);
 }
 
 class APawnWithSkill* USkill::GetOwner()
diff --git a/ProjectFish/Source/ProjectFish/Skill/SkillEffect.cpp b/ProjectFish/Source/ProjectFish/Skill/SkillEffect.cpp
index 2353f08..354f363 100644
--- a/ProjectFish/Source/ProjectFish/Skill/SkillEffect.cpp
+++ b/ProjectFish/Source/ProjectFish/Skill/SkillEffect.cpp
@@ -21,11 +21,23 @@ void USkillEffect::Execute(const FSkillContext& context)
 	FString strTargets;
 	for (auto target: targets)
 	{
-		strTargets += "|" + target->GetName();
+		if (target->GetClass()->IsChildOf(APawnWithSkill::StaticClass()))
+		{
+			strTargets += (Cast<APawnWithSkill>(target))->GetActorNameOrLabel() +"|" ;
+		}
+		else
+		{
+			strTargets += (Cast<USkill>(target))->GetSkillData().SkillName.ToString() +  "|" ;
+		}
+		
 	}
 	const UEnum* EnumPtr = StaticEnum<ESkillEffectType>();
 	FString type = EnumPtr->GetNameStringByValue(static_cast<int64>(effectData.EffectType)) ;
-	UE_LOG(LogTemp, Log, TEXT("针对目标 %s 释放技能效果%s"), *strTargets, *type);
+	
+	UE_LOG(LogTemp, Warning, TEXT("技能：%s  目标:  %s  效果： %s")
+		, *OwnerSkill->GetSkillData().SkillName.ToString()
+		,*strTargets
+		, *( GetSkillEffectDes()));
 }
 
 void USkillEffect::EffectEnded()
@@ -160,7 +172,7 @@ void USkillEffect::GetEffectTargetsByTargetType(const FSkillContext& context, TA
 			//所有当前技能右侧的技能
 			TArray< USkill*> allSkills = context.SkillManager->GetAllSkills();
 			int32 index = allSkills.Find(OwnerSkill);
-			for (int i = index; i < allSkills.Num(); ++i)
+			for (int i = index + 1; i < allSkills.Num(); ++i)
 			{
 				if (allSkills[i]->GetOwner() == OwnerSkill->GetOwner())
 					result.Add(allSkills[i]);
diff --git a/ProjectFish/Source/ProjectFish/Skill/SkillEffects/SkillEffect_ModifySpeed.cpp b/ProjectFish/Source/ProjectFish/Skill/SkillEffects/SkillEffect_ModifySpeed.cpp
index 91626b4..571fb9d 100644
--- a/ProjectFish/Source/ProjectFish/Skill/SkillEffects/SkillEffect_ModifySpeed.cpp
+++ b/ProjectFish/Source/ProjectFish/Skill/SkillEffects/SkillEffect_ModifySpeed.cpp
@@ -27,7 +27,7 @@ void USkillEffect_ModifySpeed::Execute(const FSkillContext& context)
 			GetWorld()->GetTimerManager().SetTimer(TimerHandle, [&]() 
 				{
 					
-					UE_LOG(LogTemp, Warning, TEXT("取消CD充能效果！"));
+					UE_LOG(LogTemp, Log, TEXT("取消CD充能效果！"));
 					skill->GetSkillData().Speed = 1;
 				
 				}, UKismetStringLibrary::Conv_StringToInt(effectData.ParamAddition), false); // 单次触发