From d02080c88322308fa614abd345796ea3469b3241 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Mon, 16 Jun 2025 17:19:44 +0800 Subject: [PATCH] 1 --- Configs/GameConfig/Datas/GiftConfig.xlsx | Bin 12415 -> 12424 bytes .../bytes/giftconfig_tbgiftconfig.bytes | Bin 1079 -> 1079 bytes .../HotFix/GameLogic/Actor/ActorHItem.cs | 29 +++++++++++------- .../GameLogic/Manager/DataGameSceneManager.cs | 8 +++++ 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Configs/GameConfig/Datas/GiftConfig.xlsx b/Configs/GameConfig/Datas/GiftConfig.xlsx index 89a51b9a75897ab9acccb91725b68ceb3f97155f..2919486b4b7c7187bd91b3249ab4f1b1aa76061f 100644 GIT binary patch delta 3382 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 F004^UQXK#Q diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes index 853e5d89b5df0b1c6979158309bc094b79ec32b7..4e1b2b6e421b5e29281fc115b7254e8dee5b2cb4 100644 GIT binary patch delta 85 zcmV-b0IL7D2)76q2>}o3yO`*%r00UU=(V2Zg|z?x0DwP{7cT?ILIIIUhy%#N0kPBv r0Rw=$#FO3ufdcwOlVJjY15iW9ljH(;1Ax0llV1aP17PY#liCAaIqf71 delta 85 zcmV-b0IL7D2)76q2>}o3yO`*%r00UU=(V2Zg|z_9%*;KJ7cT>VKM#>fhywt>53$q- r0RsSV!IRzrfdZgGlVJjY0|5HNljH(;0|0PBlV1aP0|1soliCAaONAn* diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index e3ad7989..f60bd235 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -159,7 +159,7 @@ namespace GameLogic private void AddMyPush() { // 最终结果值 = 初始推力+玩家数量 + 永久增加推力值 - m_AddPush = EventConts.InitPower + (m_ListUnitPlayDatas.Count * EventConts.PlayerScale) + m_AllAddPush ; + m_AddPush = EventConts.InitPower + (m_ListUnitPlayDatas.Count * EventConts.PlayerScale) + m_AllAddPush; foreach (var item in m_Buffs) { @@ -191,7 +191,6 @@ namespace GameLogic // 移除超时的Buff foreach (var buff in m_tempBuffList) { - Log.Debug("移除Buff列表:" + buff.m_Id); if (buff.m_EffectGo != null) { GameObject.Destroy(buff.m_EffectGo); @@ -214,10 +213,11 @@ namespace GameLogic // 减速也不能减到负数 - if (m_AddPush <= 0) - { - m_AddPush = 0; - } + //if (m_AddPush <= 0) + //{ + // m_AddPush = 0; + //} + m_AllPush += m_AddPush; @@ -412,10 +412,15 @@ namespace GameLogic GameObject.Destroy(effectGo); }); + + await UniTask.Delay(500); // 等待一段时间再生成下一个特效 } + // 直接扣 + m_AllAddPush = m_AllAddPush + (int)buff.addPower; + } else if (buff.m_Id == 4) @@ -428,11 +433,11 @@ namespace GameLogic eGo.gameObject.SetActive(true); eGo.transform.localPosition = new Vector3(-1500, 0, 0); eGo.transform.DOLocalMoveX(0, 4f).OnComplete(async () => - { - await UniTask.Delay(2000); - // 特效播放完毕后销毁 - GameObject.Destroy(eGo); - }); + { + await UniTask.Delay(2000); + // 特效播放完毕后销毁 + GameObject.Destroy(eGo); + }); //// 加载常规特效 //LoadEffectGo(giftConfig, buff); @@ -490,6 +495,8 @@ namespace GameLogic ).SetEase(Ease.OutElastic); }); + // 直接扣 + m_AllAddPush = m_AllAddPush + (int)buff.addPower; } } diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index b4a1ff37..1ee798c7 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -382,6 +382,8 @@ namespace GameLogic // 暂存逻辑 m_PendingGiftActions.Add(() => { + Log.Debug(giftConfig.Id); + // 下面原有的逻辑全部放到这里 if (giftConfig.Id == 1) { @@ -446,6 +448,8 @@ namespace GameLogic } } + Log.Debug("???????????"); + // 排序 m_TempList.Sort((a, b) => { @@ -469,6 +473,9 @@ namespace GameLogic var item = m_TempList[i]; // 添加减速Buff Buff m_Buff1 = new Buff(); + + Log.Debug("减速：" + giftConfig.AddPower * num); + m_Buff1.OnInit(giftConfig.Id, giftConfig.AddPower * num, giftConfig.TimerLen, giftConfig.AddGiftScore, num); item.AddBuff(m_Buff1, unitPlayerData, giftConfig); @@ -631,6 +638,7 @@ namespace GameLogic var item = m_TempList[i]; // 添加减速Buff Buff m_Buff1 = new Buff(); + Log.Debug("????????" + giftConfig.AddPower * num); m_Buff1.OnInit(giftConfig.Id, giftConfig.AddPower * num, giftConfig.TimerLen, giftConfig.AddGiftScore, num); item.AddBuff(m_Buff1, unitPlayerData, giftConfig);