From fd2370a1430818062a279115bf0b697bf120c54f Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Thu, 29 May 2025 16:32:11 +0800 Subject: [PATCH] 1 --- Configs/GameConfig/Datas/GiftConfig.xlsx | Bin 11816 -> 11812 bytes .../bytes/giftconfig_tbgiftconfig.bytes | Bin 958 -> 958 bytes .../HotFix/GameLogic/Actor/ActorHItem.cs | 27 +++++++++++------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Configs/GameConfig/Datas/GiftConfig.xlsx b/Configs/GameConfig/Datas/GiftConfig.xlsx index 31e442cde4fb7751d937a036d021e33e41bc8cac..2c65ba3187fd35f0bab5d6184ea796e1d00e8b16 100644 GIT binary patch delta 2675 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 Q1R9eLE)WI_DgXcg0O+R$Z2$lO diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes index ca7452ce9feb944753b33ea6979d8d316f06f721..6372e977b802524b8b876c137eeb6eb4908dcc3a 100644 GIT binary patch delta 14 VcmdnTzK?yw3?@dA%`=%)8388!1YQ6D delta 14 VcmdnTzK?yw3?@dd%`=%)838821XKV3 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 3d3cc020..a9637057 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -289,34 +289,39 @@ namespace GameLogic actorHItem.transform.DOLocalMoveX(0, 4f).OnComplete(async () => { // 显示一下脑袋 - m_rectNao.GetComponent().material.SetFloat("_Alpha", 1); + //m_rectNao.GetComponent().material.SetFloat("_Alpha", 1); + + // 显示一下脑袋 + var naoMat = m_rectNao.GetComponent().material; + //naoMat.SetFloat("_Alpha", 1); - // 进度条0-1之间闪烁3次 + // _Alpha 0~1 闪烁3次 int flashCount = 3; - float flashDuration = 0.12f; // 每次闪烁的时间 + float flashDuration = 1f; // 每次闪烁的时间 Sequence seq = DOTween.Sequence(); for (int i = 0; i < flashCount; i++) { seq.Append(DOTween.To( - () => m_imgValue.fillAmount, - x => m_imgValue.fillAmount = x, + () => naoMat.GetFloat("_Alpha"), + x => naoMat.SetFloat("_Alpha", x), 0f, flashDuration / 2f ).SetEase(Ease.InQuad)); seq.Append(DOTween.To( - () => m_imgValue.fillAmount, - x => m_imgValue.fillAmount = x, + () => naoMat.GetFloat("_Alpha"), + x => naoMat.SetFloat("_Alpha", x), 1f, flashDuration / 2f ).SetEase(Ease.OutQuad)); } - // 最后回到当前进度 + // 最后回到1 seq.Append(DOTween.To( - () => m_imgValue.fillAmount, - x => m_imgValue.fillAmount = x, - m_CurrentFillAmount, 0.18f + () => naoMat.GetFloat("_Alpha"), + x => naoMat.SetFloat("_Alpha", x), + 1f, 0.18f ).SetEase(Ease.OutQuad)); + await UniTask.Delay(2000); // 特效播放完毕后销毁 GameObject.Destroy(actorHItem.gameObject);