Skip to content

Commit 88dc66d

Browse files
SamuelBellomoSamuelBellomo
committed
missing changes
1 parent 38b166c commit 88dc66d

15 files changed

+30
-3
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ Material:
8080
- _Mode: 0
8181
- _OcclusionStrength: 1
8282
- _Parallax: 0.02
83+
- _QueueControl: 0
84+
- _QueueOffset: 0
8385
- _RimAmount: 0.778
8486
- _RimThreshold: 0
8587
- _SmoothnessTextureChannel: 0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ Material:
9393
- _Mode: 0
9494
- _OcclusionStrength: 1
9595
- _Parallax: 0.02
96+
- _QueueControl: 0
97+
- _QueueOffset: 0
9698
- _RimAmount: 0.667
9799
- _RimThreshold: 0
98100
- _SmoothnessTextureChannel: 0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ Material:
8080
- _Mode: 0
8181
- _OcclusionStrength: 1
8282
- _Parallax: 0.02
83+
- _QueueControl: 0
84+
- _QueueOffset: 0
8385
- _RimAmount: 0.667
8486
- _RimThreshold: 0
8587
- _SmoothnessTextureChannel: 0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ Material:
9393
- _Mode: 0
9494
- _OcclusionStrength: 1
9595
- _Parallax: 0.02
96+
- _QueueControl: 0
97+
- _QueueOffset: 0
9698
- _RimAmount: 0.366
9799
- _RimThreshold: 0
98100
- _SmoothnessTextureChannel: 0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ Material:
9393
- _Mode: 0
9494
- _OcclusionStrength: 1
9595
- _Parallax: 0.02
96+
- _QueueControl: 0
97+
- _QueueOffset: 0
9698
- _RimAmount: 0.366
9799
- _RimThreshold: 0
98100
- _SmoothnessTextureChannel: 0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ Material:
8080
- _Mode: 0
8181
- _OcclusionStrength: 1
8282
- _Parallax: 0.02
83+
- _QueueControl: 0
84+
- _QueueOffset: 0
8385
- _RimAmount: 0.264
8486
- _RimThreshold: 0.058
8587
- _SmoothnessTextureChannel: 0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ Material:
9393
- _Mode: 0
9494
- _OcclusionStrength: 1
9595
- _Parallax: 0.02
96+
- _QueueControl: 0
97+
- _QueueOffset: 0
9698
- _RimAmount: 0.264
9799
- _RimThreshold: 0.058
98100
- _SmoothnessTextureChannel: 0

‎Assets/BossRoom/VFX/Materials/FX_Crystal.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ Material:
121121
- _OcclusionStrength: 1
122122
- _Parallax: 0.02
123123
- _ParallaxDepth: 0.05
124+
- _QueueControl: 0
125+
- _QueueOffset: 0
124126
- _SmoothnessTextureChannel: 0
125127
- _SpecularHighlights: 1
126128
- _SrcBlend: 1

‎Assets/BossRoom/VFX/Materials/FX_M_Circle_Sheet 3.mat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ Material:
9191
- _GlossyReflections: 0
9292
- _Metallic: 0
9393
- _OcclusionStrength: 1
94+
- _QueueControl: 0
9495
- _QueueOffset: 0
9596
- _ReceiveShadows: 1
9697
- _Smoothness: 0.5

‎Assets/BossRoom/VFX/Materials/FX_M_Hit.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ Material:
9999
- _Mode: 0
100100
- _OcclusionStrength: 1
101101
- _Parallax: 0.02
102+
- _QueueControl: 0
103+
- _QueueOffset: 0
102104
- _SmoothnessTextureChannel: 0
103105
- _SpecularHighlights: 1
104106
- _SrcBlend: 1

‎Assets/BossRoom/VFX/Materials/FX_M_Slash_01.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ Material:
7979
- _MainTexturePower: 1
8080
- _Mask: 4
8181
- _MaskPower: 1
82+
- _QueueControl: 0
83+
- _QueueOffset: 0
8284
- _Scale: 1
8385
- __dirty: 0
8486
m_Colors:

‎Assets/BossRoom/VFX/Materials/FX_M_Slash_02.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ Material:
7979
- _MainTexturePower: 1
8080
- _Mask: 4
8181
- _MaskPower: 2
82+
- _QueueControl: 0
83+
- _QueueOffset: 0
8284
- _Scale: 1
8385
- __dirty: 0
8486
m_Colors:

‎Assets/BossRoom/VFX/Materials/FX_M_Sparks.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ Material:
110110
- _Mode: 0
111111
- _OcclusionStrength: 1
112112
- _Parallax: 0.02
113+
- _QueueControl: 0
114+
- _QueueOffset: 0
113115
- _SmoothnessTextureChannel: 0
114116
- _SpecularHighlights: 1
115117
- _SrcBlend: 1

‎Assets/BossRoom/VFX/Materials/FX_M_StylizeSmoke.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ Material:
145145
- _OcclusionStrength: 1
146146
- _Opacity: 1
147147
- _Parallax: 0.02
148+
- _QueueControl: 0
149+
- _QueueOffset: 0
148150
- _SmoothnessTextureChannel: 0
149151
- _SpecularHighlights: 1
150152
- _SrcBlend: 1

‎Assets/BossRoom/VFX/Materials/FX_SmokeDissolve_Additive.mat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: FX_SmokeDissolve_Additive
1111
m_Shader: {fileID: -6465566751694194690, guid: 5d29e5b8a08dd994aae83e406b3ffb62, type: 3}
12-
m_ShaderKeywords: ENUM_77760446580F4017ADC8BE0606DB8FC3_DISSOLVETEXRED ENUM_EA0A9A53583345159A94335DDBDA8082_CUSTOM
13-
_DISSOLVETYPE_CUSTOM _DISSOLVETYPE_UV _DISSOLVE_UV _DISTYPE_DISSOLVETEXRED _DIS_TYPE_DISSOLVETEXRED
14-
_INVERTDISSOLVE_ON _KEYWORD0_ON
12+
m_ShaderKeywords: _DISSOLVE_TYPE_CUSTOM _DIS_TYPE_DISSOLVETEXRED
1513
m_LightmapFlags: 0
1614
m_EnableInstancingVariants: 1
1715
m_DoubleSidedGI: 0
@@ -121,6 +119,8 @@ Material:
121119
- _Mode: 0
122120
- _OcclusionStrength: 1
123121
- _Parallax: 0.02
122+
- _QueueControl: 0
123+
- _QueueOffset: 0
124124
- _SmoothnessTextureChannel: 0
125125
- _SpecularHighlights: 1
126126
- _SrcBlend: 1

0 commit comments

Comments
 (0)