TCG/tcg-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并远程更改，解决MatchmakingPanel冲突

Browse Source
This commit is contained in:
xianyi
2025-10-16 11:44:59 +08:00
parent 12a19ba1a9 c696d70f7a
commit d67ab1a3d2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/TcgEngine/Scenes/Menu/Menu.unity
View File

@@ -22974,7 +22974,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: Cancel m_Text: "\u53D6\u6D88"
--- !u!222 &1092708197 --- !u!222 &1092708197
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -28696,7 +28696,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -56.975, y: -3.6600037} m_AnchoredPosition: {x: 56.97503, y: -3.6600037}
m_SizeDelta: {x: 113.95, y: 113.95} m_SizeDelta: {x: 113.95, y: 113.95}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1389982890 --- !u!114 &1389982890
@@ -45323,7 +45323,7 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 396921782448154705} m_GameObject: {fileID: 396921782448154705}
m_Enabled: 1 m_Enabled: 1
m_Alpha: 1 m_Alpha: 0
m_Interactable: 1 m_Interactable: 1
m_BlocksRaycasts: 1 m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0 m_IgnoreParentGroups: 0