From 8a81e8e37fb40544710951454b994c02513b59e1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Sat, 21 Jun 2025 00:21:43 +0800 Subject: [PATCH] 1 --- .../Assets/AssetRaw/DLL/GameLogic.dll.bytes | Bin 223744 -> 223744 bytes .../Assets/AssetRaw/UI/UIGameRankForm.prefab | 6 +++--- .../GameLogic/Manager/DataGameSceneManager.cs | 2 +- .../HotFix/GameLogic/UI/UIGameEndForm.cs | 5 ++++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes b/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes index fb0299d3a86a6099dbefe3702f4c7ea4c876150e..f552d2303d4ffb434cdc0f51fea8c815d81c05b4 100644 GIT binary patch delta 6432 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 diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab index 25feb6c9..f9dd7922 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab @@ -2210,10 +2210,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "7874\u4E07" + m_text: "7874\u4EBF" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 0d31a1ad97de02943ab92c2d32b88a3e, type: 2} - m_sharedMaterial: {fileID: -1876281447957755805, guid: 0d31a1ad97de02943ab92c2d32b88a3e, type: 2} + m_fontAsset: {fileID: 11400000, guid: 2d5dde65126cce44fa5766b27b429272, type: 2} + m_sharedMaterial: {fileID: -4557169464251847458, guid: 2d5dde65126cce44fa5766b27b429272, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 64241a4e..57604239 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -1156,7 +1156,7 @@ namespace GameLogic GameEndData gameEndData = new GameEndData() { m_DzzwPlayerName = dzzwPlayerName, - m_DzzwIcon = GetDzzwPlayer().protCustMessageData.imgURL, + m_DzzwIcon = sbyrPlayer == null ? null : sbyrPlayer.protCustMessageData.imgURL, m_TzhsPlayerName = tzhsPlayerName, m_TzhsIcon = GetTzhsPlayer().protCustMessageData.imgURL, m_SbyrPlayerName = sbyrPlayerName, diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs index 03860d7e..48fc5c53 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs @@ -81,7 +81,10 @@ namespace GameLogic AsyncImageDownload.Instance.SetAsyncImage(gameEndData.m_WinTeamIcom, m_rimg_WinPlayerIcon); - AsyncImageDownload.Instance.SetAsyncImage(gameEndData.m_SbyrIcon, m_rimg_SbyrPlayerIcon); + if (gameEndData.m_SbyrIcon != null) + { + AsyncImageDownload.Instance.SetAsyncImage(gameEndData.m_SbyrIcon, m_rimg_SbyrPlayerIcon); + } AsyncImageDownload.Instance.SetAsyncImage(gameEndData.m_ZjgxIcon, m_rimg_ZjgxPlayerIcon); AsyncImageDownload.Instance.SetAsyncImage(gameEndData.m_TzhsIcon, m_rimg_TzhsPlayerIcon); AsyncImageDownload.Instance.SetAsyncImage(gameEndData.m_DzzwIcon, m_rimg_DzzwPlayerIcon);