Merge branch 'develop' into feature/gfx-action
This commit is contained in:
@@ -65,7 +65,6 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 926741264994506648}
|
- component: {fileID: 926741264994506648}
|
||||||
- component: {fileID: 3566761532475057225}
|
- component: {fileID: 3566761532475057225}
|
||||||
- component: {fileID: 3644885308902631293}
|
|
||||||
- component: {fileID: 5217538199177562225}
|
- component: {fileID: 5217538199177562225}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Camera
|
m_Name: Camera
|
||||||
@@ -140,14 +139,6 @@ Camera:
|
|||||||
m_OcclusionCulling: 1
|
m_OcclusionCulling: 1
|
||||||
m_StereoConvergence: 10
|
m_StereoConvergence: 10
|
||||||
m_StereoSeparation: 0.022
|
m_StereoSeparation: 0.022
|
||||||
--- !u!81 &3644885308902631293
|
|
||||||
AudioListener:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 6925809458492533610}
|
|
||||||
m_Enabled: 1
|
|
||||||
--- !u!114 &5217538199177562225
|
--- !u!114 &5217538199177562225
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 969654748246802177}
|
- component: {fileID: 969654748246802177}
|
||||||
- component: {fileID: 5984941419743339992}
|
- component: {fileID: 5984941419743339992}
|
||||||
- component: {fileID: 6319271102976364310}
|
|
||||||
- component: {fileID: 8188555422466428940}
|
- component: {fileID: 8188555422466428940}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Camera
|
m_Name: Camera
|
||||||
@@ -85,14 +84,6 @@ Camera:
|
|||||||
m_OcclusionCulling: 1
|
m_OcclusionCulling: 1
|
||||||
m_StereoConvergence: 10
|
m_StereoConvergence: 10
|
||||||
m_StereoSeparation: 0.022
|
m_StereoSeparation: 0.022
|
||||||
--- !u!81 &6319271102976364310
|
|
||||||
AudioListener:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 5307011407514547582}
|
|
||||||
m_Enabled: 1
|
|
||||||
--- !u!114 &8188555422466428940
|
--- !u!114 &8188555422466428940
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
Reference in New Issue
Block a user