Skip to content

Commit db434b1

Browse files
JackTillingJackTilling
committed
Update to 2021.3
1 parent 1d322da commit db434b1

25 files changed

+1053
-501
lines changed

‎.vsconfig

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Microsoft.VisualStudio.Workload.ManagedGame"
5+
]
6+
}

‎Assets/Materials/BrickWall.mat

+41-89
Original file line numberDiff line numberDiff line change
@@ -2,129 +2,81 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: BrickWall
1011
m_Shader: {fileID: 4800000, guid: 93d8fc18fdc65dd4aa903210d93f3343, type: 3}
11-
m_ShaderKeywords: _EMISSION
12+
m_ValidKeywords: []
13+
m_InvalidKeywords:
14+
- _EMISSION
1215
m_LightmapFlags: 1
16+
m_EnableInstancingVariants: 0
17+
m_DoubleSidedGI: 0
1318
m_CustomRenderQueue: -1
1419
stringTagMap: {}
20+
disabledShaderPasses: []
1521
m_SavedProperties:
16-
serializedVersion: 2
22+
serializedVersion: 3
1723
m_TexEnvs:
18-
- first:
19-
name: _BumpMap
20-
second:
24+
- _BumpMap:
2125
m_Texture: {fileID: 0}
2226
m_Scale: {x: 1, y: 1}
2327
m_Offset: {x: 0, y: 0}
24-
- first:
25-
name: _DetailAlbedoMap
26-
second:
28+
- _DetailAlbedoMap:
2729
m_Texture: {fileID: 0}
2830
m_Scale: {x: 1, y: 1}
2931
m_Offset: {x: 0, y: 0}
30-
- first:
31-
name: _DetailMask
32-
second:
32+
- _DetailMask:
3333
m_Texture: {fileID: 0}
3434
m_Scale: {x: 1, y: 1}
3535
m_Offset: {x: 0, y: 0}
36-
- first:
37-
name: _DetailNormalMap
38-
second:
36+
- _DetailNormalMap:
3937
m_Texture: {fileID: 0}
4038
m_Scale: {x: 1, y: 1}
4139
m_Offset: {x: 0, y: 0}
42-
- first:
43-
name: _EmissionMap
44-
second:
40+
- _EmissionMap:
4541
m_Texture: {fileID: 0}
4642
m_Scale: {x: 1, y: 1}
4743
m_Offset: {x: 0, y: 0}
48-
- first:
49-
name: _MainTex
50-
second:
44+
- _MainTex:
5145
m_Texture: {fileID: 2800000, guid: 7fcdbeddb841bb245933f8a3567aca75, type: 3}
5246
m_Scale: {x: 1, y: 1}
5347
m_Offset: {x: 0, y: 0}
54-
- first:
55-
name: _MetallicGlossMap
56-
second:
48+
- _MetallicGlossMap:
5749
m_Texture: {fileID: 0}
5850
m_Scale: {x: 1, y: 1}
5951
m_Offset: {x: 0, y: 0}
60-
- first:
61-
name: _OcclusionMap
62-
second:
52+
- _OcclusionMap:
6353
m_Texture: {fileID: 0}
6454
m_Scale: {x: 1, y: 1}
6555
m_Offset: {x: 0, y: 0}
66-
- first:
67-
name: _ParallaxMap
68-
second:
56+
- _ParallaxMap:
6957
m_Texture: {fileID: 0}
7058
m_Scale: {x: 1, y: 1}
7159
m_Offset: {x: 0, y: 0}
60+
m_Ints: []
7261
m_Floats:
73-
- first:
74-
name: _BumpScale
75-
second: 1
76-
- first:
77-
name: _CurveStrength
78-
second: 0.005
79-
- first:
80-
name: _Cutoff
81-
second: 0.5
82-
- first:
83-
name: _DetailNormalMapScale
84-
second: 1
85-
- first:
86-
name: _DstBlend
87-
second: 0
88-
- first:
89-
name: _GlossMapScale
90-
second: 1
91-
- first:
92-
name: _Glossiness
93-
second: 0.5
94-
- first:
95-
name: _GlossyReflections
96-
second: 1
97-
- first:
98-
name: _Metallic
99-
second: 0
100-
- first:
101-
name: _Mode
102-
second: 0
103-
- first:
104-
name: _OcclusionStrength
105-
second: 1
106-
- first:
107-
name: _Parallax
108-
second: 0.02
109-
- first:
110-
name: _SmoothnessTextureChannel
111-
second: 0
112-
- first:
113-
name: _SpecularHighlights
114-
second: 1
115-
- first:
116-
name: _SrcBlend
117-
second: 1
118-
- first:
119-
name: _UVSec
120-
second: 0
121-
- first:
122-
name: _ZWrite
123-
second: 1
62+
- _BumpScale: 1
63+
- _CurveStrength: 0.005
64+
- _Cutoff: 0.5
65+
- _DetailNormalMapScale: 1
66+
- _DstBlend: 0
67+
- _GlossMapScale: 1
68+
- _Glossiness: 0.5
69+
- _GlossyReflections: 1
70+
- _Metallic: 0
71+
- _Mode: 0
72+
- _OcclusionStrength: 1
73+
- _Parallax: 0.02
74+
- _SmoothnessTextureChannel: 0
75+
- _SpecularHighlights: 1
76+
- _SrcBlend: 1
77+
- _UVSec: 0
78+
- _ZWrite: 1
12479
m_Colors:
125-
- first:
126-
name: _Color
127-
second: {r: 1, g: 1, b: 1, a: 1}
128-
- first:
129-
name: _EmissionColor
130-
second: {r: 0, g: 0, b: 0, a: 1}
80+
- _Color: {r: 1, g: 1, b: 1, a: 1}
81+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
82+
m_BuildTextureStacks: []

