Skip to content

Commit 303b304

Browse files
Russell-Sng-Unity3DRussell-Sng-Unity3D
committed
Merge remote-tracking branch 'origin/Lune-SnowWorld_ExtraHats' into remote-config-test
# Conflicts: # Assets/Materials/Particles/FX_JumpDust.mat
2 parents 2025dbf + 7558649 commit 303b304

90 files changed

Lines changed: 15142 additions & 7 deletions

File tree

Some content is hidden

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

‎Assets/Materials/Environment/Cardboard-snow.mat‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
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: Cardboard-snow
11+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
12+
m_ShaderKeywords: _NORMALMAP
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: 2000
17+
stringTagMap:
18+
RenderType: Opaque
19+
disabledShaderPasses: []
20+
m_SavedProperties:
21+
serializedVersion: 3
22+
m_TexEnvs:
23+
- _BaseMap:
24+
m_Texture: {fileID: 0}
25+
m_Scale: {x: 1, y: 1}
26+
m_Offset: {x: 0, y: 0}
27+
- _BumpMap:
28+
m_Texture: {fileID: 2800000, guid: 5d089b0862bdc314ebbafda47575f13f, type: 3}
29+
m_Scale: {x: 1, y: 1}
30+
m_Offset: {x: 0, y: 0}
31+
- _DetailAlbedoMap:
32+
m_Texture: {fileID: 0}
33+
m_Scale: {x: 1, y: 1}
34+
m_Offset: {x: 0, y: 0}
35+
- _DetailMask:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
39+
- _DetailNormalMap:
40+
m_Texture: {fileID: 0}
41+
m_Scale: {x: 1, y: 1}
42+
m_Offset: {x: 0, y: 0}
43+
- _EmissionMap:
44+
m_Texture: {fileID: 0}
45+
m_Scale: {x: 1, y: 1}
46+
m_Offset: {x: 0, y: 0}
47+
- _MainTex:
48+
m_Texture: {fileID: 0}
49+
m_Scale: {x: 1, y: 1}
50+
m_Offset: {x: 0, y: 0}
51+
- _MetallicGlossMap:
52+
m_Texture: {fileID: 0}
53+
m_Scale: {x: 1, y: 1}
54+
m_Offset: {x: 0, y: 0}
55+
- _OcclusionMap:
56+
m_Texture: {fileID: 0}
57+
m_Scale: {x: 1, y: 1}
58+
m_Offset: {x: 0, y: 0}
59+
- _ParallaxMap:
60+
m_Texture: {fileID: 0}
61+
m_Scale: {x: 1, y: 1}
62+
m_Offset: {x: 0, y: 0}
63+
- _SpecGlossMap:
64+
m_Texture: {fileID: 0}
65+
m_Scale: {x: 1, y: 1}
66+
m_Offset: {x: 0, y: 0}
67+
- unity_Lightmaps:
68+
m_Texture: {fileID: 0}
69+
m_Scale: {x: 1, y: 1}
70+
m_Offset: {x: 0, y: 0}
71+
- unity_LightmapsInd:
72+
m_Texture: {fileID: 0}
73+
m_Scale: {x: 1, y: 1}
74+
m_Offset: {x: 0, y: 0}
75+
- unity_ShadowMasks:
76+
m_Texture: {fileID: 0}
77+
m_Scale: {x: 1, y: 1}
78+
m_Offset: {x: 0, y: 0}
79+
m_Ints: []
80+
m_Floats:
81+
- _AlphaClip: 0
82+
- _Blend: 0
83+
- _BumpScale: 0.38
84+
- _ClearCoatMask: 0
85+
- _ClearCoatSmoothness: 0
86+
- _Cull: 2
87+
- _Cutoff: 0.5
88+
- _DetailAlbedoMapScale: 1
89+
- _DetailNormalMapScale: 1
90+
- _DstBlend: 0
91+
- _EnvironmentReflections: 1
92+
- _GlossMapScale: 1
93+
- _Glossiness: 0
94+
- _GlossyReflections: 1
95+
- _Metallic: 0
96+
- _Mode: 0
97+
- _OcclusionStrength: 1
98+
- _Parallax: 0.02
99+
- _QueueOffset: 0
100+
- _ReceiveShadows: 1
101+
- _Smoothness: 0
102+
- _SmoothnessTextureChannel: 0
103+
- _SpecularHighlights: 1
104+
- _SrcBlend: 1
105+
- _Surface: 0
106+
- _UVSec: 0
107+
- _WorkflowMode: 1
108+
- _ZWrite: 1
109+
m_Colors:
110+
- _BaseColor: {r: 0.754717, g: 0.6312733, b: 0.43787825, a: 1}
111+
- _Color: {r: 1, g: 1, b: 1, a: 1}
112+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
113+
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
114+
m_BuildTextureStacks: []
115+
--- !u!114 &1581772360757577682
116+
MonoBehaviour:
117+
m_ObjectHideFlags: 11
118+
m_CorrespondingSourceObject: {fileID: 0}
119+
m_PrefabInstance: {fileID: 0}
120+
m_PrefabAsset: {fileID: 0}
121+
m_GameObject: {fileID: 0}
122+
m_Enabled: 1
123+
m_EditorHideFlags: 0
124+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
125+
m_Name:
126+
m_EditorClassIdentifier:
127+
version: 4

