浏览代码

Squashed commit of the following:

commit c16fd4f283a0fd8108cedce6db594fdab0b96f2e
Author: Marie G <marie.guffroy@unity3d.com>
Date:   Wed Jun 16 13:49:47 2021 +0200

    planks placement

    better placement to hide planks falling at startup

commit 502985fdda64bfa384201004b7be2a4a651fdba5
Author: Thomas Iché <thomasi@unity3d.com>
Date:   Wed Jun 16 10:40:41 2021 +0200

    Final Fixes/Cleanup

commit 982d05de24b7a68c3a185850236fd2a462748243
Author: Marie G <marie.guffroy@unity3d.com>
Date:   Tue Jun 15 14:14:22 2021 +0200

    Clean names

    Camera Shake event + BufferRender

commit 5159a96a97ce4e761aff91329ea567d98d6622d6
Author: Thomas Iché <thomasi@unity3d.com>
Date:   Wed Jun 9 14:52:08 2021 +0200

    Fixed Sky / UltraWide UI

commit 6db613cf88924d42e3a902092af04f26f032ed57
Merge: d82c9ba 8653be1
Author: Thomas Iché <thomasi@unity3d.com>
Date:   Wed Jun 9 13:54:10 2021 +0200

    Merge branch 'master' into Sample/Meteorite

    # Conflicts:
    #	.gitignore
    #	Assets/HD...
/main
Thomas Iché 3 年前
当前提交
729bcf35
共有 1 个文件被更改,包括 10 次插入10 次删除
  1. 20
      Assets/Samples/Meteorite/MeteoriteSample.unity

20
Assets/Samples/Meteorite/MeteoriteSample.unity


m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 188774964}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.957, y: 0.5, z: -1.0219998}
m_LocalPosition: {x: -2.957, y: 0.129, z: -1.0219998}
m_LocalScale: {x: 2, y: 0.05, z: 0.2}
m_Children: []
m_Father: {fileID: 710594044}

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 258741997}
m_LocalRotation: {x: -0.024853192, y: 0.29526293, z: 0.08010981, w: 0.95172715}
m_LocalPosition: {x: 0.293, y: 0.5, z: -4.272}
m_LocalPosition: {x: 0.293, y: 0.197, z: -4.272}
m_LocalScale: {x: 1, y: 0.05, z: 0.2}
m_Children: []
m_Father: {fileID: 710594044}

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 422010526}
m_LocalRotation: {x: -0.060061093, y: -0.41662145, z: -0.119008414, w: 0.89925325}
m_LocalPosition: {x: 0.12, y: 0.5, z: -2.57}
m_LocalPosition: {x: 0.12, y: 0.303, z: -2.57}
m_LocalScale: {x: 2, y: 0.05, z: 0.2}
m_Children: []
m_Father: {fileID: 710594044}

m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 732813630}
m_LocalRotation: {x: 0.16146779, y: -0.000000009428793, z: 0.00000000154269, w: 0.986878}
m_LocalRotation: {x: 0.16146779, y: 0.000000009428793, z: -0.00000000154269, w: 0.986878}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 740922686}
m_LocalRotation: {x: 0.015764616, y: -0.20174299, z: 0.076292865, w: 0.97633535}
m_LocalPosition: {x: -1.55, y: 0.5, z: -1.29}
m_LocalPosition: {x: -1.55, y: 0.193, z: -1.29}
m_LocalScale: {x: 1, y: 0.05, z: 0.2}
m_Children: []
m_Father: {fileID: 710594044}

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1252865787}
m_LocalRotation: {x: 0.11161953, y: 0.23858523, z: 0.052048333, w: 0.96328044}
m_LocalPosition: {x: 1.5, y: 0.5, z: -1.03}
m_LocalPosition: {x: 1.5, y: 0.218, z: -1.03}
m_LocalScale: {x: 1, y: 0.05, z: 0.2}
m_Children: []
m_Father: {fileID: 710594044}

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1566657435}
m_LocalRotation: {x: -0, y: -0, z: 0.049988393, w: 0.9987498}
m_LocalPosition: {x: 0.46, y: 0.5, z: 1.49}
m_LocalPosition: {x: 0.46, y: 0.172, z: 1.49}
m_LocalScale: {x: 1, y: 0.05, z: 0.2}
m_Children: []
m_Father: {fileID: 710594044}

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1860573950}
m_LocalRotation: {x: -0.016426656, y: 0.19650456, z: 0.08166808, w: 0.97695774}
m_LocalPosition: {x: -0.78, y: 0.5, z: 0.71}
m_LocalPosition: {x: -0.78, y: 0.286, z: 0.71}
m_LocalScale: {x: 2, y: 0.05, z: 0.2}
m_Children: []
m_Father: {fileID: 710594044}

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1878559644}
m_LocalRotation: {x: -0, y: -0, z: -0.07512875, w: 0.9971739}
m_LocalPosition: {x: 2.69, y: 0.5, z: 0.57}
m_LocalPosition: {x: 2.69, y: 0.201, z: 0.57}
m_LocalScale: {x: 1, y: 0.05, z: 0.2}
m_Children: []
m_Father: {fileID: 710594044}

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1968940955}
m_LocalRotation: {x: -0.09657985, y: 0.31656763, z: -0.09780961, w: 0.9385577}
m_LocalPosition: {x: -2.957, y: 0.67, z: -1.0219998}
m_LocalPosition: {x: -2.957, y: 0.273, z: -1.0219998}
m_LocalScale: {x: 1, y: 0.05, z: 0.2}
m_Children: []
m_Father: {fileID: 710594044}

正在加载...
取消
保存