Skip to content

Commit 0022336

Browse files
Fixing 2021 new serialization and adding default namespace to editor settings (#642)
* adding default namespace to editor settings * new serialization with materials * missing mat changes
1 parent 99f42d4 commit 0022336

File tree

9 files changed

+18
-2
lines changed

9 files changed

+18
-2
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ Material:
9696
- _Mode: 0
9797
- _OcclusionStrength: 1
9898
- _Parallax: 0.02
99+
- _QueueControl: 0
100+
- _QueueOffset: 0
99101
- _RimAmount: 0.778
100102
- _RimThreshold: 0
101103
- _SmoothnessTextureChannel: 0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ Material:
8383
- _Mode: 0
8484
- _OcclusionStrength: 1
8585
- _Parallax: 0.02
86+
- _QueueControl: 0
87+
- _QueueOffset: 0
8688
- _RimAmount: 0.778
8789
- _RimThreshold: 0
8890
- _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Head_Rogue_Boy.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ Material:
8282
- _Mode: 0
8383
- _OcclusionStrength: 1
8484
- _Parallax: 0.02
85+
- _QueueControl: 0
86+
- _QueueOffset: 0
8587
- _RimAmount: 0.667
8688
- _RimThreshold: 0
8789
- _SmoothnessTextureChannel: 0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ Material:
8282
- _Mode: 0
8383
- _OcclusionStrength: 1
8484
- _Parallax: 0.02
85+
- _QueueControl: 0
86+
- _QueueOffset: 0
8587
- _RimAmount: 0.366
8688
- _RimThreshold: 0
8789
- _SmoothnessTextureChannel: 0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ Material:
9595
- _Mode: 0
9696
- _OcclusionStrength: 1
9797
- _Parallax: 0.02
98+
- _QueueControl: 0
99+
- _QueueOffset: 0
98100
- _RimAmount: 0.366
99101
- _RimThreshold: 0
100102
- _SmoothnessTextureChannel: 0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ Material:
9595
- _Mode: 0
9696
- _OcclusionStrength: 1
9797
- _Parallax: 0.02
98+
- _QueueControl: 0
99+
- _QueueOffset: 0
98100
- _RimAmount: 0.264
99101
- _RimThreshold: 0.058
100102
- _SmoothnessTextureChannel: 0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ Material:
8282
- _Mode: 0
8383
- _OcclusionStrength: 1
8484
- _Parallax: 0.02
85+
- _QueueControl: 0
86+
- _QueueOffset: 0
8587
- _RimAmount: 0.264
8688
- _RimThreshold: 0.058
8789
- _SmoothnessTextureChannel: 0

Assets/BossRoom/VFX/Materials/FX_M_StylizeSmoke.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ Material:
136136
- _OcclusionStrength: 1
137137
- _Opacity: 1
138138
- _Parallax: 0.02
139+
- _QueueControl: 0
140+
- _QueueOffset: 0
139141
- _SmoothnessTextureChannel: 0
140142
- _SpecularHighlights: 1
141143
- _SrcBlend: 1

ProjectSettings/EditorSettings.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:0ce3321cb23633c8a8d5b83999e00c8b20d0dccad3b2929d4a4c565b3b3d424d
3-
size 1250
2+
oid sha256:42ee6a6f99514a629df089bba8bcbbf33b2dd796f76c6ae4301773307f85858a
3+
size 1337

0 commit comments

Comments
 (0)