Skip to content

Commit 618d577

Browse files
SamuelBellomoSamuelBellomo
committed
tmp commit for merge
1 parent eef5e8d commit 618d577

File tree

118 files changed

+1506
-353
lines changed

Some content is hidden

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

118 files changed

+1506
-353
lines changed

‎Assets/BossRoom/Material/Characters/Character_Shadow.mat

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
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: Character_Shadow
1111
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
12-
m_ShaderKeywords:
12+
m_ValidKeywords:
13+
- _SURFACE_TYPE_TRANSPARENT
14+
m_InvalidKeywords: []
1315
m_LightmapFlags: 4
1416
m_EnableInstancingVariants: 0
1517
m_DoubleSidedGI: 0
@@ -18,6 +20,7 @@ Material:
1820
RenderType: Transparent
1921
disabledShaderPasses:
2022
- SHADOWCASTER
23+
- DepthOnly
2124
m_SavedProperties:
2225
serializedVersion: 3
2326
m_TexEnvs:
@@ -77,9 +80,11 @@ Material:
7780
m_Texture: {fileID: 0}
7881
m_Scale: {x: 1, y: 1}
7982
m_Offset: {x: 0, y: 0}
83+
m_Ints: []
8084
m_Floats:
8185
- _AlphaClip: 0
8286
- _Blend: 0
87+
- _BlendOp: 0
8388
- _BumpScale: 1
8489
- _ClearCoatMask: 0
8590
- _ClearCoatSmoothness: 0
@@ -107,7 +112,7 @@ Material:
107112
- _ZWrite: 0
108113
m_Colors:
109114
- _BaseColor: {r: 0, g: 0, b: 0, a: 0.54509807}
110-
- _Color: {r: 1, g: 1, b: 1, a: 1}
115+
- _Color: {r: 0, g: 0, b: 0, a: 0.54509807}
111116
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
112117
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
113118
m_BuildTextureStacks: []
@@ -123,4 +128,4 @@ MonoBehaviour:
123128
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
124129
m_Name:
125130
m_EditorClassIdentifier:
126-
version: 4
131+
version: 5

‎Assets/BossRoom/Material/Characters/Enemy_Eyes_sheet.mat

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@
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: Enemy_Eyes_sheet
1111
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
12-
m_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF
12+
m_ValidKeywords:
13+
- _ALPHATEST_ON
14+
- _EMISSION
15+
- _RECEIVE_SHADOWS_OFF
16+
- _SURFACE_TYPE_TRANSPARENT
17+
m_InvalidKeywords: []
1318
m_LightmapFlags: 2
1419
m_EnableInstancingVariants: 1
1520
m_DoubleSidedGI: 0
@@ -18,6 +23,7 @@ Material:
1823
RenderType: Transparent
1924
disabledShaderPasses:
2025
- SHADOWCASTER
26+
- DepthOnly
2127
m_SavedProperties:
2228
serializedVersion: 3
2329
m_TexEnvs:
@@ -77,6 +83,7 @@ Material:
7783
m_Texture: {fileID: 0}
7884
m_Scale: {x: 1, y: 1}
7985
m_Offset: {x: 0, y: 0}
86+
m_Ints: []
8087
m_Floats:
8188
- _AlphaClip: 1
8289
- _Blend: 0
@@ -107,7 +114,7 @@ Material:
107114
- _ZWrite: 0
108115
m_Colors:
109116
- _BaseColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
110-
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
117+
- _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
111118
- _EmissionColor: {r: 0.27450982, g: 0.27450982, b: 0.27450982, a: 1}
112119
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
113120
m_BuildTextureStacks: []
@@ -123,4 +130,4 @@ MonoBehaviour:
123130
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
124131
m_Name:
125132
m_EditorClassIdentifier:
126-
version: 4
133+
version: 5

