From 81fdd143b203360d064bebebfbf757bc55db9dcc Mon Sep 17 00:00:00 2001 From: "SD-20250424WZPW\\Administrator" Date: Thu, 8 May 2025 17:53:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=A4=BC=E7=89=A9=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E7=89=B9=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Video/ZQDN/{01_view.webm => Gift02.webm} | Bin .../ZQDN/{01_view.webm.meta => Gift02.webm.meta} | 0 .../Video/ZQDN/{02_view.webm => Gift03.webm} | Bin .../ZQDN/{02_view.webm.meta => Gift03.webm.meta} | 0 .../Video/ZQDN/{03_view.webm => Gift04.webm} | Bin .../ZQDN/{03_view.webm.meta => Gift04.webm.meta} | 0 .../Video/ZQDN/{LW02_view.webm => Gift05.webm} | Bin .../{LW02_view.webm.meta => Gift05.webm.meta} | 0 .../Video/ZQDN/{LW03_view.webm => Gift06.webm} | Bin .../{LW03_view.webm.meta => Gift06.webm.meta} | 0 .../Video/ZQDN/{LW04_view.webm => Gift07.webm} | Bin .../{LW04_view.webm.meta => Gift07.webm.meta} | 0 .../Video/ZQDN/{LW05_view.webm => Gift08.webm} | Bin .../{LW05_view.webm.meta => Gift08.webm.meta} | 0 .../Video/ZQDN/{礼物LW.webm => Gift09.webm} | Bin .../ZQDN/{礼物LW.webm.meta => Gift09.webm.meta} | 0 .../GameLogic/Manager/DataGameSceneManager.cs | 3 +-- .../HotFix/GameLogic/UI/UIVipLiWuHongItem.cs | 14 ++++++++------ 18 files changed, 9 insertions(+), 8 deletions(-) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{01_view.webm => Gift02.webm} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{01_view.webm.meta => Gift02.webm.meta} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{02_view.webm => Gift03.webm} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{02_view.webm.meta => Gift03.webm.meta} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{03_view.webm => Gift04.webm} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{03_view.webm.meta => Gift04.webm.meta} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{LW02_view.webm => Gift05.webm} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{LW02_view.webm.meta => Gift05.webm.meta} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{LW03_view.webm => Gift06.webm} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{LW03_view.webm.meta => Gift06.webm.meta} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{LW04_view.webm => Gift07.webm} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{LW04_view.webm.meta => Gift07.webm.meta} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{LW05_view.webm => Gift08.webm} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{LW05_view.webm.meta => Gift08.webm.meta} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{礼物LW.webm => Gift09.webm} (100%) rename UnityProject/Assets/AssetRaw/Video/ZQDN/{礼物LW.webm.meta => Gift09.webm.meta} (100%) diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/01_view.webm b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift02.webm similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/01_view.webm rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift02.webm diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/01_view.webm.meta b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift02.webm.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/01_view.webm.meta rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift02.webm.meta diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/02_view.webm b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift03.webm similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/02_view.webm rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift03.webm diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/02_view.webm.meta b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift03.webm.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/02_view.webm.meta rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift03.webm.meta diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/03_view.webm b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift04.webm similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/03_view.webm rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift04.webm diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/03_view.webm.meta b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift04.webm.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/03_view.webm.meta rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift04.webm.meta diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/LW02_view.webm b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift05.webm similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/LW02_view.webm rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift05.webm diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/LW02_view.webm.meta b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift05.webm.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/LW02_view.webm.meta rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift05.webm.meta diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/LW03_view.webm b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift06.webm similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/LW03_view.webm rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift06.webm diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/LW03_view.webm.meta b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift06.webm.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/LW03_view.webm.meta rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift06.webm.meta diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/LW04_view.webm b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift07.webm similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/LW04_view.webm rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift07.webm diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/LW04_view.webm.meta b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift07.webm.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/LW04_view.webm.meta rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift07.webm.meta diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/LW05_view.webm b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift08.webm similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/LW05_view.webm rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift08.webm diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/LW05_view.webm.meta b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift08.webm.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/LW05_view.webm.meta rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift08.webm.meta diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/礼物LW.webm b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift09.webm similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/礼物LW.webm rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift09.webm diff --git a/UnityProject/Assets/AssetRaw/Video/ZQDN/礼物LW.webm.meta b/UnityProject/Assets/AssetRaw/Video/ZQDN/Gift09.webm.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/Video/ZQDN/礼物LW.webm.meta rename to UnityProject/Assets/AssetRaw/Video/ZQDN/Gift09.webm.meta diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 3b13c787..5e7479e9 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -52,7 +52,7 @@ namespace GameLogic m_GameTimerLen = EventConts.gameLenTiemr; // 设置数据同步 - // GiftEffectBool = GameModule.Setting.GetBool("GiftEffect"); + GiftEffectBool = GameModule.Setting.GetBool("GiftEffect"); WorldEffectBool = GameModule.Setting.GetBool("WorldEffect"); } @@ -691,7 +691,6 @@ namespace GameLogic } } - // 礼物序列帧 if (m_GiftItemDatas.Count > 0 && GiftEffectBool) { diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIVipLiWuHongItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIVipLiWuHongItem.cs index 165ecb21..082a0fbb 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIVipLiWuHongItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIVipLiWuHongItem.cs @@ -41,14 +41,15 @@ namespace GameLogic // 根据礼物Id,加载对应的视频名称 // GiftConfig giftConfig = ConfigSystem.Instance.Tables.TbGift.Get(giftItemData.giftId); // string videoName = giftItemData.m_TeamEnum == TeamUnitEnum.Left? giftConfig.LeftVIdeoName:giftConfig.RightVideoName; - string videoName = "Gift0" + (giftItemData.giftId - 1); + string videoName = "Gift0" + (giftItemData.giftId); m_VideoPlayer.loopPointReached += HiddenVideoPlay; var videoClip = GameModule.Resource.LoadAsset(videoName); - string audioName = "礼物" + (giftItemData.giftId - 1); + + //string audioName = "礼物" + (giftItemData.giftId - 1); + //// 播放音效 + //GameModule.Audio.Play(TEngine.AudioType.UISound, audioName, false, 0.5f, true); - // 播放音效 - GameModule.Audio.Play(TEngine.AudioType.UISound, audioName, false, 0.5f, true); m_VideoPlayer.clip = videoClip; m_VideoPlayer.Play(); @@ -62,8 +63,9 @@ namespace GameLogic { await UniTask.Delay(2000); m_VideoPlayer.targetTexture.DiscardContents(); - GameModule.UI.CloseUI(); - GameModule.UI.ShowUI(UserDatas); + GameModule.UI.CloseUI(); + //GameModule.UI.CloseUI(); + //GameModule.UI.ShowUI(UserDatas); } private void HiddenVideoPlay(VideoPlayer player)