diff --git a/Assets/Material/Characters/Character_Shadow.mat b/Assets/Material/Characters/Character_Shadow.mat index 9407eaee7..72e7a1257 100644 --- a/Assets/Material/Characters/Character_Shadow.mat +++ b/Assets/Material/Characters/Character_Shadow.mat @@ -146,4 +146,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Enemy_Eyes_sheet.mat b/Assets/Material/Characters/Enemy_Eyes_sheet.mat index d84ae2289..8df68bbc6 100644 --- a/Assets/Material/Characters/Enemy_Eyes_sheet.mat +++ b/Assets/Material/Characters/Enemy_Eyes_sheet.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -141,4 +142,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Enemy_Mouth_sheet.mat b/Assets/Material/Characters/Enemy_Mouth_sheet.mat index 01468aaa8..b0bf27b41 100644 --- a/Assets/Material/Characters/Enemy_Mouth_sheet.mat +++ b/Assets/Material/Characters/Enemy_Mouth_sheet.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -26,7 +26,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 diff --git a/Assets/Material/Characters/Hero_Eyes_sheet.mat b/Assets/Material/Characters/Hero_Eyes_sheet.mat index 2102ce533..d03cae6ba 100644 --- a/Assets/Material/Characters/Hero_Eyes_sheet.mat +++ b/Assets/Material/Characters/Hero_Eyes_sheet.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -141,4 +142,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Hero_Mouth_sheet.mat b/Assets/Material/Characters/Hero_Mouth_sheet.mat index a7c30fb45..33a099c0b 100644 --- a/Assets/Material/Characters/Hero_Mouth_sheet.mat +++ b/Assets/Material/Characters/Hero_Mouth_sheet.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -146,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Hair_Archer_Boy.mat b/Assets/Material/Characters/Toon/Hair_Archer_Boy.mat index b3237664e..e44f09548 100644 --- a/Assets/Material/Characters/Toon/Hair_Archer_Boy.mat +++ b/Assets/Material/Characters/Toon/Hair_Archer_Boy.mat @@ -116,4 +116,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Hair_Archer_Girl.mat b/Assets/Material/Characters/Toon/Hair_Archer_Girl.mat index 86bd55e2e..adf79f1d4 100644 --- a/Assets/Material/Characters/Toon/Hair_Archer_Girl.mat +++ b/Assets/Material/Characters/Toon/Hair_Archer_Girl.mat @@ -116,4 +116,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Hair_Mage_Boy.mat b/Assets/Material/Characters/Toon/Hair_Mage_Boy.mat index b93c6ce1c..31eadbf45 100644 --- a/Assets/Material/Characters/Toon/Hair_Mage_Boy.mat +++ b/Assets/Material/Characters/Toon/Hair_Mage_Boy.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Characters/Toon/Hair_Mage_Girl.mat b/Assets/Material/Characters/Toon/Hair_Mage_Girl.mat index 2bb9b3d62..1c56f2fe0 100644 --- a/Assets/Material/Characters/Toon/Hair_Mage_Girl.mat +++ b/Assets/Material/Characters/Toon/Hair_Mage_Girl.mat @@ -129,4 +129,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Hair_Rogue_Boy.mat b/Assets/Material/Characters/Toon/Hair_Rogue_Boy.mat index b29f1af8f..450ee4f58 100644 --- a/Assets/Material/Characters/Toon/Hair_Rogue_Boy.mat +++ b/Assets/Material/Characters/Toon/Hair_Rogue_Boy.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Characters/Toon/Hair_Rogue_Girl.mat b/Assets/Material/Characters/Toon/Hair_Rogue_Girl.mat index 92a6846e0..cb97f1dc6 100644 --- a/Assets/Material/Characters/Toon/Hair_Rogue_Girl.mat +++ b/Assets/Material/Characters/Toon/Hair_Rogue_Girl.mat @@ -116,4 +116,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Hair_Tank_Boy.mat b/Assets/Material/Characters/Toon/Hair_Tank_Boy.mat index 5f61b1501..a4e133c9c 100644 --- a/Assets/Material/Characters/Toon/Hair_Tank_Boy.mat +++ b/Assets/Material/Characters/Toon/Hair_Tank_Boy.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Characters/Toon/Hair_Tank_Girl.mat b/Assets/Material/Characters/Toon/Hair_Tank_Girl.mat index d86e7652c..335edfbc0 100644 --- a/Assets/Material/Characters/Toon/Hair_Tank_Girl.mat +++ b/Assets/Material/Characters/Toon/Hair_Tank_Girl.mat @@ -116,4 +116,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Head_Archer_Boy.mat b/Assets/Material/Characters/Toon/Head_Archer_Boy.mat index fbffa5924..aa81e6cb1 100644 --- a/Assets/Material/Characters/Toon/Head_Archer_Boy.mat +++ b/Assets/Material/Characters/Toon/Head_Archer_Boy.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Characters/Toon/Head_Archer_Girl.mat b/Assets/Material/Characters/Toon/Head_Archer_Girl.mat index 3318c48b7..324250e71 100644 --- a/Assets/Material/Characters/Toon/Head_Archer_Girl.mat +++ b/Assets/Material/Characters/Toon/Head_Archer_Girl.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Characters/Toon/Head_Boss.mat b/Assets/Material/Characters/Toon/Head_Boss.mat index 2f4c8bb96..bb6c18844 100644 --- a/Assets/Material/Characters/Toon/Head_Boss.mat +++ b/Assets/Material/Characters/Toon/Head_Boss.mat @@ -128,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Head_Imp.mat b/Assets/Material/Characters/Toon/Head_Imp.mat index 9f72efbc5..2f7f12322 100644 --- a/Assets/Material/Characters/Toon/Head_Imp.mat +++ b/Assets/Material/Characters/Toon/Head_Imp.mat @@ -128,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Head_Imp_Vandal.mat b/Assets/Material/Characters/Toon/Head_Imp_Vandal.mat index 3cadea68e..efa297cee 100644 --- a/Assets/Material/Characters/Toon/Head_Imp_Vandal.mat +++ b/Assets/Material/Characters/Toon/Head_Imp_Vandal.mat @@ -115,4 +115,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Head_Mage_Boy.mat b/Assets/Material/Characters/Toon/Head_Mage_Boy.mat index a03238de8..37d2725c1 100644 --- a/Assets/Material/Characters/Toon/Head_Mage_Boy.mat +++ b/Assets/Material/Characters/Toon/Head_Mage_Boy.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Characters/Toon/Head_Mage_Girl.mat b/Assets/Material/Characters/Toon/Head_Mage_Girl.mat index b80bb0f2e..b8b8371f9 100644 --- a/Assets/Material/Characters/Toon/Head_Mage_Girl.mat +++ b/Assets/Material/Characters/Toon/Head_Mage_Girl.mat @@ -128,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Head_Rogue_Boy.mat b/Assets/Material/Characters/Toon/Head_Rogue_Boy.mat index 66f6f0c8f..16c76f1d7 100644 --- a/Assets/Material/Characters/Toon/Head_Rogue_Boy.mat +++ b/Assets/Material/Characters/Toon/Head_Rogue_Boy.mat @@ -115,4 +115,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Head_Rogue_Girl.mat b/Assets/Material/Characters/Toon/Head_Rogue_Girl.mat index 4bef80d85..8a2a579ca 100644 --- a/Assets/Material/Characters/Toon/Head_Rogue_Girl.mat +++ b/Assets/Material/Characters/Toon/Head_Rogue_Girl.mat @@ -128,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Head_Tank_Boy.mat b/Assets/Material/Characters/Toon/Head_Tank_Boy.mat index 14ae3a85e..22bac70a5 100644 --- a/Assets/Material/Characters/Toon/Head_Tank_Boy.mat +++ b/Assets/Material/Characters/Toon/Head_Tank_Boy.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Characters/Toon/Head_Tank_Girl.mat b/Assets/Material/Characters/Toon/Head_Tank_Girl.mat index 8abd0241c..270270ac2 100644 --- a/Assets/Material/Characters/Toon/Head_Tank_Girl.mat +++ b/Assets/Material/Characters/Toon/Head_Tank_Girl.mat @@ -115,4 +115,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Helmet_Imp.mat b/Assets/Material/Characters/Toon/Helmet_Imp.mat index 026249d35..fa9e2eabe 100644 --- a/Assets/Material/Characters/Toon/Helmet_Imp.mat +++ b/Assets/Material/Characters/Toon/Helmet_Imp.mat @@ -115,4 +115,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Torso_Archer.mat b/Assets/Material/Characters/Toon/Torso_Archer.mat index e4f4b14ef..35cdb92ec 100644 --- a/Assets/Material/Characters/Toon/Torso_Archer.mat +++ b/Assets/Material/Characters/Toon/Torso_Archer.mat @@ -128,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Torso_Boss.mat b/Assets/Material/Characters/Toon/Torso_Boss.mat index 11f7a0e33..8b9658fd1 100644 --- a/Assets/Material/Characters/Toon/Torso_Boss.mat +++ b/Assets/Material/Characters/Toon/Torso_Boss.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Characters/Toon/Torso_Imp.mat b/Assets/Material/Characters/Toon/Torso_Imp.mat index 9d6a5d74e..b702c2f27 100644 --- a/Assets/Material/Characters/Toon/Torso_Imp.mat +++ b/Assets/Material/Characters/Toon/Torso_Imp.mat @@ -115,4 +115,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Torso_Imp_Vandal.mat b/Assets/Material/Characters/Toon/Torso_Imp_Vandal.mat index 8e1901336..d98009ff8 100644 --- a/Assets/Material/Characters/Toon/Torso_Imp_Vandal.mat +++ b/Assets/Material/Characters/Toon/Torso_Imp_Vandal.mat @@ -115,4 +115,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Torso_Mage_Boy.mat b/Assets/Material/Characters/Toon/Torso_Mage_Boy.mat index 367fdf397..647e05a0a 100644 --- a/Assets/Material/Characters/Toon/Torso_Mage_Boy.mat +++ b/Assets/Material/Characters/Toon/Torso_Mage_Boy.mat @@ -128,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Torso_Mage_Girl.mat b/Assets/Material/Characters/Toon/Torso_Mage_Girl.mat index 18a4c6b49..667e28524 100644 --- a/Assets/Material/Characters/Toon/Torso_Mage_Girl.mat +++ b/Assets/Material/Characters/Toon/Torso_Mage_Girl.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Characters/Toon/Torso_Rogue.mat b/Assets/Material/Characters/Toon/Torso_Rogue.mat index aececd1f0..2482f808f 100644 --- a/Assets/Material/Characters/Toon/Torso_Rogue.mat +++ b/Assets/Material/Characters/Toon/Torso_Rogue.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Characters/Toon/Torso_Tank.mat b/Assets/Material/Characters/Toon/Torso_Tank.mat index 2df64f8e4..23111e1d8 100644 --- a/Assets/Material/Characters/Toon/Torso_Tank.mat +++ b/Assets/Material/Characters/Toon/Torso_Tank.mat @@ -128,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Weapons_Archer.mat b/Assets/Material/Characters/Toon/Weapons_Archer.mat index 0abe9de8b..fb7efbb82 100644 --- a/Assets/Material/Characters/Toon/Weapons_Archer.mat +++ b/Assets/Material/Characters/Toon/Weapons_Archer.mat @@ -128,4 +128,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Weapons_Imp.mat b/Assets/Material/Characters/Toon/Weapons_Imp.mat index b66a3fb9c..17ce5b284 100644 --- a/Assets/Material/Characters/Toon/Weapons_Imp.mat +++ b/Assets/Material/Characters/Toon/Weapons_Imp.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Characters/Toon/Weapons_Mage.mat b/Assets/Material/Characters/Toon/Weapons_Mage.mat index e1673e5c4..4ef627cdd 100644 --- a/Assets/Material/Characters/Toon/Weapons_Mage.mat +++ b/Assets/Material/Characters/Toon/Weapons_Mage.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Characters/Toon/Weapons_Rogue.mat b/Assets/Material/Characters/Toon/Weapons_Rogue.mat index 88fdf6b15..c80cea4ee 100644 --- a/Assets/Material/Characters/Toon/Weapons_Rogue.mat +++ b/Assets/Material/Characters/Toon/Weapons_Rogue.mat @@ -115,4 +115,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Weapons_Tank.mat b/Assets/Material/Characters/Toon/Weapons_Tank.mat index d83a76d6e..2e5659d32 100644 --- a/Assets/Material/Characters/Toon/Weapons_Tank.mat +++ b/Assets/Material/Characters/Toon/Weapons_Tank.mat @@ -115,4 +115,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Characters/Toon/Weapons_VandalImp.mat b/Assets/Material/Characters/Toon/Weapons_VandalImp.mat index b556c2a57..8ded36e84 100644 --- a/Assets/Material/Characters/Toon/Weapons_VandalImp.mat +++ b/Assets/Material/Characters/Toon/Weapons_VandalImp.mat @@ -115,4 +115,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Dungeon/M_BossFloor.mat b/Assets/Material/Dungeon/M_BossFloor.mat index cccb854a5..88e8823e5 100644 --- a/Assets/Material/Dungeon/M_BossFloor.mat +++ b/Assets/Material/Dungeon/M_BossFloor.mat @@ -138,4 +138,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Dungeon/M_Door_01.mat b/Assets/Material/Dungeon/M_Door_01.mat index e74077ca8..2f262ae40 100644 --- a/Assets/Material/Dungeon/M_Door_01.mat +++ b/Assets/Material/Dungeon/M_Door_01.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -25,7 +25,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -102,6 +103,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 diff --git a/Assets/Material/Dungeon/M_Door_02.mat b/Assets/Material/Dungeon/M_Door_02.mat index e5a8f54f7..d3502512c 100644 --- a/Assets/Material/Dungeon/M_Door_02.mat +++ b/Assets/Material/Dungeon/M_Door_02.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -25,7 +25,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -102,6 +103,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 diff --git a/Assets/Material/Dungeon/M_DungeonBorder.mat b/Assets/Material/Dungeon/M_DungeonBorder.mat index 94accae92..f235e9c3a 100644 --- a/Assets/Material/Dungeon/M_DungeonBorder.mat +++ b/Assets/Material/Dungeon/M_DungeonBorder.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Dungeon/M_Environment.mat b/Assets/Material/Dungeon/M_Environment.mat index 90f62e864..49df4bd9f 100644 --- a/Assets/Material/Dungeon/M_Environment.mat +++ b/Assets/Material/Dungeon/M_Environment.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Material/Dungeon/M_FloorSwitch.mat b/Assets/Material/Dungeon/M_FloorSwitch.mat index 7079e59cc..67b007025 100644 --- a/Assets/Material/Dungeon/M_FloorSwitch.mat +++ b/Assets/Material/Dungeon/M_FloorSwitch.mat @@ -12,7 +12,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -89,6 +90,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -143,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Material/Dungeon/M_Lava.mat b/Assets/Material/Dungeon/M_Lava.mat index c9ee0dbae..d7f94de32 100644 --- a/Assets/Material/Dungeon/M_Lava.mat +++ b/Assets/Material/Dungeon/M_Lava.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -25,7 +25,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 diff --git a/Assets/Material/Dungeon/M_SpiderWeb.mat b/Assets/Material/Dungeon/M_SpiderWeb.mat index f72ff9574..0685e7e96 100644 --- a/Assets/Material/Dungeon/M_SpiderWeb.mat +++ b/Assets/Material/Dungeon/M_SpiderWeb.mat @@ -27,6 +27,7 @@ Material: m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: + - _EMISSION - _METALLICGLOSSMAP - _NORMALMAP m_LightmapFlags: 2 @@ -175,4 +176,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Scripts/ApplicationLifecycle/Unity.BossRoom.ApplicationLifecycle.asmdef b/Assets/Scripts/ApplicationLifecycle/Unity.BossRoom.ApplicationLifecycle.asmdef index bee46c4fe..c52c9e7de 100644 --- a/Assets/Scripts/ApplicationLifecycle/Unity.BossRoom.ApplicationLifecycle.asmdef +++ b/Assets/Scripts/ApplicationLifecycle/Unity.BossRoom.ApplicationLifecycle.asmdef @@ -11,8 +11,7 @@ "Unity.Multiplayer.Samples.Utilities", "Unity.BossRoom.Utils", "Unity.BossRoom.ConnectionManagement", - "VContainer", - "VContainer.EnableCodeGen" + "VContainer" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Tests/Runtime/Unity.BossRoom.Tests.Runtime.asmdef b/Assets/Tests/Runtime/Unity.BossRoom.Tests.Runtime.asmdef index 4200a10d9..b3831776d 100644 --- a/Assets/Tests/Runtime/Unity.BossRoom.Tests.Runtime.asmdef +++ b/Assets/Tests/Runtime/Unity.BossRoom.Tests.Runtime.asmdef @@ -12,9 +12,7 @@ "Unity.BossRoom.UnityServices", "Unity.BossRoom.Utils", "Unity.Netcode.Runtime", - "Unity.Netcode.TestHelpers.Runtime", "VContainer", - "VContainer.EnableCodeGen", "Unity.Collections", "Unity.Netcode.Runtime.Tests" ], diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index c5ffd4393..e0ec1201f 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:692802481ab396dde201e3a84a841140f4a6c05c1f20cd33a7703b543b6b58ac -size 15046 +oid sha256:8505bb67f60142799e6e7c60fe6b0776808faeaadf5ecd42e73eecfb482f75b3 +size 21653 diff --git a/Assets/VFX/Materials/FX_M_ArcherArrow.mat b/Assets/VFX/Materials/FX_M_ArcherArrow.mat index 432dd55a8..a4dff5272 100644 --- a/Assets/VFX/Materials/FX_M_ArcherArrow.mat +++ b/Assets/VFX/Materials/FX_M_ArcherArrow.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -146,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_CharaterSneaky.mat b/Assets/VFX/Materials/FX_M_CharaterSneaky.mat index ed9d7d9a1..6d095b8a8 100644 --- a/Assets/VFX/Materials/FX_M_CharaterSneaky.mat +++ b/Assets/VFX/Materials/FX_M_CharaterSneaky.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -25,8 +25,9 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 diff --git a/Assets/VFX/Materials/FX_M_CharaterSneaky_LessSneak.mat b/Assets/VFX/Materials/FX_M_CharaterSneaky_LessSneak.mat index ed14afc57..49ca10c0f 100644 --- a/Assets/VFX/Materials/FX_M_CharaterSneaky_LessSneak.mat +++ b/Assets/VFX/Materials/FX_M_CharaterSneaky_LessSneak.mat @@ -12,8 +12,9 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -96,4 +97,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Chest.mat b/Assets/VFX/Materials/FX_M_Chest.mat index c40b69b0c..5f4a4e6c4 100644 --- a/Assets/VFX/Materials/FX_M_Chest.mat +++ b/Assets/VFX/Materials/FX_M_Chest.mat @@ -155,4 +155,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Circle_Sheet_01.mat b/Assets/VFX/Materials/FX_M_Circle_Sheet_01.mat index 3113a9345..566eb0656 100644 --- a/Assets/VFX/Materials/FX_M_Circle_Sheet_01.mat +++ b/Assets/VFX/Materials/FX_M_Circle_Sheet_01.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -140,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Circle_Sheet_02.mat b/Assets/VFX/Materials/FX_M_Circle_Sheet_02.mat index 2436c0e8b..8748d3109 100644 --- a/Assets/VFX/Materials/FX_M_Circle_Sheet_02.mat +++ b/Assets/VFX/Materials/FX_M_Circle_Sheet_02.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -140,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Circle_Sheet_03.mat b/Assets/VFX/Materials/FX_M_Circle_Sheet_03.mat index eb1e9f9be..12d54ea32 100644 --- a/Assets/VFX/Materials/FX_M_Circle_Sheet_03.mat +++ b/Assets/VFX/Materials/FX_M_Circle_Sheet_03.mat @@ -161,4 +161,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Circle_Sheet_04.mat b/Assets/VFX/Materials/FX_M_Circle_Sheet_04.mat index 64e9b96cc..a40e14903 100644 --- a/Assets/VFX/Materials/FX_M_Circle_Sheet_04.mat +++ b/Assets/VFX/Materials/FX_M_Circle_Sheet_04.mat @@ -161,4 +161,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Circle_Sheet_05.mat b/Assets/VFX/Materials/FX_M_Circle_Sheet_05.mat index ef891faa0..cecdc3fef 100644 --- a/Assets/VFX/Materials/FX_M_Circle_Sheet_05.mat +++ b/Assets/VFX/Materials/FX_M_Circle_Sheet_05.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -140,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Crystal.mat b/Assets/VFX/Materials/FX_M_Crystal.mat index a6f192a8c..f90292360 100644 --- a/Assets/VFX/Materials/FX_M_Crystal.mat +++ b/Assets/VFX/Materials/FX_M_Crystal.mat @@ -25,7 +25,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -164,4 +165,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Crystal_Broken.mat b/Assets/VFX/Materials/FX_M_Crystal_Broken.mat index a94898c21..0add12e23 100644 --- a/Assets/VFX/Materials/FX_M_Crystal_Broken.mat +++ b/Assets/VFX/Materials/FX_M_Crystal_Broken.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -25,7 +25,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 diff --git a/Assets/VFX/Materials/FX_M_Flame.mat b/Assets/VFX/Materials/FX_M_Flame.mat index 001bc41fc..ffa81d447 100644 --- a/Assets/VFX/Materials/FX_M_Flame.mat +++ b/Assets/VFX/Materials/FX_M_Flame.mat @@ -14,6 +14,7 @@ Material: m_ValidKeywords: [] m_InvalidKeywords: - ETC1_EXTERNAL_ALPHA + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -150,4 +151,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Flare_01.mat b/Assets/VFX/Materials/FX_M_Flare_01.mat index 0f168ce26..ba561d74e 100644 --- a/Assets/VFX/Materials/FX_M_Flare_01.mat +++ b/Assets/VFX/Materials/FX_M_Flare_01.mat @@ -142,4 +142,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Flash_01.mat b/Assets/VFX/Materials/FX_M_Flash_01.mat index 75ff57c07..edaa379cf 100644 --- a/Assets/VFX/Materials/FX_M_Flash_01.mat +++ b/Assets/VFX/Materials/FX_M_Flash_01.mat @@ -153,4 +153,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_GlowLine.mat b/Assets/VFX/Materials/FX_M_GlowLine.mat index ea4129188..fc7426f94 100644 --- a/Assets/VFX/Materials/FX_M_GlowLine.mat +++ b/Assets/VFX/Materials/FX_M_GlowLine.mat @@ -154,4 +154,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Glow_Additive_01.mat b/Assets/VFX/Materials/FX_M_Glow_Additive_01.mat index 73247c2a2..5871a1297 100644 --- a/Assets/VFX/Materials/FX_M_Glow_Additive_01.mat +++ b/Assets/VFX/Materials/FX_M_Glow_Additive_01.mat @@ -14,6 +14,7 @@ Material: m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: + - _EMISSION - _SWITCH_ALPHA_ON - _USE_ALPHA_ON m_LightmapFlags: 2 @@ -91,6 +92,7 @@ Material: - Boolean_236a513c11c34f97b3d22cc5b0fdd0bd: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 @@ -143,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Glow_Additive_02.mat b/Assets/VFX/Materials/FX_M_Glow_Additive_02.mat index 98a2787f9..094fd69c7 100644 --- a/Assets/VFX/Materials/FX_M_Glow_Additive_02.mat +++ b/Assets/VFX/Materials/FX_M_Glow_Additive_02.mat @@ -14,6 +14,7 @@ Material: m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: + - _EMISSION - _USE_ALPHA_ON m_LightmapFlags: 2 m_EnableInstancingVariants: 1 @@ -90,6 +91,7 @@ Material: - Boolean_236a513c11c34f97b3d22cc5b0fdd0bd: 0 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 @@ -142,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Glow_Additive_03.mat b/Assets/VFX/Materials/FX_M_Glow_Additive_03.mat index eae4c5747..d8cf213fb 100644 --- a/Assets/VFX/Materials/FX_M_Glow_Additive_03.mat +++ b/Assets/VFX/Materials/FX_M_Glow_Additive_03.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -26,8 +26,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 diff --git a/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_01.mat b/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_01.mat index 7fc4e1320..f2ef6eaac 100644 --- a/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_01.mat +++ b/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_01.mat @@ -171,4 +171,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_02.mat b/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_02.mat index cf2d6c312..022fa34d6 100644 --- a/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_02.mat +++ b/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_02.mat @@ -171,4 +171,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Glow_SoftParticleAlpha_02.mat b/Assets/VFX/Materials/FX_M_Glow_SoftParticleAlpha_02.mat index 338e5e3b5..a0da5561e 100644 --- a/Assets/VFX/Materials/FX_M_Glow_SoftParticleAlpha_02.mat +++ b/Assets/VFX/Materials/FX_M_Glow_SoftParticleAlpha_02.mat @@ -173,4 +173,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_01.mat b/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_01.mat index 8963e18b8..4ee79e8d6 100644 --- a/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_01.mat +++ b/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_01.mat @@ -14,6 +14,7 @@ Material: m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: + - _EMISSION - _SWITCH_ALPHA_ON - _USE_ALPHA_ON m_LightmapFlags: 2 @@ -91,6 +92,7 @@ Material: - Boolean_236a513c11c34f97b3d22cc5b0fdd0bd: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -143,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_02.mat b/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_02.mat index 89bdafc38..94b7cce86 100644 --- a/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_02.mat +++ b/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_02.mat @@ -171,4 +171,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_GroundClick.mat b/Assets/VFX/Materials/FX_M_GroundClick.mat index 94d0aea28..c53cf91a3 100644 --- a/Assets/VFX/Materials/FX_M_GroundClick.mat +++ b/Assets/VFX/Materials/FX_M_GroundClick.mat @@ -235,4 +235,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_GroundCrack_01.mat b/Assets/VFX/Materials/FX_M_GroundCrack_01.mat index 0198fd3a9..bac6b663e 100644 --- a/Assets/VFX/Materials/FX_M_GroundCrack_01.mat +++ b/Assets/VFX/Materials/FX_M_GroundCrack_01.mat @@ -13,8 +13,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -182,4 +183,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_GroundCrack_02.mat b/Assets/VFX/Materials/FX_M_GroundCrack_02.mat index 494338c38..2399a2d1d 100644 --- a/Assets/VFX/Materials/FX_M_GroundCrack_02.mat +++ b/Assets/VFX/Materials/FX_M_GroundCrack_02.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -26,8 +26,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 diff --git a/Assets/VFX/Materials/FX_M_Hit.mat b/Assets/VFX/Materials/FX_M_Hit.mat index fc5249e6a..1223e5346 100644 --- a/Assets/VFX/Materials/FX_M_Hit.mat +++ b/Assets/VFX/Materials/FX_M_Hit.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -27,6 +27,7 @@ Material: m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: + - _EMISSION - _SWITCH_ALPHA_ON m_LightmapFlags: 2 m_EnableInstancingVariants: 1 diff --git a/Assets/VFX/Materials/FX_M_Ice.mat b/Assets/VFX/Materials/FX_M_Ice.mat index 5df02d6fa..af1ba057b 100644 --- a/Assets/VFX/Materials/FX_M_Ice.mat +++ b/Assets/VFX/Materials/FX_M_Ice.mat @@ -13,8 +13,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: + - _EMISSION - _USEZMASK_ON - m_LightmapFlags: 0 + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -105,4 +106,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_ImpExplosionFire.mat b/Assets/VFX/Materials/FX_M_ImpExplosionFire.mat index fe54c50d1..e2effa007 100644 --- a/Assets/VFX/Materials/FX_M_ImpExplosionFire.mat +++ b/Assets/VFX/Materials/FX_M_ImpExplosionFire.mat @@ -13,8 +13,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -186,4 +187,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_MaskedPanner.mat b/Assets/VFX/Materials/FX_M_MaskedPanner.mat index ff66c958f..b2904eeeb 100644 --- a/Assets/VFX/Materials/FX_M_MaskedPanner.mat +++ b/Assets/VFX/Materials/FX_M_MaskedPanner.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -26,8 +26,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 diff --git a/Assets/VFX/Materials/FX_M_MotionFlash.mat b/Assets/VFX/Materials/FX_M_MotionFlash.mat index 5c4a7a198..5fc9d2dde 100644 --- a/Assets/VFX/Materials/FX_M_MotionFlash.mat +++ b/Assets/VFX/Materials/FX_M_MotionFlash.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -26,8 +26,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 diff --git a/Assets/VFX/Materials/FX_M_Point.mat b/Assets/VFX/Materials/FX_M_Point.mat index 7b4d126bc..ecc1b18ca 100644 --- a/Assets/VFX/Materials/FX_M_Point.mat +++ b/Assets/VFX/Materials/FX_M_Point.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -141,4 +142,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_RotatingSniper_01.mat b/Assets/VFX/Materials/FX_M_RotatingSniper_01.mat index 3f93377bd..1d83c31b2 100644 --- a/Assets/VFX/Materials/FX_M_RotatingSniper_01.mat +++ b/Assets/VFX/Materials/FX_M_RotatingSniper_01.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -142,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_RotatingSniper_02.mat b/Assets/VFX/Materials/FX_M_RotatingSniper_02.mat index ae910bb99..6ebb4c1c6 100644 --- a/Assets/VFX/Materials/FX_M_RotatingSniper_02.mat +++ b/Assets/VFX/Materials/FX_M_RotatingSniper_02.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -89,6 +90,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 0 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -141,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_RotatingTexture.mat b/Assets/VFX/Materials/FX_M_RotatingTexture.mat index bc16524a4..7222905b9 100644 --- a/Assets/VFX/Materials/FX_M_RotatingTexture.mat +++ b/Assets/VFX/Materials/FX_M_RotatingTexture.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -142,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_ShapeSheet.mat b/Assets/VFX/Materials/FX_M_ShapeSheet.mat index b7db97eb5..c442ca1ea 100644 --- a/Assets/VFX/Materials/FX_M_ShapeSheet.mat +++ b/Assets/VFX/Materials/FX_M_ShapeSheet.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -143,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_ShapeSheet_Additive.mat b/Assets/VFX/Materials/FX_M_ShapeSheet_Additive.mat index e0b6360df..abdbb319b 100644 --- a/Assets/VFX/Materials/FX_M_ShapeSheet_Additive.mat +++ b/Assets/VFX/Materials/FX_M_ShapeSheet_Additive.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -143,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Shield.mat b/Assets/VFX/Materials/FX_M_Shield.mat index 611f0fd4f..a7ee9ba71 100644 --- a/Assets/VFX/Materials/FX_M_Shield.mat +++ b/Assets/VFX/Materials/FX_M_Shield.mat @@ -19,9 +19,10 @@ Material: - _CUSTOMDATA_ON - _DISSOLVETYPE_CUSTOM - _DISTYPE_UV + - _EMISSION - _GLOWWAVE_ON - _SLASHUVCLAMP_ON - m_LightmapFlags: 0 + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -166,4 +167,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Shockwave.mat b/Assets/VFX/Materials/FX_M_Shockwave.mat index f9042537b..82cf72975 100644 --- a/Assets/VFX/Materials/FX_M_Shockwave.mat +++ b/Assets/VFX/Materials/FX_M_Shockwave.mat @@ -14,6 +14,7 @@ Material: m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: + - _EMISSION - _SWITCH_ALPHA_ON m_LightmapFlags: 2 m_EnableInstancingVariants: 1 @@ -152,4 +153,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_SlashSimple.mat b/Assets/VFX/Materials/FX_M_SlashSimple.mat index 8290ec2fe..190d7433b 100644 --- a/Assets/VFX/Materials/FX_M_SlashSimple.mat +++ b/Assets/VFX/Materials/FX_M_SlashSimple.mat @@ -135,4 +135,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Slash_01.mat b/Assets/VFX/Materials/FX_M_Slash_01.mat index c6f2a4d22..b61a93db3 100644 --- a/Assets/VFX/Materials/FX_M_Slash_01.mat +++ b/Assets/VFX/Materials/FX_M_Slash_01.mat @@ -25,7 +25,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -108,4 +109,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Slash_02.mat b/Assets/VFX/Materials/FX_M_Slash_02.mat index 66e8f0388..7d46707aa 100644 --- a/Assets/VFX/Materials/FX_M_Slash_02.mat +++ b/Assets/VFX/Materials/FX_M_Slash_02.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -25,8 +25,9 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 diff --git a/Assets/VFX/Materials/FX_M_Smoke.mat b/Assets/VFX/Materials/FX_M_Smoke.mat index 1df80b3c0..6a5489d8d 100644 --- a/Assets/VFX/Materials/FX_M_Smoke.mat +++ b/Assets/VFX/Materials/FX_M_Smoke.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -144,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_SmokeDissolve.mat b/Assets/VFX/Materials/FX_M_SmokeDissolve.mat index ceb16786d..f49a35870 100644 --- a/Assets/VFX/Materials/FX_M_SmokeDissolve.mat +++ b/Assets/VFX/Materials/FX_M_SmokeDissolve.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/VFX/Materials/FX_M_SmokeDissolveMultip.mat b/Assets/VFX/Materials/FX_M_SmokeDissolveMultip.mat index 3e5b9bf60..15bae5b2d 100644 --- a/Assets/VFX/Materials/FX_M_SmokeDissolveMultip.mat +++ b/Assets/VFX/Materials/FX_M_SmokeDissolveMultip.mat @@ -185,4 +185,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_SmokeDissolve_Additive.mat b/Assets/VFX/Materials/FX_M_SmokeDissolve_Additive.mat index 359b953d6..6ea991c99 100644 --- a/Assets/VFX/Materials/FX_M_SmokeDissolve_Additive.mat +++ b/Assets/VFX/Materials/FX_M_SmokeDissolve_Additive.mat @@ -15,8 +15,9 @@ Material: - _DISSOLVE_TYPE_CUSTOM - _DIS_DISSOLVETEXRED - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -204,4 +205,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Snowflake_Additive.mat b/Assets/VFX/Materials/FX_M_Snowflake_Additive.mat index 42cb83229..23e2ec1c2 100644 --- a/Assets/VFX/Materials/FX_M_Snowflake_Additive.mat +++ b/Assets/VFX/Materials/FX_M_Snowflake_Additive.mat @@ -14,6 +14,7 @@ Material: m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: + - _EMISSION - _USE_ALPHA_ON m_LightmapFlags: 2 m_EnableInstancingVariants: 1 @@ -90,6 +91,7 @@ Material: - Boolean_236a513c11c34f97b3d22cc5b0fdd0bd: 0 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -142,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_SoftParticle_Smoke.mat b/Assets/VFX/Materials/FX_M_SoftParticle_Smoke.mat index d88bb3596..ad591f268 100644 --- a/Assets/VFX/Materials/FX_M_SoftParticle_Smoke.mat +++ b/Assets/VFX/Materials/FX_M_SoftParticle_Smoke.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -144,4 +145,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Sparks.mat b/Assets/VFX/Materials/FX_M_Sparks.mat index 0d493f712..723192c3f 100644 --- a/Assets/VFX/Materials/FX_M_Sparks.mat +++ b/Assets/VFX/Materials/FX_M_Sparks.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -27,6 +27,7 @@ Material: m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: + - _EMISSION - _SWITCH_ALPHA_ON m_LightmapFlags: 2 m_EnableInstancingVariants: 1 diff --git a/Assets/VFX/Materials/FX_M_SpawnDoor.mat b/Assets/VFX/Materials/FX_M_SpawnDoor.mat index 9f8c5bc70..1997fa89f 100644 --- a/Assets/VFX/Materials/FX_M_SpawnDoor.mat +++ b/Assets/VFX/Materials/FX_M_SpawnDoor.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -26,7 +26,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/VFX/Materials/FX_M_Star_01.mat b/Assets/VFX/Materials/FX_M_Star_01.mat index 4becda989..8bac0fd01 100644 --- a/Assets/VFX/Materials/FX_M_Star_01.mat +++ b/Assets/VFX/Materials/FX_M_Star_01.mat @@ -14,6 +14,7 @@ Material: m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: + - _EMISSION - _SWITCH_ALPHA_ON - _USE_ALPHA_ON m_LightmapFlags: 2 @@ -91,11 +92,13 @@ Material: - Boolean_236a513c11c34f97b3d22cc5b0fdd0bd: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 - _Cull: 2 - _Cutoff: 0.5 + - _Depth_Blend: 0 - _DstBlend: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 0 @@ -114,6 +117,7 @@ Material: - _Surface: 1 - _Switch_Alpha: 1 - _UseAlpha: 1 + - _UseSoftParticles: 0 - _Use_alpha: 1 - _WorkflowMode: 1 - _ZTest: 4 @@ -143,4 +147,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Star_02.mat b/Assets/VFX/Materials/FX_M_Star_02.mat index 1b455aa84..205cb2419 100644 --- a/Assets/VFX/Materials/FX_M_Star_02.mat +++ b/Assets/VFX/Materials/FX_M_Star_02.mat @@ -28,8 +28,9 @@ Material: - _DISSOLVE_TYPE_SLIDER - _DIS_TYPE_UV - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -161,4 +162,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Star_03.mat b/Assets/VFX/Materials/FX_M_Star_03.mat index cafa7bbf5..b3a6abe0c 100644 --- a/Assets/VFX/Materials/FX_M_Star_03.mat +++ b/Assets/VFX/Materials/FX_M_Star_03.mat @@ -26,8 +26,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -163,4 +164,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_StylizeSmoke_01.mat b/Assets/VFX/Materials/FX_M_StylizeSmoke_01.mat index 33cf1e6b6..a424ede17 100644 --- a/Assets/VFX/Materials/FX_M_StylizeSmoke_01.mat +++ b/Assets/VFX/Materials/FX_M_StylizeSmoke_01.mat @@ -13,8 +13,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -183,4 +184,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_StylizeSmoke_02.mat b/Assets/VFX/Materials/FX_M_StylizeSmoke_02.mat index 5702c6ad4..deaee84a0 100644 --- a/Assets/VFX/Materials/FX_M_StylizeSmoke_02.mat +++ b/Assets/VFX/Materials/FX_M_StylizeSmoke_02.mat @@ -26,8 +26,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -196,4 +197,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_StylizeSmoke_Falldown.mat b/Assets/VFX/Materials/FX_M_StylizeSmoke_Falldown.mat index 58b05784e..8ee765329 100644 --- a/Assets/VFX/Materials/FX_M_StylizeSmoke_Falldown.mat +++ b/Assets/VFX/Materials/FX_M_StylizeSmoke_Falldown.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -26,8 +26,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 diff --git a/Assets/VFX/Materials/FX_M_Swirls.mat b/Assets/VFX/Materials/FX_M_Swirls.mat index 43a08f65d..5f73ef33f 100644 --- a/Assets/VFX/Materials/FX_M_Swirls.mat +++ b/Assets/VFX/Materials/FX_M_Swirls.mat @@ -155,4 +155,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_TargetReticule_Friendly.mat b/Assets/VFX/Materials/FX_M_TargetReticule_Friendly.mat index cdd40a7f5..011ba4339 100644 --- a/Assets/VFX/Materials/FX_M_TargetReticule_Friendly.mat +++ b/Assets/VFX/Materials/FX_M_TargetReticule_Friendly.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -26,7 +26,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 diff --git a/Assets/VFX/Materials/FX_M_TargetReticule_Hostile.mat b/Assets/VFX/Materials/FX_M_TargetReticule_Hostile.mat index 51f4ea4b5..68b2c6824 100644 --- a/Assets/VFX/Materials/FX_M_TargetReticule_Hostile.mat +++ b/Assets/VFX/Materials/FX_M_TargetReticule_Hostile.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -155,4 +156,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_TargetingSphere_InRange.mat b/Assets/VFX/Materials/FX_M_TargetingSphere_InRange.mat index 838ec51e0..cfc039419 100644 --- a/Assets/VFX/Materials/FX_M_TargetingSphere_InRange.mat +++ b/Assets/VFX/Materials/FX_M_TargetingSphere_InRange.mat @@ -183,4 +183,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_TargetingSphere_OutOfRange.mat b/Assets/VFX/Materials/FX_M_TargetingSphere_OutOfRange.mat index aaa67510b..986a8a3a2 100644 --- a/Assets/VFX/Materials/FX_M_TargetingSphere_OutOfRange.mat +++ b/Assets/VFX/Materials/FX_M_TargetingSphere_OutOfRange.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/VFX/Materials/FX_M_TilingTexture_01.mat b/Assets/VFX/Materials/FX_M_TilingTexture_01.mat index f273019fb..1fae9859f 100644 --- a/Assets/VFX/Materials/FX_M_TilingTexture_01.mat +++ b/Assets/VFX/Materials/FX_M_TilingTexture_01.mat @@ -12,7 +12,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -137,4 +138,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_TilingTexture_02.mat b/Assets/VFX/Materials/FX_M_TilingTexture_02.mat index 75b7e734b..b58172085 100644 --- a/Assets/VFX/Materials/FX_M_TilingTexture_02.mat +++ b/Assets/VFX/Materials/FX_M_TilingTexture_02.mat @@ -12,7 +12,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -137,4 +138,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_TilingTexture_03.mat b/Assets/VFX/Materials/FX_M_TilingTexture_03.mat index ae156bff7..2dd44866d 100644 --- a/Assets/VFX/Materials/FX_M_TilingTexture_03.mat +++ b/Assets/VFX/Materials/FX_M_TilingTexture_03.mat @@ -12,7 +12,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -137,4 +138,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_TilingTexture_04.mat b/Assets/VFX/Materials/FX_M_TilingTexture_04.mat index af164e71f..44c24d10d 100644 --- a/Assets/VFX/Materials/FX_M_TilingTexture_04.mat +++ b/Assets/VFX/Materials/FX_M_TilingTexture_04.mat @@ -14,6 +14,7 @@ Material: m_ValidKeywords: [] m_InvalidKeywords: - _CHANGEMASKTOX_ON + - _EMISSION - _HASMASK_ON m_LightmapFlags: 2 m_EnableInstancingVariants: 1 @@ -139,4 +140,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_TilingTexture_05.mat b/Assets/VFX/Materials/FX_M_TilingTexture_05.mat index 06dae1ffd..acd3c4c0f 100644 --- a/Assets/VFX/Materials/FX_M_TilingTexture_05.mat +++ b/Assets/VFX/Materials/FX_M_TilingTexture_05.mat @@ -14,6 +14,7 @@ Material: m_ValidKeywords: [] m_InvalidKeywords: - _CHANGEMASKTOX_ON + - _EMISSION - _HASMASK_ON - _INVERTMASK_ON m_LightmapFlags: 2 @@ -140,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_TorchFire.mat b/Assets/VFX/Materials/FX_M_TorchFire.mat index 35fb591a7..8b2087bd9 100644 --- a/Assets/VFX/Materials/FX_M_TorchFire.mat +++ b/Assets/VFX/Materials/FX_M_TorchFire.mat @@ -13,8 +13,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -214,4 +215,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Trail_01.mat b/Assets/VFX/Materials/FX_M_Trail_01.mat index d4a83cb45..6810d9647 100644 --- a/Assets/VFX/Materials/FX_M_Trail_01.mat +++ b/Assets/VFX/Materials/FX_M_Trail_01.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -142,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Trail_02.mat b/Assets/VFX/Materials/FX_M_Trail_02.mat index 9a24dbdfb..70baf1554 100644 --- a/Assets/VFX/Materials/FX_M_Trail_02.mat +++ b/Assets/VFX/Materials/FX_M_Trail_02.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -142,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Trail_03.mat b/Assets/VFX/Materials/FX_M_Trail_03.mat index 32ed777b4..bcf8c68f9 100644 --- a/Assets/VFX/Materials/FX_M_Trail_03.mat +++ b/Assets/VFX/Materials/FX_M_Trail_03.mat @@ -13,7 +13,8 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -142,4 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Wave_01.mat b/Assets/VFX/Materials/FX_M_Wave_01.mat index 00c63df0c..4a06ccdda 100644 --- a/Assets/VFX/Materials/FX_M_Wave_01.mat +++ b/Assets/VFX/Materials/FX_M_Wave_01.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -26,8 +26,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 diff --git a/Assets/VFX/Materials/FX_M_Wave_02.mat b/Assets/VFX/Materials/FX_M_Wave_02.mat index 8a8398d12..de8d5a826 100644 --- a/Assets/VFX/Materials/FX_M_Wave_02.mat +++ b/Assets/VFX/Materials/FX_M_Wave_02.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -26,8 +26,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 diff --git a/Assets/VFX/Materials/FX_M_Wave_02_TossedAttack_Display.mat b/Assets/VFX/Materials/FX_M_Wave_02_TossedAttack_Display.mat index daafa11b4..77066f33c 100644 --- a/Assets/VFX/Materials/FX_M_Wave_02_TossedAttack_Display.mat +++ b/Assets/VFX/Materials/FX_M_Wave_02_TossedAttack_Display.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -26,8 +26,9 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 0 + m_InvalidKeywords: + - _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 diff --git a/Assets/VFX/Materials/FX_M_Wave_03.mat b/Assets/VFX/Materials/FX_M_Wave_03.mat index 5ac71cbc8..f8e6abb01 100644 --- a/Assets/VFX/Materials/FX_M_Wave_03.mat +++ b/Assets/VFX/Materials/FX_M_Wave_03.mat @@ -158,4 +158,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_Wave_04.mat b/Assets/VFX/Materials/FX_M_Wave_04.mat index cc295b05f..baf6fdbb1 100644 --- a/Assets/VFX/Materials/FX_M_Wave_04.mat +++ b/Assets/VFX/Materials/FX_M_Wave_04.mat @@ -158,4 +158,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/VFX/Materials/FX_M_WigglyRing.mat b/Assets/VFX/Materials/FX_M_WigglyRing.mat index 08940cb96..077e43efe 100644 --- a/Assets/VFX/Materials/FX_M_WigglyRing.mat +++ b/Assets/VFX/Materials/FX_M_WigglyRing.mat @@ -155,4 +155,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6660a93d6..ba4dfafae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,14 @@ Additional documentation and release notes are available at [Multiplayer Documen * com.unity.timeline from 1.8.7 to 1.8.8 * Upgraded Unity Transport package to 2.5.1 (#906) * Upgraded the project to use Netcode for GameObject's recommended OnConnectionEvent callback (#907) +* Upgraded the project to the latest releases of packages and editor (#918) Changes include: + * Unity editor upgrade to 6000.0.52f1 + * com.unity.multiplayer.tools upgraded to v2.2.4 + * com.unity.multiplayer.playmode upgraded to v1.5.0 + * com.unity.inputsystem upgraded to v1.14.0 + * com.unity.postprocessing upgraded to v3.5.0 + * Netcode for GameObjects upgraded to v2.4.3 + * Multiplayer Services upgraded to v1.1.4 ### Cleanup * Removed ParrelSync from the project (#890) diff --git a/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/ClientAuthority/com.unity.multiplayer.samples.utilities.clientauthority.asmdef b/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/ClientAuthority/com.unity.multiplayer.samples.utilities.clientauthority.asmdef index 2eacc29c8..725f3f84c 100644 --- a/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/ClientAuthority/com.unity.multiplayer.samples.utilities.clientauthority.asmdef +++ b/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/ClientAuthority/com.unity.multiplayer.samples.utilities.clientauthority.asmdef @@ -2,7 +2,6 @@ "name": "Unity.Multiplayer.Samples.Utilities.ClientAuthority", "rootNamespace": "", "references": [ - "Unity.Netcode.Components", "Unity.Netcode.Runtime" ], "includePlatforms": [], diff --git a/Packages/com.unity.multiplayer.samples.coop/Utilities/com.unity.multiplayer.samples.utilities.asmdef b/Packages/com.unity.multiplayer.samples.coop/Utilities/com.unity.multiplayer.samples.utilities.asmdef index 203c3c983..18ba59173 100644 --- a/Packages/com.unity.multiplayer.samples.coop/Utilities/com.unity.multiplayer.samples.utilities.asmdef +++ b/Packages/com.unity.multiplayer.samples.coop/Utilities/com.unity.multiplayer.samples.utilities.asmdef @@ -2,9 +2,7 @@ "name": "Unity.Multiplayer.Samples.Utilities", "rootNamespace": "", "references": [ - "Unity.Netcode.Components", "Unity.Netcode.Runtime", - "Unity.Services.Relay", "Unity.Collections" ], "includePlatforms": [], diff --git a/Packages/manifest.json b/Packages/manifest.json index 13879264c..44b222ab4 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,24 +1,24 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.ai.navigation": "2.0.6", + "com.unity.ai.navigation": "2.0.8", "com.unity.cinemachine": "3.1.3", - "com.unity.collab-proxy": "2.7.1", - "com.unity.ide.rider": "3.0.35", - "com.unity.ide.visualstudio": "2.0.22", - "com.unity.inputsystem": "1.13.1", + "com.unity.collab-proxy": "2.8.2", + "com.unity.ide.rider": "3.0.36", + "com.unity.ide.visualstudio": "2.0.23", + "com.unity.inputsystem": "1.14.0", "com.unity.learn.iet-framework": "4.0.4", "com.unity.learn.iet-framework.authoring": "1.2.2", "com.unity.memoryprofiler": "1.1.6", "com.unity.multiplayer.center": "1.0.0", - "com.unity.multiplayer.playmode": "1.3.3", - "com.unity.multiplayer.tools": "2.2.3", - "com.unity.netcode.gameobjects": "2.2.0", + "com.unity.multiplayer.playmode": "1.5.0", + "com.unity.multiplayer.tools": "2.2.4", + "com.unity.netcode.gameobjects": "2.4.3", "com.unity.performance.profile-analyzer": "1.2.3", - "com.unity.postprocessing": "3.4.0", + "com.unity.postprocessing": "3.5.0", "com.unity.render-pipelines.universal": "17.0.4", "com.unity.services.authentication": "3.4.1", - "com.unity.services.multiplayer": "1.1.2", + "com.unity.services.multiplayer": "1.1.4", "com.unity.test-framework": "1.5.1", "com.unity.timeline": "1.8.8", "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.10", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 7f259d7ca..1fb191874 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": {} }, "com.unity.ai.navigation": { - "version": "2.0.6", + "version": "2.0.8", "depth": 0, "source": "registry", "dependencies": { @@ -16,7 +16,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.19", + "version": "1.8.23", "depth": 1, "source": "registry", "dependencies": { @@ -36,7 +36,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.7.1", + "version": "2.8.2", "depth": 0, "source": "registry", "dependencies": {}, @@ -68,7 +68,7 @@ "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.35", + "version": "3.0.36", "depth": 0, "source": "registry", "dependencies": { @@ -77,7 +77,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.22", + "version": "2.0.23", "depth": 0, "source": "registry", "dependencies": { @@ -86,7 +86,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.13.1", + "version": "1.14.0", "depth": 0, "source": "registry", "dependencies": { @@ -142,7 +142,7 @@ } }, "com.unity.multiplayer.playmode": { - "version": "1.3.3", + "version": "1.5.0", "depth": 0, "source": "registry", "dependencies": { @@ -161,7 +161,7 @@ } }, "com.unity.multiplayer.tools": { - "version": "2.2.3", + "version": "2.2.4", "depth": 0, "source": "registry", "dependencies": { @@ -176,7 +176,7 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "2.2.0", + "version": "2.4.3", "depth": 0, "source": "registry", "dependencies": { @@ -207,7 +207,7 @@ "url": "https://packages.unity.com" }, "com.unity.postprocessing": { - "version": "3.4.0", + "version": "3.5.0", "depth": 0, "source": "registry", "dependencies": { @@ -227,7 +227,7 @@ "depth": 1, "source": "builtin", "dependencies": { - "com.unity.burst": "1.8.14", + "com.unity.burst": "1.8.20", "com.unity.mathematics": "1.3.2", "com.unity.ugui": "2.0.0", "com.unity.collections": "2.4.3", @@ -313,15 +313,15 @@ "url": "https://packages.unity.com" }, "com.unity.services.multiplayer": { - "version": "1.1.2", + "version": "1.1.4", "depth": 0, "source": "registry", "dependencies": { - "com.unity.transport": "2.2.1", + "com.unity.transport": "2.5.0", "com.unity.collections": "2.2.1", "com.unity.services.qos": "1.3.0", "com.unity.services.core": "1.13.0", - "com.unity.services.wire": "1.2.7", + "com.unity.services.wire": "1.4.0", "com.unity.services.deployment": "1.3.0", "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.modules.unitywebrequest": "1.0.0", @@ -343,7 +343,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.wire": { - "version": "1.3.0", + "version": "1.4.0", "depth": 1, "source": "registry", "dependencies": { @@ -354,7 +354,7 @@ "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "2.0.1", + "version": "2.1.0", "depth": 1, "source": "registry", "dependencies": {}, @@ -370,11 +370,12 @@ } }, "com.unity.splines": { - "version": "2.7.2", + "version": "2.8.1", "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", + "com.unity.modules.imgui": "1.0.0", "com.unity.settings-manager": "1.0.3" }, "url": "https://packages.unity.com" @@ -406,11 +407,11 @@ } }, "com.unity.test-framework.performance": { - "version": "3.0.3", + "version": "3.1.0", "depth": 2, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.31", + "com.unity.test-framework": "1.1.33", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e2648eef4..a047fc30b 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23f534cbf21906dcc5c2de517f2c6cc5a273e98a66d57bf3d86b5226635f57d2 -size 27731 +oid sha256:49ba5096e3675c17022d5fe631b494be58df2fe419c5e124af6c29fc5f7bac6c +size 27878 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index a774647e9..ce2bc7062 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.44f1 -m_EditorVersionWithRevision: 6000.0.44f1 (726642cc4f1f) +m_EditorVersion: 6000.0.52f1 +m_EditorVersionWithRevision: 6000.0.52f1 (9e4086222921) diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset index 2572cd60e..26ae555a1 100644 --- a/ProjectSettings/URPProjectSettings.asset +++ b/ProjectSettings/URPProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3a626cb529ccfc0a82e388b8cd32bc60888f7226c33412fad3bc50aba802cd7 -size 410 +oid sha256:596d5c8bf4f957b03684c949bebc252ae1918f25415a1147a00684c4b086efda +size 411 diff --git a/ProjectSettings/VirtualProjectsConfig.json b/ProjectSettings/VirtualProjectsConfig.json index b77f3f11c..fea182f0f 100644 --- a/ProjectSettings/VirtualProjectsConfig.json +++ b/ProjectSettings/VirtualProjectsConfig.json @@ -1,4 +1,4 @@ { "PlayerTags": [], - "version": "1.3.3" + "version": "1.5.0" } \ No newline at end of file