‎Assets/BossRoom/Material/Characters/Enemy_Mouth_sheet.mat

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,22 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 4
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: Enemy_Mouth_sheet
2424
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
25-
m_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF
25+
m_ValidKeywords:
26+
- _ALPHATEST_ON
27+
- _EMISSION
28+
- _RECEIVE_SHADOWS_OFF
29+
- _SURFACE_TYPE_TRANSPARENT
30+
m_InvalidKeywords: []
2631
m_LightmapFlags: 2
2732
m_EnableInstancingVariants: 1
2833
m_DoubleSidedGI: 0
@@ -31,6 +36,7 @@ Material:
3136
RenderType: Transparent
3237
disabledShaderPasses:
3338
- SHADOWCASTER
39+
- DepthOnly
3440
m_SavedProperties:
3541
serializedVersion: 3
3642
m_TexEnvs:
@@ -90,6 +96,7 @@ Material:
9096
m_Texture: {fileID: 0}
9197
m_Scale: {x: 1, y: 1}
9298
m_Offset: {x: 0, y: 0}
99+
m_Ints: []
93100
m_Floats:
94101
- _AlphaClip: 1
95102
- _Blend: 0
@@ -123,7 +130,7 @@ Material:
123130
m_Colors:
124131
- _AmbientColor: {r: 0.4, g: 0.4, b: 0.4, a: 1}
125132
- _BaseColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
126-
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
133+
- _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
127134
- _EmissionColor: {r: 0.2745098, g: 0.2745098, b: 0.2745098, a: 1}
128135
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
129136
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

‎Assets/BossRoom/Material/Characters/Hero_Eyes_sheet.mat

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@
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: Hero_Eyes_sheet
1111
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
12-
m_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF
12+
m_ValidKeywords:
13+
- _ALPHATEST_ON
14+
- _EMISSION
15+
- _RECEIVE_SHADOWS_OFF
16+
- _SURFACE_TYPE_TRANSPARENT
17+
m_InvalidKeywords: []
1318
m_LightmapFlags: 2
1419
m_EnableInstancingVariants: 1
1520
m_DoubleSidedGI: 0
@@ -18,6 +23,7 @@ Material:
1823
RenderType: Transparent
1924
disabledShaderPasses:
2025
- SHADOWCASTER
26+
- DepthOnly
2127
m_SavedProperties:
2228
serializedVersion: 3
2329
m_TexEnvs:
@@ -77,6 +83,7 @@ Material:
7783
m_Texture: {fileID: 0}
7884
m_Scale: {x: 1, y: 1}
7985
m_Offset: {x: 0, y: 0}
86+
m_Ints: []
8087
m_Floats:
8188
- _AlphaClip: 1
8289
- _Blend: 0
@@ -107,7 +114,7 @@ Material:
107114
- _ZWrite: 0
108115
m_Colors:
109116
- _BaseColor: {r: 0.248, g: 0.248, b: 0.248, a: 1}
110-
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
117+
- _Color: {r: 0.24799997, g: 0.24799997, b: 0.24799997, a: 1}
111118
- _EmissionColor: {r: 0.135, g: 0.135, b: 0.135, a: 1}
112119
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
113120
m_BuildTextureStacks: []
@@ -123,4 +130,4 @@ MonoBehaviour:
123130
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
124131
m_Name:
125132
m_EditorClassIdentifier:
126-
version: 4
133+
version: 5

‎Assets/BossRoom/Material/Characters/Hero_Mouth_sheet.mat

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@
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: Hero_Mouth_sheet
1111
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
12-
m_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF
12+
m_ValidKeywords:
13+
- _ALPHATEST_ON
14+
- _EMISSION
15+
- _RECEIVE_SHADOWS_OFF
16+
- _SURFACE_TYPE_TRANSPARENT
17+
m_InvalidKeywords: []
1318
m_LightmapFlags: 2
1419
m_EnableInstancingVariants: 1
1520
m_DoubleSidedGI: 0
@@ -18,6 +23,7 @@ Material:
1823
RenderType: Transparent
1924
disabledShaderPasses:
2025
- SHADOWCASTER
26+
- DepthOnly
2127
m_SavedProperties:
2228
serializedVersion: 3
2329
m_TexEnvs:
@@ -77,6 +83,7 @@ Material:
7783
m_Texture: {fileID: 0}
7884
m_Scale: {x: 1, y: 1}
7985
m_Offset: {x: 0, y: 0}
86+
m_Ints: []
8087
m_Floats:
8188
- _AlphaClip: 1
8289
- _Blend: 0
@@ -110,7 +117,7 @@ Material:
110117
m_Colors:
111118
- _AmbientColor: {r: 0.4, g: 0.4, b: 0.4, a: 1}
112119
- _BaseColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
113-
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
120+
- _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
114121
- _EmissionColor: {r: 0.2745098, g: 0.2745098, b: 0.2745098, a: 1}
115122
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
116123
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
@@ -128,4 +135,4 @@ MonoBehaviour:
128135
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
129136
m_Name:
130137
m_EditorClassIdentifier:
131-
version: 4
138+
version: 5

