From 500d595251026d8a323acfa052d16181756a4d79 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期五, 24 十月 2025 16:38:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
UI/MailWin.prefab | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/UI/MailWin.prefab b/UI/MailWin.prefab
index 914c934..9ef0e04 100644
--- a/UI/MailWin.prefab
+++ b/UI/MailWin.prefab
@@ -603,6 +603,7 @@
m_UnSelectIcon: {fileID: 1427226287833015140}
m_Title: {fileID: 5835286445851499819}
m_SelectEffect: {fileID: 0}
+ isLock: 0
--- !u!1 &817884079758767332
GameObject:
m_ObjectHideFlags: 0
@@ -773,6 +774,7 @@
m_UnSelectIcon: {fileID: 1358886286249094817}
m_Title: {fileID: 3403997876537613064}
m_SelectEffect: {fileID: 0}
+ isLock: 0
--- !u!1 &1723683082946931387
GameObject:
m_ObjectHideFlags: 0
@@ -993,7 +995,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: 28
m_FontStyle: 0
m_BestFit: 0
@@ -2322,7 +2324,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: 28
m_FontStyle: 0
m_BestFit: 0
@@ -2914,7 +2916,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: 29
m_FontStyle: 0
m_BestFit: 0
@@ -2997,7 +2999,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: 28
m_FontStyle: 0
m_BestFit: 0
@@ -3232,7 +3234,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: 29
m_FontStyle: 0
m_BestFit: 0
--
Gitblit v1.8.0