Commit 1fc09c3a authored by xujr's avatar xujr

关卡合并,修正

parent dd6f256d
...@@ -3344,7 +3344,6 @@ GameObject: ...@@ -3344,7 +3344,6 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 3391661974792589287} - component: {fileID: 3391661974792589287}
- component: {fileID: 5809878061040205099} - component: {fileID: 5809878061040205099}
- component: {fileID: 2541282523726141445}
- component: {fileID: 7117536323616531269} - component: {fileID: 7117536323616531269}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
...@@ -3410,14 +3409,6 @@ Camera: ...@@ -3410,14 +3409,6 @@ Camera:
m_OcclusionCulling: 1 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
m_StereoSeparation: 0.022 m_StereoSeparation: 0.022
--- !u!124 &2541282523726141445
Behaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3857347839970904223}
m_Enabled: 1
--- !u!81 &7117536323616531269 --- !u!81 &7117536323616531269
AudioListener: AudioListener:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -9171,9 +9162,9 @@ PrefabInstance: ...@@ -9171,9 +9162,9 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: bd47440d532bf19429998480723a514f, type: 2} objectReference: {fileID: 2100000, guid: bd47440d532bf19429998480723a514f, type: 2}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ce3a603180ab1e848be4637e8ddfe198, type: 3} m_SourcePrefab: {fileID: 100100000, guid: ce3a603180ab1e848be4637e8ddfe198, type: 3}
--- !u!1 &1642599858194501621 stripped --- !u!23 &1642599858196500789 stripped
GameObject: MeshRenderer:
m_CorrespondingSourceObject: {fileID: 100000, guid: ce3a603180ab1e848be4637e8ddfe198, m_CorrespondingSourceObject: {fileID: 2300000, guid: ce3a603180ab1e848be4637e8ddfe198,
type: 3} type: 3}
m_PrefabInstance: {fileID: 1642599858194598229} m_PrefabInstance: {fileID: 1642599858194598229}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
...@@ -9189,9 +9180,9 @@ Transform: ...@@ -9189,9 +9180,9 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1642599858194598229} m_PrefabInstance: {fileID: 1642599858194598229}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!23 &1642599858196500789 stripped --- !u!1 &1642599858194501621 stripped
MeshRenderer: GameObject:
m_CorrespondingSourceObject: {fileID: 2300000, guid: ce3a603180ab1e848be4637e8ddfe198, m_CorrespondingSourceObject: {fileID: 100000, guid: ce3a603180ab1e848be4637e8ddfe198,
type: 3} type: 3}
m_PrefabInstance: {fileID: 1642599858194598229} m_PrefabInstance: {fileID: 1642599858194598229}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
......
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