From 0ff34b191a03af1d489bca7f1a9397d696a07b9b Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Wed, 7 May 2025 15:16:19 +0800 Subject: [PATCH] 1 --- Configs/GameConfig/Datas/GiftConfig.xlsx | Bin 11635 -> 11634 bytes .../bytes/giftconfig_tbgiftconfig.bytes | Bin 1037 -> 1037 bytes .../Assets/AssetRaw/Effects/Liwu/TTQ01.prefab | 66 ++++++++++++++++-- .../Assets/AssetRaw/Effects/Liwu/TTQ02.prefab | 65 +++++++++++++++-- .../HotFix/GameLogic/Actor/ActorHItem.cs | 28 +++++--- .../HotFix/GameLogic/Actor/Buff/Buff.cs | 4 +- .../HotFix/GameLogic/Common/EventConts.cs | 2 +- .../GameLogic/Manager/DataGameSceneManager.cs | 26 +++++-- .../HotFix/GameLogic/UI/UIGameBattle.cs | 18 +++++ 9 files changed, 177 insertions(+), 32 deletions(-) diff --git a/Configs/GameConfig/Datas/GiftConfig.xlsx b/Configs/GameConfig/Datas/GiftConfig.xlsx index 323e973b78fe3110a0c3ab9720cb1cfcbab515ed..27450bb0869ecf40e5b2e720e73ae80547d5a520 100644 GIT binary patch delta 3292 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 delta 3281 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 Pos&T=D+X3600000y^TYK diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes index 08eb7cd764259aeb8802b6dd9a0aaf7f86baa282..8f4b7d0b0e8ec93043c5a602ebf954d556506eb7 100644 GIT binary patch delta 14 VcmeC>=;he(o{7=;he(o{7().scale = giftConfig.EffectScale; - buff.m_EffectGo = eGo; - - Log.Debug("生成Buff特效:" + giftConfig.EffectName); + // 加载常规特效 + LoadEffectGo(giftConfig, buff); } @@ -193,6 +191,18 @@ namespace GameLogic } + private void LoadEffectGo(GiftConfig giftConfig, Buff buff) + { + var eGo = GameModule.Resource.LoadGameObject(giftConfig.EffectName); + eGo.transform.SetParent(m_rectCar.transform); + eGo.transform.localPosition = Vector3.zero; + eGo.transform.localScale = Vector3.one; + eGo.transform.GetComponent().scale = giftConfig.EffectScale; + buff.m_EffectGo = eGo; + + Log.Debug("生成Buff特效:" + giftConfig.EffectName); + } + ///

/// 计算百分比大小值 /// diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Buff/Buff.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Buff/Buff.cs index d6c5f4a7..ece269d3 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Buff/Buff.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/Buff/Buff.cs @@ -19,8 +19,8 @@ public class Buff m_Id = id; // 记录一下,特殊Buff,正常计时。非特殊Buff,在Actor中计时 m_CraeteTimer = id == EventConts.isZoneTimerBuffId ? Time.time : 0; - isZoneTimer = id == EventConts.isZoneTimerBuffId; - isAllPower = id == EventConts.isAllPowerBuffId; + //isZoneTimer = id == EventConts.isZoneTimerBuffId; + //isAllPower = id == EventConts.isAllPowerBuffId; addPower = value; if (isZoneTimer) { diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs index ac02beb3..1685dd8a 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs @@ -63,7 +63,7 @@ namespace GameLogic public const string PlayerUpdateLv = "PlayerUpdateLv"; public const string AddPlayer = "AddPlayer"; public const string AddGiftMessage = "AddGiftMessage"; - + public const string TtqEffectCreate = "TtqEffectCreate"; #endregion diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 67f8e7e7..fe14c607 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -451,16 +451,28 @@ namespace GameLogic return; } - //Buff m_Buff = new Buff(); - //m_Buff.OnInit(giftConfig.Id, giftConfig.AddPower * num, giftConfig.TimerLen, giftConfig.AddGiftScore, num); - //actor.AddBuff(m_Buff, unitPlayerData, giftConfig); + // 添加无敌护罩 + Buff m_Buff = new Buff(); + m_Buff.OnInit(giftConfig.Id, 0, giftConfig.TimerLen * num, giftConfig.AddGiftScore, num); + m_Buff.isZoneTimer = true; + actor.AddBuff(m_Buff, unitPlayerData, giftConfig); // 给其他赛道天降流星雨 - //GameModule.Timer.AddTimer((e) => - //{ - // var m_Ego = GameModule.Resource.LoadGameObject(giftConfig.EffectName); - //}, giftConfig.TimerLen); + foreach (var item in m_DicTeamList) + { + if (item.Value != actor) + { + // 添加减速Buff + Buff m_Buff1 = new Buff(); + m_Buff1.OnInit(giftConfig.Id, giftConfig.AddPower * num, giftConfig.TimerLen, giftConfig.AddGiftScore, num); + item.Value.AddBuff(m_Buff1, unitPlayerData, giftConfig); + } + } + + + // 告知UI,创建全屏特效 + GameEvent.Send(EventConts.TtqEffectCreate, giftConfig); } /// /// 能量电池礼物效果 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index cbf653c0..a9e0a8cc 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -6,6 +6,7 @@ using GameConfig.giftConfig; using System.Threading.Tasks; using Cysharp.Threading.Tasks; using TMPro; +using Coffee.UIExtensions; namespace GameLogic { @@ -125,6 +126,7 @@ namespace GameLogic { base.RegisterEvent(); GameEvent.AddEventListener(EventConts.RestGameBattle, RestGameBattleFunc); + GameEvent.AddEventListener(EventConts.TtqEffectCreate, TtqEffectCreateFunc); GameEvent.AddEventListener(EventConts.AddPlayer, AddPlayerFunc); GameEvent.AddEventListener(EventConts.AddGiftMessage, AddGiftMessageFunc); } @@ -134,6 +136,7 @@ namespace GameLogic { base.OnDestroy(); GameEvent.RemoveEventListener(EventConts.RestGameBattle, RestGameBattleFunc); + GameEvent.RemoveEventListener(EventConts.TtqEffectCreate, TtqEffectCreateFunc); GameEvent.RemoveEventListener(EventConts.AddPlayer, AddPlayerFunc); GameEvent.RemoveEventListener(EventConts.AddGiftMessage, AddGiftMessageFunc); } @@ -163,6 +166,21 @@ namespace GameLogic //topTipsTime.GetComponent().OnInit(unitPlayerData, null, 0); } + /// + /// 甜甜圈特效 + /// + private void TtqEffectCreateFunc(GiftConfig giftConfig) + { + GameModule.Timer.AddTimer((e) => + { + var m_Ego = GameModule.Resource.LoadGameObject("TTQ01"); + m_Ego.transform.SetParent(this.transform); + m_Ego.transform.localPosition = Vector3.zero; + m_Ego.transform.localScale = Vector3.one; + m_Ego.transform.GetComponent().scale = 1; + }, giftConfig.TimerLen); + } + private async void AddGiftMessageFunc(UnitPlayerData unitPlayerData, GiftConfig giftConfig, int num) { //var giftItem = GameObject.Instantiate(m_rect_GiftPanel.transform.GetChild(0));