‎Assets/Materials/Environment/Cardboard-snow.mat.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/Materials/Environment/Snow.mat‎

Lines changed: 125 additions & 0 deletions
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!114 &-5644043456866408729
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: Snow
24+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_ShaderKeywords:
26+
m_LightmapFlags: 4
27+
m_EnableInstancingVariants: 0
28+
m_DoubleSidedGI: 0
29+
m_CustomRenderQueue: 2000
30+
stringTagMap:
31+
RenderType: Opaque
32+
disabledShaderPasses: []
33+
m_SavedProperties:
34+
serializedVersion: 3
35+
m_TexEnvs:
36+
- _BaseMap:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _BumpMap:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _DetailAlbedoMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _DetailMask:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _DetailNormalMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _EmissionMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _MainTex:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _MetallicGlossMap:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _OcclusionMap:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- _ParallaxMap:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- _SpecGlossMap:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- unity_Lightmaps:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- unity_LightmapsInd:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- unity_ShadowMasks:
89+
m_Texture: {fileID: 0}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
92+
m_Ints: []
93+
m_Floats:
94+
- _AlphaClip: 0
95+
- _Blend: 0
96+
- _BumpScale: 1
97+
- _ClearCoatMask: 0
98+
- _ClearCoatSmoothness: 0
99+
- _Cull: 2
100+
- _Cutoff: 0.5
101+
- _DetailAlbedoMapScale: 1
102+
- _DetailNormalMapScale: 1
103+
- _DstBlend: 0
104+
- _EnvironmentReflections: 1
105+
- _GlossMapScale: 0
106+
- _Glossiness: 0
107+
- _GlossyReflections: 0
108+
- _Metallic: 0
109+
- _OcclusionStrength: 1
110+
- _Parallax: 0.005
111+
- _QueueOffset: 0
112+
- _ReceiveShadows: 1
113+
- _Smoothness: 0.586
114+
- _SmoothnessTextureChannel: 0
115+
- _SpecularHighlights: 1
116+
- _SrcBlend: 1
117+
- _Surface: 0
118+
- _WorkflowMode: 1
119+
- _ZWrite: 1
120+
m_Colors:
121+
- _BaseColor: {r: 0.60083663, g: 0.6888573, b: 0.8113208, a: 1}
122+
- _Color: {r: 1, g: 1, b: 1, a: 1}
123+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
124+
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
125+
m_BuildTextureStacks: []

‎Assets/Materials/Environment/Snow.mat.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/Materials/Environment/Snow_CandyCone_CandyCone_AlbedoTransparency.mat‎

Lines changed: 125 additions & 0 deletions
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!114 &-4012549589263609079
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: Snow_CandyCone_CandyCone_AlbedoTransparency
24+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_ShaderKeywords: _NORMALMAP
26+
m_LightmapFlags: 4
27+
m_EnableInstancingVariants: 0
28+
m_DoubleSidedGI: 0
29+
m_CustomRenderQueue: 2000
30+
stringTagMap:
31+
RenderType: Opaque
32+
disabledShaderPasses: []
33+
m_SavedProperties:
34+
serializedVersion: 3
35+
m_TexEnvs:
36+
- _BaseMap:
37+
m_Texture: {fileID: 2800000, guid: 8162c0b2a45dedb4db6c8fcc6bd8d8b1, type: 3}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _BumpMap:
41+
m_Texture: {fileID: 2800000, guid: 801810e845213b54ca72d2f74eaa9791, type: 3}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _DetailAlbedoMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _DetailMask:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _DetailNormalMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _EmissionMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _MainTex:
61+
m_Texture: {fileID: 2800000, guid: 8162c0b2a45dedb4db6c8fcc6bd8d8b1, type: 3}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _MetallicGlossMap:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _OcclusionMap:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- _ParallaxMap:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- _SpecGlossMap:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- unity_Lightmaps:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- unity_LightmapsInd:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- unity_ShadowMasks:
89+
m_Texture: {fileID: 0}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
92+
m_Ints: []
93+
m_Floats:
94+
- _AlphaClip: 0
95+
- _Blend: 0
96+
- _BumpScale: 1
97+
- _ClearCoatMask: 0
98+
- _ClearCoatSmoothness: 0
99+
- _Cull: 2
100+
- _Cutoff: 0.5
101+
- _DetailAlbedoMapScale: 1
102+
- _DetailNormalMapScale: 1
103+
- _DstBlend: 0
104+
- _EnvironmentReflections: 1
105+
- _GlossMapScale: 0
106+
- _Glossiness: 0
107+
- _GlossyReflections: 0
108+
- _Metallic: 0
109+
- _OcclusionStrength: 1
110+
- _Parallax: 0.005
111+
- _QueueOffset: 0
112+
- _ReceiveShadows: 1
113+
- _Smoothness: 1
114+
- _SmoothnessTextureChannel: 0
115+
- _SpecularHighlights: 1
116+
- _SrcBlend: 1
117+
- _Surface: 0
118+
- _WorkflowMode: 1
119+
- _ZWrite: 1
120+
m_Colors:
121+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
122+
- _Color: {r: 1, g: 1, b: 1, a: 1}
123+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
124+
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
125+
m_BuildTextureStacks: []

0 commit comments

Comments
 (0)