Skip to content

Commit c348fd3

Browse files
adamgrahamadamgraham
committed
Upgrade to Unity 2020.2.1f1
1 parent 35e00af commit c348fd3

8 files changed

+219
-81
lines changed

Diff for: ‎Assets/Scenes/Asteroids.unity

+90-17
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RenderSettings:
4343
--- !u!157 &3
4444
LightmapSettings:
4545
m_ObjectHideFlags: 0
46-
serializedVersion: 11
46+
serializedVersion: 12
4747
m_GIWorkflowMode: 1
4848
m_GISettings:
4949
serializedVersion: 2
@@ -98,7 +98,8 @@ LightmapSettings:
9898
m_TrainingDataDestination: TrainingData
9999
m_LightProbeSampleCountMultiplier: 4
100100
m_LightingDataAsset: {fileID: 0}
101-
m_UseShadowmask: 1
101+
m_LightingSettings: {fileID: 4890085278179872738, guid: 5ecbc974358be7d45ba5763d3b6d5fde,
102+
type: 2}
102103
--- !u!196 &4
103104
NavMeshSettings:
104105
serializedVersion: 2
@@ -118,6 +119,8 @@ NavMeshSettings:
118119
manualTileSize: 0
119120
tileSize: 256
120121
accuratePlacement: 0
122+
maxJobWorkers: 0
123+
preserveTilesOutsideBounds: 0
121124
debug:
122125
m_Flags: 0
123126
m_NavMeshData: {fileID: 0}
@@ -267,6 +270,7 @@ MonoBehaviour:
267270
m_Material: {fileID: 0}
268271
m_Color: {r: 1, g: 1, b: 1, a: 1}
269272
m_RaycastTarget: 1
273+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
270274
m_Maskable: 1
271275
m_OnCullStateChanged:
272276
m_PersistentCalls:
@@ -602,6 +606,7 @@ SpriteRenderer:
602606
m_LightProbeUsage: 1
603607
m_ReflectionProbeUsage: 1
604608
m_RayTracingMode: 0
609+
m_RayTraceProcedural: 0
605610
m_RenderingLayerMask: 1
606611
m_RendererPriority: 0
607612
m_Materials:
@@ -725,6 +730,7 @@ MonoBehaviour:
725730
m_FallbackScreenDPI: 96
726731
m_DefaultSpriteDPI: 96
727732
m_DynamicPixelsPerUnit: 1
733+
m_PresetInfoIsWorld: 0
728734
--- !u!223 &556392475
729735
Canvas:
730736
m_ObjectHideFlags: 0
@@ -867,11 +873,11 @@ ParticleSystemRenderer:
867873
m_LightProbeUsage: 0
868874
m_ReflectionProbeUsage: 0
869875
m_RayTracingMode: 0
876+
m_RayTraceProcedural: 0
870877
m_RenderingLayerMask: 1
871878
m_RendererPriority: 0
872879
m_Materials:
873880
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
874-
- {fileID: 0}
875881
m_StaticBatchInfo:
876882
firstSubMesh: 0
877883
subMeshCount: 0
@@ -909,6 +915,8 @@ ParticleSystemRenderer:
909915
m_EnableGPUInstancing: 1
910916
m_ApplyActiveColorSpace: 1
911917
m_AllowRoll: 1
918+
m_FreeformStretching: 0
919+
m_RotateWithStretchDirection: 1
912920
m_VertexStreams: 00010304
913921
m_Mesh: {fileID: 0}
914922
m_Mesh1: {fileID: 0}
@@ -922,7 +930,7 @@ ParticleSystem:
922930
m_PrefabInstance: {fileID: 0}
923931
m_PrefabAsset: {fileID: 0}
924932
m_GameObject: {fileID: 945290019}
925-
serializedVersion: 6
933+
serializedVersion: 7
926934
lengthInSec: 1
927935
simulationSpeed: 1
928936
stopAction: 0
@@ -3066,6 +3074,62 @@ ParticleSystem:
30663074
m_PreInfinity: 2
30673075
m_PostInfinity: 2
30683076
m_RotationOrder: 4
3077+
LifetimeByEmitterSpeedModule:
3078+
enabled: 0
3079+
m_Curve:
3080+
serializedVersion: 2
3081+
minMaxState: 1
3082+
scalar: 1
3083+
minScalar: 1
3084+
maxCurve:
3085+
serializedVersion: 2
3086+
m_Curve:
3087+
- serializedVersion: 3
3088+
time: 0
3089+
value: 1
3090+
inSlope: 0
3091+
outSlope: -0.8
3092+
tangentMode: 0
3093+
weightedMode: 0
3094+
inWeight: 0.33333334
3095+
outWeight: 0.33333334
3096+
- serializedVersion: 3
3097+
time: 1
3098+
value: 0.2
3099+
inSlope: -0.8
3100+
outSlope: 0
3101+
tangentMode: 0
3102+
weightedMode: 0
3103+
inWeight: 0.33333334
3104+
outWeight: 0.33333334
3105+
m_PreInfinity: 2
3106+
m_PostInfinity: 2
3107+
m_RotationOrder: 4
3108+
minCurve:
3109+
serializedVersion: 2
3110+
m_Curve:
3111+
- serializedVersion: 3
3112+
time: 0
3113+
value: 1
3114+
inSlope: 0
3115+
outSlope: 0
3116+
tangentMode: 0
3117+
weightedMode: 0
3118+
inWeight: 0.33333334
3119+
outWeight: 0.33333334
3120+
- serializedVersion: 3
3121+
time: 1
3122+
value: 1
3123+
inSlope: 0
3124+
outSlope: 0
3125+
tangentMode: 0
3126+
weightedMode: 0
3127+
inWeight: 0.33333334
3128+
outWeight: 0.33333334
3129+
m_PreInfinity: 2
3130+
m_PostInfinity: 2
3131+
m_RotationOrder: 4
3132+
m_Range: {x: 0, y: 1}
30693133
ForceModule:
30703134
enabled: 0
30713135
x:
@@ -4496,19 +4560,20 @@ ParticleSystem:
44964560
range: {x: 0, y: 1}
44974561
CollisionModule:
44984562
enabled: 0
4499-
serializedVersion: 3
4563+
serializedVersion: 4
45004564
type: 0
45014565
collisionMode: 0
45024566
colliderForce: 0
45034567
multiplyColliderForceByParticleSize: 0
45044568
multiplyColliderForceByParticleSpeed: 0
45054569
multiplyColliderForceByCollisionAngle: 1
4506-
plane0: {fileID: 0}
4507-
plane1: {fileID: 0}
4508-
plane2: {fileID: 0}
4509-
plane3: {fileID: 0}
4510-
plane4: {fileID: 0}
4511-
plane5: {fileID: 0}
4570+
m_Planes:
4571+
- {fileID: 0}
4572+
- {fileID: 0}
4573+
- {fileID: 0}
4574+
- {fileID: 0}
4575+
- {fileID: 0}
4576+
- {fileID: 0}
45124577
m_Dampen:
45134578
serializedVersion: 2
45144579
minMaxState: 0
@@ -4682,17 +4747,20 @@ ParticleSystem:
46824747
interiorCollisions: 0
46834748
TriggerModule:
46844749
enabled: 0
4685-
collisionShape0: {fileID: 0}
4686-
collisionShape1: {fileID: 0}
4687-
collisionShape2: {fileID: 0}
4688-
collisionShape3: {fileID: 0}
4689-
collisionShape4: {fileID: 0}
4690-
collisionShape5: {fileID: 0}
4750+
serializedVersion: 2
46914751
inside: 1
46924752
outside: 0
46934753
enter: 0
46944754
exit: 0
4755+
colliderQueryMode: 0
46954756
radiusScale: 1
4757+
primitives:
4758+
- {fileID: 0}
4759+
- {fileID: 0}
4760+
- {fileID: 0}
4761+
- {fileID: 0}
4762+
- {fileID: 0}
4763+
- {fileID: 0}
46964764
SubModule:
46974765
serializedVersion: 2
46984766
enabled: 0
@@ -5745,6 +5813,7 @@ MonoBehaviour:
57455813
m_Material: {fileID: 0}
57465814
m_Color: {r: 1, g: 1, b: 1, a: 1}
57475815
m_RaycastTarget: 1
5816+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
57485817
m_Maskable: 1
57495818
m_OnCullStateChanged:
57505819
m_PersistentCalls:
@@ -5937,6 +6006,7 @@ MonoBehaviour:
59376006
m_Material: {fileID: 0}
59386007
m_Color: {r: 1, g: 1, b: 1, a: 1}
59396008
m_RaycastTarget: 1
6009+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
59406010
m_Maskable: 1
59416011
m_OnCullStateChanged:
59426012
m_PersistentCalls:
@@ -6011,6 +6081,7 @@ MonoBehaviour:
60116081
m_Material: {fileID: 0}
60126082
m_Color: {r: 1, g: 1, b: 1, a: 1}
60136083
m_RaycastTarget: 1
6084+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
60146085
m_Maskable: 1
60156086
m_OnCullStateChanged:
60166087
m_PersistentCalls:
@@ -6126,6 +6197,7 @@ MonoBehaviour:
61266197
m_Material: {fileID: 0}
61276198
m_Color: {r: 1, g: 1, b: 1, a: 1}
61286199
m_RaycastTarget: 1
6200+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
61296201
m_Maskable: 1
61306202
m_OnCullStateChanged:
61316203
m_PersistentCalls:
@@ -6204,6 +6276,7 @@ MonoBehaviour:
62046276
m_Material: {fileID: 0}
62056277
m_Color: {r: 1, g: 1, b: 1, a: 1}
62066278
m_RaycastTarget: 1
6279+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
62076280
m_Maskable: 1
62086281
m_OnCullStateChanged:
62096282
m_PersistentCalls:

