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

dev_chengFeng
gaoxin 2021-03-09 15:39:46 +08:00
commit 460479779e
1 changed files with 2 additions and 17 deletions

View File

@ -841,7 +841,6 @@ GameObject:
- component: {fileID: 4707173299278221511}
- component: {fileID: 309248663674038662}
- component: {fileID: 6298785809566221234}
- component: {fileID: 7805423499986424984}
m_Layer: 5
m_Name: nameText
m_TagString: Untagged
@ -865,8 +864,8 @@ 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: -50.000008, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: -43, y: 0}
m_SizeDelta: {x: 90, y: 55}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &309248663674038662
CanvasRenderer:
@ -911,20 +910,6 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u51B0\u51E4"
LanguageIndex: 0
--- !u!114 &7805423499986424984
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 198526555081314674}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &259358215116488240
GameObject:
m_ObjectHideFlags: 0