‎Assets/Materials/ControlRig.mat

+9-4
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,23 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 1
15+
version: 5
1616
--- !u!21 &2100000
1717
Material:
18-
serializedVersion: 6
18+
serializedVersion: 8
1919
m_ObjectHideFlags: 0
2020
m_CorrespondingSourceObject: {fileID: 0}
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: ControlRig
2424
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
25-
m_ShaderKeywords: _EMISSION
25+
m_ValidKeywords: []
26+
m_InvalidKeywords:
27+
- _EMISSION
2628
m_LightmapFlags: 1
2729
m_EnableInstancingVariants: 0
2830
m_DoubleSidedGI: 0
29-
m_CustomRenderQueue: 2050
31+
m_CustomRenderQueue: 2000
3032
stringTagMap:
3133
RenderType: Opaque
3234
disabledShaderPasses: []
@@ -73,9 +75,11 @@ Material:
7375
m_Texture: {fileID: 0}
7476
m_Scale: {x: 1, y: 1}
7577
m_Offset: {x: 0, y: 0}
78+
m_Ints: []
7679
m_Floats:
7780
- _AlphaClip: 0
7881
- _Blend: 0
82+
- _BlendOp: 0
7983
- _BumpScale: 1
8084
- _Cull: 2
8185
- _Cutoff: 0.5
@@ -100,3 +104,4 @@ Material:
100104
- _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
101105
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
102106
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
107+
m_BuildTextureStacks: []

‎Assets/Materials/Shield.mat

+8-4
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,22 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 1
15+
version: 5
1616
--- !u!21 &2100000
1717
Material:
18-
serializedVersion: 6
18+
serializedVersion: 8
1919
m_ObjectHideFlags: 0
2020
m_CorrespondingSourceObject: {fileID: 0}
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Shield
2424
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
25-
m_ShaderKeywords:
25+
m_ValidKeywords: []
26+
m_InvalidKeywords: []
2627
m_LightmapFlags: 6
2728
m_EnableInstancingVariants: 0
2829
m_DoubleSidedGI: 0
29-
m_CustomRenderQueue: 2050
30+
m_CustomRenderQueue: 2000
3031
stringTagMap:
3132
RenderType: Opaque
3233
disabledShaderPasses: []
@@ -77,9 +78,11 @@ Material:
7778
m_Texture: {fileID: 0}
7879
m_Scale: {x: 1, y: 1}
7980
m_Offset: {x: 0, y: 0}
81+
m_Ints: []
8082
m_Floats:
8183
- _AlphaClip: 0
8284
- _Blend: 0
85+
- _BlendOp: 0
8386
- _BumpScale: 1
8487
- _Cull: 2
8588
- _Cutoff: 0.5
@@ -109,3 +112,4 @@ Material:
109112
- _Color: {r: 1, g: 1, b: 1, a: 1}
110113
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
111114
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
115+
m_BuildTextureStacks: []

‎Assets/Materials/StarGlow.mat

