Skip to content

Commit 53e8cce

Browse files
sindhartasindharta
authored
project: upgrade ToonShader_ProjectForwardPlus to 2022.3.60f1 with Forward+ settings (#404)
* upgrade assets * upgrade materials * upgrade settings * delete boot.config * upgrade packages * update asset * update forward+ * update asset
1 parent 6f6f94d commit 53e8cce

File tree

62 files changed

+822
-150
lines changed

Some content is hidden

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

62 files changed

+822
-150
lines changed

‎ToonShader_ProjectForwardPlus/Assets/ExampleAssets/Materials/ConstructionLight_Mat.mat‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,30 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 5
15+
version: 7
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: ConstructionLight_Mat
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25-
m_ShaderKeywords: _METALLICSPECGLOSSMAP _OCCLUSIONMAP
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
27+
m_ValidKeywords:
28+
- _METALLICSPECGLOSSMAP
29+
- _OCCLUSIONMAP
30+
m_InvalidKeywords: []
2631
m_LightmapFlags: 4
2732
m_EnableInstancingVariants: 0
2833
m_DoubleSidedGI: 0
2934
m_CustomRenderQueue: 2000
3035
stringTagMap:
3136
RenderType: Opaque
3237
disabledShaderPasses: []
38+
m_LockedProperties:
3339
m_SavedProperties:
3440
serializedVersion: 3
3541
m_TexEnvs:
@@ -92,7 +98,9 @@ Material:
9298
m_Ints: []
9399
m_Floats:
94100
- _AlphaClip: 0
101+
- _AlphaToMask: 0
95102
- _Blend: 0
103+
- _BlendModePreserveSpecular: 1
96104
- _BumpScale: 1
97105
- _ClearCoatMask: 0
98106
- _ClearCoatSmoothness: 0
@@ -101,6 +109,7 @@ Material:
101109
- _DetailAlbedoMapScale: 1
102110
- _DetailNormalMapScale: 1
103111
- _DstBlend: 0
112+
- _DstBlendAlpha: 0
104113
- _EnvironmentReflections: 1
105114
- _GlossMapScale: 1
106115
- _Glossiness: 0.5
@@ -115,6 +124,7 @@ Material:
115124
- _SmoothnessTextureChannel: 0
116125
- _SpecularHighlights: 1
117126
- _SrcBlend: 1
127+
- _SrcBlendAlpha: 1
118128
- _Surface: 0
119129
- _UVSec: 0
120130
- _WorkflowMode: 1

‎ToonShader_ProjectForwardPlus/Assets/ExampleAssets/Materials/DryWallPainted_Mat.mat‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,27 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: DryWallPainted_Mat
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12-
m_ShaderKeywords: _NORMALMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords:
15+
- _NORMALMAP
16+
- _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
17+
m_InvalidKeywords: []
1318
m_LightmapFlags: 4
1419
m_EnableInstancingVariants: 0
1520
m_DoubleSidedGI: 0
1621
m_CustomRenderQueue: 2000
1722
stringTagMap:
1823
RenderType: Opaque
1924
disabledShaderPasses: []
25+
m_LockedProperties:
2026
m_SavedProperties:
2127
serializedVersion: 3
2228
m_TexEnvs:
@@ -79,7 +85,9 @@ Material:
7985
m_Ints: []
8086
m_Floats:
8187
- _AlphaClip: 0
88+
- _AlphaToMask: 0
8289
- _Blend: 0
90+
- _BlendModePreserveSpecular: 1
8391
- _BumpScale: 1
8492
- _ClearCoatMask: 0
8593
- _ClearCoatSmoothness: 0
@@ -88,6 +96,7 @@ Material:
8896
- _DetailAlbedoMapScale: 1
8997
- _DetailNormalMapScale: 1
9098
- _DstBlend: 0
99+
- _DstBlendAlpha: 0
91100
- _EnvironmentReflections: 1
92101
- _GlossMapScale: 1
93102
- _Glossiness: 0.5
@@ -102,6 +111,7 @@ Material:
102111
- _SmoothnessTextureChannel: 1
103112
- _SpecularHighlights: 1
104113
- _SrcBlend: 1
114+
- _SrcBlendAlpha: 1
105115
- _Surface: 0
106116
- _UVSec: 0
107117
- _WorkflowMode: 1
@@ -124,4 +134,4 @@ MonoBehaviour:
124134
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
125135
m_Name:
126136
m_EditorClassIdentifier:
127-
version: 5
137+
version: 7

‎ToonShader_ProjectForwardPlus/Assets/ExampleAssets/Materials/DryWall_Mat.mat‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,30 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 5
15+
version: 7
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: DryWall_Mat
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25-
m_ShaderKeywords: _NORMALMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
27+
m_ValidKeywords:
28+
- _NORMALMAP
29+
- _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
30+
m_InvalidKeywords: []
2631
m_LightmapFlags: 4
2732
m_EnableInstancingVariants: 0
2833
m_DoubleSidedGI: 0
2934
m_CustomRenderQueue: 2000
3035
stringTagMap:
3136
RenderType: Opaque
3237
disabledShaderPasses: []
38+
m_LockedProperties:
3339
m_SavedProperties:
3440
serializedVersion: 3
3541
m_TexEnvs:
@@ -92,7 +98,9 @@ Material:
9298
m_Ints: []
9399
m_Floats:
94100
- _AlphaClip: 0
101+
- _AlphaToMask: 0
95102
- _Blend: 0
103+
- _BlendModePreserveSpecular: 1
96104
- _BumpScale: 1
97105
- _ClearCoatMask: 0
98106
- _ClearCoatSmoothness: 0
@@ -101,6 +109,7 @@ Material:
101109
- _DetailAlbedoMapScale: 1
102110
- _DetailNormalMapScale: 1
103111
- _DstBlend: 0
112+
- _DstBlendAlpha: 0
104113
- _EnvironmentReflections: 1
105114
- _GlossMapScale: 1
106115
- _Glossiness: 0.5
@@ -115,6 +124,7 @@ Material:
115124
- _SmoothnessTextureChannel: 1
116125
- _SpecularHighlights: 1
117126
- _SrcBlend: 1
127+
- _SrcBlendAlpha: 1
118128
- _Surface: 0
119129
- _UVSec: 0
120130
- _WorkflowMode: 1

‎ToonShader_ProjectForwardPlus/Assets/ExampleAssets/Materials/Ground_Mat.mat‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,31 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 5
15+
version: 7
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: Ground_Mat
2424
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25-
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
27+
m_ValidKeywords:
28+
- _METALLICSPECGLOSSMAP
29+
- _NORMALMAP
30+
- _OCCLUSIONMAP
31+
m_InvalidKeywords: []
2632
m_LightmapFlags: 4
2733
m_EnableInstancingVariants: 0
2834
m_DoubleSidedGI: 0
2935
m_CustomRenderQueue: 2000
3036
stringTagMap:
3137
RenderType: Opaque
3238
disabledShaderPasses: []
39+
m_LockedProperties:
3340
m_SavedProperties:
3441
serializedVersion: 3
3542
m_TexEnvs:
@@ -92,7 +99,9 @@ Material:
9299
m_Ints: []
93100
m_Floats:
94101
- _AlphaClip: 0
102+
- _AlphaToMask: 0
95103
- _Blend: 0
104+
- _BlendModePreserveSpecular: 1
96105
- _BumpScale: 1
97106
- _ClearCoatMask: 0
98107
- _ClearCoatSmoothness: 0
@@ -101,6 +110,7 @@ Material:
101110
- _DetailAlbedoMapScale: 1
102111
- _DetailNormalMapScale: 1
103112
- _DstBlend: 0
113+
- _DstBlendAlpha: 0
104114
- _EnvironmentReflections: 1
105115
- _GlossMapScale: 1
106116
- _Glossiness: 0
@@ -115,6 +125,7 @@ Material:
115125
- _SmoothnessTextureChannel: 0
116126
- _SpecularHighlights: 1
117127
- _SrcBlend: 1
128+
- _SrcBlendAlpha: 1
118129
- _Surface: 0
119130
- _UVSec: 0
120131
- _WorkflowMode: 1

‎ToonShader_ProjectForwardPlus/Assets/ExampleAssets/Materials/Hammer_Mat.mat‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,28 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Hammer_Mat
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12-
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords:
15+
- _METALLICSPECGLOSSMAP
16+
- _NORMALMAP
17+
- _OCCLUSIONMAP
18+
m_InvalidKeywords: []
1319
m_LightmapFlags: 4
1420
m_EnableInstancingVariants: 0
1521
m_DoubleSidedGI: 0
1622
m_CustomRenderQueue: 2000
1723
stringTagMap:
1824
RenderType: Opaque
1925
disabledShaderPasses: []
26+
m_LockedProperties:
2027
m_SavedProperties:
2128
serializedVersion: 3
2229
m_TexEnvs:
@@ -79,7 +86,9 @@ Material:
7986
m_Ints: []
8087
m_Floats:
8188
- _AlphaClip: 0
89+
- _AlphaToMask: 0
8290
- _Blend: 0
91+
- _BlendModePreserveSpecular: 1
8392
- _BumpScale: 1
8493
- _ClearCoatMask: 0
8594
- _ClearCoatSmoothness: 0
@@ -88,6 +97,7 @@ Material:
8897
- _DetailAlbedoMapScale: 1
8998
- _DetailNormalMapScale: 1
9099
- _DstBlend: 0
100+
- _DstBlendAlpha: 0
91101
- _EnvironmentReflections: 1
92102
- _GlossMapScale: 1
93103
- _Glossiness: 0.5
@@ -102,6 +112,7 @@ Material:
102112
- _SmoothnessTextureChannel: 0
103113
- _SpecularHighlights: 1
104114
- _SrcBlend: 1
115+
- _SrcBlendAlpha: 1
105116
- _Surface: 0
106117
- _UVSec: 0
107118
- _WorkflowMode: 1
@@ -124,4 +135,4 @@ MonoBehaviour:
124135
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
125136
m_Name:
126137
m_EditorClassIdentifier:
127-
version: 5
138+
version: 7

‎ToonShader_ProjectForwardPlus/Assets/ExampleAssets/Materials/HardHat_Mat.mat‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,28 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: HardHat_Mat
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12-
m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
14+
m_ValidKeywords:
15+
- _METALLICSPECGLOSSMAP
16+
- _NORMALMAP
17+
- _OCCLUSIONMAP
18+
m_InvalidKeywords: []
1319
m_LightmapFlags: 4
1420
m_EnableInstancingVariants: 0
1521
m_DoubleSidedGI: 0
1622
m_CustomRenderQueue: 2000
1723
stringTagMap:
1824
RenderType: Opaque
1925
disabledShaderPasses: []
26+
m_LockedProperties:
2027
m_SavedProperties:
2128
serializedVersion: 3
2229
m_TexEnvs:
@@ -79,7 +86,9 @@ Material:
7986
m_Ints: []
8087
m_Floats:
8188
- _AlphaClip: 0
89+
- _AlphaToMask: 0
8290
- _Blend: 0
91+
- _BlendModePreserveSpecular: 1
8392
- _BumpScale: 1
8493
- _ClearCoatMask: 0
8594
- _ClearCoatSmoothness: 0
@@ -88,6 +97,7 @@ Material:
8897
- _DetailAlbedoMapScale: 1
8998
- _DetailNormalMapScale: 1
9099
- _DstBlend: 0
100+
- _DstBlendAlpha: 0
91101
- _EnvironmentReflections: 1
92102
- _GlossMapScale: 1
93103
- _Glossiness: 0.5
@@ -102,6 +112,7 @@ Material:
102112
- _SmoothnessTextureChannel: 0
103113
- _SpecularHighlights: 1
104114
- _SrcBlend: 1
115+
- _SrcBlendAlpha: 1
105116
- _Surface: 0
106117
- _UVSec: 0
107118
- _WorkflowMode: 1
@@ -124,4 +135,4 @@ MonoBehaviour:
124135
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
125136
m_Name:
126137
m_EditorClassIdentifier:
127-
version: 5
138+
version: 7

0 commit comments

Comments
 (0)