From abf018ca631bbf7f4651c582dd80d84506055040 Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Sat, 8 Feb 2025 11:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E4=BD=93=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=20=E5=8F=AF=E6=94=AF=E6=8C=81=E6=8D=A2=E8=A1=8C?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=9B=B4=E5=A4=9A=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Art/UIPrefab/UIDeviceTip.prefab           | 16 ++++++++--------
 .../UITextures/UIDeviceTip/物品介绍标签.png.meta |  2 +-
 Assets/Scripts/UI/UIDeviceTip.cs                 |  4 +++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Assets/Art/UIPrefab/UIDeviceTip.prefab b/Assets/Art/UIPrefab/UIDeviceTip.prefab
index c63b2f19..e77484bc 100644
--- a/Assets/Art/UIPrefab/UIDeviceTip.prefab
+++ b/Assets/Art/UIPrefab/UIDeviceTip.prefab
@@ -86,8 +86,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 138.84, y: -17}
-  m_SizeDelta: {x: 247.68, y: 34}
+  m_AnchoredPosition: {x: 35.93, y: -16.205}
+  m_SizeDelta: {x: 41.86, y: 22.41}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4957094274820776498
 CanvasRenderer:
@@ -117,7 +117,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 12313123123123213123123123123
+  m_text: 12321
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
   m_sharedMaterial: {fileID: 168401102475399263, guid: 97936a7b3a86809479ac89371e95b079, type: 2}
@@ -240,7 +240,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 44.3}
-  m_SizeDelta: {x: 277.68, y: 34}
+  m_SizeDelta: {x: 71.86, y: 32.41}
   m_Pivot: {x: 0.5000002, y: 0.4999999}
 --- !u!222 &1036003715876543771
 CanvasRenderer:
@@ -295,14 +295,14 @@ MonoBehaviour:
   m_Padding:
     m_Left: 15
     m_Right: 15
-    m_Top: 0
-    m_Bottom: 0
+    m_Top: 5
+    m_Bottom: 5
   m_ChildAlignment: 0
   m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
-  m_ChildControlHeight: 0
+  m_ChildControlHeight: 1
   m_ChildScaleWidth: 1
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
@@ -319,7 +319,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
-  m_VerticalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &7435450924104219624
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Art/UITextures/UIDeviceTip/物品介绍标签.png.meta b/Assets/Art/UITextures/UIDeviceTip/物品介绍标签.png.meta
index 9f373e13..a4b57c2f 100644
--- a/Assets/Art/UITextures/UIDeviceTip/物品介绍标签.png.meta
+++ b/Assets/Art/UITextures/UIDeviceTip/物品介绍标签.png.meta
@@ -49,7 +49,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 35, y: 0, z: 35, w: 0}
+  spriteBorder: {x: 35, y: 16, z: 35, w: 16}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
diff --git a/Assets/Scripts/UI/UIDeviceTip.cs b/Assets/Scripts/UI/UIDeviceTip.cs
index 1b94bf72..47b0496d 100644
--- a/Assets/Scripts/UI/UIDeviceTip.cs
+++ b/Assets/Scripts/UI/UIDeviceTip.cs
@@ -1,6 +1,8 @@
 using UnityEngine;
 using UnityEngine.UI;
 using QFramework;
+using System.Security.Cryptography;
+using System.Text.RegularExpressions;
 
 namespace QFramework.Example
 {
@@ -31,7 +33,7 @@ namespace QFramework.Example
 
         public void Set(string txt)
         {
-            Label.text = txt;
+            Label.text = Regex.Replace(txt, @"\\n", "\n");
         }
         public void Active(bool active)
         {