root
/
sk-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei

zhangjiannan 2025-05-26 12:27:28 +08:00
parent be67be9790 35b691b0b1
commit 0e361884c7
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/ManagedResources/Prefabs/UI/CardActivity/CardActivityPanel.prefab
View File

@ -1512,7 +1512,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0.00019926403}
m_AnchoredPosition: {x: 0, y: 0.00012196774}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &2048267012451701727
@ -6612,7 +6612,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6630680969274340478
RectTransform:
m_ObjectHideFlags: 0
@ -7391,7 +7391,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6967188419340956783
RectTransform:
m_ObjectHideFlags: 0
@ -9699,7 +9699,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &7849108177704691978
RectTransform:
m_ObjectHideFlags: 0
@ -12823,7 +12823,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3903509875318588365
RectTransform:
m_ObjectHideFlags: 0

28
Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab
View File

@ -365,11 +365,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: d86d8a727ce12394cb7af8a758dd3ec7, type: 3}
m_FontSize: 30
m_FontSize: 38
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 22
m_MaxSize: 30
m_MinSize: 35
m_MaxSize: 38
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -991,11 +991,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: d86d8a727ce12394cb7af8a758dd3ec7, type: 3}
m_FontSize: 30
m_FontSize: 38
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 30
m_MinSize: 35
m_MaxSize: 38
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
@ -5689,11 +5689,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: d86d8a727ce12394cb7af8a758dd3ec7, type: 3}
m_FontSize: 36
m_FontSize: 38
m_FontStyle: 3
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 36
m_MinSize: 36
m_MaxSize: 38
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -8430,11 +8430,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: d86d8a727ce12394cb7af8a758dd3ec7, type: 3}
m_FontSize: 30
m_FontSize: 38
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 30
m_MinSize: 35
m_MaxSize: 38
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
@ -8859,10 +8859,10 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: d86d8a727ce12394cb7af8a758dd3ec7, type: 3}
m_FontSize: 42
m_FontSize: 48
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MinSize: 4
m_MaxSize: 300
m_Alignment: 4
m_AlignByGeometry: 0