From 00045455da9c9633c6ef80acb42d97c0910900f6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Mon, 23 Jun 2025 15:49:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/AssetRaw/DLL/GameLogic.dll.bytes | Bin 223744 -> 223744 bytes .../Assets/AssetRaw/UI/UIGameBattle.prefab | 12 +- .../HotFix/GameLogic/Actor/ActorHItem.cs | 107 +++++++++--------- 3 files changed, 57 insertions(+), 62 deletions(-) diff --git a/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes b/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes index f552d2303d4ffb434cdc0f51fea8c815d81c05b4..e5669c4d990df34ef68c54d72b9d2df7aff73511 100644 GIT binary patch delta 6566 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 E0~1+uRsaA1 diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index f67ebe36..51b837c5 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -16613,7 +16613,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0023804, y: 893} + m_AnchoredPosition: {x: -0.0023804, y: 750} m_SizeDelta: {x: 1080, y: 472.77} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1762914308485668896 @@ -42621,10 +42621,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2161047130895777792} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5552065052100559850 CanvasRenderer: @@ -52808,7 +52808,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 100, y: 131} + m_AnchoredPosition: {x: 100, y: 42} m_SizeDelta: {x: 1080, y: 1327.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4858832337821100010 @@ -78461,7 +78461,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6472483763040821812 RectTransform: m_ObjectHideFlags: 0 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 4edc627d..a5a10e18 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -188,10 +188,7 @@ namespace GameLogic else { // 增加推力 - if (buff.addPower > 0) - { - m_AddPush += buff.addPower; - } + m_AddPush += buff.addPower; } } @@ -220,10 +217,10 @@ namespace GameLogic // 减速也不能减到负数 - //if (m_AddPush <= 0) - //{ - // m_AddPush = 0; - //} + if (m_AddPush <= 0) + { + m_AddPush = 0; + } m_AllPush += m_AddPush; @@ -262,7 +259,7 @@ namespace GameLogic m_tmpWaiXing.text = WaiXingCount.ToString(); m_rectWaiXing.gameObject.SetActive(WaiXingCount > 0); - + } List m_ListEgo = new List(); @@ -276,12 +273,18 @@ namespace GameLogic public async Task AddBuff(Buff buff, UnitPlayerData unitPlayerData, GiftConfig giftConfig) { - //Log.Debug("获得Buff " + buff.m_Id); + Log.Debug("获得Buff " + buff.m_Id); // 确认Buff效果,生成指定Buff特效. if (buff.m_Id == 5) { // 龙卷风特效特殊处理 + + + // 直接扣 + m_AllAddPush += (int)buff.addPower; + + } else if (buff.m_Id == 1) { @@ -430,12 +433,12 @@ namespace GameLogic // 直接扣 - m_AllAddPush = m_AllAddPush + (int)buff.addPower; + //m_AllAddPush = m_AllAddPush + (int)buff.addPower; - if (m_AllAddPush <= 0) - { - m_AllAddPush = 0; - } + //if (m_AllAddPush <= 0) + //{ + // m_AllAddPush = 0; + //} } @@ -514,10 +517,6 @@ namespace GameLogic // 直接扣 m_AllAddPush += (int)buff.addPower; - if (m_AllAddPush <= 0 ) - { - m_AllAddPush = 0; - } } } @@ -539,10 +538,6 @@ namespace GameLogic // 永久增加推力 m_AllAddPush += ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).YongJiuPower; - if (m_AllAddPush <= 0) - { - m_AllAddPush = 0; - } } else if (buff.m_Id == 9) { @@ -576,43 +571,43 @@ namespace GameLogic if (m_Buffs.ContainsKey(unitPlayerData.protCustMessageData.openId)) { - // 如果是负面Buff - if (buff.addPower < 0) - { + //// 如果是负面Buff + //if (buff.addPower < 0) + //{ - Buff godBuff = null; + // Buff godBuff = null; - // 先检查自身身上有没有无敌Buff ,Value == 0的 - foreach (var item in m_Buffs[unitPlayerData.protCustMessageData.openId]) - { - // 无敌 - if (item.addPower == 0) - { + // // 先检查自身身上有没有无敌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 = item; + // } + // else + // { + // // 比较,看谁时间最短 + // if (godBuff.m_CraeteTimer < item.m_CraeteTimer) + // { + // godBuff = item; + // } + // } + // } + // } - // 抵消 - if (godBuff != null) - { - // 有效时间置空 - godBuff.m_CraeteTimer = godBuff.m_AllTimer; - Log.Debug("触发抵消机制"); - return; - } - } + // // 抵消 + // if (godBuff != null) + // { + // // 有效时间置空 + // godBuff.m_CraeteTimer = godBuff.m_AllTimer; + // Log.Debug("触发抵消机制"); + // return; + // } + //} // 累加设计 // 没有该Buff,则新增这个Buff