Skip to content

Commit 49de488

Browse files
CA-TatamiCA-Tatami
committed
unity6上げ
1 parent 17cf661 commit 49de488

23 files changed

Lines changed: 576 additions & 119 deletions

‎Assets/DefaultVolumeProfile.asset‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
13+
m_Name: DefaultVolumeProfile
14+
m_EditorClassIdentifier:
15+
components: []

‎Assets/DefaultVolumeProfile.asset.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Demo/Demo01/Materials/mat_test_02.mat‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: mat_test_02
1111
m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _METALLICSPECGLOSSMAP
1416
- _NORMALMAP
@@ -20,6 +22,7 @@ Material:
2022
m_CustomRenderQueue: 2000
2123
stringTagMap: {}
2224
disabledShaderPasses: []
25+
m_LockedProperties:
2326
m_SavedProperties:
2427
serializedVersion: 3
2528
m_TexEnvs:
@@ -78,6 +81,7 @@ Material:
7881
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
7982
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
8083
m_BuildTextureStacks: []
84+
m_AllowLocking: 1
8185
--- !u!114 &1071911827084087253
8286
MonoBehaviour:
8387
m_ObjectHideFlags: 11
@@ -90,4 +94,4 @@ MonoBehaviour:
9094
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
9195
m_Name:
9296
m_EditorClassIdentifier:
93-
version: 5
97+
version: 9

‎Assets/Demo/Demo01/Materials/mat_test_03.mat‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: mat_test_03
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _METALLICSPECGLOSSMAP
1416
- _NORMALMAP
@@ -18,8 +20,11 @@ Material:
1820
m_EnableInstancingVariants: 0
1921
m_DoubleSidedGI: 0
2022
m_CustomRenderQueue: 2000
21-
stringTagMap: {}
22-
disabledShaderPasses: []
23+
stringTagMap:
24+
RenderType: Opaque
25+
disabledShaderPasses:
26+
- MOTIONVECTORS
27+
m_LockedProperties:
2328
m_SavedProperties:
2429
serializedVersion: 3
2530
m_TexEnvs:
@@ -81,8 +86,11 @@ Material:
8186
m_Offset: {x: 0, y: 0}
8287
m_Ints: []
8388
m_Floats:
89+
- _AddPrecomputedVelocity: 0
8490
- _AlphaClip: 0
91+
- _AlphaToMask: 0
8592
- _Blend: 0
93+
- _BlendModePreserveSpecular: 1
8694
- _BumpScale: 1
8795
- _ClearCoatMask: 0
8896
- _ClearCoatSmoothness: 0
@@ -91,6 +99,7 @@ Material:
9199
- _DetailAlbedoMapScale: 1
92100
- _DetailNormalMapScale: 1
93101
- _DstBlend: 0
102+
- _DstBlendAlpha: 0
94103
- _EnvironmentReflections: 1
95104
- _GlossMapScale: 0
96105
- _Glossiness: 0
@@ -104,6 +113,7 @@ Material:
104113
- _SmoothnessTextureChannel: 0
105114
- _SpecularHighlights: 1
106115
- _SrcBlend: 1
116+
- _SrcBlendAlpha: 1
107117
- _Surface: 0
108118
- _WorkflowMode: 0
109119
- _ZWrite: 1
@@ -113,6 +123,7 @@ Material:
113123
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
114124
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
115125
m_BuildTextureStacks: []
126+
m_AllowLocking: 1
116127
--- !u!114 &1071911827084087253
117128
MonoBehaviour:
118129
m_ObjectHideFlags: 11
@@ -125,4 +136,4 @@ MonoBehaviour:
125136
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
126137
m_Name:
127138
m_EditorClassIdentifier:
128-
version: 5
139+
version: 9

‎Assets/Demo/Demo01/Materials/mat_test_06.mat‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: mat_test_06
1111
m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _NORMALMAP
1416
m_InvalidKeywords:
@@ -19,6 +21,7 @@ Material:
1921
m_CustomRenderQueue: 2000
2022
stringTagMap: {}
2123
disabledShaderPasses: []
24+
m_LockedProperties:
2225
m_SavedProperties:
2326
serializedVersion: 3
2427
m_TexEnvs:
@@ -77,6 +80,7 @@ Material:
7780
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
7881
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
7982
m_BuildTextureStacks: []
83+
m_AllowLocking: 1
8084
--- !u!114 &1071911827084087253
8185
MonoBehaviour:
8286
m_ObjectHideFlags: 11
@@ -89,4 +93,4 @@ MonoBehaviour:
8993
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
9094
m_Name:
9195
m_EditorClassIdentifier:
92-
version: 5
96+
version: 9

