Skip to content

Commit b72b72b

Browse files
authored
Merge pull request #15 from IJEMIN/update-2023.2
Update 2023.2
2 parents 5ed0102 + e3723c4 commit b72b72b

687 files changed

Lines changed: 161355 additions & 6781 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

01/Done/Hello Unity/Assets/Scenes/SampleScene.unity

Lines changed: 104 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 9
16+
serializedVersion: 10
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -38,13 +38,12 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 1526980366}
41-
m_IndirectSpecularColor: {r: 0.44657838, g: 0.49641234, b: 0.57481676, a: 1}
41+
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
4545
m_ObjectHideFlags: 0
46-
serializedVersion: 11
47-
m_GIWorkflowMode: 0
46+
serializedVersion: 12
4847
m_GISettings:
4948
serializedVersion: 2
5049
m_BounceScale: 1
@@ -67,9 +66,6 @@ LightmapSettings:
6766
m_LightmapParameters: {fileID: 0}
6867
m_LightmapsBakeMode: 1
6968
m_TextureCompression: 1
70-
m_FinalGather: 0
71-
m_FinalGatherFiltering: 1
72-
m_FinalGatherRayCount: 256
7369
m_ReflectionCompression: 2
7470
m_MixedBakeMode: 2
7571
m_BakeBackend: 1
@@ -94,16 +90,18 @@ LightmapSettings:
9490
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
9591
m_PVRFilteringAtrousPositionSigmaIndirect: 2
9692
m_PVRFilteringAtrousPositionSigmaAO: 1
97-
m_ShowResolutionOverlay: 1
9893
m_ExportTrainingData: 0
94+
m_TrainingDataDestination: TrainingData
95+
m_LightProbeSampleCountMultiplier: 4
9996
m_LightingDataAsset: {fileID: 0}
100-
m_UseShadowmask: 1
97+
m_LightingSettings: {fileID: 4890085278179872738, guid: cd26a50145663405f838642adea526a8,
98+
type: 2}
10199
--- !u!196 &4
102100
NavMeshSettings:
103101
serializedVersion: 2
104102
m_ObjectHideFlags: 0
105103
m_BuildSettings:
106-
serializedVersion: 2
104+
serializedVersion: 3
107105
agentTypeID: 0
108106
agentRadius: 0.5
109107
agentHeight: 2
@@ -116,7 +114,9 @@ NavMeshSettings:
116114
cellSize: 0.16666667
117115
manualTileSize: 0
118116
tileSize: 256
119-
accuratePlacement: 0
117+
buildHeightMesh: 0
118+
maxJobWorkers: 0
119+
preserveTilesOutsideBounds: 0
120120
debug:
121121
m_Flags: 0
122122
m_NavMeshData: {fileID: 0}
@@ -160,9 +160,17 @@ Camera:
160160
m_projectionMatrixMode: 1
161161
m_GateFitMode: 2
162162
m_FOVAxisMode: 0
163+
m_Iso: 200
164+
m_ShutterSpeed: 0.005
165+
m_Aperture: 16
166+
m_FocusDistance: 10
167+
m_FocalLength: 50
168+
m_BladeCount: 5
169+
m_Curvature: {x: 2, y: 11}
170+
m_BarrelClipping: 0.25
171+
m_Anamorphism: 0
163172
m_SensorSize: {x: 36, y: 24}
164173
m_LensShift: {x: 0, y: 0}
165-
m_FocalLength: 50
166174
m_NormalizedViewPortRect:
167175
serializedVersion: 2
168176
x: 0
@@ -196,12 +204,13 @@ Transform:
196204
m_PrefabInstance: {fileID: 0}
197205
m_PrefabAsset: {fileID: 0}
198206
m_GameObject: {fileID: 282840810}
207+
serializedVersion: 2
199208
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
200209
m_LocalPosition: {x: 0, y: 1, z: -10}
201210
m_LocalScale: {x: 1, y: 1, z: 1}
211+
m_ConstrainProportionsScale: 0
202212
m_Children: []
203213
m_Father: {fileID: 0}
204-
m_RootOrder: 0
205214
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
206215
--- !u!1 &763985891
207216
GameObject:
@@ -231,9 +240,17 @@ BoxCollider:
231240
m_PrefabAsset: {fileID: 0}
232241
m_GameObject: {fileID: 763985891}
233242
m_Material: {fileID: 0}
243+
m_IncludeLayers:
244+
serializedVersion: 2
245+
m_Bits: 0
246+
m_ExcludeLayers:
247+
serializedVersion: 2
248+
m_Bits: 0
249+
m_LayerOverridePriority: 0
234250
m_IsTrigger: 0
251+
m_ProvidesContacts: 0
235252
m_Enabled: 1
236-
serializedVersion: 2
253+
serializedVersion: 3
237254
m_Size: {x: 1, y: 1, z: 1}
238255
m_Center: {x: 0, y: 0, z: 0}
239256
--- !u!23 &763985893
@@ -247,9 +264,14 @@ MeshRenderer:
247264
m_CastShadows: 1
248265
m_ReceiveShadows: 1
249266
m_DynamicOccludee: 1
267+
m_StaticShadowCaster: 0
250268
m_MotionVectors: 1
251269
m_LightProbeUsage: 1
252270
m_ReflectionProbeUsage: 1
271+
m_RayTracingMode: 2
272+
m_RayTraceProcedural: 0
273+
m_RayTracingAccelStructBuildFlagsOverride: 0
274+
m_RayTracingAccelStructBuildFlags: 1
253275
m_RenderingLayerMask: 4294967295
254276
m_RendererPriority: 0
255277
m_Materials:
@@ -261,6 +283,7 @@ MeshRenderer:
261283
m_ProbeAnchor: {fileID: 0}
262284
m_LightProbeVolumeOverride: {fileID: 0}
263285
m_ScaleInLightmap: 1
286+
m_ReceiveGI: 1
264287
m_PreserveUVs: 0
265288
m_IgnoreNormalsForChartDetection: 0
266289
m_ImportantGI: 0
@@ -273,6 +296,7 @@ MeshRenderer:
273296
m_SortingLayerID: 0
274297
m_SortingLayer: 0
275298
m_SortingOrder: 0
299+
m_AdditionalVertexStreams: {fileID: 0}
276300
--- !u!33 &763985894
277301
MeshFilter:
278302
m_ObjectHideFlags: 0
@@ -288,12 +312,13 @@ Transform:
288312
m_PrefabInstance: {fileID: 0}
289313
m_PrefabAsset: {fileID: 0}
290314
m_GameObject: {fileID: 763985891}
315+
serializedVersion: 2
291316
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
292317
m_LocalPosition: {x: 0, y: 3, z: 0}
293318
m_LocalScale: {x: 1, y: 1, z: 1}
319+
m_ConstrainProportionsScale: 0
294320
m_Children: []
295321
m_Father: {fileID: 0}
296-
m_RootOrder: 2
297322
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
298323
--- !u!54 &763985896
299324
Rigidbody:
@@ -302,10 +327,21 @@ Rigidbody:
302327
m_PrefabInstance: {fileID: 0}
303328
m_PrefabAsset: {fileID: 0}
304329
m_GameObject: {fileID: 763985891}
305-
serializedVersion: 2
330+
serializedVersion: 4
306331
m_Mass: 1
307332
m_Drag: 0
308333
m_AngularDrag: 0.05
334+
m_CenterOfMass: {x: 0, y: 0, z: 0}
335+
m_InertiaTensor: {x: 1, y: 1, z: 1}
336+
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
337+
m_IncludeLayers:
338+
serializedVersion: 2
339+
m_Bits: 0
340+
m_ExcludeLayers:
341+
serializedVersion: 2
342+
m_Bits: 0
343+
m_ImplicitCom: 1
344+
m_ImplicitTensor: 1
309345
m_UseGravity: 1
310346
m_IsKinematic: 0
311347
m_Interpolate: 0
@@ -338,11 +374,19 @@ MeshCollider:
338374
m_PrefabAsset: {fileID: 0}
339375
m_GameObject: {fileID: 1439734678}
340376
m_Material: {fileID: 0}
377+
m_IncludeLayers:
378+
serializedVersion: 2
379+
m_Bits: 0
380+
m_ExcludeLayers:
381+
serializedVersion: 2
382+
m_Bits: 0
383+
m_LayerOverridePriority: 0
341384
m_IsTrigger: 0
385+
m_ProvidesContacts: 0
342386
m_Enabled: 1
343-
serializedVersion: 3
387+
serializedVersion: 5
344388
m_Convex: 0
345-
m_CookingOptions: 14
389+
m_CookingOptions: 30
346390
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
347391
--- !u!23 &1439734680
348392
MeshRenderer:
@@ -355,9 +399,14 @@ MeshRenderer:
355399
m_CastShadows: 1
356400
m_ReceiveShadows: 1
357401
m_DynamicOccludee: 1
402+
m_StaticShadowCaster: 0
358403
m_MotionVectors: 1
359404
m_LightProbeUsage: 1
360405
m_ReflectionProbeUsage: 1
406+
m_RayTracingMode: 2
407+
m_RayTraceProcedural: 0
408+
m_RayTracingAccelStructBuildFlagsOverride: 0
409+
m_RayTracingAccelStructBuildFlags: 1
361410
m_RenderingLayerMask: 4294967295
362411
m_RendererPriority: 0
363412
m_Materials:
@@ -369,6 +418,7 @@ MeshRenderer:
369418
m_ProbeAnchor: {fileID: 0}
370419
m_LightProbeVolumeOverride: {fileID: 0}
371420
m_ScaleInLightmap: 1
421+
m_ReceiveGI: 1
372422
m_PreserveUVs: 0
373423
m_IgnoreNormalsForChartDetection: 0
374424
m_ImportantGI: 0
@@ -381,6 +431,7 @@ MeshRenderer:
381431
m_SortingLayerID: 0
382432
m_SortingLayer: 0
383433
m_SortingOrder: 0
434+
m_AdditionalVertexStreams: {fileID: 0}
384435
--- !u!33 &1439734681
385436
MeshFilter:
386437
m_ObjectHideFlags: 0
@@ -396,12 +447,13 @@ Transform:
396447
m_PrefabInstance: {fileID: 0}
397448
m_PrefabAsset: {fileID: 0}
398449
m_GameObject: {fileID: 1439734678}
450+
serializedVersion: 2
399451
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
400452
m_LocalPosition: {x: 0, y: 0, z: 0}
401453
m_LocalScale: {x: 1, y: 1, z: 1}
454+
m_ConstrainProportionsScale: 0
402455
m_Children: []
403456
m_Father: {fileID: 0}
404-
m_RootOrder: 3
405457
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
406458
--- !u!1 &1526980365
407459
GameObject:
@@ -428,7 +480,7 @@ Light:
428480
m_PrefabAsset: {fileID: 0}
429481
m_GameObject: {fileID: 1526980365}
430482
m_Enabled: 1
431-
serializedVersion: 9
483+
serializedVersion: 11
432484
m_Type: 1
433485
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
434486
m_Intensity: 1
@@ -444,19 +496,41 @@ Light:
444496
m_Bias: 0.005
445497
m_NormalBias: 0.1
446498
m_NearPlane: 5
499+
m_CullingMatrixOverride:
500+
e00: 1
501+
e01: 0
502+
e02: 0
503+
e03: 0
504+
e10: 0
505+
e11: 1
506+
e12: 0
507+
e13: 0
508+
e20: 0
509+
e21: 0
510+
e22: 1
511+
e23: 0
512+
e30: 0
513+
e31: 0
514+
e32: 0
515+
e33: 1
516+
m_UseCullingMatrixOverride: 0
447517
m_Cookie: {fileID: 0}
448518
m_DrawHalo: 0
449519
m_Flare: {fileID: 0}
450520
m_RenderMode: 0
451521
m_CullingMask:
452522
serializedVersion: 2
453523
m_Bits: 4294967295
524+
m_RenderingLayerMask: 1
454525
m_Lightmapping: 1
455526
m_LightShadowCasterMode: 0
456527
m_AreaSize: {x: 1, y: 1}
457528
m_BounceIntensity: 1
458529
m_ColorTemperature: 6570
459530
m_UseColorTemperature: 0
531+
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
532+
m_UseBoundingSphereOverride: 0
533+
m_UseViewFrustumForShadowCasterCull: 1
460534
m_ShadowRadius: 0
461535
m_ShadowAngle: 0
462536
--- !u!4 &1526980367
@@ -466,10 +540,19 @@ Transform:
466540
m_PrefabInstance: {fileID: 0}
467541
m_PrefabAsset: {fileID: 0}
468542
m_GameObject: {fileID: 1526980365}
543+
serializedVersion: 2
469544
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
470545
m_LocalPosition: {x: 0, y: 3, z: 0}
471546
m_LocalScale: {x: 1, y: 1, z: 1}
547+
m_ConstrainProportionsScale: 0
472548
m_Children: []
473549
m_Father: {fileID: 0}
474-
m_RootOrder: 1
475550
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
551+
--- !u!1660057539 &9223372036854775807
552+
SceneRoots:
553+
m_ObjectHideFlags: 0
554+
m_Roots:
555+
- {fileID: 282840814}
556+
- {fileID: 1526980367}
557+
- {fileID: 763985895}
558+
- {fileID: 1439734682}
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!850595691 &4890085278179872738
4+
LightingSettings:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: SampleSceneSettings
10+
serializedVersion: 8
11+
m_EnableBakedLightmaps: 1
12+
m_EnableRealtimeLightmaps: 1
13+
m_RealtimeEnvironmentLighting: 1
14+
m_BounceScale: 1
15+
m_AlbedoBoost: 1
16+
m_IndirectOutputScale: 1
17+
m_UsingShadowmask: 1
18+
m_BakeBackend: 1
19+
m_LightmapMaxSize: 1024
20+
m_LightmapSizeFixed: 0
21+
m_UseMipmapLimits: 1
22+
m_BakeResolution: 40
23+
m_Padding: 2
24+
m_LightmapCompression: 3
25+
m_AO: 0
26+
m_AOMaxDistance: 1
27+
m_CompAOExponent: 1
28+
m_CompAOExponentDirect: 0
29+
m_ExtractAO: 0
30+
m_MixedBakeMode: 2
31+
m_LightmapsBakeMode: 1
32+
m_FilterMode: 1
33+
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
34+
m_ExportTrainingData: 0
35+
m_TrainingDataDestination: TrainingData
36+
m_RealtimeResolution: 2
37+
m_ForceWhiteAlbedo: 0
38+
m_ForceUpdates: 0
39+
m_PVRCulling: 1
40+
m_PVRSampling: 1
41+
m_PVRDirectSampleCount: 32
42+
m_PVRSampleCount: 512
43+
m_PVREnvironmentSampleCount: 256
44+
m_PVREnvironmentReferencePointCount: 2048
45+
m_LightProbeSampleCountMultiplier: 4
46+
m_PVRBounces: 2
47+
m_PVRMinBounces: 2
48+
m_PVREnvironmentImportanceSampling: 1
49+
m_PVRFilteringMode: 1
50+
m_PVRDenoiserTypeDirect: 1
51+
m_PVRDenoiserTypeIndirect: 1
52+
m_PVRDenoiserTypeAO: 1
53+
m_PVRFilterTypeDirect: 0
54+
m_PVRFilterTypeIndirect: 0
55+
m_PVRFilterTypeAO: 0
56+
m_PVRFilteringGaussRadiusDirect: 1
57+
m_PVRFilteringGaussRadiusIndirect: 5
58+
m_PVRFilteringGaussRadiusAO: 2
59+
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
60+
m_PVRFilteringAtrousPositionSigmaIndirect: 2
61+
m_PVRFilteringAtrousPositionSigmaAO: 1
62+
m_RespectSceneVisibilityWhenBakingGI: 0

0 commit comments

Comments
 (0)