From ca4d427906743918e0a55f26c518baee7457d403 Mon Sep 17 00:00:00 2001
From: "SD-20250424WZPW\\Administrator" <Cjw>
Date: Thu, 8 May 2025 17:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BE=99=E5=8D=B7=E9=A3=8E?=
 =?UTF-8?q?=E6=B2=A1=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Configs/GameConfig/Datas/GiftConfig.xlsx      | Bin 11784 -> 11784 bytes
 .../bytes/giftconfig_tbgiftconfig.bytes       | Bin 957 -> 957 bytes
 .../HotFix/GameLogic/Actor/ActorHItem.cs      |  39 ++++++++++++++++++
 .../HotFix/GameLogic/Actor/Buff/Buff.cs       |   5 +--
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/Configs/GameConfig/Datas/GiftConfig.xlsx b/Configs/GameConfig/Datas/GiftConfig.xlsx
index 56587ea79423627024b7e05fd8b406a12589899c..d8a4308343210b5d592920d733c3d5760c00f133 100644
GIT binary patch
delta 2672
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

delta 2670
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

diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes
index ca969529591e021efd9aaa363300049d5a8917bc..9dd32a3c98c6f75e8c6d0811ed11df7d1d48f850 100644
GIT binary patch
delta 22
dcmdnXzL$N2F(VTL!(>y&W+ny4&AS+xnE*!F1(5&%

delta 22
dcmdnXzL$N2F(Z?h^JG)TW~K)F&AS+xnE*}*21oz^

diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs
index cfa66413..0ed1f4b5 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs
@@ -198,6 +198,45 @@ namespace GameLogic
 
             if (m_Buffs.ContainsKey(unitPlayerData.protCustMessageData.openId))
             {
+
+                // 如果是负面Buff
+                if (buff.addPower < 0)
+                {
+
+                    Buff godBuff = null;
+
+                    // 先检查自身身上有没有无敌Buff ，Value == 0的
+                    foreach (var item in m_Buffs[unitPlayerData.protCustMessageData.openId])
+                    {
+                        // 无敌
+                        if (item.addPower == 0)
+                        {
+
+                            if (godBuff == null)
+                            {
+                                godBuff = item;
+                            }
+                            else
+                            {
+                                // 比较，看谁时间最短
+                                if (godBuff.m_CraeteTimer < item.m_CraeteTimer)
+                                {
+                                    godBuff = item;
+                                }
+                            }
+                        }
+                    }
+
+                    // 抵消
+                    if (godBuff != null)
+                    {
+                        // 有效时间置空
+                        godBuff.m_CraeteTimer = godBuff.m_AllTimer;
+                        Log.Debug("触发抵消机制");
+                        return;
+                    }
+                }
+
                 // 累加设计
                 // 没有该Buff,则新增这个Buff
                 m_Buffs[unitPlayerData.protCustMessageData.openId].Add(buff);
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Buff/Buff.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Buff/Buff.cs
index 501c11d9..d4bdc6bc 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Buff/Buff.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Buff/Buff.cs
@@ -17,10 +17,7 @@ public class Buff
     public void OnInit(int id, float value, int timerLen, int addScale, int num)
     {
         m_Id = id;
-        // 记录一下,特殊Buff,正常计时。非特殊Buff,在Actor中计时
-        m_CraeteTimer = id == EventConts.isZoneTimerBuffId ? Time.time : 0;
-        //isZoneTimer = id == EventConts.isZoneTimerBuffId;
-        //isAllPower = id == EventConts.isAllPowerBuffId;
+        //m_CraeteTimer = timerLen;
         addPower = value;
         if (isZoneTimer)
         {