‎Assets/Demo/Demo01/Materials/mat_test_07.mat‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: mat_test_07
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _NORMALMAP
1416
- _SPECULAR_SETUP
@@ -17,8 +19,11 @@ Material:
1719
m_EnableInstancingVariants: 0
1820
m_DoubleSidedGI: 0
1921
m_CustomRenderQueue: 2000
20-
stringTagMap: {}
21-
disabledShaderPasses: []
22+
stringTagMap:
23+
RenderType: Opaque
24+
disabledShaderPasses:
25+
- MOTIONVECTORS
26+
m_LockedProperties:
2227
m_SavedProperties:
2328
serializedVersion: 3
2429
m_TexEnvs:
@@ -80,8 +85,11 @@ Material:
8085
m_Offset: {x: 0, y: 0}
8186
m_Ints: []
8287
m_Floats:
88+
- _AddPrecomputedVelocity: 0
8389
- _AlphaClip: 0
90+
- _AlphaToMask: 0
8491
- _Blend: 0
92+
- _BlendModePreserveSpecular: 1
8593
- _BumpScale: 1
8694
- _ClearCoatMask: 0
8795
- _ClearCoatSmoothness: 0
@@ -90,6 +98,7 @@ Material:
9098
- _DetailAlbedoMapScale: 1
9199
- _DetailNormalMapScale: 1
92100
- _DstBlend: 0
101+
- _DstBlendAlpha: 0
93102
- _EnvironmentReflections: 1
94103
- _GlossMapScale: 0
95104
- _Glossiness: 0
@@ -103,6 +112,7 @@ Material:
103112
- _SmoothnessTextureChannel: 0
104113
- _SpecularHighlights: 1
105114
- _SrcBlend: 1
115+
- _SrcBlendAlpha: 1
106116
- _Surface: 0
107117
- _WorkflowMode: 0
108118
- _ZWrite: 1
@@ -112,6 +122,7 @@ Material:
112122
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
113123
- _SpecColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
114124
m_BuildTextureStacks: []
125+
m_AllowLocking: 1
115126
--- !u!114 &1071911827084087253
116127
MonoBehaviour:
117128
m_ObjectHideFlags: 11
@@ -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: 9

