还原页面1
parent
709d247600
commit
d0f5186992
|
|
@ -2196,11 +2196,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
<<<<<<< HEAD
|
||||
m_Text: "\u5929\u68AF\u6218"
|
||||
=======
|
||||
m_Text: "\u7834\u574F\u795E\u8BD5\u70BC"
|
||||
>>>>>>> 6518c7fc0f489db1f10f3bb27dd9da2f5e048d51
|
||||
--- !u!114 &192760128354121307
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue