From d4ef4f4f2ac19474756feaab1761acf108d04eb7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Wed, 4 Jun 2025 05:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZQDN/FX/Maerials/{Main_UI_Top01.mat => Main_UI_Top1.mat} | 2 +- .../{Main_UI_Top01.mat.meta => Main_UI_Top1.mat.meta} | 0 .../ZQDN/FX/Maerials/{Main_UI_Top02.mat => Main_UI_Top2.mat} | 2 +- .../{Main_UI_Top02.mat.meta => Main_UI_Top2.mat.meta} | 0 .../ZQDN/FX/Maerials/{Main_UI_Top03.mat => Main_UI_Top3.mat} | 2 +- .../{Main_UI_Top03.mat.meta => Main_UI_Top3.mat.meta} | 0 .../ZQDN/FX/Maerials/{Main_UI_Top04.mat => Main_UI_Top4.mat} | 2 +- .../{Main_UI_Top04.mat.meta => Main_UI_Top4.mat.meta} | 0 .../ZQDN/FX/Maerials/{Main_UI_Top05.mat => Main_UI_Top5.mat} | 2 +- .../{Main_UI_Top05.mat.meta => Main_UI_Top5.mat.meta} | 0 .../Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs | 5 +++-- 11 files changed, 8 insertions(+), 7 deletions(-) rename UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/{Main_UI_Top01.mat => Main_UI_Top1.mat} (99%) rename UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/{Main_UI_Top01.mat.meta => Main_UI_Top1.mat.meta} (100%) rename UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/{Main_UI_Top02.mat => Main_UI_Top2.mat} (99%) rename UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/{Main_UI_Top02.mat.meta => Main_UI_Top2.mat.meta} (100%) rename UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/{Main_UI_Top03.mat => Main_UI_Top3.mat} (99%) rename UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/{Main_UI_Top03.mat.meta => Main_UI_Top3.mat.meta} (100%) rename UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/{Main_UI_Top04.mat => Main_UI_Top4.mat} (99%) rename UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/{Main_UI_Top04.mat.meta => Main_UI_Top4.mat.meta} (100%) rename UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/{Main_UI_Top05.mat => Main_UI_Top5.mat} (99%) rename UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/{Main_UI_Top05.mat.meta => Main_UI_Top5.mat.meta} (100%) diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top01.mat b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top1.mat similarity index 99% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top01.mat rename to UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top1.mat index 7fd74e87..c3f4fd41 100644 --- a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top01.mat +++ b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top1.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Main_UI_Top01 + m_Name: Main_UI_Top1 m_Shader: {fileID: -6465566751694194690, guid: a820fcb5cf012694580d2c8fbe33c5f9, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top01.mat.meta b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top1.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top01.mat.meta rename to UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top1.mat.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top02.mat b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top2.mat similarity index 99% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top02.mat rename to UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top2.mat index 476fa482..d53c467f 100644 --- a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top02.mat +++ b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top2.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Main_UI_Top02 + m_Name: Main_UI_Top2 m_Shader: {fileID: -6465566751694194690, guid: a820fcb5cf012694580d2c8fbe33c5f9, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top02.mat.meta b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top2.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top02.mat.meta rename to UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top2.mat.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top03.mat b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top3.mat similarity index 99% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top03.mat rename to UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top3.mat index f10b1aef..af22a480 100644 --- a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top03.mat +++ b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top3.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Main_UI_Top03 + m_Name: Main_UI_Top3 m_Shader: {fileID: -6465566751694194690, guid: a820fcb5cf012694580d2c8fbe33c5f9, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top03.mat.meta b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top3.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top03.mat.meta rename to UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top3.mat.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top04.mat b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top4.mat similarity index 99% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top04.mat rename to UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top4.mat index e65a67f6..5a7c2499 100644 --- a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top04.mat +++ b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top4.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Main_UI_Top04 + m_Name: Main_UI_Top4 m_Shader: {fileID: -6465566751694194690, guid: a820fcb5cf012694580d2c8fbe33c5f9, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top04.mat.meta b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top4.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top04.mat.meta rename to UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top4.mat.meta diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top05.mat b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top5.mat similarity index 99% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top05.mat rename to UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top5.mat index b0230adf..98d17da8 100644 --- a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top05.mat +++ b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top5.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Main_UI_Top05 + m_Name: Main_UI_Top5 m_Shader: {fileID: -6465566751694194690, guid: a820fcb5cf012694580d2c8fbe33c5f9, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top05.mat.meta b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top5.mat.meta similarity index 100% rename from UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top05.mat.meta rename to UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Main_UI_Top5.mat.meta diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index 25f4ec11..f8a1adc3 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -530,8 +530,9 @@ namespace GameLogic /// private void SwitchUIResource() { - m_img_BT.sprite = GameModule.Resource.LoadAsset(string.Format("zjm_{0}_BT", DataGameSceneManager.Instance.m_TeamId + 1)); - m_img_BT.SetNativeSize(); + //m_img_BT.sprite = GameModule.Resource.LoadAsset(string.Format("zjm_{0}_BT", DataGameSceneManager.Instance.m_TeamId + 1)); + //m_img_BT.SetNativeSize(); + m_img_BT.material = GameModule.Resource.LoadAsset(string.Format("Main_UI_Top{0}", DataGameSceneManager.Instance.m_TeamId + 1)); } ///