Commit b10d31f7 authored by wanqing's avatar wanqing

Merge remote-tracking branch 'origin/xjr'

parents c3a5c6ee dee7da23
......@@ -9209,7 +9209,7 @@ MonoBehaviour:
byOffset: 0.1
byDamage: 0.1
byActivator: 0
byImpact: 0
byImpact: 1
byConnectivity: 1
unyielding: 0
activatable: 0
......@@ -9549,8 +9549,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2dae403a59cd85344ab1c214fcc3ccef, type: 3}
m_Name:
m_EditorClassIdentifier:
size: {x: 3.0654492, y: 0.84665245, z: 2.8614812}
centerPosition: {x: 0, y: 0.32862365, z: 0}
size: {x: 3.0654492, y: 0.18769082, z: 3.0927496}
centerPosition: {x: 0.22633621, y: -0.036876798, z: -0.16892521}
rigidList: []
initialized: 0
showGizmo: 1
......
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