diff --git a/UnityProject/Assets/AssetRaw/DLL/GameBase.dll.bytes b/UnityProject/Assets/AssetRaw/DLL/GameBase.dll.bytes index 5430bbb4..1f0fe0f9 100644 Binary files a/UnityProject/Assets/AssetRaw/DLL/GameBase.dll.bytes and b/UnityProject/Assets/AssetRaw/DLL/GameBase.dll.bytes differ diff --git a/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes b/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes index 755dd633..3b748e84 100644 Binary files a/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes and b/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes differ diff --git a/UnityProject/Assets/AssetRaw/DLL/GameProto.dll.bytes b/UnityProject/Assets/AssetRaw/DLL/GameProto.dll.bytes index c349a352..14b11d0c 100644 Binary files a/UnityProject/Assets/AssetRaw/DLL/GameProto.dll.bytes and b/UnityProject/Assets/AssetRaw/DLL/GameProto.dll.bytes differ diff --git a/UnityProject/Assets/AssetRaw/DLL/TEngine.Runtime.dll.bytes b/UnityProject/Assets/AssetRaw/DLL/TEngine.Runtime.dll.bytes index fb92836e..ac55e5ac 100644 Binary files a/UnityProject/Assets/AssetRaw/DLL/TEngine.Runtime.dll.bytes and b/UnityProject/Assets/AssetRaw/DLL/TEngine.Runtime.dll.bytes differ diff --git a/UnityProject/Assets/AssetRaw/DLL/UniTask.dll.bytes b/UnityProject/Assets/AssetRaw/DLL/UniTask.dll.bytes index 436688d2..d96b3683 100644 Binary files a/UnityProject/Assets/AssetRaw/DLL/UniTask.dll.bytes and b/UnityProject/Assets/AssetRaw/DLL/UniTask.dll.bytes differ diff --git a/UnityProject/Assets/AssetRaw/DLL/UnityEngine.CoreModule.dll.bytes b/UnityProject/Assets/AssetRaw/DLL/UnityEngine.CoreModule.dll.bytes index c0854848..5cc12a0c 100644 Binary files a/UnityProject/Assets/AssetRaw/DLL/UnityEngine.CoreModule.dll.bytes and b/UnityProject/Assets/AssetRaw/DLL/UnityEngine.CoreModule.dll.bytes differ diff --git a/UnityProject/Assets/AssetRaw/DLL/YooAsset.dll.bytes b/UnityProject/Assets/AssetRaw/DLL/YooAsset.dll.bytes index 5f5b163e..86fb0901 100644 Binary files a/UnityProject/Assets/AssetRaw/DLL/YooAsset.dll.bytes and b/UnityProject/Assets/AssetRaw/DLL/YooAsset.dll.bytes differ diff --git a/UnityProject/Assets/AssetRaw/DLL/mscorlib.dll.bytes b/UnityProject/Assets/AssetRaw/DLL/mscorlib.dll.bytes index e21405e5..780d2c2f 100644 Binary files a/UnityProject/Assets/AssetRaw/DLL/mscorlib.dll.bytes and b/UnityProject/Assets/AssetRaw/DLL/mscorlib.dll.bytes differ diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs index 15e8c70f..66caceed 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using GameConfig.actorConfig; using TEngine; using Unity.Mathematics; -using UnityEditor.Experimental.GraphView; using UnityEngine; namespace GameLogic diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index 1311cfa6..80e27c77 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -656,6 +656,9 @@ namespace GameLogic var rectTransform = hItemActor.gameObject.GetComponent(); Vector2 targetPosition = new Vector2(127, 190 - i * (109 - 5f)); targetPositions[rectTransform] = targetPosition; + + // 让UI层级与排序一致 + rectTransform.SetSiblingIndex(i); } } diff --git a/UnityProject/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadUpdate.prefab b/UnityProject/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadUpdate.prefab index 40758c9c..7f7c4bd7 100644 --- a/UnityProject/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadUpdate.prefab +++ b/UnityProject/Assets/GameScripts/Main/Launcher/Resources/AssetLoad/UILoadUpdate.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 967ed9e56c7ad6c46a7fbf00ad5c6153, type: 3} + m_Sprite: {fileID: 21300000, guid: bf41522f17e35c244a6cbe340bddee06, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1