Diff for: ‎Packages/manifest.json

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{
22
"dependencies": {
3-
"com.unity.2d.animation": "3.2.5",
4-
"com.unity.2d.pixel-perfect": "2.1.0",
5-
"com.unity.2d.psdimporter": "2.1.6",
3+
"com.unity.2d.animation": "5.0.3",
4+
"com.unity.2d.pixel-perfect": "4.0.1",
5+
"com.unity.2d.psdimporter": "4.0.2",
66
"com.unity.2d.sprite": "1.0.0",
7-
"com.unity.2d.spriteshape": "3.0.14",
7+
"com.unity.2d.spriteshape": "5.1.0",
88
"com.unity.2d.tilemap": "1.0.0",
9-
"com.unity.collab-proxy": "1.2.16",
10-
"com.unity.ide.rider": "1.1.4",
9+
"com.unity.collab-proxy": "1.3.9",
10+
"com.unity.ide.rider": "2.0.7",
11+
"com.unity.ide.visualstudio": "2.0.5",
1112
"com.unity.ide.vscode": "1.2.3",
1213
"com.unity.test-framework": "1.1.20",
13-
"com.unity.textmeshpro": "2.1.1",
14+
"com.unity.textmeshpro": "3.0.1",
1415
"com.unity.timeline": "1.2.17",
1516
"com.unity.ugui": "1.0.0",
1617
"com.unity.modules.ai": "1.0.0",

0 commit comments

Comments
 (0)