Yash
This commit is contained in:
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,7 @@
|
|||||||
Base path: '/home/thysona/Unity/Hub/Editor/6000.2.14f1/Editor/Data', plugins path '/home/thysona/Unity/Hub/Editor/6000.2.14f1/Editor/Data/PlaybackEngines'
|
Base path: '/home/anemunt/Unity/Hub/Editor/6000.2.14f1/Editor/Data', plugins path '/home/anemunt/Unity/Hub/Editor/6000.2.14f1/Editor/Data/PlaybackEngines'
|
||||||
Cmd: initializeCompiler
|
Cmd: initializeCompiler
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
Cmd: preprocessCompute
|
Cmd: preprocessCompute
|
||||||
insize=2849 file=Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/RenderingLayerMask/TraceRenderingLayerMask.urtshader buildPlatform=24 validAPIs=294912 pKW=SHADER_API_DESKTOP UNITY_PLATFORM_SUPPORTS_DEPTH_FETCH dKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 SHADER_API_GLES31 SHADER_API_GLES32 UNITY_UNIFIED_SHADER_PRECISION_MODEL ok=1 outsize=2849
|
insize=2849 file=Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/RenderingLayerMask/TraceRenderingLayerMask.urtshader buildPlatform=24 validAPIs=294912 pKW=SHADER_API_DESKTOP UNITY_PLATFORM_SUPPORTS_DEPTH_FETCH dKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 SHADER_API_GLES31 SHADER_API_GLES32 UNITY_UNIFIED_SHADER_PRECISION_MODEL ok=1 outsize=2849
|
||||||
|
|
||||||
@@ -79,3 +80,5 @@ Cmd: compileSnippet
|
|||||||
Cmd: compileSnippet
|
Cmd: compileSnippet
|
||||||
insize=1732 file=Packages/com.unity.render-pipelines.universal/Shaders/Utils/CoreBlit.shader name=Hidden/Universal/CoreBlit pass=Bilinear ppOnly=0 stripLineD=0 buildPlatform=24 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR UNITY_PLATFORM_SUPPORTS_DEPTH_FETCH uKW= dKW=UNITY_NO_DXT5nm UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 SHADER_API_GLES31 SHADER_API_GLES32 UNITY_UNIFIED_SHADER_PRECISION_MODEL flags=0 lang=3 type=Vertex platform=vulkan reqs=1 mask=2 start=61 ok=1 outsize=1168
|
insize=1732 file=Packages/com.unity.render-pipelines.universal/Shaders/Utils/CoreBlit.shader name=Hidden/Universal/CoreBlit pass=Bilinear ppOnly=0 stripLineD=0 buildPlatform=24 rsLen=0 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR UNITY_PLATFORM_SUPPORTS_DEPTH_FETCH uKW= dKW=UNITY_NO_DXT5nm UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 SHADER_API_GLES31 SHADER_API_GLES32 UNITY_UNIFIED_SHADER_PRECISION_MODEL flags=0 lang=3 type=Vertex platform=vulkan reqs=1 mask=2 start=61 ok=1 outsize=1168
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
|
|||||||
@@ -38,13 +38,18 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_PixelRect:
|
m_PixelRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 124
|
||||||
y: 32
|
y: 130
|
||||||
width: 1920
|
width: 1644
|
||||||
height: 980
|
height: 899
|
||||||
m_ShowMode: 4
|
m_ShowMode: 4
|
||||||
|
<<<<<<< HEAD
|
||||||
m_Title: Scene
|
m_Title: Scene
|
||||||
m_RootView: {fileID: 9}
|
m_RootView: {fileID: 9}
|
||||||
|
=======
|
||||||
|
m_Title: Project
|
||||||
|
m_RootView: {fileID: 6}
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_MinSize: {x: 875, y: 300}
|
m_MinSize: {x: 875, y: 300}
|
||||||
m_MaxSize: {x: 10000, y: 10000}
|
m_MaxSize: {x: 10000, y: 10000}
|
||||||
m_Maximized: 0
|
m_Maximized: 0
|
||||||
@@ -100,6 +105,32 @@ MonoBehaviour:
|
|||||||
controlID: 193
|
controlID: 193
|
||||||
draggingID: 0
|
draggingID: 0
|
||||||
--- !u!114 &5
|
--- !u!114 &5
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 52
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_Name: InspectorWindow
|
||||||
|
m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.DockArea
|
||||||
|
m_Children: []
|
||||||
|
m_Position:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 1217
|
||||||
|
y: 0
|
||||||
|
width: 427
|
||||||
|
height: 642
|
||||||
|
m_MinSize: {x: 276, y: 76}
|
||||||
|
m_MaxSize: {x: 4001, y: 4026}
|
||||||
|
m_ActualView: {fileID: 13}
|
||||||
|
m_Panes:
|
||||||
|
- {fileID: 13}
|
||||||
|
m_Selected: 0
|
||||||
|
m_LastSelected: 0
|
||||||
|
--- !u!114 &3
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -112,19 +143,24 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Children:
|
m_Children:
|
||||||
|
<<<<<<< HEAD
|
||||||
- {fileID: 12}
|
- {fileID: 12}
|
||||||
- {fileID: 6}
|
- {fileID: 6}
|
||||||
|
=======
|
||||||
|
- {fileID: 9}
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 36
|
y: 36
|
||||||
width: 1920
|
width: 1644
|
||||||
height: 924
|
height: 843
|
||||||
m_MinSize: {x: 300, y: 100}
|
m_MinSize: {x: 300, y: 100}
|
||||||
m_MaxSize: {x: 24288, y: 16192}
|
m_MaxSize: {x: 24288, y: 16192}
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 37
|
controlID: 37
|
||||||
draggingID: 0
|
draggingID: 0
|
||||||
|
<<<<<<< HEAD
|
||||||
--- !u!114 &6
|
--- !u!114 &6
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
@@ -152,6 +188,9 @@ MonoBehaviour:
|
|||||||
m_Selected: 0
|
m_Selected: 0
|
||||||
m_LastSelected: 0
|
m_LastSelected: 0
|
||||||
--- !u!114 &7
|
--- !u!114 &7
|
||||||
|
=======
|
||||||
|
--- !u!114 &4
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -168,6 +207,7 @@ MonoBehaviour:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 0
|
y: 0
|
||||||
|
<<<<<<< HEAD
|
||||||
width: 363
|
width: 363
|
||||||
height: 545
|
height: 545
|
||||||
m_MinSize: {x: 201, y: 226}
|
m_MinSize: {x: 201, y: 226}
|
||||||
@@ -175,6 +215,15 @@ MonoBehaviour:
|
|||||||
m_ActualView: {fileID: 18}
|
m_ActualView: {fileID: 18}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 18}
|
- {fileID: 18}
|
||||||
|
=======
|
||||||
|
width: 368
|
||||||
|
height: 642
|
||||||
|
m_MinSize: {x: 201, y: 226}
|
||||||
|
m_MaxSize: {x: 4001, y: 4026}
|
||||||
|
m_ActualView: {fileID: 14}
|
||||||
|
m_Panes:
|
||||||
|
- {fileID: 14}
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_Selected: 0
|
m_Selected: 0
|
||||||
m_LastSelected: 0
|
m_LastSelected: 0
|
||||||
--- !u!114 &8
|
--- !u!114 &8
|
||||||
@@ -193,6 +242,7 @@ MonoBehaviour:
|
|||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
|
<<<<<<< HEAD
|
||||||
y: 545
|
y: 545
|
||||||
width: 1466
|
width: 1466
|
||||||
height: 379
|
height: 379
|
||||||
@@ -205,6 +255,20 @@ MonoBehaviour:
|
|||||||
m_Selected: 0
|
m_Selected: 0
|
||||||
m_LastSelected: 1
|
m_LastSelected: 1
|
||||||
--- !u!114 &9
|
--- !u!114 &9
|
||||||
|
=======
|
||||||
|
y: 642
|
||||||
|
width: 1644
|
||||||
|
height: 201
|
||||||
|
m_MinSize: {x: 230, y: 276}
|
||||||
|
m_MaxSize: {x: 10000, y: 10026}
|
||||||
|
m_ActualView: {fileID: 12}
|
||||||
|
m_Panes:
|
||||||
|
- {fileID: 12}
|
||||||
|
- {fileID: 17}
|
||||||
|
m_Selected: 0
|
||||||
|
m_LastSelected: 1
|
||||||
|
--- !u!114 &6
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -217,15 +281,21 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Children:
|
m_Children:
|
||||||
|
<<<<<<< HEAD
|
||||||
- {fileID: 10}
|
- {fileID: 10}
|
||||||
- {fileID: 5}
|
- {fileID: 5}
|
||||||
- {fileID: 11}
|
- {fileID: 11}
|
||||||
|
=======
|
||||||
|
- {fileID: 7}
|
||||||
|
- {fileID: 3}
|
||||||
|
- {fileID: 8}
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 0
|
y: 0
|
||||||
width: 1920
|
width: 1644
|
||||||
height: 980
|
height: 899
|
||||||
m_MinSize: {x: 875, y: 300}
|
m_MinSize: {x: 875, y: 300}
|
||||||
m_MaxSize: {x: 10000, y: 10000}
|
m_MaxSize: {x: 10000, y: 10000}
|
||||||
m_UseTopView: 1
|
m_UseTopView: 1
|
||||||
@@ -249,7 +319,7 @@ MonoBehaviour:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 0
|
y: 0
|
||||||
width: 1920
|
width: 1644
|
||||||
height: 36
|
height: 36
|
||||||
m_MinSize: {x: 0, y: 0}
|
m_MinSize: {x: 0, y: 0}
|
||||||
m_MaxSize: {x: 0, y: 0}
|
m_MaxSize: {x: 0, y: 0}
|
||||||
@@ -270,8 +340,8 @@ MonoBehaviour:
|
|||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 960
|
y: 879
|
||||||
width: 1920
|
width: 1644
|
||||||
height: 20
|
height: 20
|
||||||
m_MinSize: {x: 0, y: 0}
|
m_MinSize: {x: 0, y: 0}
|
||||||
m_MaxSize: {x: 0, y: 0}
|
m_MaxSize: {x: 0, y: 0}
|
||||||
@@ -294,10 +364,10 @@ MonoBehaviour:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 0
|
y: 0
|
||||||
width: 1466
|
width: 1644
|
||||||
height: 924
|
height: 843
|
||||||
m_MinSize: {x: 200, y: 100}
|
m_MinSize: {x: 300, y: 100}
|
||||||
m_MaxSize: {x: 16192, y: 16192}
|
m_MaxSize: {x: 24288, y: 16192}
|
||||||
vertical: 1
|
vertical: 1
|
||||||
controlID: 38
|
controlID: 38
|
||||||
draggingID: 0
|
draggingID: 0
|
||||||
@@ -314,16 +384,29 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Children:
|
m_Children:
|
||||||
|
<<<<<<< HEAD
|
||||||
- {fileID: 7}
|
- {fileID: 7}
|
||||||
- {fileID: 14}
|
- {fileID: 14}
|
||||||
|
=======
|
||||||
|
- {fileID: 4}
|
||||||
|
- {fileID: 11}
|
||||||
|
- {fileID: 2}
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 0
|
y: 0
|
||||||
|
<<<<<<< HEAD
|
||||||
width: 1466
|
width: 1466
|
||||||
height: 545
|
height: 545
|
||||||
m_MinSize: {x: 200, y: 50}
|
m_MinSize: {x: 200, y: 50}
|
||||||
m_MaxSize: {x: 16192, y: 8096}
|
m_MaxSize: {x: 16192, y: 8096}
|
||||||
|
=======
|
||||||
|
width: 1644
|
||||||
|
height: 642
|
||||||
|
m_MinSize: {x: 300, y: 50}
|
||||||
|
m_MaxSize: {x: 24288, y: 8096}
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
vertical: 0
|
vertical: 0
|
||||||
controlID: 39
|
controlID: 39
|
||||||
draggingID: 0
|
draggingID: 0
|
||||||
@@ -342,8 +425,9 @@ MonoBehaviour:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 363
|
x: 368
|
||||||
y: 0
|
y: 0
|
||||||
|
<<<<<<< HEAD
|
||||||
width: 1103
|
width: 1103
|
||||||
height: 545
|
height: 545
|
||||||
m_MinSize: {x: 202, y: 226}
|
m_MinSize: {x: 202, y: 226}
|
||||||
@@ -352,6 +436,16 @@ MonoBehaviour:
|
|||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 19}
|
- {fileID: 19}
|
||||||
- {fileID: 20}
|
- {fileID: 20}
|
||||||
|
=======
|
||||||
|
width: 849
|
||||||
|
height: 642
|
||||||
|
m_MinSize: {x: 202, y: 226}
|
||||||
|
m_MaxSize: {x: 4002, y: 4026}
|
||||||
|
m_ActualView: {fileID: 15}
|
||||||
|
m_Panes:
|
||||||
|
- {fileID: 15}
|
||||||
|
- {fileID: 16}
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_Selected: 0
|
m_Selected: 0
|
||||||
m_LastSelected: 1
|
m_LastSelected: 1
|
||||||
--- !u!114 &15
|
--- !u!114 &15
|
||||||
@@ -362,6 +456,7 @@ MonoBehaviour:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 0}
|
m_GameObject: {fileID: 0}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
|
<<<<<<< HEAD
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 13854, guid: 0000000000000000e000000000000000, type: 0}
|
m_Script: {fileID: 13854, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
m_Name:
|
m_Name:
|
||||||
@@ -426,6 +521,8 @@ MonoBehaviour:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 0}
|
m_GameObject: {fileID: 0}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
|
=======
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_EditorHideFlags: 1
|
m_EditorHideFlags: 1
|
||||||
m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
|
m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
m_Name:
|
m_Name:
|
||||||
@@ -439,10 +536,17 @@ MonoBehaviour:
|
|||||||
m_TextWithWhitespace: "Project\u200B"
|
m_TextWithWhitespace: "Project\u200B"
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
x: 0
|
x: 0
|
||||||
y: 569
|
y: 569
|
||||||
width: 1465
|
width: 1465
|
||||||
height: 353
|
height: 353
|
||||||
|
=======
|
||||||
|
x: 124
|
||||||
|
y: 827
|
||||||
|
width: 1644
|
||||||
|
height: 175
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_SerializedDataModeController:
|
m_SerializedDataModeController:
|
||||||
m_DataMode: 0
|
m_DataMode: 0
|
||||||
m_PreferredDataMode: 0
|
m_PreferredDataMode: 0
|
||||||
@@ -465,7 +569,7 @@ MonoBehaviour:
|
|||||||
m_SkipHidden: 0
|
m_SkipHidden: 0
|
||||||
m_SearchArea: 1
|
m_SearchArea: 1
|
||||||
m_Folders:
|
m_Folders:
|
||||||
- Assets
|
- Assets/Scenes
|
||||||
m_Globs: []
|
m_Globs: []
|
||||||
m_ProductIds:
|
m_ProductIds:
|
||||||
m_AnyWithAssetOrigin: 0
|
m_AnyWithAssetOrigin: 0
|
||||||
@@ -473,18 +577,30 @@ MonoBehaviour:
|
|||||||
m_ImportLogFlags: 0
|
m_ImportLogFlags: 0
|
||||||
m_FilterByTypeIntersection: 0
|
m_FilterByTypeIntersection: 0
|
||||||
m_ViewMode: 1
|
m_ViewMode: 1
|
||||||
m_StartGridSize: 64
|
m_StartGridSize: 32
|
||||||
m_LastFolders:
|
m_LastFolders:
|
||||||
|
<<<<<<< HEAD
|
||||||
- Assets
|
- Assets
|
||||||
m_LastFoldersGridSize: -1
|
m_LastFoldersGridSize: -1
|
||||||
m_LastProjectPath: /home/thysona/SCLPlus
|
m_LastProjectPath: /home/thysona/SCLPlus
|
||||||
|
=======
|
||||||
|
- Assets/Scenes
|
||||||
|
m_LastFoldersGridSize: 32
|
||||||
|
m_LastProjectPath: /home/anemunt/Git-base/SCLPlus
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_LockTracker:
|
m_LockTracker:
|
||||||
m_IsLocked: 0
|
m_IsLocked: 0
|
||||||
m_FolderTreeState:
|
m_FolderTreeState:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
|
<<<<<<< HEAD
|
||||||
m_SelectedIDs: 10e70000
|
m_SelectedIDs: 10e70000
|
||||||
m_LastClickedID: 59152
|
m_LastClickedID: 59152
|
||||||
m_ExpandedIDs: 000000008eac0000
|
m_ExpandedIDs: 000000008eac0000
|
||||||
|
=======
|
||||||
|
m_SelectedIDs: b2ac0000
|
||||||
|
m_LastClickedID: 44210
|
||||||
|
m_ExpandedIDs: 000000007eab000000ca9a3b
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
@@ -513,7 +629,11 @@ MonoBehaviour:
|
|||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs:
|
m_SelectedIDs:
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
|
<<<<<<< HEAD
|
||||||
m_ExpandedIDs: 000000008eac0000
|
m_ExpandedIDs: 000000008eac0000
|
||||||
|
=======
|
||||||
|
m_ExpandedIDs: 000000007eab0000
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
@@ -568,10 +688,14 @@ MonoBehaviour:
|
|||||||
m_ResourceFile:
|
m_ResourceFile:
|
||||||
m_NewAssetIndexInList: -1
|
m_NewAssetIndexInList: -1
|
||||||
m_ScrollPosition: {x: 0, y: 0}
|
m_ScrollPosition: {x: 0, y: 0}
|
||||||
m_GridSize: 64
|
m_GridSize: 32
|
||||||
m_SkipHiddenPackages: 0
|
m_SkipHiddenPackages: 0
|
||||||
m_DirectoriesAreaWidth: 207
|
m_DirectoriesAreaWidth: 207
|
||||||
|
<<<<<<< HEAD
|
||||||
--- !u!114 &17
|
--- !u!114 &17
|
||||||
|
=======
|
||||||
|
--- !u!114 &13
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -592,10 +716,17 @@ MonoBehaviour:
|
|||||||
m_TextWithWhitespace: "Inspector\u200B"
|
m_TextWithWhitespace: "Inspector\u200B"
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
x: 1467
|
x: 1467
|
||||||
y: 24
|
y: 24
|
||||||
width: 453
|
width: 453
|
||||||
height: 898
|
height: 898
|
||||||
|
=======
|
||||||
|
x: 1341
|
||||||
|
y: 185
|
||||||
|
width: 426
|
||||||
|
height: 616
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_SerializedDataModeController:
|
m_SerializedDataModeController:
|
||||||
m_DataMode: 0
|
m_DataMode: 0
|
||||||
m_PreferredDataMode: 0
|
m_PreferredDataMode: 0
|
||||||
@@ -620,7 +751,11 @@ MonoBehaviour:
|
|||||||
m_LockTracker:
|
m_LockTracker:
|
||||||
m_IsLocked: 0
|
m_IsLocked: 0
|
||||||
m_PreviewWindow: {fileID: 0}
|
m_PreviewWindow: {fileID: 0}
|
||||||
|
<<<<<<< HEAD
|
||||||
--- !u!114 &18
|
--- !u!114 &18
|
||||||
|
=======
|
||||||
|
--- !u!114 &14
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -641,10 +776,17 @@ MonoBehaviour:
|
|||||||
m_TextWithWhitespace: "Hierarchy\u200B"
|
m_TextWithWhitespace: "Hierarchy\u200B"
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
x: 0
|
x: 0
|
||||||
y: 24
|
y: 24
|
||||||
width: 362
|
width: 362
|
||||||
height: 519
|
height: 519
|
||||||
|
=======
|
||||||
|
x: 124
|
||||||
|
y: 185
|
||||||
|
width: 367
|
||||||
|
height: 616
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_SerializedDataModeController:
|
m_SerializedDataModeController:
|
||||||
m_DataMode: 0
|
m_DataMode: 0
|
||||||
m_PreferredDataMode: 0
|
m_PreferredDataMode: 0
|
||||||
@@ -659,9 +801,15 @@ MonoBehaviour:
|
|||||||
m_SceneHierarchy:
|
m_SceneHierarchy:
|
||||||
m_TreeViewState:
|
m_TreeViewState:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
|
<<<<<<< HEAD
|
||||||
m_SelectedIDs:
|
m_SelectedIDs:
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
m_ExpandedIDs: d653ffff8454ffff8e54ffff3c59ffff
|
m_ExpandedIDs: d653ffff8454ffff8e54ffff3c59ffff
|
||||||
|
=======
|
||||||
|
m_SelectedIDs: c0ac0000
|
||||||
|
m_LastClickedID: 0
|
||||||
|
m_ExpandedIDs: 74c4ffff40c5ffff10fbffff
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
@@ -686,7 +834,11 @@ MonoBehaviour:
|
|||||||
m_IsLocked: 0
|
m_IsLocked: 0
|
||||||
m_CurrentSortingName: TransformSorting
|
m_CurrentSortingName: TransformSorting
|
||||||
m_WindowGUID: 4c969a2b90040154d917609493e03593
|
m_WindowGUID: 4c969a2b90040154d917609493e03593
|
||||||
|
<<<<<<< HEAD
|
||||||
--- !u!114 &19
|
--- !u!114 &19
|
||||||
|
=======
|
||||||
|
--- !u!114 &15
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -707,10 +859,17 @@ MonoBehaviour:
|
|||||||
m_TextWithWhitespace: "Scene\u200B"
|
m_TextWithWhitespace: "Scene\u200B"
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
|
<<<<<<< HEAD
|
||||||
x: 364
|
x: 364
|
||||||
y: 24
|
y: 24
|
||||||
width: 1101
|
width: 1101
|
||||||
height: 519
|
height: 519
|
||||||
|
=======
|
||||||
|
x: 492
|
||||||
|
y: 185
|
||||||
|
width: 847
|
||||||
|
height: 616
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_SerializedDataModeController:
|
m_SerializedDataModeController:
|
||||||
m_DataMode: 0
|
m_DataMode: 0
|
||||||
m_PreferredDataMode: 0
|
m_PreferredDataMode: 0
|
||||||
@@ -1083,9 +1242,15 @@ MonoBehaviour:
|
|||||||
m_AudioPlay: 0
|
m_AudioPlay: 0
|
||||||
m_DebugDrawModesUseInteractiveLightBakingData: 0
|
m_DebugDrawModesUseInteractiveLightBakingData: 0
|
||||||
m_Position:
|
m_Position:
|
||||||
|
<<<<<<< HEAD
|
||||||
m_Target: {x: -11.712889, y: -2.188706, z: -3.138106}
|
m_Target: {x: -11.712889, y: -2.188706, z: -3.138106}
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: {x: -11.712889, y: -2.188706, z: -3.138106}
|
m_Value: {x: -11.712889, y: -2.188706, z: -3.138106}
|
||||||
|
=======
|
||||||
|
m_Target: {x: -3.1625144, y: 5.739222, z: -8.97646}
|
||||||
|
speed: 2
|
||||||
|
m_Value: {x: -3.1625142, y: 5.739222, z: -8.97646}
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_RenderMode: 0
|
m_RenderMode: 0
|
||||||
m_CameraMode:
|
m_CameraMode:
|
||||||
drawMode: 0
|
drawMode: 0
|
||||||
@@ -1118,7 +1283,7 @@ MonoBehaviour:
|
|||||||
m_Value: 1
|
m_Value: 1
|
||||||
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
|
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
|
||||||
m_Pivot: {x: 0, y: 0, z: 0}
|
m_Pivot: {x: 0, y: 0, z: 0}
|
||||||
m_Size: {x: 1, y: 1}
|
m_Size: {x: 0.01, y: 0.01}
|
||||||
zGrid:
|
zGrid:
|
||||||
m_Fade:
|
m_Fade:
|
||||||
m_Target: 0
|
m_Target: 0
|
||||||
@@ -1131,9 +1296,15 @@ MonoBehaviour:
|
|||||||
m_GridAxis: 1
|
m_GridAxis: 1
|
||||||
m_gridOpacity: 0.5
|
m_gridOpacity: 0.5
|
||||||
m_Rotation:
|
m_Rotation:
|
||||||
|
<<<<<<< HEAD
|
||||||
m_Target: {x: -0.10891323, y: 0.681718, z: -0.10370966, w: -0.7160146}
|
m_Target: {x: -0.10891323, y: 0.681718, z: -0.10370966, w: -0.7160146}
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: {x: -0.10891323, y: 0.68171805, z: -0.10370967, w: -0.7160146}
|
m_Value: {x: -0.10891323, y: 0.68171805, z: -0.10370967, w: -0.7160146}
|
||||||
|
=======
|
||||||
|
m_Target: {x: -0.24699703, y: -0.17415476, z: 0.04517572, w: -0.95216995}
|
||||||
|
speed: 2
|
||||||
|
m_Value: {x: -0.24842429, y: -0.1740863, z: 0.045436773, w: -0.95179564}
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_Size:
|
m_Size:
|
||||||
m_Target: 10
|
m_Target: 10
|
||||||
speed: 2
|
speed: 2
|
||||||
@@ -1158,7 +1329,11 @@ MonoBehaviour:
|
|||||||
m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0}
|
m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||||
m_LastSceneViewOrtho: 0
|
m_LastSceneViewOrtho: 0
|
||||||
m_Viewpoint:
|
m_Viewpoint:
|
||||||
|
<<<<<<< HEAD
|
||||||
m_SceneView: {fileID: 19}
|
m_SceneView: {fileID: 19}
|
||||||
|
=======
|
||||||
|
m_SceneView: {fileID: 15}
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
m_CameraOverscanSettings:
|
m_CameraOverscanSettings:
|
||||||
m_Opacity: 50
|
m_Opacity: 50
|
||||||
m_Scale: 1
|
m_Scale: 1
|
||||||
@@ -1171,7 +1346,11 @@ MonoBehaviour:
|
|||||||
name: Contributors / Receivers
|
name: Contributors / Receivers
|
||||||
section: Lighting
|
section: Lighting
|
||||||
m_ViewIsLockedToObject: 0
|
m_ViewIsLockedToObject: 0
|
||||||
|
<<<<<<< HEAD
|
||||||
--- !u!114 &20
|
--- !u!114 &20
|
||||||
|
=======
|
||||||
|
--- !u!114 &16
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
@@ -1272,7 +1451,11 @@ MonoBehaviour:
|
|||||||
m_XRRenderMode: 0
|
m_XRRenderMode: 0
|
||||||
m_RenderTexture: {fileID: 0}
|
m_RenderTexture: {fileID: 0}
|
||||||
m_showToolbar: 1
|
m_showToolbar: 1
|
||||||
|
<<<<<<< HEAD
|
||||||
--- !u!114 &21
|
--- !u!114 &21
|
||||||
|
=======
|
||||||
|
--- !u!114 &17
|
||||||
|
>>>>>>> 1d6aaca805992ec77a2f6eb1f6792f0647a5782e
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
|||||||
Reference in New Issue
Block a user