Merge remote-tracking branch 'origin/main' into Ljh

2025-11-28 10:38:04 +08:00
parent 3c1b3ab532 49a873d234
commit 3c655c64a1
1 changed files with 2 additions and 2 deletions
--- a/Assets/_MrCs/Resources/UI/ConPanel.prefab
+++ b/Assets/_MrCs/Resources/UI/ConPanel.prefab
@@ -648,7 +648,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7822314074319250458
 RectTransform:
  m_ObjectHideFlags: 0
@@ -2320,7 +2320,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1063200187910553120
 RectTransform:
  m_ObjectHideFlags: 0