冲突提交

jiaoyangna 2020-12-23 20:30:43 +08:00
parent 2c454127f9
commit d8a46ba5b7
1 changed files with 6 additions and 6 deletions

View File

@ -5532,7 +5532,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.9
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -5697,7 +5697,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.86
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -5862,7 +5862,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.9
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -6027,7 +6027,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.86
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -6208,7 +6208,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.9
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@ -6389,7 +6389,7 @@ PrefabInstance:
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.86
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}