Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev

dev_chengFeng
gaoxin 2021-03-07 14:57:12 +08:00
commit 906c44ae95
3 changed files with 2587 additions and 3027 deletions

View File

@ -2382,7 +2382,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.0000121593475, y: -182.83006}
m_AnchoredPosition: {x: 0.0000121593475, y: -0.0000669994}
m_SizeDelta: {x: 850.1, y: 33}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &4102787374670331663
@ -7564,7 +7564,7 @@ ParticleSystem:
--- !u!199 &6683236217412788304
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -9228,14 +9228,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_BestFit: 1
m_MinSize: 14
m_MaxSize: 30
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6D3B\u52A8\u5269\u4F59\u65F6\u95F4\uFF1A29\u592912\u5C0F\u65F6"
LanguageIndex: 0
@ -10625,7 +10625,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 11.699997, y: 0.000019017947}
m_AnchoredPosition: {x: 11.699997, y: 0.000019073486}
m_SizeDelta: {x: 196.51, y: 73}
m_Pivot: {x: 0, y: 1}
--- !u!222 &3578854696546125194
@ -11389,7 +11389,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 11.699997, y: 0.00008773804}
m_AnchoredPosition: {x: 11.699997, y: -0.000008128568}
m_SizeDelta: {x: 196.5, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &3974276503969912513
@ -11447,7 +11447,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1.08
m_Text: "\u5FC5\u5B9A\u83B7\u5F974\u661F\u53CA\u4EE5\u4E0A\u795E\u5C06\u5FC5\u5B9A\u83B7\u5F974\u661F\u53CA\u4EE5\u4E0A\u795E\u5C06"
m_Text: "\u5FC5\u5B9A\u83B7\u5F974\u661F\u53CA\u4EE5\u4E0A\u795E\u5C06"
LanguageIndex: 10911
--- !u!1 &4044931386107902750
GameObject:
@ -12244,7 +12244,7 @@ MonoBehaviour:
m_Inertia: 1
m_DecelerationRate: 0.135
m_ScrollSensitivity: 1
m_Viewport: {fileID: 0}
m_Viewport: {fileID: 6878634906363755089}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 0}
m_HorizontalScrollbarVisibility: 0
@ -12335,7 +12335,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 34
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
@ -22189,7 +22189,7 @@ ParticleSystem:
--- !u!199 &305727223664186203
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -2828,7 +2828,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 41.8
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
@ -14649,7 +14649,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3901352447422915093
RectTransform:
m_ObjectHideFlags: 0