Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
wangzhenxing 2021-06-03 11:24:11 +08:00
commit 4f3aa3016a
1 changed files with 11 additions and 11 deletions

View File

@ -34,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -252.8, y: 735}
m_AnchoredPosition: {x: 0, y: 735}
m_SizeDelta: {x: 69.63, y: 111.21}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5120411
@ -67,11 +67,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontSize: 52
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 40
m_MaxSize: 52
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
@ -120,7 +120,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 367, y: -1269}
m_AnchoredPosition: {x: 0, y: -1269}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &143979781216228526
@ -590,7 +590,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1032078651153755405
RectTransform:
m_ObjectHideFlags: 0
@ -966,7 +966,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6382467389483365844
RectTransform:
m_ObjectHideFlags: 0
@ -1225,7 +1225,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &9072459568714868046
RectTransform:
m_ObjectHideFlags: 0
@ -1305,7 +1305,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1870648834952150814
RectTransform:
m_ObjectHideFlags: 0
@ -3267,7 +3267,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7260763964865399722
RectTransform:
m_ObjectHideFlags: 0
@ -4192,7 +4192,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1720287018513450661
RectTransform:
m_ObjectHideFlags: 0
@ -5269,7 +5269,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &9178348290668544461
RectTransform:
m_ObjectHideFlags: 0