diff --git a/UnityProject/Assets/AssetRaw/UI/GiftItem.prefab b/UnityProject/Assets/AssetRaw/UI/GiftItem.prefab
index 1224349c..a7c6f085 100644
--- a/UnityProject/Assets/AssetRaw/UI/GiftItem.prefab
+++ b/UnityProject/Assets/AssetRaw/UI/GiftItem.prefab
@@ -40175,8 +40175,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u73A9\u5BB6\u540D\u79F0\u516D\u4F4D"
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 5e819e6696df637458fd9101965251d9, type: 2}
-  m_sharedMaterial: {fileID: -4149713549750991327, guid: 5e819e6696df637458fd9101965251d9, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 862c67edffd3b2d45a615d993efe75d4, type: 2}
+  m_sharedMaterial: {fileID: -1876281447957755805, guid: 862c67edffd3b2d45a615d993efe75d4, 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 fc3e3e2a..717a71e9 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
@@ -1085,7 +1085,7 @@ namespace GameLogic
             var winActorTeam = OnCheckWinTeam();
 
             Log.Debug("获胜阵营的teamid" + winActorTeam.m_Index);
-            string winActorName = GetStrs(winActorTeam.m_Index);
+            string winActorName = GetStrs(winActorTeam.m_Index) + "氏文明";
 
             Log.Debug("获胜阵营的名称:" + winActorName);
 
@@ -1149,7 +1149,7 @@ namespace GameLogic
                 m_ZjgxIcon = topPlayer.protCustMessageData.imgURL,
                 m_WinPlayerName = winActorPlayerName,
                 m_WinTeamIcom = winActorPlayer.protCustMessageData.imgURL,
-                m_WinTeamName = zjgxPlayerName
+                m_WinTeamName = winActorName
             };
 
 
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIDianZanItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIDianZanItem.cs
index 4e3d2c25..ea04a1cc 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIDianZanItem.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIDianZanItem.cs
@@ -25,7 +25,7 @@ namespace GameLogic
         {
             if (!string.IsNullOrEmpty(nickname))
             {
-                m_tmp_PlayerName.text = nickname;
+                m_tmp_PlayerName.text = UITool.ConvertName(nickname);
                 UniTask.Delay(1500).ContinueWith(() => { Destroy(); });
 
             }
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs
index 24bfb827..e950a451 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameEndForm.cs
@@ -72,12 +72,12 @@ namespace GameLogic
         {
             GameEndData gameEndData = UserData as GameEndData;
 
-            m_tmp_PlayerName.text = gameEndData.m_WinTeamName;
-            m_tmp_SbyrPlayerName.text = gameEndData.m_SbyrPlayerName;
-            m_tmp_ZjgxPlayerNAME.text = gameEndData.m_ZjgxPlayerName;
-            m_tmp_TzhsPlayerName.text = gameEndData.m_TzhsPlayerName;
-            m_tmp_DzzwPlayerName.text = gameEndData.m_DzzwPlayerName;
-            m_tmp_WinPlayerName.text = gameEndData.m_WinPlayerName;
+            m_tmp_PlayerName.text = UITool.ConvertName(gameEndData.m_WinTeamName);
+            m_tmp_SbyrPlayerName.text = UITool.ConvertName(gameEndData.m_SbyrPlayerName);
+            m_tmp_ZjgxPlayerNAME.text = UITool.ConvertName(gameEndData.m_ZjgxPlayerName);
+            m_tmp_TzhsPlayerName.text = UITool.ConvertName(gameEndData.m_TzhsPlayerName);
+            m_tmp_DzzwPlayerName.text = UITool.ConvertName(gameEndData.m_DzzwPlayerName);
+            m_tmp_WinPlayerName.text = UITool.ConvertName(gameEndData.m_WinPlayerName);
 
 
             AsyncImageDownload.Instance.SetAsyncImage(gameEndData.m_WinTeamIcom, m_rimg_WinPlayerIcon);
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs
index 441078a4..55781742 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs
@@ -44,7 +44,7 @@ namespace GameLogic
             Log.Debug("送礼玩家阵营id:" + unitPlayerData.teamId);
 
             m_tmpTeamName.text = DataGameSceneManager.Instance.GetStrs(int.Parse(unitPlayerData.teamId) - 1);
-            m_GiftName.text = unitPlayerData.protCustMessageData.nickName;
+            m_GiftName.text = UITool.ConvertName(unitPlayerData.protCustMessageData.nickName);
             AsyncImageDownload.Instance.SetAsyncImage(unitPlayerData.protCustMessageData.imgURL, m_HeadIcon);
             StartCoroutine(ScrollNumber(num)); // Start the number scrolling coroutine
             m_InfoTex.text = "送" + giftConfig.Name;
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIJiaRuItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIJiaRuItem.cs
index 0963b919..00ec082c 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIJiaRuItem.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIJiaRuItem.cs
@@ -20,7 +20,7 @@ namespace GameLogic
 
         public async Task OnInit(UnitPlayerData unitPlayerData)
         {
-            m_PlayerName.text = unitPlayerData.protCustMessageData.nickName;
+            m_PlayerName.text = UITool.ConvertName(unitPlayerData.protCustMessageData.nickName);
 
             //Log.Debug("��Ҽ�����Ӫ" + DataGameSceneManager.Instance.GetStrs(int.Parse(unitPlayerData.teamId)));
 
diff --git a/UnityProject/UserSettings/EditorUserSettings.asset b/UnityProject/UserSettings/EditorUserSettings.asset
index df25aa4b..b99af829 100644
--- a/UnityProject/UserSettings/EditorUserSettings.asset
+++ b/UnityProject/UserSettings/EditorUserSettings.asset
@@ -30,10 +30,10 @@ EditorUserSettings:
       value: 55570c0506015f0e08595d7043205944401641792f2b77682b7b4963e4e5323c
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5754500456065b0b550d087413710644401549292f7d2063297a1c6be3b5366a
+      value: 02500105010d500359565b7616225a44474e4c7d7b2c27337b7f4d31b1b8666f
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 02500105010d500359565b7616225a44474e4c7d7b2c27337b7f4d31b1b8666f
+      value: 5754500456065b0b550d087413710644401549292f7d2063297a1c6be3b5366a
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
       value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd3c3e302a07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c968797a7cf