From 4f4982be9028101699bd91c01fefc86b98034634 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期一, 15 十二月 2025 15:59:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout

---
 UI/PhantasmPavilionModelWin.prefab |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/UI/PhantasmPavilionModelWin.prefab b/UI/PhantasmPavilionModelWin.prefab
index f2dc303..5271349 100644
--- a/UI/PhantasmPavilionModelWin.prefab
+++ b/UI/PhantasmPavilionModelWin.prefab
@@ -1017,6 +1017,7 @@
   m_SelectIcon: {fileID: 8373439221698378935}
   m_UnSelectIcon: {fileID: 5106862279985533459}
   m_Title: {fileID: 7615478011478816086}
+  m_TitleOutline: {fileID: 0}
   m_SelectEffect: {fileID: 0}
   redpoint: {fileID: 2241241967602938738}
   isLock: 0
@@ -1185,6 +1186,8 @@
   m_EditorClassIdentifier: 
   m_SelectedTextColor: {r: 0.9607843, g: 0.9647059, b: 0.9019608, a: 1}
   m_NormalTextColor: {r: 0.43137255, g: 0.36078432, b: 0.3764706, a: 1}
+  m_SelectOutlineColor: {r: 0.43137255, g: 0.36078432, b: 0.3764706, a: 1}
+  m_NormalOutlineColor: {r: 0.43137255, g: 0.36078432, b: 0.3764706, a: 1}
 --- !u!1 &851345939009754615
 GameObject:
   m_ObjectHideFlags: 0
@@ -4442,6 +4445,7 @@
   m_SelectIcon: {fileID: 3571808656447665635}
   m_UnSelectIcon: {fileID: 4611876448653779805}
   m_Title: {fileID: 5945372231542438840}
+  m_TitleOutline: {fileID: 0}
   m_SelectEffect: {fileID: 0}
   redpoint: {fileID: 5834957409259194735}
   isLock: 0
@@ -5669,7 +5673,7 @@
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
+    m_Font: {fileID: 12800000, guid: 111f1aa530e864341a505ce1acbfc0b8, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -7143,7 +7147,7 @@
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 7cd825c6867461a4090871836190730f, type: 3}
+    m_Font: {fileID: 12800000, guid: 111f1aa530e864341a505ce1acbfc0b8, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
@@ -10695,7 +10699,7 @@
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 85.70001, y: 0}
+  m_AnchoredPosition: {x: 75, y: 0}
   m_SizeDelta: {x: 104, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9216992618384939507
@@ -10795,8 +10799,8 @@
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 210.3, y: 541.5}
-  m_SizeDelta: {x: 53, y: 53}
+  m_AnchoredPosition: {x: 220, y: 541.5}
+  m_SizeDelta: {x: 40, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7891225922964321246
 MonoBehaviour:

--
Gitblit v1.8.0