Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev

This commit is contained in:
chenxi 2023-06-21 10:12:54 +08:00
commit f15e3f6c11

View File

@ -367,7 +367,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 36, y: 4}
m_SizeDelta: {x: 200, y: 50}
m_SizeDelta: {x: 180, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2937228301080521382
CanvasRenderer:
@ -427,9 +427,9 @@ MonoBehaviour:
m_fontSize: 34
m_fontSizeBase: 34
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontSizeMax: 34
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -440,7 +440,7 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
@ -681,7 +681,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 36, y: 4}
m_SizeDelta: {x: 200, y: 50}
m_SizeDelta: {x: 180, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3662780689206770409
CanvasRenderer:
@ -741,9 +741,9 @@ MonoBehaviour:
m_fontSize: 34
m_fontSizeBase: 34
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontSizeMax: 34
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
@ -754,7 +754,7 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}