taosuqi
/
CultivationOfBrewing-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tongbu2

This commit is contained in:
huqibin 2025-05-21 18:06:39 +08:00
parent cf655438e8
commit 909cab50b2
1 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Assets/HQB/Scene/10002_2002_03_OfficeScene.unity
View File

@ -2033,22 +2033,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 3057514198336764871, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
m_PrefabInstance: {fileID: 1882503364}
m_PrefabAsset: {fileID: 0}
<<<<<<< HEAD
serializedVersion: 6
m_Component:
- component: {fileID: 1902030985}
- component: {fileID: 1902030984}
- component: {fileID: 1902030982}
- component: {fileID: 1902030986}
m_Layer: 0
m_Name: Camera_Normal
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1902030982
=======
--- !u!1 &1882503367 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -1660739062635597432, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
@ -2060,7 +2044,6 @@ GameObject:
m_PrefabInstance: {fileID: 1882503364}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1882503369
>>>>>>> 5edd75841aa2d4dc0ed7bb3430aa850a8fd1c9b0
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -2076,43 +2059,9 @@ MonoBehaviour:
profileSync: 0
camerasLayerMask:
serializedVersion: 2
<<<<<<< HEAD
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
--- !u!20 &1902030984
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1902030981}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
=======
m_Bits: 4294967295
effectGroup: 1
effectGroupLayer:
>>>>>>> 5edd75841aa2d4dc0ed7bb3430aa850a8fd1c9b0
serializedVersion: 2
m_Bits: 4294967295
effectNameFilter: