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

dev_chengFeng
ZhangBiao 2021-05-27 17:58:02 +08:00
commit 6050b780dd
1 changed files with 8 additions and 8 deletions

View File

@ -422,7 +422,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: -248.9, y: -94.29993}
m_AnchoredPosition: {x: -243.20004, y: -94.29993}
m_SizeDelta: {x: 110, y: 109.99999}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6041485972145568497
@ -509,7 +509,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: -150.1, y: -91}
m_AnchoredPosition: {x: -100.4, y: -91}
m_SizeDelta: {x: 522, y: 106}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5867666873718742173
@ -583,7 +583,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: -44.5, y: -69.900085}
m_AnchoredPosition: {x: -38.8, y: -69.900085}
m_SizeDelta: {x: 300.59998, y: 41.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2147840817754537498
@ -1023,7 +1023,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: -44.1, y: -112.900055}
m_AnchoredPosition: {x: -38.400047, y: -112.900055}
m_SizeDelta: {x: 300.59998, y: 41.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3116687099565280738
@ -1729,7 +1729,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0.00001513958, y: 0.00008345365}
m_AnchoredPosition: {x: 0.00001513958, y: 0.000023643905}
m_SizeDelta: {x: 1003, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &4770267391901505225
@ -2309,7 +2309,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
m_Color: {r: 0.9372549, g: 0.8, b: 0.7411765, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2318,7 +2318,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 38
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
@ -2696,7 +2696,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 36
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0