‎Assets/Demo/Demo01/Materials/mat_test_10.mat‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: mat_test_10
1111
m_Shader: {fileID: 4800000, guid: b7839dad95683814aa64166edc107ae2, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords: []
1315
m_InvalidKeywords:
1416
- _FLIPBOOKBLENDING_OFF
@@ -18,6 +20,7 @@ Material:
1820
m_CustomRenderQueue: 2000
1921
stringTagMap: {}
2022
disabledShaderPasses: []
23+
m_LockedProperties:
2124
m_SavedProperties:
2225
serializedVersion: 3
2326
m_TexEnvs:
@@ -76,6 +79,7 @@ Material:
7679
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
7780
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
7881
m_BuildTextureStacks: []
82+
m_AllowLocking: 1
7983
--- !u!114 &1071911827084087253
8084
MonoBehaviour:
8185
m_ObjectHideFlags: 11
@@ -88,4 +92,4 @@ MonoBehaviour:
8892
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
8993
m_Name:
9094
m_EditorClassIdentifier:
91-
version: 5
95+
version: 9

‎Assets/Demo/Demo01/Materials/mat_test_12.mat‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,20 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: mat_test_12
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _SPECULAR_SETUP
1416
m_InvalidKeywords: []
1517
m_LightmapFlags: 4
1618
m_EnableInstancingVariants: 0
1719
m_DoubleSidedGI: 0
1820
m_CustomRenderQueue: 2000
19-
stringTagMap: {}
20-
disabledShaderPasses: []
21+
stringTagMap:
22+
RenderType: Opaque
23+
disabledShaderPasses:
24+
- MOTIONVECTORS
25+
m_LockedProperties:
2126
m_SavedProperties:
2227
serializedVersion: 3
2328
m_TexEnvs:
@@ -79,8 +84,11 @@ Material:
7984
m_Offset: {x: 0, y: 0}
8085
m_Ints: []
8186
m_Floats:
87+
- _AddPrecomputedVelocity: 0
8288
- _AlphaClip: 0
89+
- _AlphaToMask: 0
8390
- _Blend: 0
91+
- _BlendModePreserveSpecular: 1
8492
- _BumpScale: 1
8593
- _ClearCoatMask: 0
8694
- _ClearCoatSmoothness: 0
@@ -89,6 +97,7 @@ Material:
8997
- _DetailAlbedoMapScale: 1
9098
- _DetailNormalMapScale: 1
9199
- _DstBlend: 0
100+
- _DstBlendAlpha: 0
92101
- _EnvironmentReflections: 1
93102
- _GlossMapScale: 0
94103
- _Glossiness: 0
@@ -102,6 +111,7 @@ Material:
102111
- _SmoothnessTextureChannel: 0
103112
- _SpecularHighlights: 1
104113
- _SrcBlend: 1
114+
- _SrcBlendAlpha: 1
105115
- _Surface: 0
106116
- _WorkflowMode: 0
107117
- _ZWrite: 1
@@ -111,6 +121,7 @@ Material:
111121
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
112122
- _SpecColor: {r: 1, g: 0, b: 0, a: 1}
113123
m_BuildTextureStacks: []
124+
m_AllowLocking: 1
114125
--- !u!114 &1071911827084087253
115126
MonoBehaviour:
116127
m_ObjectHideFlags: 11
@@ -123,4 +134,4 @@ MonoBehaviour:
123134
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
124135
m_Name:
125136
m_EditorClassIdentifier:
126-
version: 5
137+
version: 9

‎Assets/Samples/Materials/Common/mat_bg_buttom.mat‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,20 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: mat_bg_buttom
1111
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_Parent: {fileID: 0}
13+
m_ModifiedSerializedProperties: 0
1214
m_ValidKeywords:
1315
- _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
1416
m_InvalidKeywords: []
1517
m_LightmapFlags: 4
1618
m_EnableInstancingVariants: 0
1719
m_DoubleSidedGI: 0
1820
m_CustomRenderQueue: 2000
19-
stringTagMap: {}
20-
disabledShaderPasses: []
21+
stringTagMap:
22+
RenderType: Opaque
23+
disabledShaderPasses:
24+
- MOTIONVECTORS
25+
m_LockedProperties:
2126
m_SavedProperties:
2227
serializedVersion: 3
2328
m_TexEnvs:
@@ -79,8 +84,11 @@ Material:
7984
m_Offset: {x: 0, y: 0}
8085
m_Ints: []
8186
m_Floats:
87+
- _AddPrecomputedVelocity: 0
8288
- _AlphaClip: 0
89+
- _AlphaToMask: 0
8390
- _Blend: 0
91+
- _BlendModePreserveSpecular: 1
8492
- _BumpScale: 1
8593
- _ClearCoatMask: 0
8694
- _ClearCoatSmoothness: 0
@@ -89,6 +97,7 @@ Material:
8997
- _DetailAlbedoMapScale: 1
9098
- _DetailNormalMapScale: 1
9199
- _DstBlend: 0
100+
- _DstBlendAlpha: 0
92101
- _EnvironmentReflections: 1
93102
- _GlossMapScale: 1
94103
- _Glossiness: 0.5
@@ -102,6 +111,7 @@ Material:
102111
- _SmoothnessTextureChannel: 1
103112
- _SpecularHighlights: 1
104113
- _SrcBlend: 1
114+
- _SrcBlendAlpha: 1
105115
- _Surface: 0
106116
- _WorkflowMode: 1
107117
- _ZWrite: 1
@@ -111,6 +121,7 @@ Material:
111121
- _EmissionColor: {r: 0.028301895, g: 0.028301895, b: 0.028301895, a: 1}
112122
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
113123
m_BuildTextureStacks: []
124+
m_AllowLocking: 1
114125
--- !u!114 &7572151150662715042
115126
MonoBehaviour:
116127
m_ObjectHideFlags: 11
@@ -123,4 +134,4 @@ MonoBehaviour:
123134
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
124135
m_Name:
125136
m_EditorClassIdentifier:
126-
version: 5
137+
version: 9

0 commit comments

Comments
 (0)