Skip to content

B
BoomMaster
Commit fa83889f authored by wanqing's avatar wanqing
Browse files
Options

Merge remote-tracking branch 'origin/xjr'

parents 0be7475d 3d5fc4fd
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
BoomMaster/Assets/#A3_Prefabs/Bomb 3_create.prefab
View file @ fa83889f
...@@ -27,7 +27,7 @@ Transform: ...@@ -27,7 +27,7 @@ Transform:
m_GameObject: {fileID: 4587193679013363977} m_GameObject: {fileID: 4587193679013363977}
m_LocalRotation: {x: -0.5735764, y: -0, z: 0.8191521, w: 0} m_LocalRotation: {x: -0.5735764, y: -0, z: 0.8191521, w: 0}
m_LocalPosition: {x: -0.311, y: 0.385, z: 0.113} m_LocalPosition: {x: -0.311, y: 0.385, z: 0.113}
m_LocalScale: {x: 3, y: 3, z: 3} m_LocalScale: {x: 2.6, y: 2.6, z: 2.6}
m_Children: m_Children:
- {fileID: 2769654101736037492} - {fileID: 2769654101736037492}
m_Father: {fileID: 7079061562166580384} m_Father: {fileID: 7079061562166580384}
......
BoomMaster/Assets/Res/Prefabs/Levels/Level5.prefab
View file @ fa83889f
...@@ -5187,8 +5187,8 @@ MonoBehaviour: ...@@ -5187,8 +5187,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2dae403a59cd85344ab1c214fcc3ccef, type: 3} m_Script: {fileID: 11500000, guid: 2dae403a59cd85344ab1c214fcc3ccef, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
size: {x: 0.30768466, y: 2.0367022, z: 0.3124625} size: {x: 0.30768466, y: 1.050272, z: 0.3124625}
centerPosition: {x: 0.005344474, y: 0.97365236, z: 0.013220539} centerPosition: {x: 0.005344474, y: 0.4868989, z: 0.013220539}
rigidList: [] rigidList: []
initialized: 0 initialized: 0
showGizmo: 1 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