diff --git a/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes b/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes index 53e76079..fb0299d3 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/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 992d246f..4edc627d 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -432,6 +432,11 @@ namespace GameLogic // 直接扣 m_AllAddPush = m_AllAddPush + (int)buff.addPower; + if (m_AllAddPush <= 0) + { + m_AllAddPush = 0; + } + } else if (buff.m_Id == 4) @@ -507,7 +512,7 @@ namespace GameLogic }); // 直接扣 - m_AllAddPush = m_AllAddPush + (int)buff.addPower; + m_AllAddPush += (int)buff.addPower; if (m_AllAddPush <= 0 ) { diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs index a5ff2583..9b730fc0 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs @@ -45,11 +45,16 @@ namespace GameLogic public class GameEndData { public string m_WinTeamName; + public string m_WinTeamIcom; public string m_WinPlayerName; public string m_SbyrPlayerName; + public string m_SbyrIcon; public string m_ZjgxPlayerName; + public string m_ZjgxIcon; public string m_TzhsPlayerName; + public string m_TzhsIcon; public string m_DzzwPlayerName; + public string m_DzzwIcon; } diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 907f10e1..64241a4e 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -1156,10 +1156,15 @@ namespace GameLogic GameEndData gameEndData = new GameEndData() { m_DzzwPlayerName = dzzwPlayerName, + m_DzzwIcon = GetDzzwPlayer().protCustMessageData.imgURL, m_TzhsPlayerName = tzhsPlayerName, + m_TzhsIcon = GetTzhsPlayer().protCustMessageData.imgURL, m_SbyrPlayerName = sbyrPlayerName, + m_SbyrIcon = sbyrPlayer.protCustMessageData.imgURL, m_ZjgxPlayerName = zjgxPlayerName, + m_ZjgxIcon = topPlayer.protCustMessageData.imgURL, m_WinPlayerName = winActorPlayerName, + m_WinTeamIcom = winActorPlayer.protCustMessageData.imgURL, m_WinTeamName = zjgxPlayerName }; diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs index 65cbd611..03860d7e 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs @@ -80,6 +80,13 @@ namespace GameLogic m_tmp_WinPlayerName.text = gameEndData.m_WinPlayerName; + AsyncImageDownload.Instance.SetAsyncImage(gameEndData.m_WinTeamIcom, m_rimg_WinPlayerIcon); + 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); + + }