‎Assets/BossRoom/Material/Characters/Toon/Hair_Archer_Boy.mat

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
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: Hair_Archer_Boy
1111
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
12-
m_ShaderKeywords: _EMISSION _NORMALMAP
12+
m_ValidKeywords: []
13+
m_InvalidKeywords:
14+
- _EMISSION
15+
- _NORMALMAP
1316
m_LightmapFlags: 2
1417
m_EnableInstancingVariants: 1
1518
m_DoubleSidedGI: 0
@@ -67,6 +70,7 @@ Material:
6770
m_Texture: {fileID: 0}
6871
m_Scale: {x: 1, y: 1}
6972
m_Offset: {x: 0, y: 0}
73+
m_Ints: []
7074
m_Floats:
7175
- _BumpScale: 1
7276
- _Cutoff: 0.5
@@ -93,3 +97,16 @@ Material:
9397
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
9498
- _SpecularColor: {r: 3.6078432, g: 3.6078432, b: 3.6078432, a: 1}
9599
m_BuildTextureStacks: []
100+
--- !u!114 &291750459087336187
101+
MonoBehaviour:
102+
m_ObjectHideFlags: 11
103+
m_CorrespondingSourceObject: {fileID: 0}
104+
m_PrefabInstance: {fileID: 0}
105+
m_PrefabAsset: {fileID: 0}
106+
m_GameObject: {fileID: 0}
107+
m_Enabled: 1
108+
m_EditorHideFlags: 0
109+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
110+
m_Name:
111+
m_EditorClassIdentifier:
112+
version: 5

‎Assets/BossRoom/Material/Characters/Toon/Hair_Archer_Girl.mat

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,31 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-9751005091268525
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: 5
316
--- !u!21 &2100000
417
Material:
5-
serializedVersion: 6
18+
serializedVersion: 8
619
m_ObjectHideFlags: 0
720
m_CorrespondingSourceObject: {fileID: 0}
821
m_PrefabInstance: {fileID: 0}
922
m_PrefabAsset: {fileID: 0}
1023
m_Name: Hair_Archer_Girl
1124
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
12-
m_ShaderKeywords: _EMISSION _NORMALMAP
25+
m_ValidKeywords: []
26+
m_InvalidKeywords:
27+
- _EMISSION
28+
- _NORMALMAP
1329
m_LightmapFlags: 2
1430
m_EnableInstancingVariants: 1
1531
m_DoubleSidedGI: 0
@@ -67,6 +83,7 @@ Material:
6783
m_Texture: {fileID: 0}
6884
m_Scale: {x: 1, y: 1}
6985
m_Offset: {x: 0, y: 0}
86+
m_Ints: []
7087
m_Floats:
7188
- _BumpScale: 1
7289
- _Cutoff: 0.5

‎Assets/BossRoom/Material/Characters/Toon/Hair_Mage_Boy.mat

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
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: Hair_Mage_Boy
1111
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
12-
m_ShaderKeywords: _EMISSION _NORMALMAP
12+
m_ValidKeywords: []
13+
m_InvalidKeywords:
14+
- _EMISSION
15+
- _NORMALMAP
1316
m_LightmapFlags: 2
1417
m_EnableInstancingVariants: 1
1518
m_DoubleSidedGI: 0
@@ -67,6 +70,7 @@ Material:
6770
m_Texture: {fileID: 0}
6871
m_Scale: {x: 1, y: 1}
6972
m_Offset: {x: 0, y: 0}
73+
m_Ints: []
7074
m_Floats:
7175
- _BumpScale: 1
7276
- _Cutoff: 0.5
@@ -93,3 +97,16 @@ Material:
9397
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
9498
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
9599
m_BuildTextureStacks: []
100+
--- !u!114 &3667653722729066752
101+
MonoBehaviour:
102+
m_ObjectHideFlags: 11
103+
m_CorrespondingSourceObject: {fileID: 0}
104+
m_PrefabInstance: {fileID: 0}
105+
m_PrefabAsset: {fileID: 0}
106+
m_GameObject: {fileID: 0}
107+
m_Enabled: 1
108+
m_EditorHideFlags: 0
109+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
110+
m_Name:
111+
m_EditorClassIdentifier:
112+
version: 5

0 commit comments

Comments
 (0)