Skip to content

Commit e9a2f6c

Browse files
SamuelBellomoSamuelBellomo
committed
initial engine bump
1 parent 1fec2ac commit e9a2f6c

File tree

120 files changed

+1001
-141
lines changed

Some content is hidden

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

120 files changed

+1001
-141
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Character_Shadow
1111
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
12-
m_ShaderKeywords:
12+
m_ShaderKeywords: _SURFACE_TYPE_TRANSPARENT
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
@@ -18,6 +18,7 @@ Material:
1818
RenderType: Transparent
1919
disabledShaderPasses:
2020
- SHADOWCASTER
21+
- DepthOnly
2122
m_SavedProperties:
2223
serializedVersion: 3
2324
m_TexEnvs:
@@ -77,9 +78,11 @@ Material:
7778
m_Texture: {fileID: 0}
7879
m_Scale: {x: 1, y: 1}
7980
m_Offset: {x: 0, y: 0}
81+
m_Ints: []
8082
m_Floats:
8183
- _AlphaClip: 0
8284
- _Blend: 0
85+
- _BlendOp: 0
8386
- _BumpScale: 1
8487
- _ClearCoatMask: 0
8588
- _ClearCoatSmoothness: 0
@@ -107,7 +110,7 @@ Material:
107110
- _ZWrite: 0
108111
m_Colors:
109112
- _BaseColor: {r: 0, g: 0, b: 0, a: 0.54509807}
110-
- _Color: {r: 1, g: 1, b: 1, a: 1}
113+
- _Color: {r: 0, g: 0, b: 0, a: 0.54509807}
111114
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
112115
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
113116
m_BuildTextureStacks: []
@@ -123,4 +126,4 @@ MonoBehaviour:
123126
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
124127
m_Name:
125128
m_EditorClassIdentifier:
126-
version: 4
129+
version: 5

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Material:
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_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT
1313
m_LightmapFlags: 2
1414
m_EnableInstancingVariants: 1
1515
m_DoubleSidedGI: 0
@@ -18,6 +18,7 @@ Material:
1818
RenderType: Transparent
1919
disabledShaderPasses:
2020
- SHADOWCASTER
21+
- DepthOnly
2122
m_SavedProperties:
2223
serializedVersion: 3
2324
m_TexEnvs:
@@ -77,6 +78,7 @@ Material:
7778
m_Texture: {fileID: 0}
7879
m_Scale: {x: 1, y: 1}
7980
m_Offset: {x: 0, y: 0}
81+
m_Ints: []
8082
m_Floats:
8183
- _AlphaClip: 1
8284
- _Blend: 0
@@ -107,7 +109,7 @@ Material:
107109
- _ZWrite: 0
108110
m_Colors:
109111
- _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}
112+
- _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
111113
- _EmissionColor: {r: 0.27450982, g: 0.27450982, b: 0.27450982, a: 1}
112114
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
113115
m_BuildTextureStacks: []
@@ -123,4 +125,4 @@ MonoBehaviour:
123125
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
124126
m_Name:
125127
m_EditorClassIdentifier:
126-
version: 4
128+
version: 5

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ 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:
1818
serializedVersion: 6
@@ -22,7 +22,7 @@ Material:
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_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT
2626
m_LightmapFlags: 2
2727
m_EnableInstancingVariants: 1
2828
m_DoubleSidedGI: 0
@@ -31,6 +31,7 @@ Material:
3131
RenderType: Transparent
3232
disabledShaderPasses:
3333
- SHADOWCASTER
34+
- DepthOnly
3435
m_SavedProperties:
3536
serializedVersion: 3
3637
m_TexEnvs:
@@ -90,6 +91,7 @@ Material:
9091
m_Texture: {fileID: 0}
9192
m_Scale: {x: 1, y: 1}
9293
m_Offset: {x: 0, y: 0}
94+
m_Ints: []
9395
m_Floats:
9496
- _AlphaClip: 1
9597
- _Blend: 0
@@ -123,7 +125,7 @@ Material:
123125
m_Colors:
124126
- _AmbientColor: {r: 0.4, g: 0.4, b: 0.4, a: 1}
125127
- _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}
128+
- _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
127129
- _EmissionColor: {r: 0.2745098, g: 0.2745098, b: 0.2745098, a: 1}
128130
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
129131
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Material:
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_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT
1313
m_LightmapFlags: 2
1414
m_EnableInstancingVariants: 1
1515
m_DoubleSidedGI: 0
@@ -18,6 +18,7 @@ Material:
1818
RenderType: Transparent
1919
disabledShaderPasses:
2020
- SHADOWCASTER
21+
- DepthOnly
2122
m_SavedProperties:
2223
serializedVersion: 3
2324
m_TexEnvs:
@@ -77,6 +78,7 @@ Material:
7778
m_Texture: {fileID: 0}
7879
m_Scale: {x: 1, y: 1}
7980
m_Offset: {x: 0, y: 0}
81+
m_Ints: []
8082
m_Floats:
8183
- _AlphaClip: 1
8284
- _Blend: 0
@@ -107,7 +109,7 @@ Material:
107109
- _ZWrite: 0
108110
m_Colors:
109111
- _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}
112+
- _Color: {r: 0.24799997, g: 0.24799997, b: 0.24799997, a: 1}
111113
- _EmissionColor: {r: 0.135, g: 0.135, b: 0.135, a: 1}
112114
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
113115
m_BuildTextureStacks: []
@@ -123,4 +125,4 @@ MonoBehaviour:
123125
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
124126
m_Name:
125127
m_EditorClassIdentifier:
126-
version: 4
128+
version: 5

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Material:
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_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT
1313
m_LightmapFlags: 2
1414
m_EnableInstancingVariants: 1
1515
m_DoubleSidedGI: 0
@@ -18,6 +18,7 @@ Material:
1818
RenderType: Transparent
1919
disabledShaderPasses:
2020
- SHADOWCASTER
21+
- DepthOnly
2122
m_SavedProperties:
2223
serializedVersion: 3
2324
m_TexEnvs:
@@ -77,6 +78,7 @@ Material:
7778
m_Texture: {fileID: 0}
7879
m_Scale: {x: 1, y: 1}
7980
m_Offset: {x: 0, y: 0}
81+
m_Ints: []
8082
m_Floats:
8183
- _AlphaClip: 1
8284
- _Blend: 0
@@ -110,7 +112,7 @@ Material:
110112
m_Colors:
111113
- _AmbientColor: {r: 0.4, g: 0.4, b: 0.4, a: 1}
112114
- _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}
115+
- _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
114116
- _EmissionColor: {r: 0.2745098, g: 0.2745098, b: 0.2745098, a: 1}
115117
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
116118
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
@@ -128,4 +130,4 @@ MonoBehaviour:
128130
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
129131
m_Name:
130132
m_EditorClassIdentifier:
131-
version: 4
133+
version: 5

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-5970013690206242241
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:
518
serializedVersion: 6
@@ -67,6 +80,7 @@ Material:
6780
m_Texture: {fileID: 0}
6881
m_Scale: {x: 1, y: 1}
6982
m_Offset: {x: 0, y: 0}
83+
m_Ints: []
7084
m_Floats:
7185
- _BumpScale: 1
7286
- _Cutoff: 0.5

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ Material:
6767
m_Texture: {fileID: 0}
6868
m_Scale: {x: 1, y: 1}
6969
m_Offset: {x: 0, y: 0}
70+
m_Ints: []
7071
m_Floats:
7172
- _BumpScale: 1
7273
- _Cutoff: 0.5
@@ -93,3 +94,16 @@ Material:
9394
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
9495
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
9596
m_BuildTextureStacks: []
97+
--- !u!114 &11195970808030904
98+
MonoBehaviour:
99+
m_ObjectHideFlags: 11
100+
m_CorrespondingSourceObject: {fileID: 0}
101+
m_PrefabInstance: {fileID: 0}
102+
m_PrefabAsset: {fileID: 0}
103+
m_GameObject: {fileID: 0}
104+
m_Enabled: 1
105+
m_EditorHideFlags: 0
106+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
107+
m_Name:
108+
m_EditorClassIdentifier:
109+
version: 5

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-4980724838769866959
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:
518
serializedVersion: 6
@@ -67,6 +80,7 @@ Material:
6780
m_Texture: {fileID: 0}
6881
m_Scale: {x: 1, y: 1}
6982
m_Offset: {x: 0, y: 0}
83+
m_Ints: []
7084
m_Floats:
7185
- _BumpScale: 1
7286
- _Cutoff: 0.5

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-4958961300368626302
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:
518
serializedVersion: 6
@@ -67,6 +80,7 @@ Material:
6780
m_Texture: {fileID: 0}
6881
m_Scale: {x: 1, y: 1}
6982
m_Offset: {x: 0, y: 0}
83+
m_Ints: []
7084
m_Floats:
7185
- _BumpScale: 1
7286
- _Cutoff: 0.5

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-2186454493988483094
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:
518
serializedVersion: 6
@@ -67,6 +80,7 @@ Material:
6780
m_Texture: {fileID: 0}
6881
m_Scale: {x: 1, y: 1}
6982
m_Offset: {x: 0, y: 0}
83+
m_Ints: []
7084
m_Floats:
7185
- _BumpScale: 1
7286
- _Cutoff: 0.5

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ Material:
6767
m_Texture: {fileID: 0}
6868
m_Scale: {x: 1, y: 1}
6969
m_Offset: {x: 0, y: 0}
70+
m_Ints: []
7071
m_Floats:
7172
- _BumpScale: 1
7273
- _Cutoff: 0.5
@@ -93,3 +94,16 @@ Material:
9394
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
9495
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
9596
m_BuildTextureStacks: []
97+
--- !u!114 &7370260492650119529
98+
MonoBehaviour:
99+
m_ObjectHideFlags: 11
100+
m_CorrespondingSourceObject: {fileID: 0}
101+
m_PrefabInstance: {fileID: 0}
102+
m_PrefabAsset: {fileID: 0}
103+
m_GameObject: {fileID: 0}
104+
m_Enabled: 1
105+
m_EditorHideFlags: 0
106+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
107+
m_Name:
108+
m_EditorClassIdentifier:
109+
version: 5

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ Material:
6767
m_Texture: {fileID: 0}
6868
m_Scale: {x: 1, y: 1}
6969
m_Offset: {x: 0, y: 0}
70+
m_Ints: []
7071
m_Floats:
7172
- _BumpScale: 1
7273
- _Cutoff: 0.5
@@ -93,3 +94,16 @@ Material:
9394
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
9495
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
9596
m_BuildTextureStacks: []
97+
--- !u!114 &5272448003705847202
98+
MonoBehaviour:
99+
m_ObjectHideFlags: 11
100+
m_CorrespondingSourceObject: {fileID: 0}
101+
m_PrefabInstance: {fileID: 0}
102+
m_PrefabAsset: {fileID: 0}
103+
m_GameObject: {fileID: 0}
104+
m_Enabled: 1
105+
m_EditorHideFlags: 0
106+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
107+
m_Name:
108+
m_EditorClassIdentifier:
109+
version: 5

0 commit comments

Comments
 (0)