+8-4
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,22 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 1
15+
version: 5
1616
--- !u!21 &2100000
1717
Material:
18-
serializedVersion: 6
18+
serializedVersion: 8
1919
m_ObjectHideFlags: 0
2020
m_CorrespondingSourceObject: {fileID: 0}
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: StarGlow
2424
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
25-
m_ShaderKeywords:
25+
m_ValidKeywords: []
26+
m_InvalidKeywords: []
2627
m_LightmapFlags: 6
2728
m_EnableInstancingVariants: 0
2829
m_DoubleSidedGI: 0
29-
m_CustomRenderQueue: 2050
30+
m_CustomRenderQueue: 2000
3031
stringTagMap:
3132
RenderType: Opaque
3233
disabledShaderPasses: []
@@ -77,9 +78,11 @@ Material:
7778
m_Texture: {fileID: 0}
7879
m_Scale: {x: 1, y: 1}
7980
m_Offset: {x: 0, y: 0}
81+
m_Ints: []
8082
m_Floats:
8183
- _AlphaClip: 0
8284
- _Blend: 0
85+
- _BlendOp: 0
8386
- _BumpScale: 1
8487
- _Cull: 2
8588
- _Cutoff: 0.5
@@ -108,3 +111,4 @@ Material:
108111
- _Color: {r: 1, g: 1, b: 1, a: 1}
109112
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
110113
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
114+
m_BuildTextureStacks: []

‎Assets/RenderingPipeline.asset

+30-2
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,63 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
1313
m_Name: RenderingPipeline
1414
m_EditorClassIdentifier:
15-
k_AssetVersion: 4
15+
k_AssetVersion: 9
16+
k_AssetPreviousVersion: 9
1617
m_RendererType: 0
1718
m_RendererData: {fileID: 11400000, guid: 45e4c9a2a5aaef0409ca1edd4a368fc6, type: 2}
19+
m_RendererDataList:
20+
- {fileID: 11400000, guid: 45e4c9a2a5aaef0409ca1edd4a368fc6, type: 2}
21+
m_DefaultRendererIndex: 0
1822
m_RequireDepthTexture: 0
1923
m_RequireOpaqueTexture: 0
2024
m_OpaqueDownsampling: 1
25+
m_SupportsTerrainHoles: 1
26+
m_StoreActionsOptimization: 0
2127
m_SupportsHDR: 0
2228
m_MSAA: 1
2329
m_RenderScale: 1
30+
m_UpscalingFilter: 0
31+
m_FsrOverrideSharpness: 0
32+
m_FsrSharpness: 0.92
2433
m_MainLightRenderingMode: 1
2534
m_MainLightShadowsSupported: 1
2635
m_MainLightShadowmapResolution: 2048
2736
m_AdditionalLightsRenderingMode: 1
2837
m_AdditionalLightsPerObjectLimit: 0
2938
m_AdditionalLightShadowsSupported: 0
3039
m_AdditionalLightsShadowmapResolution: 512
40+
m_AdditionalLightsShadowResolutionTierLow: 128
41+
m_AdditionalLightsShadowResolutionTierMedium: 256
42+
m_AdditionalLightsShadowResolutionTierHigh: 512
43+
m_ReflectionProbeBlending: 0
44+
m_ReflectionProbeBoxProjection: 0
3145
m_ShadowDistance: 50
32-
m_ShadowCascades: 2
46+
m_ShadowCascadeCount: 4
3347
m_Cascade2Split: 0.25
48+
m_Cascade3Split: {x: 0.1, y: 0.3}
3449
m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
50+
m_CascadeBorder: 0.1
3551
m_ShadowDepthBias: 1
3652
m_ShadowNormalBias: 1
3753
m_SoftShadowsSupported: 0
54+
m_ConservativeEnclosingSphere: 0
55+
m_NumIterationsEnclosingSphere: 64
56+
m_AdditionalLightsCookieResolution: 2048
57+
m_AdditionalLightsCookieFormat: 3
3858
m_UseSRPBatcher: 1
3959
m_SupportsDynamicBatching: 1
4060
m_MixedLightingSupported: 1
61+
m_SupportsLightLayers: 0
62+
m_DebugLevel: 0
63+
m_UseAdaptivePerformance: 1
64+
m_ColorGradingMode: 0
65+
m_ColorGradingLutSize: 32
66+
m_UseFastSRGBLinearConversion: 0
4167
m_ShadowType: 0
4268
m_LocalShadowsSupported: 0
4369
m_LocalShadowsAtlasResolution: 512
4470
m_MaxPixelLights: 0
4571
m_ShadowAtlasResolution: 2048
4672
m_ShaderVariantLogLevel: 0
73+
m_VolumeFrameworkUpdateMode: 0
74+
m_ShadowCascades: 2

‎Assets/Resources/BillingMode.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"androidStore":"GooglePlay"}

‎Assets/Resources/BillingMode.json.meta

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)