Skip to content

Commit db08a3f

Browse files
PresenceOP-CoderPresenceOP-Coder
authored
Merge branch 'main' into streak
2 parents f75ad8b + 47aee04 commit db08a3f

16 files changed

+1400
-1205
lines changed

‎Assets/Scenes/Level1.unity‎

Lines changed: 141 additions & 364 deletions
Large diffs are not rendered by default.

‎Assets/Scenes/Level2.unity‎

Lines changed: 57 additions & 227 deletions
Large diffs are not rendered by default.

‎Assets/Scenes/Level3.unity‎

Lines changed: 43 additions & 195 deletions
Large diffs are not rendered by default.

‎Assets/Scenes/Level4.unity‎

Lines changed: 44 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -528,8 +528,6 @@ MeshRenderer:
528528
m_RayTracingAccelStructBuildFlagsOverride: 0
529529
m_RayTracingAccelStructBuildFlags: 1
530530
m_SmallMeshCulling: 1
531-
m_ForceMeshLod: -1
532-
m_MeshLodSelectionBias: 0
533531
m_RenderingLayerMask: 1
534532
m_RendererPriority: 0
535533
m_Materials:
@@ -551,7 +549,6 @@ MeshRenderer:
551549
m_AutoUVMaxDistance: 0.5
552550
m_AutoUVMaxAngle: 89
553551
m_LightmapParameters: {fileID: 0}
554-
m_GlobalIlluminationMeshLod: 0
555552
m_SortingLayerID: 0
556553
m_SortingLayer: 0
557554
m_SortingOrder: 0
@@ -1266,8 +1263,6 @@ MeshRenderer:
12661263
m_RayTracingAccelStructBuildFlagsOverride: 0
12671264
m_RayTracingAccelStructBuildFlags: 1
12681265
m_SmallMeshCulling: 1
1269-
m_ForceMeshLod: -1
1270-
m_MeshLodSelectionBias: 0
12711266
m_RenderingLayerMask: 1
12721267
m_RendererPriority: 0
12731268
m_Materials:
@@ -1289,7 +1284,6 @@ MeshRenderer:
12891284
m_AutoUVMaxDistance: 0.5
12901285
m_AutoUVMaxAngle: 89
12911286
m_LightmapParameters: {fileID: 0}
1292-
m_GlobalIlluminationMeshLod: 0
12931287
m_SortingLayerID: 0
12941288
m_SortingLayer: 0
12951289
m_SortingOrder: 0
@@ -1530,8 +1524,6 @@ MeshRenderer:
15301524
m_RayTracingAccelStructBuildFlagsOverride: 0
15311525
m_RayTracingAccelStructBuildFlags: 1
15321526
m_SmallMeshCulling: 1
1533-
m_ForceMeshLod: -1
1534-
m_MeshLodSelectionBias: 0
15351527
m_RenderingLayerMask: 1
15361528
m_RendererPriority: 0
15371529
m_Materials:
@@ -1553,7 +1545,6 @@ MeshRenderer:
15531545
m_AutoUVMaxDistance: 0.5
15541546
m_AutoUVMaxAngle: 89
15551547
m_LightmapParameters: {fileID: 0}
1556-
m_GlobalIlluminationMeshLod: 0
15571548
m_SortingLayerID: 0
15581549
m_SortingLayer: 0
15591550
m_SortingOrder: 0
@@ -2787,8 +2778,6 @@ MeshRenderer:
27872778
m_RayTracingAccelStructBuildFlagsOverride: 0
27882779
m_RayTracingAccelStructBuildFlags: 1
27892780
m_SmallMeshCulling: 1
2790-
m_ForceMeshLod: -1
2791-
m_MeshLodSelectionBias: 0
27922781
m_RenderingLayerMask: 1
27932782
m_RendererPriority: 0
27942783
m_Materials:
@@ -2810,7 +2799,6 @@ MeshRenderer:
28102799
m_AutoUVMaxDistance: 0.5
28112800
m_AutoUVMaxAngle: 89
28122801
m_LightmapParameters: {fileID: 0}
2813-
m_GlobalIlluminationMeshLod: 0
28142802
m_SortingLayerID: 0
28152803
m_SortingLayer: 0
28162804
m_SortingOrder: 0
@@ -3945,8 +3933,6 @@ MeshRenderer:
39453933
m_RayTracingAccelStructBuildFlagsOverride: 0
39463934
m_RayTracingAccelStructBuildFlags: 1
39473935
m_SmallMeshCulling: 1
3948-
m_ForceMeshLod: -1
3949-
m_MeshLodSelectionBias: 0
39503936
m_RenderingLayerMask: 1
39513937
m_RendererPriority: 0
39523938
m_Materials:
@@ -3968,7 +3954,6 @@ MeshRenderer:
39683954
m_AutoUVMaxDistance: 0.5
39693955
m_AutoUVMaxAngle: 89
39703956
m_LightmapParameters: {fileID: 0}
3971-
m_GlobalIlluminationMeshLod: 0
39723957
m_SortingLayerID: 0
39733958
m_SortingLayer: 0
39743959
m_SortingOrder: 0
@@ -4139,8 +4124,6 @@ MeshRenderer:
41394124
m_RayTracingAccelStructBuildFlagsOverride: 0
41404125
m_RayTracingAccelStructBuildFlags: 1
41414126
m_SmallMeshCulling: 1
4142-
m_ForceMeshLod: -1
4143-
m_MeshLodSelectionBias: 0
41444127
m_RenderingLayerMask: 1
41454128
m_RendererPriority: 0
41464129
m_Materials:
@@ -4162,7 +4145,6 @@ MeshRenderer:
41624145
m_AutoUVMaxDistance: 0.5
41634146
m_AutoUVMaxAngle: 89
41644147
m_LightmapParameters: {fileID: 0}
4165-
m_GlobalIlluminationMeshLod: 0
41664148
m_SortingLayerID: 0
41674149
m_SortingLayer: 0
41684150
m_SortingOrder: 0
@@ -4339,14 +4321,14 @@ MonoBehaviour:
43394321
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
43404322
m_RequiresDepthTexture: 0
43414323
m_RequiresColorTexture: 0
4324+
m_Version: 2
43424325
m_TaaSettings:
43434326
m_Quality: 3
43444327
m_FrameInfluence: 0.1
43454328
m_JitterScale: 1
43464329
m_MipBias: 0
43474330
m_VarianceClampScale: 0.9
43484331
m_ContrastAdaptiveSharpening: 0
4349-
m_Version: 2
43504332
--- !u!81 &1090058344
43514333
AudioListener:
43524334
m_ObjectHideFlags: 0
@@ -4439,6 +4421,8 @@ GameObject:
44394421
- component: {fileID: 1106560895}
44404422
- component: {fileID: 1106560896}
44414423
- component: {fileID: 1106560897}
4424+
- component: {fileID: 1106560898}
4425+
- component: {fileID: 1106560899}
44424426
m_Layer: 0
44434427
m_Name: Player
44444428
m_TagString: Player
@@ -4518,10 +4502,10 @@ Rigidbody:
45184502
m_PrefabInstance: {fileID: 0}
45194503
m_PrefabAsset: {fileID: 0}
45204504
m_GameObject: {fileID: 1106560884}
4521-
serializedVersion: 5
4505+
serializedVersion: 4
45224506
m_Mass: 1
4523-
m_LinearDamping: 0
4524-
m_AngularDamping: 0.05
4507+
m_Drag: 0
4508+
m_AngularDrag: 0.05
45254509
m_CenterOfMass: {x: 0, y: 0, z: 0}
45264510
m_InertiaTensor: {x: 1, y: 1, z: 1}
45274511
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -4579,8 +4563,6 @@ MeshRenderer:
45794563
m_RayTracingAccelStructBuildFlagsOverride: 0
45804564
m_RayTracingAccelStructBuildFlags: 1
45814565
m_SmallMeshCulling: 1
4582-
m_ForceMeshLod: -1
4583-
m_MeshLodSelectionBias: 0
45844566
m_RenderingLayerMask: 1
45854567
m_RendererPriority: 0
45864568
m_Materials:
@@ -4602,7 +4584,6 @@ MeshRenderer:
46024584
m_AutoUVMaxDistance: 0.5
46034585
m_AutoUVMaxAngle: 89
46044586
m_LightmapParameters: {fileID: 0}
4605-
m_GlobalIlluminationMeshLod: 0
46064587
m_SortingLayerID: 0
46074588
m_SortingLayer: 0
46084589
m_SortingOrder: 0
@@ -4698,8 +4679,6 @@ TrailRenderer:
46984679
m_RayTracingAccelStructBuildFlagsOverride: 0
46994680
m_RayTracingAccelStructBuildFlags: 1
47004681
m_SmallMeshCulling: 1
4701-
m_ForceMeshLod: -1
4702-
m_MeshLodSelectionBias: 0
47034682
m_RenderingLayerMask: 1
47044683
m_RendererPriority: 0
47054684
m_Materials:
@@ -4721,7 +4700,6 @@ TrailRenderer:
47214700
m_AutoUVMaxDistance: 0.5
47224701
m_AutoUVMaxAngle: 89
47234702
m_LightmapParameters: {fileID: 0}
4724-
m_GlobalIlluminationMeshLod: 0
47254703
m_SortingLayerID: 0
47264704
m_SortingLayer: 0
47274705
m_SortingOrder: 0
@@ -4787,6 +4765,36 @@ TrailRenderer:
47874765
m_Autodestruct: 0
47884766
m_Emitting: 1
47894767
m_ApplyActiveColorSpace: 1
4768+
--- !u!114 &1106560898
4769+
MonoBehaviour:
4770+
m_ObjectHideFlags: 0
4771+
m_CorrespondingSourceObject: {fileID: 0}
4772+
m_PrefabInstance: {fileID: 0}
4773+
m_PrefabAsset: {fileID: 0}
4774+
m_GameObject: {fileID: 1106560884}
4775+
m_Enabled: 1
4776+
m_EditorHideFlags: 0
4777+
m_Script: {fileID: 11500000, guid: 73d6eeca99fa1d74e8cab3e70210ae35, type: 3}
4778+
m_Name:
4779+
m_EditorClassIdentifier:
4780+
cubeMesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
4781+
sphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
4782+
capsuleMesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
4783+
--- !u!114 &1106560899
4784+
MonoBehaviour:
4785+
m_ObjectHideFlags: 0
4786+
m_CorrespondingSourceObject: {fileID: 0}
4787+
m_PrefabInstance: {fileID: 0}
4788+
m_PrefabAsset: {fileID: 0}
4789+
m_GameObject: {fileID: 1106560884}
4790+
m_Enabled: 1
4791+
m_EditorHideFlags: 0
4792+
m_Script: {fileID: 11500000, guid: 73d6eeca99fa1d74e8cab3e70210ae35, type: 3}
4793+
m_Name:
4794+
m_EditorClassIdentifier:
4795+
cubeMesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
4796+
sphereMesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
4797+
capsuleMesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
47904798
--- !u!1 &1110252937
47914799
GameObject:
47924800
m_ObjectHideFlags: 0
@@ -5397,8 +5405,6 @@ MeshRenderer:
53975405
m_RayTracingAccelStructBuildFlagsOverride: 0
53985406
m_RayTracingAccelStructBuildFlags: 1
53995407
m_SmallMeshCulling: 1
5400-
m_ForceMeshLod: -1
5401-
m_MeshLodSelectionBias: 0
54025408
m_RenderingLayerMask: 1
54035409
m_RendererPriority: 0
54045410
m_Materials:
@@ -5420,7 +5426,6 @@ MeshRenderer:
54205426
m_AutoUVMaxDistance: 0.5
54215427
m_AutoUVMaxAngle: 89
54225428
m_LightmapParameters: {fileID: 0}
5423-
m_GlobalIlluminationMeshLod: 0
54245429
m_SortingLayerID: 0
54255430
m_SortingLayer: 0
54265431
m_SortingOrder: 0
@@ -5525,8 +5530,6 @@ MeshRenderer:
55255530
m_RayTracingAccelStructBuildFlagsOverride: 0
55265531
m_RayTracingAccelStructBuildFlags: 1
55275532
m_SmallMeshCulling: 1
5528-
m_ForceMeshLod: -1
5529-
m_MeshLodSelectionBias: 0
55305533
m_RenderingLayerMask: 1
55315534
m_RendererPriority: 0
55325535
m_Materials:
@@ -5548,7 +5551,6 @@ MeshRenderer:
55485551
m_AutoUVMaxDistance: 0.5
55495552
m_AutoUVMaxAngle: 89
55505553
m_LightmapParameters: {fileID: 0}
5551-
m_GlobalIlluminationMeshLod: 0
55525554
m_SortingLayerID: 0
55535555
m_SortingLayer: 0
55545556
m_SortingOrder: 0
@@ -5755,8 +5757,6 @@ MeshRenderer:
57555757
m_RayTracingAccelStructBuildFlagsOverride: 0
57565758
m_RayTracingAccelStructBuildFlags: 1
57575759
m_SmallMeshCulling: 1
5758-
m_ForceMeshLod: -1
5759-
m_MeshLodSelectionBias: 0
57605760
m_RenderingLayerMask: 1
57615761
m_RendererPriority: 0
57625762
m_Materials:
@@ -5778,7 +5778,6 @@ MeshRenderer:
57785778
m_AutoUVMaxDistance: 0.5
57795779
m_AutoUVMaxAngle: 89
57805780
m_LightmapParameters: {fileID: 0}
5781-
m_GlobalIlluminationMeshLod: 0
57825781
m_SortingLayerID: 0
57835782
m_SortingLayer: 0
57845783
m_SortingOrder: 0
@@ -6365,8 +6364,6 @@ MeshRenderer:
63656364
m_RayTracingAccelStructBuildFlagsOverride: 0
63666365
m_RayTracingAccelStructBuildFlags: 1
63676366
m_SmallMeshCulling: 1
6368-
m_ForceMeshLod: -1
6369-
m_MeshLodSelectionBias: 0
63706367
m_RenderingLayerMask: 1
63716368
m_RendererPriority: 0
63726369
m_Materials:
@@ -6388,7 +6385,6 @@ MeshRenderer:
63886385
m_AutoUVMaxDistance: 0.5
63896386
m_AutoUVMaxAngle: 89
63906387
m_LightmapParameters: {fileID: 0}
6391-
m_GlobalIlluminationMeshLod: 0
63926388
m_SortingLayerID: 0
63936389
m_SortingLayer: 0
63946390
m_SortingOrder: 0
@@ -6478,8 +6474,6 @@ MeshRenderer:
64786474
m_RayTracingAccelStructBuildFlagsOverride: 0
64796475
m_RayTracingAccelStructBuildFlags: 1
64806476
m_SmallMeshCulling: 1
6481-
m_ForceMeshLod: -1
6482-
m_MeshLodSelectionBias: 0
64836477
m_RenderingLayerMask: 1
64846478
m_RendererPriority: 0
64856479
m_Materials:
@@ -6501,7 +6495,6 @@ MeshRenderer:
65016495
m_AutoUVMaxDistance: 0.5
65026496
m_AutoUVMaxAngle: 89
65036497
m_LightmapParameters: {fileID: 0}
6504-
m_GlobalIlluminationMeshLod: 0
65056498
m_SortingLayerID: 0
65066499
m_SortingLayer: 0
65076500
m_SortingOrder: 0
@@ -6775,9 +6768,14 @@ MonoBehaviour:
67756768
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
67766769
m_Name:
67776770
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData
6771+
m_Version: 4
67786772
m_UsePipelineSettings: 1
67796773
m_AdditionalLightsShadowResolutionTier: 2
6774+
m_LightLayerMask: 1
6775+
m_RenderingLayers: 1
67806776
m_CustomShadowLayers: 0
6777+
m_ShadowLayerMask: 1
6778+
m_ShadowRenderingLayers: 1
67816779
m_LightCookieSize: {x: 1, y: 1}
67826780
m_LightCookieOffset: {x: 0, y: 0}
67836781
m_SoftShadowQuality: 0
@@ -7040,8 +7038,6 @@ MeshRenderer:
70407038
m_RayTracingAccelStructBuildFlagsOverride: 0
70417039
m_RayTracingAccelStructBuildFlags: 1
70427040
m_SmallMeshCulling: 1
7043-
m_ForceMeshLod: -1
7044-
m_MeshLodSelectionBias: 0
70457041
m_RenderingLayerMask: 1
70467042
m_RendererPriority: 0
70477043
m_Materials:
@@ -7063,7 +7059,6 @@ MeshRenderer:
70637059
m_AutoUVMaxDistance: 0.5
70647060
m_AutoUVMaxAngle: 89
70657061
m_LightmapParameters: {fileID: 0}
7066-
m_GlobalIlluminationMeshLod: 0
70677062
m_SortingLayerID: 0
70687063
m_SortingLayer: 0
70697064
m_SortingOrder: 0
@@ -7098,10 +7093,10 @@ Rigidbody:
70987093
m_PrefabInstance: {fileID: 0}
70997094
m_PrefabAsset: {fileID: 0}
71007095
m_GameObject: {fileID: 1687870659}
7101-
serializedVersion: 5
7096+
serializedVersion: 4
71027097
m_Mass: 1
7103-
m_LinearDamping: 0
7104-
m_AngularDamping: 0.05
7098+
m_Drag: 0
7099+
m_AngularDrag: 0.05
71057100
m_CenterOfMass: {x: 0, y: 0, z: 0}
71067101
m_InertiaTensor: {x: 1, y: 1, z: 1}
71077102
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -7397,8 +7392,6 @@ MeshRenderer:
73977392
m_RayTracingAccelStructBuildFlagsOverride: 0
73987393
m_RayTracingAccelStructBuildFlags: 1
73997394
m_SmallMeshCulling: 1
7400-
m_ForceMeshLod: -1
7401-
m_MeshLodSelectionBias: 0
74027395
m_RenderingLayerMask: 1
74037396
m_RendererPriority: 0
74047397
m_Materials:
@@ -7420,7 +7413,6 @@ MeshRenderer:
74207413
m_AutoUVMaxDistance: 0.5
74217414
m_AutoUVMaxAngle: 89
74227415
m_LightmapParameters: {fileID: 0}
7423-
m_GlobalIlluminationMeshLod: 0
74247416
m_SortingLayerID: 0
74257417
m_SortingLayer: 0
74267418
m_SortingOrder: 0
@@ -7696,8 +7688,6 @@ MeshRenderer:
76967688
m_RayTracingAccelStructBuildFlagsOverride: 0
76977689
m_RayTracingAccelStructBuildFlags: 1
76987690
m_SmallMeshCulling: 1
7699-
m_ForceMeshLod: -1
7700-
m_MeshLodSelectionBias: 0
77017691
m_RenderingLayerMask: 1
77027692
m_RendererPriority: 0
77037693
m_Materials:
@@ -7719,7 +7709,6 @@ MeshRenderer:
77197709
m_AutoUVMaxDistance: 0.5
77207710
m_AutoUVMaxAngle: 89
77217711
m_LightmapParameters: {fileID: 0}
7722-
m_GlobalIlluminationMeshLod: 0
77237712
m_SortingLayerID: 0
77247713
m_SortingLayer: 0
77257714
m_SortingOrder: 0
@@ -8131,8 +8120,6 @@ MeshRenderer:
81318120
m_RayTracingAccelStructBuildFlagsOverride: 0
81328121
m_RayTracingAccelStructBuildFlags: 1
81338122
m_SmallMeshCulling: 1
8134-
m_ForceMeshLod: -1
8135-
m_MeshLodSelectionBias: 0
81368123
m_RenderingLayerMask: 1
81378124
m_RendererPriority: 0
81388125
m_Materials:
@@ -8154,7 +8141,6 @@ MeshRenderer:
81548141
m_AutoUVMaxDistance: 0.5
81558142
m_AutoUVMaxAngle: 89
81568143
m_LightmapParameters: {fileID: 0}
8157-
m_GlobalIlluminationMeshLod: 0
81588144
m_SortingLayerID: 0
81598145
m_SortingLayer: 0
81608146
m_SortingOrder: 0

0 commit comments

Comments
 (0)