Commit 77bdd7c1 authored by wanqing's avatar wanqing

Merge commit 'fd95bf9c'

parents 24489d54 fd95bf9c
......@@ -212859,7 +212859,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 5f2f0bbf781fb684688e7582be675c6b, type: 2}
objectReference: {fileID: 2100000, guid: 14334c1feb5f3824b909bb50f2495c41, type: 2}
- target: {fileID: -927199367670048503, guid: e5b826e8cccdcb44ba8f973963955bd0,
type: 3}
propertyPath: m_Name
......@@ -213040,7 +213040,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: a7d59368848bbf84dabca086b0bbb07e, type: 2}
objectReference: {fileID: 2100000, guid: 5f2f0bbf781fb684688e7582be675c6b, type: 2}
- target: {fileID: -927199367670048503, guid: 74345e650be006046bdb1823b5713571,
type: 3}
propertyPath: m_Name
......@@ -213252,7 +213252,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: da831133407ebd64f9a684848defd58e, type: 2}
objectReference: {fileID: 2100000, guid: a7d59368848bbf84dabca086b0bbb07e, type: 2}
- target: {fileID: -927199367670048503, guid: ca98f1c956b47fa4baeaa0f18403194c,
type: 3}
propertyPath: m_Name
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment