Skip to content

Commit f35ae9e

Browse files
ezioleqezioleq
committed
Merge branch 'grill' into dev
- Tweak some values - Closes #15
2 parents 52ab5c8 + 23c1898 commit f35ae9e

10 files changed

+7689
-2
lines changed

‎Assets/Materials/Disintegration.meta

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

‎Assets/Materials/Disintegration/Disintegration.mat

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-9100556678050616131
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 4
16+
--- !u!21 &2100000
17+
Material:
18+
serializedVersion: 6
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name: Disintegration
24+
m_Shader: {fileID: -6465566751694194690, guid: 9b06da46d09d7910885628f75a84840f, type: 3}
25+
m_ShaderKeywords:
26+
m_LightmapFlags: 4
27+
m_EnableInstancingVariants: 0
28+
m_DoubleSidedGI: 0
29+
m_CustomRenderQueue: -1
30+
stringTagMap: {}
31+
disabledShaderPasses: []
32+
m_SavedProperties:
33+
serializedVersion: 3
34+
m_TexEnvs:
35+
- _BaseMap:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
39+
- _BumpMap:
40+
m_Texture: {fileID: 0}
41+
m_Scale: {x: 1, y: 1}
42+
m_Offset: {x: 0, y: 0}
43+
- _DetailAlbedoMap:
44+
m_Texture: {fileID: 0}
45+
m_Scale: {x: 1, y: 1}
46+
m_Offset: {x: 0, y: 0}
47+
- _DetailMask:
48+
m_Texture: {fileID: 0}
49+
m_Scale: {x: 1, y: 1}
50+
m_Offset: {x: 0, y: 0}
51+
- _DetailNormalMap:
52+
m_Texture: {fileID: 0}
53+
m_Scale: {x: 1, y: 1}
54+
m_Offset: {x: 0, y: 0}
55+
- _EmissionMap:
56+
m_Texture: {fileID: 0}
57+
m_Scale: {x: 1, y: 1}
58+
m_Offset: {x: 0, y: 0}
59+
- _MainTex:
60+
m_Texture: {fileID: 0}
61+
m_Scale: {x: 1, y: 1}
62+
m_Offset: {x: 0, y: 0}
63+
- _MetallicGlossMap:
64+
m_Texture: {fileID: 0}
65+
m_Scale: {x: 1, y: 1}
66+
m_Offset: {x: 0, y: 0}
67+
- _OcclusionMap:
68+
m_Texture: {fileID: 0}
69+
m_Scale: {x: 1, y: 1}
70+
m_Offset: {x: 0, y: 0}
71+
- _ParallaxMap:
72+
m_Texture: {fileID: 0}
73+
m_Scale: {x: 1, y: 1}
74+
m_Offset: {x: 0, y: 0}
75+
- _SpecGlossMap:
76+
m_Texture: {fileID: 0}
77+
m_Scale: {x: 1, y: 1}
78+
m_Offset: {x: 0, y: 0}
79+
- unity_Lightmaps:
80+
m_Texture: {fileID: 0}
81+
m_Scale: {x: 1, y: 1}
82+
m_Offset: {x: 0, y: 0}
83+
- unity_LightmapsInd:
84+
m_Texture: {fileID: 0}
85+
m_Scale: {x: 1, y: 1}
86+
m_Offset: {x: 0, y: 0}
87+
- unity_ShadowMasks:
88+
m_Texture: {fileID: 0}
89+
m_Scale: {x: 1, y: 1}
90+
m_Offset: {x: 0, y: 0}
91+
m_Floats:
92+
- Vector1_718398ec84974e538d05adc82fa23483: -0.03
93+
- Vector1_92d06b6063df4822869d38d58d2daa72: 1
94+
- Vector1_c9f4f8fb685c4047813066f44e58a5f0: 50
95+
- Vector1_e4f0220bcc1746ba9c79f8186747b053: 0.2
96+
- _AlphaClip: 0
97+
- _Blend: 0
98+
- _BumpScale: 1
99+
- _ClearCoatMask: 0
100+
- _ClearCoatSmoothness: 0
101+
- _Cull: 2
102+
- _Cutoff: 0.5
103+
- _DetailAlbedoMapScale: 1
104+
- _DetailNormalMapScale: 1
105+
- _DstBlend: 0
106+
- _EnvironmentReflections: 1
107+
- _GlossMapScale: 0
108+
- _Glossiness: 0
109+
- _GlossyReflections: 0
110+
- _Metallic: 0
111+
- _OcclusionStrength: 1
112+
- _Parallax: 0.005
113+
- _QueueOffset: 0
114+
- _ReceiveShadows: 1
115+
- _Smoothness: 0.5
116+
- _SmoothnessTextureChannel: 0
117+
- _SpecularHighlights: 1
118+
- _SrcBlend: 1
119+
- _Surface: 0
120+
- _WorkflowMode: 1
121+
- _ZWrite: 1
122+
m_Colors:
123+
- Color_d061594120e0495e88fe336db995536c: {r: 1.4980392, g: 1.4980392, b: 1.4980392, a: 0}
124+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
125+
- _Color: {r: 1, g: 1, b: 1, a: 1}
126+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
127+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
128+
m_BuildTextureStacks: []

‎Assets/Materials/Disintegration/Disintegration.mat.meta

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

‎Assets/Materials/Disintegration/DisintegrationParticle.mat

+125
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: DisintegrationParticle
11+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_ShaderKeywords: _ALPHATEST_ON _RECEIVE_SHADOWS_OFF
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: 3000
17+
stringTagMap:
18+
RenderType: Transparent
19+
disabledShaderPasses:
20+
- SHADOWCASTER
21+
m_SavedProperties:
22+
serializedVersion: 3
23+
m_TexEnvs:
24+
- _BaseMap:
25+
m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0}
26+
m_Scale: {x: 1, y: 1}
27+
m_Offset: {x: 0, y: 0}
28+
- _BumpMap:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
- _DetailAlbedoMap:
33+
m_Texture: {fileID: 0}
34+
m_Scale: {x: 1, y: 1}
35+
m_Offset: {x: 0, y: 0}
36+
- _DetailMask:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _DetailNormalMap:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _EmissionMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _MainTex:
49+
m_Texture: {fileID: 10300, guid: 0000000000000000f000000000000000, type: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _MetallicGlossMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _OcclusionMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _ParallaxMap:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _SpecGlossMap:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- unity_Lightmaps:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- unity_LightmapsInd:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- unity_ShadowMasks:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
m_Floats:
81+
- _AlphaClip: 1
82+
- _Blend: 0
83+
- _BumpScale: 1
84+
- _ClearCoatMask: 0
85+
- _ClearCoatSmoothness: 0
86+
- _Cull: 2
87+
- _Cutoff: 0.75
88+
- _DetailAlbedoMapScale: 1
89+
- _DetailNormalMapScale: 1
90+
- _DstBlend: 10
91+
- _EnvironmentReflections: 1
92+
- _GlossMapScale: 0
93+
- _Glossiness: 0
94+
- _GlossyReflections: 0
95+
- _Metallic: 0
96+
- _OcclusionStrength: 1
97+
- _Parallax: 0.005
98+
- _QueueOffset: 0
99+
- _ReceiveShadows: 0
100+
- _Smoothness: 0
101+
- _SmoothnessTextureChannel: 0
102+
- _SpecularHighlights: 1
103+
- _SrcBlend: 5
104+
- _Surface: 1
105+
- _WorkflowMode: 1
106+
- _ZWrite: 0
107+
m_Colors:
108+
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
109+
- _Color: {r: 1, g: 1, b: 1, a: 1}
110+
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
111+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
112+
m_BuildTextureStacks: []
113+
--- !u!114 &2112667605426640547
114+
MonoBehaviour:
115+
m_ObjectHideFlags: 11
116+
m_CorrespondingSourceObject: {fileID: 0}
117+
m_PrefabInstance: {fileID: 0}
118+
m_PrefabAsset: {fileID: 0}
119+
m_GameObject: {fileID: 0}
120+
m_Enabled: 1
121+
m_EditorHideFlags: 0
122+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
123+
m_Name:
124+
m_EditorClassIdentifier:
125+
version: 4

‎Assets/Materials/Disintegration/DisintegrationParticle.mat.meta

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

0 commit comments

Comments
 (0)