diff --git a/.yamato/mobile-build-and-run.yml b/.yamato/mobile-build-and-run.yml index 94865b87c..b271e485d 100644 --- a/.yamato/mobile-build-and-run.yml +++ b/.yamato/mobile-build-and-run.yml @@ -9,12 +9,12 @@ Build_Player_With_Tests_iOS_{{ project.name }}_{{ editor }}: name: build {{ project.name }} - {{ editor }} on iOS agent: type: Unity::VM::osx - image: mobile/macos-10.15-testing:stable + image: package-ci/macos-12:v4 flavor: b1.large commands: - pip install unity-downloader-cli==1.2.0 --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - unity-downloader-cli -c Editor -c iOS -u 2021.3.15f1 --fast --wait + - unity-downloader-cli -c Editor -c iOS -u {{ editor }} --fast --wait - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - chmod +x ./utr - ./utr --suite=playmode --platform=iOS --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --build-only --testfilter=Unity.BossRoom.Tests.Runtime @@ -70,7 +70,7 @@ mobile_test_ios_{{ project.name }}_{{ editor }}: name: {{ project.name }} mobile project tests - {{ editor }} on iOS agent: type: Unity::mobile::iPhone - image: mobile/macos-10.15-testing:latest + image: package-ci/macos-12:v4 flavor: b1.medium # Skip repository cloning diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml index 5ca1154c9..7fc50c638 100644 --- a/.yamato/project-standards.yml +++ b/.yamato/project-standards.yml @@ -5,7 +5,7 @@ standards_{{ projects.first.name }}: agent: type: Unity::VM image: desktop/logging-testing-linux:v0.1.2-926285 - flavor: b1.medium + flavor: b1.large commands: - dotnet --version - dotnet format --version diff --git a/.yamato/project.metafile b/.yamato/project.metafile index e6b55ebab..eaa1a8977 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -1,23 +1,20 @@ -validation_editor: 2020.3 - -# Platforms that will be tested. The first entry in this array will also -# be used for validation +# Platforms that will be tested. test_platforms: - name: win type: Unity::VM - image: package-ci/win10:stable + image: package-ci/win10:v4 flavor: b1.large editorpath: .Editor\Unity.exe utr: .\utr.bat - name: mac type: Unity::VM::osx - image: package-ci/mac:stable + image: package-ci/macos-12:v4 flavor: b1.large editorpath: .Editor/Unity.app/Contents/MacOS/Unity utr: ./utr - name: ubuntu type: Unity::VM - image: package-ci/ubuntu:stable + image: package-ci/ubuntu-18.04:v4 flavor: b1.large editorpath: .Editor/Unity utr: ./utr @@ -33,4 +30,4 @@ projects: - name: com.unity.multiplayer.samples.coop path: Packages/com.unity.multiplayer.samples.coop test_editors: - - 2021.3 + - 2022.3 diff --git a/Assets/DefaultNetworkPrefabs.asset b/Assets/DefaultNetworkPrefabs.asset new file mode 100644 index 000000000..31f8dae8b --- /dev/null +++ b/Assets/DefaultNetworkPrefabs.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ea3d807af7c9ec66aebf48d9e112b0e3ba2fe55867d1f99ec53f744502aa727 +size 6447 diff --git a/Assets/DefaultNetworkPrefabs.asset.meta b/Assets/DefaultNetworkPrefabs.asset.meta new file mode 100644 index 000000000..188776569 --- /dev/null +++ b/Assets/DefaultNetworkPrefabs.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 164b10da014f4d749a423fe48ea7d685 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Material/Characters/Character_Shadow.mat b/Assets/Material/Characters/Character_Shadow.mat index e960ce0d8..316de6927 100644 --- a/Assets/Material/Characters/Character_Shadow.mat +++ b/Assets/Material/Characters/Character_Shadow.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Character_Shadow m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -87,6 +90,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -140,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Enemy_Eyes_sheet.mat b/Assets/Material/Characters/Enemy_Eyes_sheet.mat index 370fabb79..8bd47d8b5 100644 --- a/Assets/Material/Characters/Enemy_Eyes_sheet.mat +++ b/Assets/Material/Characters/Enemy_Eyes_sheet.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Enemy_Eyes_sheet m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -83,6 +86,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -135,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Enemy_Mouth_sheet.mat b/Assets/Material/Characters/Enemy_Mouth_sheet.mat index a74d0344b..2af786300 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,18 +22,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Enemy_Mouth_sheet m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -96,6 +99,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 diff --git a/Assets/Material/Characters/Hero_Eyes_sheet.mat b/Assets/Material/Characters/Hero_Eyes_sheet.mat index e9b7deed4..32ce187b9 100644 --- a/Assets/Material/Characters/Hero_Eyes_sheet.mat +++ b/Assets/Material/Characters/Hero_Eyes_sheet.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hero_Eyes_sheet m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -83,6 +86,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -135,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Hero_Mouth_sheet.mat b/Assets/Material/Characters/Hero_Mouth_sheet.mat index aa212772c..a0437b710 100644 --- a/Assets/Material/Characters/Hero_Mouth_sheet.mat +++ b/Assets/Material/Characters/Hero_Mouth_sheet.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hero_Mouth_sheet m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -83,6 +86,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -140,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Hair_Archer_Boy.mat b/Assets/Material/Characters/Toon/Hair_Archer_Boy.mat index 1b855c8a2..205b31727 100644 --- a/Assets/Material/Characters/Toon/Hair_Archer_Boy.mat +++ b/Assets/Material/Characters/Toon/Hair_Archer_Boy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hair_Archer_Boy m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _EMISSION @@ -19,6 +21,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -111,4 +114,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Hair_Archer_Girl.mat b/Assets/Material/Characters/Toon/Hair_Archer_Girl.mat index 3cb812f1c..857a79cca 100644 --- a/Assets/Material/Characters/Toon/Hair_Archer_Girl.mat +++ b/Assets/Material/Characters/Toon/Hair_Archer_Girl.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hair_Archer_Girl m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _EMISSION @@ -19,6 +21,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -111,4 +114,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Hair_Mage_Boy.mat b/Assets/Material/Characters/Toon/Hair_Mage_Boy.mat index 5757e74b9..0a72b9dc5 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hair_Mage_Boy m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _EMISSION @@ -32,6 +34,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Characters/Toon/Hair_Mage_Girl.mat b/Assets/Material/Characters/Toon/Hair_Mage_Girl.mat index f88d20ef9..52f0090ee 100644 --- a/Assets/Material/Characters/Toon/Hair_Mage_Girl.mat +++ b/Assets/Material/Characters/Toon/Hair_Mage_Girl.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hair_Mage_Girl m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _EMISSION @@ -32,6 +34,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -124,4 +127,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Hair_Rogue_Boy.mat b/Assets/Material/Characters/Toon/Hair_Rogue_Boy.mat index d60974e27..ccbc9a767 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hair_Rogue_Boy m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _EMISSION @@ -32,6 +34,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Characters/Toon/Hair_Rogue_Girl.mat b/Assets/Material/Characters/Toon/Hair_Rogue_Girl.mat index 9e10acc0a..8ef73219f 100644 --- a/Assets/Material/Characters/Toon/Hair_Rogue_Girl.mat +++ b/Assets/Material/Characters/Toon/Hair_Rogue_Girl.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hair_Rogue_Girl m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _EMISSION @@ -19,6 +21,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -111,4 +114,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Hair_Tank_Boy.mat b/Assets/Material/Characters/Toon/Hair_Tank_Boy.mat index 2cbafd152..66348ca43 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hair_Tank_Boy m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _EMISSION @@ -32,6 +34,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Characters/Toon/Hair_Tank_Girl.mat b/Assets/Material/Characters/Toon/Hair_Tank_Girl.mat index 16fafefaf..e924aa3c1 100644 --- a/Assets/Material/Characters/Toon/Hair_Tank_Girl.mat +++ b/Assets/Material/Characters/Toon/Hair_Tank_Girl.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hair_Tank_Girl m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _EMISSION @@ -19,6 +21,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -111,4 +114,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Head_Archer_Boy.mat b/Assets/Material/Characters/Toon/Head_Archer_Boy.mat index bfd805377..172ae9ca9 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Head_Archer_Boy m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Characters/Toon/Head_Archer_Girl.mat b/Assets/Material/Characters/Toon/Head_Archer_Girl.mat index 54613aaf6..746eea7f0 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Head_Archer_Girl m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Characters/Toon/Head_Boss.mat b/Assets/Material/Characters/Toon/Head_Boss.mat index 778f2344b..e2b7cda78 100644 --- a/Assets/Material/Characters/Toon/Head_Boss.mat +++ b/Assets/Material/Characters/Toon/Head_Boss.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Head_Boss m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Head_Imp.mat b/Assets/Material/Characters/Toon/Head_Imp.mat index a06e3fa31..268877f7f 100644 --- a/Assets/Material/Characters/Toon/Head_Imp.mat +++ b/Assets/Material/Characters/Toon/Head_Imp.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Head_Imp m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Head_Imp_Vandal.mat b/Assets/Material/Characters/Toon/Head_Imp_Vandal.mat index 99395951d..a411522d6 100644 --- a/Assets/Material/Characters/Toon/Head_Imp_Vandal.mat +++ b/Assets/Material/Characters/Toon/Head_Imp_Vandal.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Head_Imp_Vandal m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -110,4 +113,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Head_Mage_Boy.mat b/Assets/Material/Characters/Toon/Head_Mage_Boy.mat index a57ce16d6..600dd9720 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Head_Mage_Boy m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Characters/Toon/Head_Mage_Girl.mat b/Assets/Material/Characters/Toon/Head_Mage_Girl.mat index 5277d47c9..0a4b4c23c 100644 --- a/Assets/Material/Characters/Toon/Head_Mage_Girl.mat +++ b/Assets/Material/Characters/Toon/Head_Mage_Girl.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Head_Mage_Girl m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Head_Rogue_Boy.mat b/Assets/Material/Characters/Toon/Head_Rogue_Boy.mat index 609b113a3..031833f20 100644 --- a/Assets/Material/Characters/Toon/Head_Rogue_Boy.mat +++ b/Assets/Material/Characters/Toon/Head_Rogue_Boy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Head_Rogue_Boy m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -110,4 +113,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Head_Rogue_Girl.mat b/Assets/Material/Characters/Toon/Head_Rogue_Girl.mat index 65cae3473..f9f13a2e1 100644 --- a/Assets/Material/Characters/Toon/Head_Rogue_Girl.mat +++ b/Assets/Material/Characters/Toon/Head_Rogue_Girl.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Head_Rogue_Girl m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Head_Tank_Boy.mat b/Assets/Material/Characters/Toon/Head_Tank_Boy.mat index cb7c0cbe3..be00ccd60 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Head_Tank_Boy m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Characters/Toon/Head_Tank_Girl.mat b/Assets/Material/Characters/Toon/Head_Tank_Girl.mat index 94a4ef811..412065a81 100644 --- a/Assets/Material/Characters/Toon/Head_Tank_Girl.mat +++ b/Assets/Material/Characters/Toon/Head_Tank_Girl.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Head_Tank_Girl m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -110,4 +113,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Helmet_Imp.mat b/Assets/Material/Characters/Toon/Helmet_Imp.mat index 10879466c..730e6c9ad 100644 --- a/Assets/Material/Characters/Toon/Helmet_Imp.mat +++ b/Assets/Material/Characters/Toon/Helmet_Imp.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Helmet_Imp m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -110,4 +113,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Torso_Archer.mat b/Assets/Material/Characters/Toon/Torso_Archer.mat index 30b3a1c18..32dab09fc 100644 --- a/Assets/Material/Characters/Toon/Torso_Archer.mat +++ b/Assets/Material/Characters/Toon/Torso_Archer.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Torso_Archer m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Torso_Boss.mat b/Assets/Material/Characters/Toon/Torso_Boss.mat index fef724749..fac62a817 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Torso_Boss m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Characters/Toon/Torso_Imp.mat b/Assets/Material/Characters/Toon/Torso_Imp.mat index a08568387..046c9e209 100644 --- a/Assets/Material/Characters/Toon/Torso_Imp.mat +++ b/Assets/Material/Characters/Toon/Torso_Imp.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Torso_Imp m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -110,4 +113,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Torso_Imp_Vandal.mat b/Assets/Material/Characters/Toon/Torso_Imp_Vandal.mat index 2078ce119..42e545e74 100644 --- a/Assets/Material/Characters/Toon/Torso_Imp_Vandal.mat +++ b/Assets/Material/Characters/Toon/Torso_Imp_Vandal.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Torso_Imp_Vandal m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -110,4 +113,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Torso_Mage_Boy.mat b/Assets/Material/Characters/Toon/Torso_Mage_Boy.mat index 65d4f351a..c1423f628 100644 --- a/Assets/Material/Characters/Toon/Torso_Mage_Boy.mat +++ b/Assets/Material/Characters/Toon/Torso_Mage_Boy.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Torso_Mage_Boy m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Torso_Mage_Girl.mat b/Assets/Material/Characters/Toon/Torso_Mage_Girl.mat index ef7432e46..1b30026b1 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Torso_Mage_Girl m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Characters/Toon/Torso_Rogue.mat b/Assets/Material/Characters/Toon/Torso_Rogue.mat index d4d4fdcf0..0dee3dd94 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Torso_Rogue m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Characters/Toon/Torso_Tank.mat b/Assets/Material/Characters/Toon/Torso_Tank.mat index 9bcda35bf..67e94c207 100644 --- a/Assets/Material/Characters/Toon/Torso_Tank.mat +++ b/Assets/Material/Characters/Toon/Torso_Tank.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Torso_Tank m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Weapons_Archer.mat b/Assets/Material/Characters/Toon/Weapons_Archer.mat index 12a27b2a3..0baa62323 100644 --- a/Assets/Material/Characters/Toon/Weapons_Archer.mat +++ b/Assets/Material/Characters/Toon/Weapons_Archer.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Weapons_Archer m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Weapons_Imp.mat b/Assets/Material/Characters/Toon/Weapons_Imp.mat index 76ad12250..43a9bb662 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Weapons_Imp m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Characters/Toon/Weapons_Mage.mat b/Assets/Material/Characters/Toon/Weapons_Mage.mat index dc44cb543..babd34fb7 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Weapons_Mage m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Characters/Toon/Weapons_Rogue.mat b/Assets/Material/Characters/Toon/Weapons_Rogue.mat index 36f507ddc..feded0ab5 100644 --- a/Assets/Material/Characters/Toon/Weapons_Rogue.mat +++ b/Assets/Material/Characters/Toon/Weapons_Rogue.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Weapons_Rogue m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -110,4 +113,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Weapons_Tank.mat b/Assets/Material/Characters/Toon/Weapons_Tank.mat index b08b3956f..cffde3382 100644 --- a/Assets/Material/Characters/Toon/Weapons_Tank.mat +++ b/Assets/Material/Characters/Toon/Weapons_Tank.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Weapons_Tank m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -110,4 +113,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Characters/Toon/Weapons_VandalImp.mat b/Assets/Material/Characters/Toon/Weapons_VandalImp.mat index dc42eb1b5..2f73efd00 100644 --- a/Assets/Material/Characters/Toon/Weapons_VandalImp.mat +++ b/Assets/Material/Characters/Toon/Weapons_VandalImp.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Weapons_VandalImp m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _NORMALMAP @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -110,4 +113,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Dungeon/M_BossFloor.mat b/Assets/Material/Dungeon/M_BossFloor.mat index e92cfafc5..38885cbd8 100644 --- a/Assets/Material/Dungeon/M_BossFloor.mat +++ b/Assets/Material/Dungeon/M_BossFloor.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_BossFloor m_Shader: {fileID: -6465566751694194690, guid: 58d945a80f1f06c4db5c1fa66a0afc55, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _EMISSION @@ -20,6 +22,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -133,4 +136,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Dungeon/M_Door_01.mat b/Assets/Material/Dungeon/M_Door_01.mat index 5a2073680..a3e5d91d2 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_Door_01 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 2 @@ -32,6 +34,7 @@ Material: RenderType: Opaque disabledShaderPasses: - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Dungeon/M_Door_02.mat b/Assets/Material/Dungeon/M_Door_02.mat index 68d05981f..4c3b75584 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_Door_02 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 2 @@ -32,6 +34,7 @@ Material: RenderType: Opaque disabledShaderPasses: - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Dungeon/M_DungeonBorder.mat b/Assets/Material/Dungeon/M_DungeonBorder.mat index 9b67c0891..efdce6a88 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_DungeonBorder m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -32,6 +34,7 @@ Material: RenderType: Opaque disabledShaderPasses: - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Dungeon/M_Environment.mat b/Assets/Material/Dungeon/M_Environment.mat index e13f4b7ea..cee763dd8 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_Environment m_Shader: {fileID: -6465566751694194690, guid: 58d945a80f1f06c4db5c1fa66a0afc55, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _METALLICSPECGLOSSMAP @@ -32,6 +34,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Material/Dungeon/M_FloorSwitch.mat b/Assets/Material/Dungeon/M_FloorSwitch.mat index 22cbe3949..085b4f432 100644 --- a/Assets/Material/Dungeon/M_FloorSwitch.mat +++ b/Assets/Material/Dungeon/M_FloorSwitch.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_FloorSwitch m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 2 @@ -19,6 +21,7 @@ Material: RenderType: Opaque disabledShaderPasses: - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -138,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Material/Dungeon/M_Lava.mat b/Assets/Material/Dungeon/M_Lava.mat index 5b439bbd4..6c2e35b64 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_Lava m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 2 @@ -32,6 +34,7 @@ Material: RenderType: Opaque disabledShaderPasses: - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -98,6 +101,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 diff --git a/Assets/Material/Dungeon/M_SpiderWeb.mat b/Assets/Material/Dungeon/M_SpiderWeb.mat index 928580654..fbb2a4d76 100644 --- a/Assets/Material/Dungeon/M_SpiderWeb.mat +++ b/Assets/Material/Dungeon/M_SpiderWeb.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_SpiderWeb m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -30,12 +32,13 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -104,6 +107,7 @@ Material: - Boolean_236a513c11c34f97b3d22cc5b0fdd0bd: 0 - PixelSnap: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -169,4 +173,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/Prefabs/UI/CharSel_Background.prefab b/Assets/Prefabs/UI/CharSel_Background.prefab index 5ba181293..f37701d12 100644 --- a/Assets/Prefabs/UI/CharSel_Background.prefab +++ b/Assets/Prefabs/UI/CharSel_Background.prefab @@ -26,6 +26,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -34.616104, y: 8.532433, z: 109.21108} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5090482364057567587} - {fileID: 3285723283678389666} @@ -153,6 +154,7 @@ Transform: m_LocalRotation: {x: 0.20431855, y: -0, z: -0, w: 0.9789045} m_LocalPosition: {x: -1.63, y: -28.275, z: -2.9420395} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4920663751426647139} m_RootOrder: 0 @@ -195,6 +197,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 4624227725711097874, guid: 4e2ccdc22ce4a0f4f84280f1d3025a46, type: 3} @@ -250,6 +253,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e2ccdc22ce4a0f4f84280f1d3025a46, type: 3} --- !u!4 &4706495449646070121 stripped Transform: @@ -261,8 +267,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} propertyPath: m_RootOrder value: 26 @@ -337,6 +348,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + - {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &3234345934838456955 stripped Transform: @@ -348,8 +363,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} propertyPath: m_RootOrder value: 38 @@ -424,6 +444,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + - {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &3263701879421858790 stripped Transform: @@ -435,8 +459,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -503,6 +532,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &5091891627499304090 stripped Transform: @@ -514,8 +547,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -582,6 +620,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &5145653915750001454 stripped Transform: @@ -593,8 +635,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -661,6 +708,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &5183051475224248315 stripped Transform: @@ -672,8 +723,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -740,6 +796,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &4999727750412628632 stripped Transform: @@ -751,8 +811,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} propertyPath: m_RootOrder value: 48 @@ -827,6 +892,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + - {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &3026354410201873862 stripped Transform: @@ -838,8 +907,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} propertyPath: m_RootOrder value: 45 @@ -914,6 +988,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + - {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &2633666134721422644 stripped Transform: @@ -925,8 +1003,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -993,6 +1076,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &5251724142864442328 stripped Transform: @@ -1004,8 +1091,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -1072,6 +1164,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &5314946158855289737 stripped Transform: @@ -1083,6 +1179,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -1155,6 +1252,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &2976957566934501913 stripped Transform: @@ -1166,6 +1266,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 3325143161705299546, guid: 4adee64436cbf334b8ab837a5ab13a1a, type: 3} @@ -1246,6 +1347,9 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6664442740537142151, guid: 4adee64436cbf334b8ab837a5ab13a1a, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4adee64436cbf334b8ab837a5ab13a1a, type: 3} --- !u!4 &2530991597359301258 stripped Transform: @@ -1257,8 +1361,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -1325,6 +1434,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &5586872420031154336 stripped Transform: @@ -1336,8 +1449,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -1404,6 +1522,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &6033892548504091151 stripped Transform: @@ -1415,6 +1537,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1148747288013210730, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} @@ -1487,6 +1610,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8619486518123324128, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} --- !u!4 &744763515804582010 stripped Transform: @@ -1498,8 +1624,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -1566,6 +1697,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &6084772302248676129 stripped Transform: @@ -1577,6 +1712,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -1649,6 +1785,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &3657063113099343713 stripped Transform: @@ -1660,8 +1799,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} propertyPath: m_RootOrder value: 28 @@ -1736,6 +1880,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + - {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &3867829615690795967 stripped Transform: @@ -1747,8 +1895,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -1815,6 +1968,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &6811761498905329375 stripped Transform: @@ -1826,6 +1983,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -1898,6 +2056,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &4177558615837457137 stripped Transform: @@ -1909,8 +2070,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -1977,6 +2143,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &6812830544662576959 stripped Transform: @@ -1988,8 +2158,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -2056,6 +2231,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &6864563551950278584 stripped Transform: @@ -2067,6 +2246,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1899106884463111546, guid: 0694fadc66450d74c815c822643aae02, type: 3} @@ -2138,6 +2318,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0694fadc66450d74c815c822643aae02, type: 3} --- !u!4 &8135191846433530663 stripped Transform: @@ -2149,8 +2332,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -2217,6 +2405,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &6703415741398579804 stripped Transform: @@ -2228,8 +2420,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} propertyPath: m_RootOrder value: 40 @@ -2304,6 +2501,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + - {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &912274811401280800 stripped Transform: @@ -2315,6 +2516,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1148747288013210730, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} @@ -2387,6 +2589,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8619486518123324128, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} --- !u!4 &4073471928574029972 stripped Transform: @@ -2398,8 +2603,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -2466,6 +2676,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &7308070030084154003 stripped Transform: @@ -2477,6 +2691,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 3325143161705299546, guid: 4adee64436cbf334b8ab837a5ab13a1a, type: 3} @@ -2557,6 +2772,9 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6664442740537142151, guid: 4adee64436cbf334b8ab837a5ab13a1a, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4adee64436cbf334b8ab837a5ab13a1a, type: 3} --- !u!4 &293547408551421237 stripped Transform: @@ -2568,6 +2786,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 244755325804016404, guid: fbe2ea8ebacf1954a9636a5916cf5402, type: 3} @@ -2759,6 +2978,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fbe2ea8ebacf1954a9636a5916cf5402, type: 3} --- !u!4 &1856643699541129185 stripped Transform: @@ -2770,8 +2992,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -2838,6 +3065,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8064690637549537155 stripped Transform: @@ -2849,6 +3080,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1148747288013210730, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} @@ -2921,6 +3153,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8619486518123324128, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} --- !u!4 &3380408451001089066 stripped Transform: @@ -2932,6 +3167,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} @@ -3004,6 +3240,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} --- !u!4 &1542329270733806462 stripped Transform: @@ -3015,6 +3254,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1899106884463111546, guid: 702ab0d292bbb1a4cb6821e2ffcad426, type: 3} @@ -3091,6 +3331,9 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 4897062626467851486, guid: 702ab0d292bbb1a4cb6821e2ffcad426, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 702ab0d292bbb1a4cb6821e2ffcad426, type: 3} --- !u!4 &6821737240886408707 stripped Transform: @@ -3102,8 +3345,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} propertyPath: m_RootOrder value: 9 @@ -3178,6 +3426,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + - {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &2175789611110148677 stripped Transform: @@ -3189,6 +3441,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1899106884463111546, guid: 028c030816ef0094b81d3239f296e369, type: 3} @@ -3258,6 +3511,9 @@ PrefabInstance: m_RemovedComponents: - {fileID: 4897062626467851486, guid: 028c030816ef0094b81d3239f296e369, type: 3} - {fileID: 8778471712971589033, guid: 028c030816ef0094b81d3239f296e369, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 028c030816ef0094b81d3239f296e369, type: 3} --- !u!4 &6821737241329974283 stripped Transform: @@ -3269,8 +3525,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} propertyPath: m_RootOrder value: 17 @@ -3345,6 +3606,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + - {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &2175789611652344471 stripped Transform: @@ -3356,8 +3621,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -3424,6 +3694,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8220524271094872161 stripped Transform: @@ -3435,8 +3709,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -3503,6 +3782,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8220524271010362682 stripped Transform: @@ -3514,6 +3797,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1148747288013210730, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} @@ -3586,6 +3870,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8619486518123324128, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} --- !u!4 &3380408450136048289 stripped Transform: @@ -3597,6 +3884,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} @@ -3669,6 +3957,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} --- !u!4 &1542329270995496232 stripped Transform: @@ -3680,6 +3971,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1899106884463111546, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} @@ -3757,6 +4049,9 @@ PrefabInstance: m_RemovedComponents: - {fileID: 4897062626467851486, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} - {fileID: 8778471712971589033, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} --- !u!4 &6821737242145051659 stripped Transform: @@ -3768,6 +4063,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1148747288013210730, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} @@ -3840,6 +4136,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8619486518123324128, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} --- !u!4 &3380408450032615351 stripped Transform: @@ -3851,8 +4150,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -3919,6 +4223,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8220524272313890799 stripped Transform: @@ -3930,6 +4238,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -4002,6 +4311,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &1542329270150831046 stripped Transform: @@ -4013,6 +4325,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1148747288013210730, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} @@ -4085,6 +4398,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8619486518123324128, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} --- !u!4 &3380408449366138002 stripped Transform: @@ -4096,8 +4412,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} propertyPath: m_RootOrder value: 20 @@ -4172,6 +4493,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + - {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &2175789612560067261 stripped Transform: @@ -4183,6 +4508,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -4255,6 +4581,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &1542329270275864979 stripped Transform: @@ -4266,8 +4595,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -4334,6 +4668,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8220524271961446367 stripped Transform: @@ -4345,8 +4683,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} propertyPath: m_RootOrder value: 12 @@ -4421,6 +4764,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + - {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &2175789612438555974 stripped Transform: @@ -4432,8 +4779,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -4500,6 +4852,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8243883689471615297 stripped Transform: @@ -4511,8 +4867,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -4579,6 +4940,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8247516805826393626 stripped Transform: @@ -4590,6 +4955,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -4662,6 +5028,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &1638842208548707075 stripped Transform: @@ -4673,6 +5042,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -4745,6 +5115,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &1625720810058963086 stripped Transform: @@ -4756,8 +5129,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -4824,6 +5202,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8380985825850896864 stripped Transform: @@ -4835,6 +5217,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -4907,6 +5290,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &1430945200787393532 stripped Transform: @@ -4918,6 +5304,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1899106884463111546, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} @@ -4995,6 +5382,9 @@ PrefabInstance: m_RemovedComponents: - {fileID: 4897062626467851486, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} - {fileID: 8778471712971589033, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3043be3dd5e679141871f4297e5847f2, type: 3} --- !u!4 &6443100005166458716 stripped Transform: @@ -5006,8 +5396,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -5074,6 +5469,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &8928409966773851272 stripped Transform: @@ -5085,6 +5484,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 3325143161705299546, guid: de75bb4ddac2e2f4097798b91c0d4c1e, type: 3} @@ -5160,6 +5560,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: de75bb4ddac2e2f4097798b91c0d4c1e, type: 3} --- !u!4 &1547563109838096507 stripped Transform: @@ -5171,6 +5574,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} @@ -5243,6 +5647,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} --- !u!4 &1834740943003492376 stripped Transform: @@ -5254,6 +5661,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -5326,6 +5734,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &1872207809922079481 stripped Transform: @@ -5337,8 +5748,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -5405,6 +5821,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &9201846079159653841 stripped Transform: @@ -5416,6 +5836,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 3325143161705299546, guid: de75bb4ddac2e2f4097798b91c0d4c1e, type: 3} @@ -5491,6 +5912,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: de75bb4ddac2e2f4097798b91c0d4c1e, type: 3} --- !u!4 &1163198926015539775 stripped Transform: @@ -5502,6 +5926,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} @@ -5574,6 +5999,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} --- !u!4 &7251287495355780583 stripped Transform: @@ -5585,8 +6013,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -5653,6 +6086,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &90720135868898045 stripped Transform: @@ -5664,8 +6101,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -5732,6 +6174,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &434748549844287899 stripped Transform: @@ -5743,8 +6189,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -5811,6 +6262,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &458728874466469216 stripped Transform: @@ -5822,6 +6277,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -5894,6 +6350,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &7034815778319695098 stripped Transform: @@ -5905,6 +6364,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 4624227725711097874, guid: 4e2ccdc22ce4a0f4f84280f1d3025a46, type: 3} @@ -5960,6 +6420,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e2ccdc22ce4a0f4f84280f1d3025a46, type: 3} --- !u!4 &379802694103644842 stripped Transform: @@ -5971,8 +6434,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} propertyPath: m_RootOrder value: 50 @@ -6047,6 +6515,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + - {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &7278730828392968038 stripped Transform: @@ -6058,6 +6530,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 3325143161705299546, guid: 6e5deea61a7dedb48b2e17997b9ce8ae, type: 3} @@ -6117,6 +6590,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6e5deea61a7dedb48b2e17997b9ce8ae, type: 3} --- !u!4 &7077900180040830498 stripped Transform: @@ -6128,6 +6604,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -6200,6 +6677,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &7738129568973818823 stripped Transform: @@ -6211,8 +6691,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -6279,6 +6764,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &1298931352510757286 stripped Transform: @@ -6290,6 +6779,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -6362,6 +6852,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &8482147364920586566 stripped Transform: @@ -6373,6 +6866,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 3325143161705299546, guid: 607206da21792af45a04c3da88fb0edf, type: 3} @@ -6448,6 +6942,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 607206da21792af45a04c3da88fb0edf, type: 3} --- !u!4 &9215320845868057429 stripped Transform: @@ -6459,6 +6956,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -6531,6 +7029,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &8239405506365050426 stripped Transform: @@ -6542,6 +7043,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 3325143161705299546, guid: 607206da21792af45a04c3da88fb0edf, type: 3} @@ -6617,6 +7119,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 607206da21792af45a04c3da88fb0edf, type: 3} --- !u!4 &8515083028342485757 stripped Transform: @@ -6628,8 +7133,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -6696,6 +7206,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &1953718301382847309 stripped Transform: @@ -6707,8 +7221,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} propertyPath: m_RootOrder value: 30 @@ -6783,6 +7302,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + - {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &8576695604743464035 stripped Transform: @@ -6794,8 +7317,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -6862,6 +7390,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &2470208979014459096 stripped Transform: @@ -6873,8 +7405,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -6941,6 +7478,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &2740411313084716046 stripped Transform: @@ -6952,8 +7493,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -7020,6 +7566,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &2924576605462022811 stripped Transform: @@ -7031,8 +7581,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -7099,6 +7654,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &2934847741690845232 stripped Transform: @@ -7110,6 +7669,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -7182,6 +7742,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &5461440007803685514 stripped Transform: @@ -7193,6 +7756,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1035124629187868206, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} @@ -7356,17 +7920,207 @@ PrefabInstance: value: 4.050003 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7611187898492969243, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} + insertIndex: -1 + addedObject: {fileID: 3772235450065214618} + - targetCorrespondingSourceObject: {fileID: 1854552078081533770, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} + insertIndex: -1 + addedObject: {fileID: 7662978519699544152} + - targetCorrespondingSourceObject: {fileID: 7129222076054156212, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} + insertIndex: -1 + addedObject: {fileID: 8494480966804817477} + - targetCorrespondingSourceObject: {fileID: 4363544379914543528, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} + insertIndex: -1 + addedObject: {fileID: 2969519876693436158} + - targetCorrespondingSourceObject: {fileID: 8100776851967309111, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} + insertIndex: -1 + addedObject: {fileID: 6731023149658478050} + - targetCorrespondingSourceObject: {fileID: 4169002944229521292, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} + insertIndex: -1 + addedObject: {fileID: 7292983845636200868} m_SourcePrefab: {fileID: 100100000, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} +--- !u!1 &201667787006272746 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8100776851967309111, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} + m_PrefabInstance: {fileID: 8261794590216032733} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6731023149658478050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 201667787006272746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!1 &1177655966066713193 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7129222076054156212, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} + m_PrefabInstance: {fileID: 8261794590216032733} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8494480966804817477 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1177655966066713193} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!1 &1947689712084775110 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7611187898492969243, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} + m_PrefabInstance: {fileID: 8261794590216032733} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3772235450065214618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1947689712084775110} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 --- !u!4 &3285723283678389666 stripped Transform: m_CorrespondingSourceObject: {fileID: 6863188427856376959, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} m_PrefabInstance: {fileID: 8261794590216032733} m_PrefabAsset: {fileID: 0} +--- !u!1 &5439376926161086033 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4169002944229521292, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} + m_PrefabInstance: {fileID: 8261794590216032733} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7292983845636200868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5439376926161086033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!1 &5632215425567125621 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4363544379914543528, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} + m_PrefabInstance: {fileID: 8261794590216032733} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2969519876693436158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5632215425567125621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!1 &7717897773102741143 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1854552078081533770, guid: 70f4c0b3f0a1344458a3a13ffe4668e6, type: 3} + m_PrefabInstance: {fileID: 8261794590216032733} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7662978519699544152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7717897773102741143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 --- !u!1001 &8391560410282153065 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} @@ -7439,6 +8193,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ea4099dde2e45f4f80b1f58171a6b9b, type: 3} --- !u!4 &5838643131072430612 stripped Transform: @@ -7450,6 +8207,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 759726440798291530, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} @@ -7522,6 +8280,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2616948069966954651, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f45b98cfe724004e84597dc148d6a3f, type: 3} --- !u!4 &6007102251735563566 stripped Transform: @@ -7533,6 +8294,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1148747288013210730, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} @@ -7605,6 +8367,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8619486518123324128, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16cfec2fee031384ab80c080e2927dac, type: 3} --- !u!4 &7509401185041245797 stripped Transform: @@ -7616,8 +8381,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -7684,6 +8454,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &4312831425241163007 stripped Transform: @@ -7695,8 +8469,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -7763,6 +8542,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &4057583862999188522 stripped Transform: @@ -7774,6 +8557,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 1148747288013210730, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} @@ -7846,6 +8630,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8619486518123324128, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 18746b4a20a009b4cae4eed4fc4c6ce7, type: 3} --- !u!4 &7342158933333170647 stripped Transform: @@ -7857,8 +8644,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -7925,6 +8717,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &4119662209576114786 stripped Transform: @@ -7936,6 +8732,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: - target: {fileID: 3325143161705299546, guid: 6e5deea61a7dedb48b2e17997b9ce8ae, type: 3} @@ -7995,6 +8792,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6e5deea61a7dedb48b2e17997b9ce8ae, type: 3} --- !u!4 &5770059994887671484 stripped Transform: @@ -8006,8 +8806,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} propertyPath: m_Enabled value: 0 @@ -8074,6 +8879,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 3946375560253007557, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + - {fileID: -5069363821460787684, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e8bd4962790c8142ac06150a37418de, type: 3} --- !u!4 &4465395886613609450 stripped Transform: @@ -8085,8 +8894,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4920663751426647139} m_Modifications: + - target: {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + propertyPath: m_Collider + value: + objectReference: {fileID: 0} - target: {fileID: 3325143161705299546, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} propertyPath: m_RootOrder value: 35 @@ -8161,6 +8975,10 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2} m_RemovedComponents: - {fileID: 6399737381871187658, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + - {fileID: -3983996757204683007, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0c0ac1f8d6b7aa46a1b2c7dc8e67866, type: 3} --- !u!4 &5899669677500254489 stripped Transform: diff --git a/Assets/Scenes/BossRoom/LightingData.asset b/Assets/Scenes/BossRoom/LightingData.asset index 1442014f6..4baab75f3 100644 --- a/Assets/Scenes/BossRoom/LightingData.asset +++ b/Assets/Scenes/BossRoom/LightingData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ae65413677fcfde8d892a86516b93e75fbded4fa81583c53d414eb8621e884b -size 209052 +oid sha256:bd6954cf2b1b09a98bd4c3424f332cd50b8e20033691aa85e8fcf2276ea27e41 +size 213084 diff --git a/Assets/Scenes/BossRoom/Lightmap-0_comp_light.exr b/Assets/Scenes/BossRoom/Lightmap-0_comp_light.exr index ecacf1e8d..41863175b 100644 --- a/Assets/Scenes/BossRoom/Lightmap-0_comp_light.exr +++ b/Assets/Scenes/BossRoom/Lightmap-0_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:617f8a9cde3aa445e45bcc8c99c2e9ba36417f7c2f1c2e5e8b9945a3432f84f6 -size 3218969 +oid sha256:d5a7333a5a73f3c3211570b45185ba1bc9ed3620ef6569ad8291aedbcd4b0f2c +size 3278467 diff --git a/Assets/Scenes/BossRoom/Lightmap-0_comp_light.exr.meta b/Assets/Scenes/BossRoom/Lightmap-0_comp_light.exr.meta index 7fb29f179..58498b273 100644 --- a/Assets/Scenes/BossRoom/Lightmap-0_comp_light.exr.meta +++ b/Assets/Scenes/BossRoom/Lightmap-0_comp_light.exr.meta @@ -3,7 +3,7 @@ guid: e27ca13460aaa7e4dae9bff6fc591ddf TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,17 +64,46 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -90,9 +120,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/BossRoom/Lightmap-1_comp_light.exr b/Assets/Scenes/BossRoom/Lightmap-1_comp_light.exr index f97759f57..ceb064980 100644 --- a/Assets/Scenes/BossRoom/Lightmap-1_comp_light.exr +++ b/Assets/Scenes/BossRoom/Lightmap-1_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50e1b6368086e0372c54b59d946e9a77b918aa2650347e4b7e61a01212a810f9 -size 911880 +oid sha256:33e04993ea472bbc610c8a80632673c95c94e5a8d9ec05c03b2970561d24c401 +size 884546 diff --git a/Assets/Scenes/BossRoom/Lightmap-1_comp_light.exr.meta b/Assets/Scenes/BossRoom/Lightmap-1_comp_light.exr.meta index 0d6e28005..96e3f2f31 100644 --- a/Assets/Scenes/BossRoom/Lightmap-1_comp_light.exr.meta +++ b/Assets/Scenes/BossRoom/Lightmap-1_comp_light.exr.meta @@ -3,7 +3,7 @@ guid: 4566692bd110c2847bea6eaf6b43a811 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,17 +64,46 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -90,9 +120,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/BossRoom/Lightmap-2_comp_light.exr b/Assets/Scenes/BossRoom/Lightmap-2_comp_light.exr index 6bf6138b5..dfb4831db 100644 --- a/Assets/Scenes/BossRoom/Lightmap-2_comp_light.exr +++ b/Assets/Scenes/BossRoom/Lightmap-2_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ba70d0d2136120b63a3c0db8a977f820f357ef25059518fc15d2768ab9231b6 -size 2425796 +oid sha256:269f5807c005a61511248c7dbd9bfdc763f65669e9965b6e528a1fc14aded1bb +size 2475847 diff --git a/Assets/Scenes/BossRoom/Lightmap-2_comp_light.exr.meta b/Assets/Scenes/BossRoom/Lightmap-2_comp_light.exr.meta index 67c8b73ff..4bc2d4d95 100644 --- a/Assets/Scenes/BossRoom/Lightmap-2_comp_light.exr.meta +++ b/Assets/Scenes/BossRoom/Lightmap-2_comp_light.exr.meta @@ -3,7 +3,7 @@ guid: 605d9c9273e496c468ff9f03a25f1da0 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,17 +64,46 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -90,9 +120,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/BossRoom/Lightmap-3_comp_light.exr b/Assets/Scenes/BossRoom/Lightmap-3_comp_light.exr index 62766773b..5174c8c68 100644 --- a/Assets/Scenes/BossRoom/Lightmap-3_comp_light.exr +++ b/Assets/Scenes/BossRoom/Lightmap-3_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef384e693ec8ed27c3d1ebea93972618f81b0ded43c47dc382e029963550c3e4 -size 2713710 +oid sha256:3f383a74713fc7d9cd8cb6924251ba4c998e0ef666f13b278e229fa1d69860bf +size 2794146 diff --git a/Assets/Scenes/BossRoom/Lightmap-3_comp_light.exr.meta b/Assets/Scenes/BossRoom/Lightmap-3_comp_light.exr.meta index 9bffaefb2..91e379981 100644 --- a/Assets/Scenes/BossRoom/Lightmap-3_comp_light.exr.meta +++ b/Assets/Scenes/BossRoom/Lightmap-3_comp_light.exr.meta @@ -3,7 +3,7 @@ guid: d65a2204dfc865748ab4170d512432f4 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,17 +64,46 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -90,9 +120,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/BossRoom/Lightmap-4_comp_light.exr b/Assets/Scenes/BossRoom/Lightmap-4_comp_light.exr index 515d29884..78f93da3c 100644 --- a/Assets/Scenes/BossRoom/Lightmap-4_comp_light.exr +++ b/Assets/Scenes/BossRoom/Lightmap-4_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84ea3fa2e3c708409ff8e61f5e600a74579ad7978684c1018fced6450d011cd2 -size 2813161 +oid sha256:ba1ce99f2ae5b19990f4b2e40c98deb4fb533e2366547f7750ce27d678852272 +size 2892971 diff --git a/Assets/Scenes/BossRoom/Lightmap-4_comp_light.exr.meta b/Assets/Scenes/BossRoom/Lightmap-4_comp_light.exr.meta index 054a5e127..48cb3ed96 100644 --- a/Assets/Scenes/BossRoom/Lightmap-4_comp_light.exr.meta +++ b/Assets/Scenes/BossRoom/Lightmap-4_comp_light.exr.meta @@ -3,7 +3,7 @@ guid: 1f4aa1c28bde8ab48b47715d8fe1597a TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,17 +64,46 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -90,9 +120,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/BossRoom/Lightmap-5_comp_light.exr b/Assets/Scenes/BossRoom/Lightmap-5_comp_light.exr index a932aa140..54665d750 100644 --- a/Assets/Scenes/BossRoom/Lightmap-5_comp_light.exr +++ b/Assets/Scenes/BossRoom/Lightmap-5_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de7accce61548c85dc80cfe3a15517bf55a4e79030bca56d5a7ce61e9274e1a3 -size 1669074 +oid sha256:b7899a2462a5de89d9c79bd9d38141c974d5e0b67187e9f6e7bb27b5eeece7f8 +size 1677426 diff --git a/Assets/Scenes/BossRoom/Lightmap-5_comp_light.exr.meta b/Assets/Scenes/BossRoom/Lightmap-5_comp_light.exr.meta index 6e6537c77..e3fe6afea 100644 --- a/Assets/Scenes/BossRoom/Lightmap-5_comp_light.exr.meta +++ b/Assets/Scenes/BossRoom/Lightmap-5_comp_light.exr.meta @@ -3,7 +3,7 @@ guid: c68d97b97e20e914e83b0cc2f5fb7aee TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,17 +64,46 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -90,9 +120,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/BossRoom/ReflectionProbe-0.png b/Assets/Scenes/BossRoom/ReflectionProbe-0.png index f74963f7e..89dbf1b62 100644 --- a/Assets/Scenes/BossRoom/ReflectionProbe-0.png +++ b/Assets/Scenes/BossRoom/ReflectionProbe-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fc2d008499fe8abf2426dcdfe77d73477efbc09976a8211c49696695eef0584 -size 9556 +oid sha256:162f0d1edc923835c10709c899053dbea4ca48f95cc3972b8a562022904dc552 +size 9853 diff --git a/Assets/Scenes/BossRoom/ReflectionProbe-0.png.meta b/Assets/Scenes/BossRoom/ReflectionProbe-0.png.meta index a255e20da..5bfbb9da8 100644 --- a/Assets/Scenes/BossRoom/ReflectionProbe-0.png.meta +++ b/Assets/Scenes/BossRoom/ReflectionProbe-0.png.meta @@ -3,7 +3,7 @@ guid: 8b8ead4ccc0189a4dbe595239ce2037f TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 1 @@ -63,6 +64,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -74,6 +77,33 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -90,9 +120,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/BossRoom/ReflectionProbe-1.png b/Assets/Scenes/BossRoom/ReflectionProbe-1.png index b0ab12891..f3876adbf 100644 --- a/Assets/Scenes/BossRoom/ReflectionProbe-1.png +++ b/Assets/Scenes/BossRoom/ReflectionProbe-1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbf94b601f17a1beda3230546eda77bf2289c033fd1844d7196862fa1365b856 -size 10871 +oid sha256:c8c85eee7048c0e4f6802d16366ec1049fc27efbc643cd660696479f317c5300 +size 10235 diff --git a/Assets/Scenes/BossRoom/ReflectionProbe-1.png.meta b/Assets/Scenes/BossRoom/ReflectionProbe-1.png.meta index e17039e4f..7187a8d35 100644 --- a/Assets/Scenes/BossRoom/ReflectionProbe-1.png.meta +++ b/Assets/Scenes/BossRoom/ReflectionProbe-1.png.meta @@ -3,7 +3,7 @@ guid: 5bdb781db8ed99040a98ebe8160fda8e TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 1 @@ -63,6 +64,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -74,6 +77,33 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -90,9 +120,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/BossRoom/ReflectionProbe-2.png b/Assets/Scenes/BossRoom/ReflectionProbe-2.png index 9b993e56d..c4e8f7ea5 100644 --- a/Assets/Scenes/BossRoom/ReflectionProbe-2.png +++ b/Assets/Scenes/BossRoom/ReflectionProbe-2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2facd8fba92c891483fe5505840e8c1a811530516b1e8ce84a509083fa1617c -size 10289 +oid sha256:65904120612d6320dd83defa45fb1d0f546018c014f7540b5eeab5b6039dd65e +size 9236 diff --git a/Assets/Scenes/BossRoom/ReflectionProbe-2.png.meta b/Assets/Scenes/BossRoom/ReflectionProbe-2.png.meta index b11ddbea3..60dfc3b41 100644 --- a/Assets/Scenes/BossRoom/ReflectionProbe-2.png.meta +++ b/Assets/Scenes/BossRoom/ReflectionProbe-2.png.meta @@ -3,7 +3,7 @@ guid: d63e394d7601b6d4ba741d22090ae913 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 1 @@ -63,6 +64,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -74,6 +77,33 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -90,9 +120,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/BossRoom/ReflectionProbe-3.exr.meta b/Assets/Scenes/BossRoom/ReflectionProbe-3.exr.meta index 6c7777e15..0061d8cfe 100644 --- a/Assets/Scenes/BossRoom/ReflectionProbe-3.exr.meta +++ b/Assets/Scenes/BossRoom/ReflectionProbe-3.exr.meta @@ -3,7 +3,7 @@ guid: 45f0d5a1cf3e10542bc185b638383479 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 1 @@ -63,6 +64,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -74,6 +77,33 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -90,9 +120,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/Startup.unity b/Assets/Scenes/Startup.unity index 60965a95f..c03bd06c6 100644 --- a/Assets/Scenes/Startup.unity +++ b/Assets/Scenes/Startup.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e76c2bb285c5a359327bfbb6d400e404ef587ccf118ad3092cd8e4ddc251e26 -size 45928 +oid sha256:89766f5be9a377c6e6749849490ece163d1a4a1ee0d5600e9fe04415e0e83381 +size 48341 diff --git a/Assets/URP/Mobile/0_UniversalRenderPipelineAsset_Mobile_Low.asset b/Assets/URP/Mobile/0_UniversalRenderPipelineAsset_Mobile_Low.asset index 24462e25f..8c7f5e8cf 100644 --- a/Assets/URP/Mobile/0_UniversalRenderPipelineAsset_Mobile_Low.asset +++ b/Assets/URP/Mobile/0_UniversalRenderPipelineAsset_Mobile_Low.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da29810c341bcf738578f47551ecbe28f8e97219b291a31573861911483bfe13 -size 2274 +oid sha256:62ae1d73a7e79f82f466f0cca0ffd7d7f3c647af0c5d7876e8f28aed6ba195da +size 3501 diff --git a/Assets/URP/Mobile/1_UniversalRenderPipelineAsset_Mobile_Medium.asset b/Assets/URP/Mobile/1_UniversalRenderPipelineAsset_Mobile_Medium.asset index 6b019a5e5..52cf4af4e 100644 --- a/Assets/URP/Mobile/1_UniversalRenderPipelineAsset_Mobile_Medium.asset +++ b/Assets/URP/Mobile/1_UniversalRenderPipelineAsset_Mobile_Medium.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5af532fbda783cc134217ba61421dd74757b2815c13bad89459539d20f250dff -size 2277 +oid sha256:ec3b54e2206ca1aca321f2f0b9961bf14937f8e15821aa8342e45835b965db81 +size 3504 diff --git a/Assets/URP/Mobile/2_UniversalRenderPipelineAsset_Mobile_High.asset b/Assets/URP/Mobile/2_UniversalRenderPipelineAsset_Mobile_High.asset index 8e49855ad..ddd784b09 100644 --- a/Assets/URP/Mobile/2_UniversalRenderPipelineAsset_Mobile_High.asset +++ b/Assets/URP/Mobile/2_UniversalRenderPipelineAsset_Mobile_High.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9890a6b627a2c2432d7779057d5507d3d77d7ccba3d5492dcc2e93aaf7223042 -size 2275 +oid sha256:78565188a9b121a758c685ad1b4da264123ab20dc15b2de49725c527140b8ae0 +size 3502 diff --git a/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low.asset b/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low.asset index 180064f43..ac12d42a8 100644 --- a/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low.asset +++ b/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c89de387b09b66122b1fafc5db5c343753ab924dfc0765bfb3d102624424080 -size 2266 +oid sha256:b276240933fdda078fe3a462a4729dbade38d49a9ae51cc6eaad477907cb2ac9 +size 3493 diff --git a/Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium.asset b/Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium.asset index 5d2abf8ed..60ab234f6 100644 --- a/Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium.asset +++ b/Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34f94cbfdeecaddec5dc78be403314ec6a232f42300db751d722928710a43b60 -size 2274 +oid sha256:08ba74e6bb58af1ca915ad7e9f6bdcc451d2604be3bf6a8621a9a91f83ac747c +size 3501 diff --git a/Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium_Renderer.asset b/Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium_Renderer.asset index c460ef906..c0d97af4e 100644 --- a/Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium_Renderer.asset +++ b/Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium_Renderer.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a2000f971807c4da5bea0bb26e7338c8a3e705dd1a37d94f99f6a828601f83e -size 2927 +oid sha256:52463974785ae7050f0828ba83615b26e51c2f3cdd25e326985c5ee71a7493ab +size 3760 diff --git a/Assets/URP/Windows/2_UniversalRenderPipelineAsset_Windows_High.asset b/Assets/URP/Windows/2_UniversalRenderPipelineAsset_Windows_High.asset index 59ca8c015..636658577 100644 --- a/Assets/URP/Windows/2_UniversalRenderPipelineAsset_Windows_High.asset +++ b/Assets/URP/Windows/2_UniversalRenderPipelineAsset_Windows_High.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1cdbea3b4b01ff59099ce403a979576fca035dbbdf81d78b38b984831273917 -size 2266 +oid sha256:b3fa683710f40f40512976e3bdae2171c9ba488c985f87995fd0577839347cd6 +size 3493 diff --git a/Assets/URP/Windows/3_UniversalRenderPipelineAsset_Windows_Ultra.asset b/Assets/URP/Windows/3_UniversalRenderPipelineAsset_Windows_Ultra.asset index d2f2cf08a..85384a7ed 100644 --- a/Assets/URP/Windows/3_UniversalRenderPipelineAsset_Windows_Ultra.asset +++ b/Assets/URP/Windows/3_UniversalRenderPipelineAsset_Windows_Ultra.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e42330b31093de0051cedcf0a292fb23e2bbf4de2444d57a35fc8f127c142d2 -size 2268 +oid sha256:d20bce9da6b76d3fb037333159f05170ad0e75d5f4df6414bcca8c368585f501 +size 3495 diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index 8ca63e895..83829b821 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:545e8af4968fd158275413e9b255615ddd9d6b7cc85c7605254d6022ba0055cc -size 842 +oid sha256:ad47c9a555fa0774e8982e52f039ce9c33a21b1524c18d7e430d1505708bb014 +size 1183 diff --git a/Assets/VFX/Materials/FX_M_ArcherArrow.mat b/Assets/VFX/Materials/FX_M_ArcherArrow.mat index b3f7bb29d..9660d56a5 100644 --- a/Assets/VFX/Materials/FX_M_ArcherArrow.mat +++ b/Assets/VFX/Materials/FX_M_ArcherArrow.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_ArcherArrow m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -87,6 +90,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -94,6 +98,7 @@ Material: - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _Depth_Blend: 0 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 @@ -115,6 +120,7 @@ Material: - _Surface: 1 - _UVSec: 0 - _UseAlpha: 1 + - _UseSoftParticles: 0 - _WorkflowMode: 0 - _ZTest: 4 - _ZWrite: 0 @@ -138,4 +144,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_CharaterSneaky.mat b/Assets/VFX/Materials/FX_M_CharaterSneaky.mat index 29b968481..034a1bbfa 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_CharaterSneaky m_Shader: {fileID: -6465566751694194690, guid: 9eaa742b6fd266949a5196eb90e8f6aa, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 0 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/VFX/Materials/FX_M_CharaterSneaky_LessSneak.mat b/Assets/VFX/Materials/FX_M_CharaterSneaky_LessSneak.mat index be091b362..d654dafe6 100644 --- a/Assets/VFX/Materials/FX_M_CharaterSneaky_LessSneak.mat +++ b/Assets/VFX/Materials/FX_M_CharaterSneaky_LessSneak.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_CharaterSneaky_LessSneak m_Shader: {fileID: -6465566751694194690, guid: 9eaa742b6fd266949a5196eb90e8f6aa, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 0 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -91,4 +94,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Chest.mat b/Assets/VFX/Materials/FX_M_Chest.mat index 17d3d9bb2..c893d1333 100644 --- a/Assets/VFX/Materials/FX_M_Chest.mat +++ b/Assets/VFX/Materials/FX_M_Chest.mat @@ -9,19 +9,22 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Chest m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - ALWAYS - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -84,6 +87,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -94,6 +98,7 @@ Material: - _ColorMode: 0 - _Cull: 0 - _Cutoff: 0.5 + - _Depth_Blend: 0 - _DetailNormalMapScale: 1 - _DistortionBlend: 0 - _DistortionEnabled: 0 @@ -122,6 +127,7 @@ Material: - _Surface: 1 - _UVSec: 0 - _UseAlpha: 1 + - _UseSoftParticles: 0 - _ZTest: 4 - _ZWrite: 0 - _ZWriteControl: 0 @@ -147,4 +153,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Circle_Sheet_01.mat b/Assets/VFX/Materials/FX_M_Circle_Sheet_01.mat index 9916999c1..47849a96d 100644 --- a/Assets/VFX/Materials/FX_M_Circle_Sheet_01.mat +++ b/Assets/VFX/Materials/FX_M_Circle_Sheet_01.mat @@ -9,17 +9,20 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Circle_Sheet_01 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -84,6 +87,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 1 @@ -134,4 +138,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Circle_Sheet_02.mat b/Assets/VFX/Materials/FX_M_Circle_Sheet_02.mat index 805dd7c2e..c222ac558 100644 --- a/Assets/VFX/Materials/FX_M_Circle_Sheet_02.mat +++ b/Assets/VFX/Materials/FX_M_Circle_Sheet_02.mat @@ -9,17 +9,20 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Circle_Sheet_02 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -84,6 +87,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 0 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 1 @@ -134,4 +138,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Circle_Sheet_03.mat b/Assets/VFX/Materials/FX_M_Circle_Sheet_03.mat index 048fd12cc..58cd36f53 100644 --- a/Assets/VFX/Materials/FX_M_Circle_Sheet_03.mat +++ b/Assets/VFX/Materials/FX_M_Circle_Sheet_03.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Circle_Sheet_03 m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _FLIPBOOKBLENDING_ON - _SURFACE_TYPE_TRANSPARENT @@ -22,6 +24,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -86,6 +89,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -102,6 +106,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnvironmentReflections: 1 - _FlipbookBlending: 1 - _FlipbookMode: 0 @@ -121,6 +126,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UseAlpha: 1 - _UseSoftParticles: 0 @@ -154,4 +160,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Circle_Sheet_04.mat b/Assets/VFX/Materials/FX_M_Circle_Sheet_04.mat index 5173d64c6..c07b6393b 100644 --- a/Assets/VFX/Materials/FX_M_Circle_Sheet_04.mat +++ b/Assets/VFX/Materials/FX_M_Circle_Sheet_04.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Circle_Sheet_04 m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _FLIPBOOKBLENDING_ON - _SURFACE_TYPE_TRANSPARENT @@ -22,6 +24,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -86,6 +89,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -102,6 +106,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _FlipbookBlending: 1 - _FlipbookMode: 0 @@ -121,6 +126,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UseAlpha: 0 - _UseSoftParticles: 0 @@ -154,4 +160,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Circle_Sheet_05.mat b/Assets/VFX/Materials/FX_M_Circle_Sheet_05.mat index a95cb1ae6..8570c1bbb 100644 --- a/Assets/VFX/Materials/FX_M_Circle_Sheet_05.mat +++ b/Assets/VFX/Materials/FX_M_Circle_Sheet_05.mat @@ -9,17 +9,20 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Circle_Sheet_05 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -84,6 +87,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 1 @@ -134,4 +138,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Crystal.mat b/Assets/VFX/Materials/FX_M_Crystal.mat index 83c5a11db..2c9dbcf99 100644 --- a/Assets/VFX/Materials/FX_M_Crystal.mat +++ b/Assets/VFX/Materials/FX_M_Crystal.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Crystal m_Shader: {fileID: -6465566751694194690, guid: 1b76023fc80e4ae43bfa38d1092c2f3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 2 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -73,6 +76,10 @@ Material: m_Texture: {fileID: 2800000, guid: 9ed3e7e3831313745a7354fa9e38753c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SampleTexture2D_e44098f8ce8c4aafaf724e92f07e43fd_Texture_1_Texture2D: + m_Texture: {fileID: 2800000, guid: 9ed3e7e3831313745a7354fa9e38753c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _Texture0: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -155,4 +162,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Crystal_Broken.mat b/Assets/VFX/Materials/FX_M_Crystal_Broken.mat index ad853bce1..b5c997e77 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Crystal_Broken m_Shader: {fileID: -6465566751694194690, guid: 1b76023fc80e4ae43bfa38d1092c2f3c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 2 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -77,6 +80,10 @@ Material: m_Texture: {fileID: 2800000, guid: 9ed3e7e3831313745a7354fa9e38753c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SampleTexture2D_e44098f8ce8c4aafaf724e92f07e43fd_Texture_1_Texture2D: + m_Texture: {fileID: 2800000, guid: 9ed3e7e3831313745a7354fa9e38753c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/VFX/Materials/FX_M_Flame.mat b/Assets/VFX/Materials/FX_M_Flame.mat index da65eca58..741adb2b9 100644 --- a/Assets/VFX/Materials/FX_M_Flame.mat +++ b/Assets/VFX/Materials/FX_M_Flame.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Flame m_Shader: {fileID: -6465566751694194690, guid: 798777296cb5a224295c90cb705670b8, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - ETC1_EXTERNAL_ALPHA @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -145,4 +148,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Flare_01.mat b/Assets/VFX/Materials/FX_M_Flare_01.mat index 287b37a47..54e06b5be 100644 --- a/Assets/VFX/Materials/FX_M_Flare_01.mat +++ b/Assets/VFX/Materials/FX_M_Flare_01.mat @@ -9,17 +9,20 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Flare_01 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -84,11 +87,13 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 0 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 1 - _Cull: 2 - _Cutoff: 0.5 + - _Depth_Blend: 0 - _DstBlend: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 0 @@ -107,6 +112,7 @@ Material: - _Surface: 1 - _Switch_Alpha: 0 - _UseAlpha: 0 + - _UseSoftParticles: 0 - _Use_alpha: 0 - _WorkflowMode: 1 - _ZTest: 8 @@ -134,4 +140,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Flash_01.mat b/Assets/VFX/Materials/FX_M_Flash_01.mat index 22f91cfb1..91ffab3a2 100644 --- a/Assets/VFX/Materials/FX_M_Flash_01.mat +++ b/Assets/VFX/Materials/FX_M_Flash_01.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Flash_01 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -80,6 +83,7 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -90,6 +94,7 @@ Material: - _ColorMode: 0 - _Cull: 0 - _Cutoff: 0.261 + - _Depth_Blend: 0 - _DistortionBlend: 0.5 - _DistortionEnabled: 0 - _DistortionStrength: 1 @@ -117,6 +122,7 @@ Material: - _Surface: 1 - _Switch_Alpha: 1 - _UseAlpha: 1 + - _UseSoftParticles: 0 - _Use_alpha: 1 - _WorkflowMode: 1 - _ZTest: 4 @@ -145,4 +151,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_GlowLine.mat b/Assets/VFX/Materials/FX_M_GlowLine.mat index a7b4df02a..2fe494ae9 100644 --- a/Assets/VFX/Materials/FX_M_GlowLine.mat +++ b/Assets/VFX/Materials/FX_M_GlowLine.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_GlowLine m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -83,6 +86,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -93,6 +97,7 @@ Material: - _ColorMode: 0 - _Cull: 2 - _Cutoff: 0.5 + - _Depth_Blend: 0 - _DetailNormalMapScale: 1 - _DistortionBlend: 0.5 - _DistortionEnabled: 0 @@ -121,6 +126,7 @@ Material: - _Surface: 1 - _UVSec: 0 - _UseAlpha: 1 + - _UseSoftParticles: 0 - _ZTest: 4 - _ZWrite: 0 - _ZWriteControl: 0 @@ -146,4 +152,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Glow_Additive_01.mat b/Assets/VFX/Materials/FX_M_Glow_Additive_01.mat index 15c6d856e..763b48fc1 100644 --- a/Assets/VFX/Materials/FX_M_Glow_Additive_01.mat +++ b/Assets/VFX/Materials/FX_M_Glow_Additive_01.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Glow_Additive_01 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -23,6 +25,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -138,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Glow_Additive_02.mat b/Assets/VFX/Materials/FX_M_Glow_Additive_02.mat index 536185f26..324eda9c8 100644 --- a/Assets/VFX/Materials/FX_M_Glow_Additive_02.mat +++ b/Assets/VFX/Materials/FX_M_Glow_Additive_02.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Glow_Additive_02 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -22,6 +24,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -137,4 +140,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Glow_Additive_03.mat b/Assets/VFX/Materials/FX_M_Glow_Additive_03.mat index ab4927159..03bd4b2c5 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,18 +22,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Glow_Additive_03 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,6 +95,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 diff --git a/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_01.mat b/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_01.mat index 2fde05b64..c581c8201 100644 --- a/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_01.mat +++ b/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_01.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Glow_NoDepthAlpha_01 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -21,6 +23,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,4 +169,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_02.mat b/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_02.mat index 9eb96ed9d..ef38fe9f1 100644 --- a/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_02.mat +++ b/Assets/VFX/Materials/FX_M_Glow_NoDepthAlpha_02.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Glow_NoDepthAlpha_02 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -21,6 +23,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,4 +169,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Glow_SoftParticleAlpha_02.mat b/Assets/VFX/Materials/FX_M_Glow_SoftParticleAlpha_02.mat index b45559ab6..4cbbb0e30 100644 --- a/Assets/VFX/Materials/FX_M_Glow_SoftParticleAlpha_02.mat +++ b/Assets/VFX/Materials/FX_M_Glow_SoftParticleAlpha_02.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Glow_SoftParticleAlpha_02 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -21,6 +23,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -168,4 +171,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_01.mat b/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_01.mat index b9046ea49..52e101e8f 100644 --- a/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_01.mat +++ b/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_01.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Glow_UnlitAlpha_01 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -23,6 +25,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -138,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_02.mat b/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_02.mat index e25a46cd8..b8e2c0215 100644 --- a/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_02.mat +++ b/Assets/VFX/Materials/FX_M_Glow_UnlitAlpha_02.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Glow_UnlitAlpha_02 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -21,6 +23,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -166,4 +169,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_GroundClick.mat b/Assets/VFX/Materials/FX_M_GroundClick.mat index a84f89559..993594450 100644 --- a/Assets/VFX/Materials/FX_M_GroundClick.mat +++ b/Assets/VFX/Materials/FX_M_GroundClick.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_GroundClick m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -22,6 +24,7 @@ Material: - ALWAYS - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -230,4 +233,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_GroundCrack_01.mat b/Assets/VFX/Materials/FX_M_GroundCrack_01.mat index f390d1bb0..b32ae4787 100644 --- a/Assets/VFX/Materials/FX_M_GroundCrack_01.mat +++ b/Assets/VFX/Materials/FX_M_GroundCrack_01.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_GroundCrack_01 m_Shader: {fileID: -6465566751694194690, guid: 42787e4b9b9ce6049827a84217a0075e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -114,6 +117,7 @@ Material: - Vector1_ffa04a928dac4de2b4be502e4caee4d3: 1 - Vector1_ffa04a928dac4de2b4be502e4caee4d3_1: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -176,4 +180,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_GroundCrack_02.mat b/Assets/VFX/Materials/FX_M_GroundCrack_02.mat index 214597aec..917989036 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,18 +22,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_GroundCrack_02 m_Shader: {fileID: -6465566751694194690, guid: 42787e4b9b9ce6049827a84217a0075e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -127,6 +130,7 @@ Material: - Vector1_ffa04a928dac4de2b4be502e4caee4d3: 1 - Vector1_ffa04a928dac4de2b4be502e4caee4d3_1: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 diff --git a/Assets/VFX/Materials/FX_M_Hit.mat b/Assets/VFX/Materials/FX_M_Hit.mat index fab30d5be..51d7d03d5 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Hit m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -29,12 +31,13 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -107,6 +110,7 @@ Material: - Boolean_236a513c11c34f97b3d22cc5b0fdd0bd: 1 - _ASEOutlineWidth: 0 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 diff --git a/Assets/VFX/Materials/FX_M_Ice.mat b/Assets/VFX/Materials/FX_M_Ice.mat index c73e56c0d..0f5bab5c6 100644 --- a/Assets/VFX/Materials/FX_M_Ice.mat +++ b/Assets/VFX/Materials/FX_M_Ice.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Ice m_Shader: {fileID: -6465566751694194690, guid: 726a76293c22ee04ab5948804a43a5fa, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _USEZMASK_ON @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -100,4 +103,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_ImpExplosionFire.mat b/Assets/VFX/Materials/FX_M_ImpExplosionFire.mat index b56788032..19d6e8aef 100644 --- a/Assets/VFX/Materials/FX_M_ImpExplosionFire.mat +++ b/Assets/VFX/Materials/FX_M_ImpExplosionFire.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_ImpExplosionFire m_Shader: {fileID: -6465566751694194690, guid: 42787e4b9b9ce6049827a84217a0075e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -115,6 +118,7 @@ Material: - Vector1_ffa04a928dac4de2b4be502e4caee4d3_1: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -180,4 +184,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_MaskedPanner.mat b/Assets/VFX/Materials/FX_M_MaskedPanner.mat index 190a7ba7c..413488611 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,18 +22,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_MaskedPanner m_Shader: {fileID: -6465566751694194690, guid: 42787e4b9b9ce6049827a84217a0075e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -135,6 +138,7 @@ Material: - Vector1_ffa04a928dac4de2b4be502e4caee4d3: 1 - Vector1_ffa04a928dac4de2b4be502e4caee4d3_1: 3 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 diff --git a/Assets/VFX/Materials/FX_M_MotionFlash.mat b/Assets/VFX/Materials/FX_M_MotionFlash.mat index 67ceaebd4..ea3d62826 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,18 +22,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_MotionFlash m_Shader: {fileID: -6465566751694194690, guid: 42787e4b9b9ce6049827a84217a0075e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -147,6 +150,7 @@ Material: - Vector1_ffa04a928dac4de2b4be502e4caee4d3: 1 - Vector1_ffa04a928dac4de2b4be502e4caee4d3_1: 2.5 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 diff --git a/Assets/VFX/Materials/FX_M_Point.mat b/Assets/VFX/Materials/FX_M_Point.mat index 799d62233..95b3977da 100644 --- a/Assets/VFX/Materials/FX_M_Point.mat +++ b/Assets/VFX/Materials/FX_M_Point.mat @@ -9,17 +9,20 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Point m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -84,6 +87,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 0 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 1 @@ -135,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_RotatingSniper_01.mat b/Assets/VFX/Materials/FX_M_RotatingSniper_01.mat index 9e34f810e..4d359e32f 100644 --- a/Assets/VFX/Materials/FX_M_RotatingSniper_01.mat +++ b/Assets/VFX/Materials/FX_M_RotatingSniper_01.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_RotatingSniper_01 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,6 +88,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -136,4 +140,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_RotatingSniper_02.mat b/Assets/VFX/Materials/FX_M_RotatingSniper_02.mat index 7350892c0..d47167d9c 100644 --- a/Assets/VFX/Materials/FX_M_RotatingSniper_02.mat +++ b/Assets/VFX/Materials/FX_M_RotatingSniper_02.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_RotatingSniper_02 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -21,6 +23,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -136,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_RotatingTexture.mat b/Assets/VFX/Materials/FX_M_RotatingTexture.mat index 6de48c6f4..43eaf1e84 100644 --- a/Assets/VFX/Materials/FX_M_RotatingTexture.mat +++ b/Assets/VFX/Materials/FX_M_RotatingTexture.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_RotatingTexture m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,6 +88,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -136,4 +140,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_ShapeSheet.mat b/Assets/VFX/Materials/FX_M_ShapeSheet.mat index f32791416..2f506743a 100644 --- a/Assets/VFX/Materials/FX_M_ShapeSheet.mat +++ b/Assets/VFX/Materials/FX_M_ShapeSheet.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_ShapeSheet m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,6 +88,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -137,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_ShapeSheet_Additive.mat b/Assets/VFX/Materials/FX_M_ShapeSheet_Additive.mat index 121e43a41..a4d5522d6 100644 --- a/Assets/VFX/Materials/FX_M_ShapeSheet_Additive.mat +++ b/Assets/VFX/Materials/FX_M_ShapeSheet_Additive.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_ShapeSheet_Additive m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,6 +88,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 @@ -137,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Shield.mat b/Assets/VFX/Materials/FX_M_Shield.mat index 39c44070e..d792dab26 100644 --- a/Assets/VFX/Materials/FX_M_Shield.mat +++ b/Assets/VFX/Materials/FX_M_Shield.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Shield m_Shader: {fileID: -6465566751694194690, guid: 922a3ac3775cf5a4ab9786d4178e029d, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISSOLVE_TYPE_CUSTOM - _DIS_TYPE_UV @@ -22,12 +24,13 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -102,6 +105,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendMode: 0 - _BumpScale: 1 @@ -160,4 +164,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Shockwave.mat b/Assets/VFX/Materials/FX_M_Shockwave.mat index 2bbb160cb..6e7575afa 100644 --- a/Assets/VFX/Materials/FX_M_Shockwave.mat +++ b/Assets/VFX/Materials/FX_M_Shockwave.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Shockwave m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -16,12 +18,13 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -94,6 +97,7 @@ Material: - Boolean_236a513c11c34f97b3d22cc5b0fdd0bd: 1 - _ASEOutlineWidth: -0.16 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 @@ -146,4 +150,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_SlashSimple.mat b/Assets/VFX/Materials/FX_M_SlashSimple.mat index 01ac464a5..fc55b1cfd 100644 --- a/Assets/VFX/Materials/FX_M_SlashSimple.mat +++ b/Assets/VFX/Materials/FX_M_SlashSimple.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_SlashSimple m_Shader: {fileID: -6465566751694194690, guid: 7efde22a7d967994c95b83f0da282e47, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _DISSOLVE_TYPE_SLIDER @@ -19,6 +21,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -130,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Slash_01.mat b/Assets/VFX/Materials/FX_M_Slash_01.mat index 77707de3d..f87523891 100644 --- a/Assets/VFX/Materials/FX_M_Slash_01.mat +++ b/Assets/VFX/Materials/FX_M_Slash_01.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Slash_01 m_Shader: {fileID: -6465566751694194690, guid: 5c90e4042929e434ea65849264330573, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 2 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -103,4 +106,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Slash_02.mat b/Assets/VFX/Materials/FX_M_Slash_02.mat index 3a0de782d..1f5d38886 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Slash_02 m_Shader: {fileID: -6465566751694194690, guid: 5c90e4042929e434ea65849264330573, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 0 @@ -30,6 +32,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/VFX/Materials/FX_M_Smoke.mat b/Assets/VFX/Materials/FX_M_Smoke.mat index e1cb5ea03..684458582 100644 --- a/Assets/VFX/Materials/FX_M_Smoke.mat +++ b/Assets/VFX/Materials/FX_M_Smoke.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Smoke m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,6 +88,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -138,4 +142,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_SmokeDissolve.mat b/Assets/VFX/Materials/FX_M_SmokeDissolve.mat index e12753487..4fc99dc77 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,19 +22,22 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_SmokeDissolve m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - ALWAYS - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -109,6 +112,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 diff --git a/Assets/VFX/Materials/FX_M_SmokeDissolveMultip.mat b/Assets/VFX/Materials/FX_M_SmokeDissolveMultip.mat index 43fef4036..94d8a5d42 100644 --- a/Assets/VFX/Materials/FX_M_SmokeDissolveMultip.mat +++ b/Assets/VFX/Materials/FX_M_SmokeDissolveMultip.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_SmokeDissolveMultip m_Shader: {fileID: -6465566751694194690, guid: 500cf73690d12844cb03f790a7b81174, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISSOLVE_TYPE_CUSTOM - _DIS_RED @@ -23,6 +25,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -180,4 +183,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_SmokeDissolve_Additive.mat b/Assets/VFX/Materials/FX_M_SmokeDissolve_Additive.mat index f379aca92..a444c6a89 100644 --- a/Assets/VFX/Materials/FX_M_SmokeDissolve_Additive.mat +++ b/Assets/VFX/Materials/FX_M_SmokeDissolve_Additive.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_SmokeDissolve_Additive m_Shader: {fileID: -6465566751694194690, guid: 500cf73690d12844cb03f790a7b81174, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISSOLVE_TYPE_CUSTOM - _DIS_DISSOLVETEXRED @@ -17,12 +19,13 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -133,6 +136,7 @@ Material: - Vector1_ffa04a928dac4de2b4be502e4caee4d3: 1 - Vector1_ffa04a928dac4de2b4be502e4caee4d3_1: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 @@ -198,4 +202,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Snowflake_Additive.mat b/Assets/VFX/Materials/FX_M_Snowflake_Additive.mat index 1f60cb861..f4176d5f2 100644 --- a/Assets/VFX/Materials/FX_M_Snowflake_Additive.mat +++ b/Assets/VFX/Materials/FX_M_Snowflake_Additive.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Snowflake_Additive m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -22,6 +24,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -137,4 +140,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_SoftParticle_Smoke.mat b/Assets/VFX/Materials/FX_M_SoftParticle_Smoke.mat index 2b7e33a7f..098b90b8c 100644 --- a/Assets/VFX/Materials/FX_M_SoftParticle_Smoke.mat +++ b/Assets/VFX/Materials/FX_M_SoftParticle_Smoke.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_SoftParticle_Smoke m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,6 +88,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -138,4 +142,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Sparks.mat b/Assets/VFX/Materials/FX_M_Sparks.mat index 0d4842e7c..4d1ddaded 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Sparks m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -29,12 +31,13 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -106,6 +109,7 @@ Material: m_Floats: - Boolean_236a513c11c34f97b3d22cc5b0fdd0bd: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 diff --git a/Assets/VFX/Materials/FX_M_SpawnDoor.mat b/Assets/VFX/Materials/FX_M_SpawnDoor.mat index addd0596b..07f4f2f3d 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,19 +22,22 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_SpawnDoor m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - ALWAYS - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -151,6 +154,7 @@ Material: - PixelSnap: 0 - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _Brightness: 0 @@ -163,6 +167,7 @@ Material: - _ColorMode: 0 - _Cull: 2 - _Cutoff: 0.5 + - _Depth_Blend: 0 - _DetailNormalMapScale: 1 - _DiffuseAmount: 0.2 - _DistortionBlend: 1 @@ -208,6 +213,7 @@ Material: - _Tighten: 0.3 - _UVSec: 0 - _UseAlpha: 1 + - _UseSoftParticles: 0 - _UseUIAlphaClip: 0 - _ZTest: 4 - _ZWrite: 0 diff --git a/Assets/VFX/Materials/FX_M_Star_01.mat b/Assets/VFX/Materials/FX_M_Star_01.mat index b6fbc8a8c..ea1066913 100644 --- a/Assets/VFX/Materials/FX_M_Star_01.mat +++ b/Assets/VFX/Materials/FX_M_Star_01.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Star_01 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -23,6 +25,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -138,4 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Star_02.mat b/Assets/VFX/Materials/FX_M_Star_02.mat index 214baad59..6554c8055 100644 --- a/Assets/VFX/Materials/FX_M_Star_02.mat +++ b/Assets/VFX/Materials/FX_M_Star_02.mat @@ -22,6 +22,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Star_02 m_Shader: {fileID: -6465566751694194690, guid: 922a3ac3775cf5a4ab9786d4178e029d, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISSOLVE_TYPE_SLIDER - _DIS_TYPE_UV @@ -30,12 +32,13 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -102,6 +105,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 @@ -155,4 +159,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Star_03.mat b/Assets/VFX/Materials/FX_M_Star_03.mat index 673012060..88a03349f 100644 --- a/Assets/VFX/Materials/FX_M_Star_03.mat +++ b/Assets/VFX/Materials/FX_M_Star_03.mat @@ -22,18 +22,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Star_03 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -100,6 +103,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 @@ -157,4 +161,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_StylizeSmoke_01.mat b/Assets/VFX/Materials/FX_M_StylizeSmoke_01.mat index e2c434970..4182d75ca 100644 --- a/Assets/VFX/Materials/FX_M_StylizeSmoke_01.mat +++ b/Assets/VFX/Materials/FX_M_StylizeSmoke_01.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_StylizeSmoke_01 m_Shader: {fileID: -6465566751694194690, guid: 42787e4b9b9ce6049827a84217a0075e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -114,6 +117,7 @@ Material: - Vector1_ffa04a928dac4de2b4be502e4caee4d3: 1 - Vector1_ffa04a928dac4de2b4be502e4caee4d3_1: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -177,4 +181,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_StylizeSmoke_02.mat b/Assets/VFX/Materials/FX_M_StylizeSmoke_02.mat index 0bde3cf54..d3a90004c 100644 --- a/Assets/VFX/Materials/FX_M_StylizeSmoke_02.mat +++ b/Assets/VFX/Materials/FX_M_StylizeSmoke_02.mat @@ -22,18 +22,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_StylizeSmoke_02 m_Shader: {fileID: -6465566751694194690, guid: 42787e4b9b9ce6049827a84217a0075e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -127,6 +130,7 @@ Material: - Vector1_ffa04a928dac4de2b4be502e4caee4d3: 1 - Vector1_ffa04a928dac4de2b4be502e4caee4d3_1: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -190,4 +194,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_StylizeSmoke_Falldown.mat b/Assets/VFX/Materials/FX_M_StylizeSmoke_Falldown.mat index f7a895c19..a6dfc8d50 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,18 +22,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_StylizeSmoke_Falldown m_Shader: {fileID: -6465566751694194690, guid: 42787e4b9b9ce6049827a84217a0075e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -127,6 +130,7 @@ Material: - Vector1_ffa04a928dac4de2b4be502e4caee4d3: 1 - Vector1_ffa04a928dac4de2b4be502e4caee4d3_1: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 diff --git a/Assets/VFX/Materials/FX_M_Swirls.mat b/Assets/VFX/Materials/FX_M_Swirls.mat index 11641b522..d96a42725 100644 --- a/Assets/VFX/Materials/FX_M_Swirls.mat +++ b/Assets/VFX/Materials/FX_M_Swirls.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Swirls m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -80,6 +83,7 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -90,6 +94,7 @@ Material: - _ColorMode: 1 - _Cull: 2 - _Cutoff: 0 + - _Depth_Blend: 0 - _DistortionBlend: 0 - _DistortionEnabled: 0 - _DistortionStrength: 64.87 @@ -118,6 +123,7 @@ Material: - _Surface: 1 - _Switch_Alpha: 1 - _UseAlpha: 1 + - _UseSoftParticles: 0 - _Use_alpha: 1 - _WorkflowMode: 1 - _ZTest: 4 @@ -147,4 +153,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_TargetReticule_Friendly.mat b/Assets/VFX/Materials/FX_M_TargetReticule_Friendly.mat index 420720bdc..c4a87a180 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,19 +22,22 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_TargetReticule_Friendly m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - ALWAYS - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -97,6 +100,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -107,6 +111,7 @@ Material: - _ColorMode: 0 - _Cull: 2 - _Cutoff: 0.5 + - _Depth_Blend: 0 - _DetailNormalMapScale: 1 - _DistortionBlend: 0.5 - _DistortionEnabled: 0 @@ -135,6 +140,7 @@ Material: - _Surface: 1 - _UVSec: 0 - _UseAlpha: 1 + - _UseSoftParticles: 0 - _ZTest: 4 - _ZWrite: 0 - _ZWriteControl: 0 diff --git a/Assets/VFX/Materials/FX_M_TargetReticule_Hostile.mat b/Assets/VFX/Materials/FX_M_TargetReticule_Hostile.mat index 9a81c93d9..1d7313787 100644 --- a/Assets/VFX/Materials/FX_M_TargetReticule_Hostile.mat +++ b/Assets/VFX/Materials/FX_M_TargetReticule_Hostile.mat @@ -9,19 +9,22 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_TargetReticule_Hostile m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - ALWAYS - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -84,6 +87,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -94,6 +98,7 @@ Material: - _ColorMode: 0 - _Cull: 2 - _Cutoff: 0.5 + - _Depth_Blend: 0 - _DetailNormalMapScale: 1 - _DistortionBlend: 0.5 - _DistortionEnabled: 0 @@ -122,6 +127,7 @@ Material: - _Surface: 1 - _UVSec: 0 - _UseAlpha: 1 + - _UseSoftParticles: 0 - _ZTest: 4 - _ZWrite: 0 - _ZWriteControl: 0 @@ -147,4 +153,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_TargetingSphere_InRange.mat b/Assets/VFX/Materials/FX_M_TargetingSphere_InRange.mat index 3b4412c63..6e9e55d21 100644 --- a/Assets/VFX/Materials/FX_M_TargetingSphere_InRange.mat +++ b/Assets/VFX/Materials/FX_M_TargetingSphere_InRange.mat @@ -9,19 +9,22 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_TargetingSphere_InRange m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - ALWAYS - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -100,6 +103,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -110,6 +114,7 @@ Material: - _ColorMode: 0 - _Cull: 2 - _Cutoff: 0.5 + - _Depth_Blend: 0 - _DetailNormalMapScale: 1 - _Distortion: 0.058 - _Distortion1: 0.162 @@ -146,6 +151,7 @@ Material: - _TileNormalTexture1: 0.01 - _UVSec: 0 - _UseAlpha: 1 + - _UseSoftParticles: 0 - _ZTest: 4 - _ZWrite: 0 - _ZWriteControl: 0 @@ -175,4 +181,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_TargetingSphere_OutOfRange.mat b/Assets/VFX/Materials/FX_M_TargetingSphere_OutOfRange.mat index 948a85595..9433e12df 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,18 +22,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_TargetingSphere_OutOfRange m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -88,6 +91,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -98,6 +102,7 @@ Material: - _ColorMode: 0 - _Cull: 2 - _Cutoff: 0.5 + - _Depth_Blend: 0 - _Distortion: 0.058 - _Distortion1: 0.162 - _DistortionBlend: 0.5 @@ -124,6 +129,7 @@ Material: - _TileNormalTexture: 0.05 - _TileNormalTexture1: 0.01 - _UseAlpha: 1 + - _UseSoftParticles: 0 - _ZTest: 4 - _ZWrite: 0 - _ZWriteControl: 0 diff --git a/Assets/VFX/Materials/FX_M_TilingTexture_01.mat b/Assets/VFX/Materials/FX_M_TilingTexture_01.mat index bfc359bd0..920bd4328 100644 --- a/Assets/VFX/Materials/FX_M_TilingTexture_01.mat +++ b/Assets/VFX/Materials/FX_M_TilingTexture_01.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_TilingTexture_01 m_Shader: {fileID: -6465566751694194690, guid: 0cefb6ee4cd470a4d80ba840257bdab2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 2 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -132,4 +135,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_TilingTexture_02.mat b/Assets/VFX/Materials/FX_M_TilingTexture_02.mat index 348491e14..79ac33f5c 100644 --- a/Assets/VFX/Materials/FX_M_TilingTexture_02.mat +++ b/Assets/VFX/Materials/FX_M_TilingTexture_02.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_TilingTexture_02 m_Shader: {fileID: -6465566751694194690, guid: 0cefb6ee4cd470a4d80ba840257bdab2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 2 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -132,4 +135,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_TilingTexture_03.mat b/Assets/VFX/Materials/FX_M_TilingTexture_03.mat index 5ee89316b..c03579618 100644 --- a/Assets/VFX/Materials/FX_M_TilingTexture_03.mat +++ b/Assets/VFX/Materials/FX_M_TilingTexture_03.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_TilingTexture_03 m_Shader: {fileID: -6465566751694194690, guid: 0cefb6ee4cd470a4d80ba840257bdab2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 2 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -132,4 +135,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_TilingTexture_04.mat b/Assets/VFX/Materials/FX_M_TilingTexture_04.mat index 115dcaf8b..91b878b03 100644 --- a/Assets/VFX/Materials/FX_M_TilingTexture_04.mat +++ b/Assets/VFX/Materials/FX_M_TilingTexture_04.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_TilingTexture_04 m_Shader: {fileID: -6465566751694194690, guid: 0cefb6ee4cd470a4d80ba840257bdab2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _CHANGEMASKTOX_ON @@ -19,6 +21,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -134,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_TilingTexture_05.mat b/Assets/VFX/Materials/FX_M_TilingTexture_05.mat index f707c79f2..1ff465368 100644 --- a/Assets/VFX/Materials/FX_M_TilingTexture_05.mat +++ b/Assets/VFX/Materials/FX_M_TilingTexture_05.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_TilingTexture_05 m_Shader: {fileID: -6465566751694194690, guid: 0cefb6ee4cd470a4d80ba840257bdab2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _CHANGEMASKTOX_ON @@ -20,6 +22,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -135,4 +138,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_TorchFire.mat b/Assets/VFX/Materials/FX_M_TorchFire.mat index effcae63c..d4d80be6d 100644 --- a/Assets/VFX/Materials/FX_M_TorchFire.mat +++ b/Assets/VFX/Materials/FX_M_TorchFire.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_TorchFire m_Shader: {fileID: -6465566751694194690, guid: 42787e4b9b9ce6049827a84217a0075e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -135,6 +138,7 @@ Material: - Vector1_ffa04a928dac4de2b4be502e4caee4d3: 1 - Vector1_ffa04a928dac4de2b4be502e4caee4d3_1: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -208,4 +212,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Trail_01.mat b/Assets/VFX/Materials/FX_M_Trail_01.mat index ac4d1ecf9..68b833f28 100644 --- a/Assets/VFX/Materials/FX_M_Trail_01.mat +++ b/Assets/VFX/Materials/FX_M_Trail_01.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Trail_01 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,6 +88,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -136,4 +140,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Trail_02.mat b/Assets/VFX/Materials/FX_M_Trail_02.mat index 5d8fd19cc..069954177 100644 --- a/Assets/VFX/Materials/FX_M_Trail_02.mat +++ b/Assets/VFX/Materials/FX_M_Trail_02.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Trail_02 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,6 +88,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -136,4 +140,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Trail_03.mat b/Assets/VFX/Materials/FX_M_Trail_03.mat index 9c3c40f17..38195dc22 100644 --- a/Assets/VFX/Materials/FX_M_Trail_03.mat +++ b/Assets/VFX/Materials/FX_M_Trail_03.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Trail_03 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,6 +88,7 @@ Material: - Boolean_f3c76e1f79d04ab0a9f91a5dd13e3822: 1 - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 @@ -136,4 +140,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Wave_01.mat b/Assets/VFX/Materials/FX_M_Wave_01.mat index f88686f48..d7e96d6ac 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,18 +22,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Wave_01 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -100,6 +103,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 diff --git a/Assets/VFX/Materials/FX_M_Wave_02.mat b/Assets/VFX/Materials/FX_M_Wave_02.mat index ee2b509bc..73b00c766 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,18 +22,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Wave_02 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,6 +95,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 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 c1b199119..623f86141 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: 5 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -22,18 +22,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Wave_02_TossedAttack_Display m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -92,6 +95,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 diff --git a/Assets/VFX/Materials/FX_M_Wave_03.mat b/Assets/VFX/Materials/FX_M_Wave_03.mat index f2ee37243..c4d8d7965 100644 --- a/Assets/VFX/Materials/FX_M_Wave_03.mat +++ b/Assets/VFX/Materials/FX_M_Wave_03.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Wave_03 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -95,6 +98,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 @@ -102,6 +106,7 @@ Material: - _Cutoff: 0.5 - _DIS: 2 - _DISSOLVE_TYPE: 0 + - _Depth_Blend: 0 - _DetailNormalMapScale: 1 - _DisType: 2 - _Dissolve: 1 @@ -124,6 +129,7 @@ Material: - _Switch_Alpha: 0 - _UVSec: 0 - _UseAlpha: 1 + - _UseSoftParticles: 0 - _ZTest: 4 - _ZTestMode: 0 - _ZWrite: 0 @@ -150,4 +156,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_Wave_04.mat b/Assets/VFX/Materials/FX_M_Wave_04.mat index 03031a7ff..d05304f32 100644 --- a/Assets/VFX/Materials/FX_M_Wave_04.mat +++ b/Assets/VFX/Materials/FX_M_Wave_04.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_Wave_04 m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -95,6 +98,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BumpScale: 1 - _CastShadows: 0 @@ -152,4 +156,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Materials/FX_M_WigglyRing.mat b/Assets/VFX/Materials/FX_M_WigglyRing.mat index 3f7b50fbf..7e78aeccd 100644 --- a/Assets/VFX/Materials/FX_M_WigglyRing.mat +++ b/Assets/VFX/Materials/FX_M_WigglyRing.mat @@ -9,18 +9,21 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: FX_M_WigglyRing m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 6 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -80,6 +83,7 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaCutoff: 0.5 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -90,6 +94,7 @@ Material: - _ColorMode: 1 - _Cull: 2 - _Cutoff: 0.023 + - _Depth_Blend: 0 - _DistortionBlend: 0.131 - _DistortionEnabled: 0 - _DistortionStrength: 1 @@ -118,6 +123,7 @@ Material: - _Surface: 1 - _Switch_Alpha: 1 - _UseAlpha: 1 + - _UseSoftParticles: 0 - _Use_alpha: 1 - _WorkflowMode: 1 - _ZTest: 4 @@ -147,4 +153,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Assets/VFX/Shaders/SG_StylizedFlame.shadergraph b/Assets/VFX/Shaders/SG_StylizedFlame.shadergraph index 55c66242e..9ca3ec213 100644 --- a/Assets/VFX/Shaders/SG_StylizedFlame.shadergraph +++ b/Assets/VFX/Shaders/SG_StylizedFlame.shadergraph @@ -1,5 +1,5 @@ { - "m_SGVersion": 2, + "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.GraphData", "m_ObjectId": "4870a9e16c9a43558591e67996621cec", "m_Properties": [ @@ -44,6 +44,12 @@ } ], "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "aa2a4377b5484fcdb16bc514a8759e47" + } + ], "m_Nodes": [ { "m_Id": "1d5dd3a83d5445e59d463e25fe6465b4" @@ -1547,10 +1553,11 @@ "serializedMesh": { "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", "m_Guid": "" - } + }, + "preventRotation": false }, "m_Path": "Shader Graphs", - "m_ConcretePrecision": 0, + "m_GraphPrecision": 0, "m_PreviewMode": 2, "m_OutputNode": { "m_Id": "" @@ -1636,6 +1643,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1683,6 +1691,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1718,6 +1727,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1785,6 +1795,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1880,6 +1891,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2171,9 +2183,14 @@ "m_GuidSerialized": "c429fc85-f002-4955-9607-8cf7ec8a3321" }, "m_Name": "Alpha Texture", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_1af9833e728b4400be472f11e114bf95", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2182,6 +2199,8 @@ "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 0 } @@ -2218,6 +2237,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2261,6 +2281,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2324,9 +2345,14 @@ "m_GuidSerialized": "5db1473f-8d80-42cc-bb9b-ae812729a7d5" }, "m_Name": "Texture 2 Tile/Speed", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "Vector4_e771ca002e644c0c89285d39e4dd8e2a_1", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2386,12 +2412,15 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 } { @@ -2580,9 +2609,14 @@ "m_GuidSerialized": "bb86948c-fd12-46f9-be0f-2133a794ee02" }, "m_Name": "Center Amount", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_22c28b9cbc644219a74499230c081668", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2627,6 +2661,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2685,6 +2720,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2757,6 +2793,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2831,6 +2868,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2881,6 +2919,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3186,6 +3225,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3287,9 +3327,14 @@ "m_GuidSerialized": "dcc4b7b8-e3ef-462c-8ca7-fb5cd64fbe94" }, "m_Name": "Flame", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "Vector1_fc24d2cc110c4d90bf8fe0e6d625f6fa_1", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3583,6 +3628,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3683,6 +3729,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3791,6 +3838,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3829,6 +3877,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4065,6 +4114,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4264,6 +4314,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4389,6 +4440,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4421,6 +4473,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4621,6 +4674,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4720,9 +4774,14 @@ "m_GuidSerialized": "9f219233-5005-4dd1-b155-38627e25cde5" }, "m_Name": "Alpha Texture Tiling/Offset", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "Vector4_e771ca002e644c0c89285d39e4dd8e2a_2", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -4767,6 +4826,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4805,6 +4865,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4973,6 +5034,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5032,6 +5094,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5085,6 +5148,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5099,9 +5163,14 @@ "m_GuidSerialized": "f3b0fde3-4008-4d63-9682-4266027c1ff5" }, "m_Name": "EdgeBlur", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "Vector1_fc24d2cc110c4d90bf8fe0e6d625f6fa_2", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -5146,6 +5215,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5206,6 +5276,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5256,6 +5327,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5289,6 +5361,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5372,6 +5445,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5434,9 +5508,14 @@ "m_GuidSerialized": "a6131db0-2439-477d-be0c-3a1cbce621ae" }, "m_Name": "Emissive", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_7a91de8e44d24835b49d68664bbe892f", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -5481,6 +5560,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5534,6 +5614,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5566,6 +5647,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5604,6 +5686,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5663,6 +5746,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5695,6 +5779,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5705,7 +5790,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 2, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", "m_ObjectId": "84151efd53af4cd5abfd71ebc4d89843" } @@ -5796,6 +5881,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6044,6 +6130,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6107,9 +6194,14 @@ "m_GuidSerialized": "2d77d156-aa00-4a39-9fe6-9074b18c489a" }, "m_Name": "Center Color", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Color_9195cb73a727450cbc963d9e3025d795", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -6120,6 +6212,7 @@ "b": 0.15592649579048158, "a": 1.0 }, + "isMainColor": false, "m_ColorMode": 1 } @@ -6149,6 +6242,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6319,6 +6413,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6470,6 +6565,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6535,6 +6631,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6573,6 +6670,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6666,6 +6764,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6707,6 +6806,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6757,6 +6857,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6798,6 +6899,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6847,6 +6949,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6886,6 +6989,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -7067,6 +7171,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "aa2a4377b5484fcdb16bc514a8759e47", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "22c28b9cbc644219a74499230c081668" + }, + { + "m_Id": "fc24d2cc110c4d90bf8fe0e6d625f6fa" + }, + { + "m_Id": "fc6bbeba4e8c458bbeb642f2f0b0c048" + }, + { + "m_Id": "9195cb73a727450cbc963d9e3025d795" + }, + { + "m_Id": "1af9833e728b4400be472f11e114bf95" + }, + { + "m_Id": "6b692fcf7ce04680aa6290c5f2659e51" + }, + { + "m_Id": "7175939dbfc14ef88e0dee10d8dfec28" + }, + { + "m_Id": "da35baa1803f46aa8b034df23477decd" + }, + { + "m_Id": "e771ca002e644c0c89285d39e4dd8e2a" + }, + { + "m_Id": "1e5c5aa4516344a79324cfeef2310b19" + }, + { + "m_Id": "39412f572af14b1fad3b5a16ea6f8486" + }, + { + "m_Id": "7a91de8e44d24835b49d68664bbe892f" + }, + { + "m_Id": "b77b84f97c6b49b982b44922b5f18523" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -7114,6 +7266,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -7257,6 +7410,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -7310,6 +7464,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -7498,6 +7653,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -7512,9 +7668,14 @@ "m_GuidSerialized": "bd271f03-7952-4f0d-8e03-2fa68dcea6a1" }, "m_Name": "Distortion", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "", "m_OverrideReferenceName": "Vector1_1", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -7583,6 +7744,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -8107,6 +8269,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -8169,6 +8332,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -8255,6 +8419,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -8404,12 +8569,15 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 } { @@ -8486,6 +8654,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -8525,6 +8694,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -8605,6 +8775,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -8816,6 +8987,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -8919,17 +9091,25 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", "m_ObjectId": "da1eee70b18b45f3953397b5ec006bd7", + "m_Datas": [], "m_ActiveSubTarget": { "m_Id": "84151efd53af4cd5abfd71ebc4d89843" }, + "m_AllowMaterialOverride": false, "m_SurfaceType": 1, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, "m_AlphaMode": 1, - "m_TwoSided": false, + "m_RenderFace": 2, "m_AlphaClip": false, - "m_CustomEditorGUI": "" + "m_CastShadows": false, + "m_ReceiveShadows": true, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false } { @@ -8940,9 +9120,14 @@ "m_GuidSerialized": "f5a6488b-5887-476f-9291-c77f7b850383" }, "m_Name": "Noise Flame", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Texture2D_da35baa1803f46aa8b034df23477decd", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -8951,6 +9136,8 @@ "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, + "isMainTexture": false, + "useTilingAndOffset": false, "m_Modifiable": true, "m_DefaultType": 0 } @@ -8987,6 +9174,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -9031,6 +9219,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -9174,6 +9363,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -9393,6 +9583,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -9407,9 +9598,14 @@ "m_GuidSerialized": "63bc5484-18d5-4a8d-8af8-91a96a8a7de9" }, "m_Name": "Texture 1 Tile/Speed", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector4_e771ca002e644c0c89285d39e4dd8e2a", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -9530,6 +9726,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -9637,6 +9834,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -9694,6 +9892,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -9868,12 +10067,15 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, - "m_NormalMapSpace": 0 + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 } { @@ -9902,6 +10104,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 2, "m_CustomColors": { "m_SerializableColors": [] @@ -9964,6 +10167,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -10027,9 +10231,14 @@ "m_GuidSerialized": "f7afe211-fc83-43fb-85f9-e14b9b65519c" }, "m_Name": "Outside Amount", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Vector1_fc24d2cc110c4d90bf8fe0e6d625f6fa", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -10065,9 +10274,14 @@ "m_GuidSerialized": "c9f24e09-7829-49ee-a2c8-83baebd65c9c" }, "m_Name": "Outside Color", + "m_DefaultRefNameVersion": 0, + "m_RefNameGeneratedByDisplayName": "", "m_DefaultReferenceName": "Color_fc6bbeba4e8c458bbeb642f2f0b0c048", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -10078,6 +10292,7 @@ "b": 0.0, "a": 1.0 }, + "isMainColor": false, "m_ColorMode": 1 } @@ -10168,6 +10383,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ad44d40d..643759237 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ Additional documentation and release notes are available at [Multiplayer Documen ## [unreleased] - yyyy-mm-dd ### Changed +* Upgraded editor version to 2022.3.0f1 (#840) * NetworkTransform bandwidth optimizations applied to NetworkObject prefabs inside project (#836) Netcode for GameObjects v1.4.0 introduced bandwidth compression techniques to further reduce the bandwidth footprint of a NetworkTransform's synchronization payload. Inside Boss Room, the base prefab for PCs and NPCs, Character, had its NetworkTransform modified to now utilize half float precision, ie. "Use Half Float Precision" set to true. Its y position is also explicitly no longer synced. This results in a net 5 byte reduction in a NetworkTransform's synchronization payload. This bandwidth reduction was applied also to the Archer's arrow NetworkObject prefabs. Additionally, several NetworkObjects have now their "Synchronize Transform" flag disabled inside their NetworkObject component, meaning that its transform properties will not be synced when spawning and/or when late-joining clients connect. This is particularly useful if the NetworkObject is used more for management related tasks and has no spatial synchronization needs. For more information, see [Netcode for GameObjects' v1.4.0 release notes](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.4.0). ## [2.1.0] - 2023-04-27 diff --git a/Packages/manifest.json b/Packages/manifest.json index ee01fee25..67d7b2a5c 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,27 +1,27 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.ai.navigation.components": "https://github.com/Unity-Technologies/NavMeshComponents.git#package", - "com.unity.cinemachine": "2.8.9", - "com.unity.collab-proxy": "1.17.7", - "com.unity.ide.rider": "3.0.16", - "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ai.navigation": "1.1.3", + "com.unity.cinemachine": "2.9.5", + "com.unity.collab-proxy": "2.0.4", + "com.unity.ide.rider": "3.0.21", + "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", - "com.unity.learn.iet-framework": "2.2.2", - "com.unity.memoryprofiler": "0.5.0-preview.1", - "com.unity.multiplayer.tools": "1.1.0", + "com.unity.learn.iet-framework": "3.1.3", + "com.unity.memoryprofiler": "1.0.0", + "com.unity.multiplayer.tools": "2.0.0-pre.3", "com.unity.netcode.gameobjects": "1.4.0", - "com.unity.performance.profile-analyzer": "1.1.1", + "com.unity.performance.profile-analyzer": "1.2.2", "com.unity.postprocessing": "3.2.2", - "com.unity.render-pipelines.universal": "12.1.8", - "com.unity.services.authentication": "2.3.1", + "com.unity.render-pipelines.universal": "14.0.7", + "com.unity.services.authentication": "2.5.0", "com.unity.services.lobby": "1.1.0-pre.3", - "com.unity.services.relay": "1.0.3", - "com.unity.services.wire": "1.0.0", + "com.unity.services.relay": "1.0.5", + "com.unity.services.wire": "1.1.5", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", - "com.unity.toolchain.macos-x86_64-linux-x86_64": "1.0.0", + "com.unity.timeline": "1.7.4", + "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.4", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", "jp.hadashikick.vcontainer": "1.11.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index cbe497a76..69eb3f1b1 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -6,17 +6,17 @@ "source": "builtin", "dependencies": {} }, - "com.unity.ai.navigation.components": { - "version": "https://github.com/Unity-Technologies/NavMeshComponents.git#package", + "com.unity.ai.navigation": { + "version": "1.1.3", "depth": 0, - "source": "git", + "source": "registry", "dependencies": { "com.unity.modules.ai": "1.0.0" }, - "hash": "0fc6f532e4f47d66d173314efcb906bc7cf0d00f" + "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.7.3", + "version": "1.8.4", "depth": 1, "source": "registry", "dependencies": { @@ -25,7 +25,7 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.8.9", + "version": "2.9.5", "depth": 0, "source": "registry", "dependencies": { @@ -34,12 +34,10 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.17.7", + "version": "2.0.4", "depth": 0, "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, + "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { @@ -67,7 +65,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.16", + "version": "3.0.21", "depth": 0, "source": "registry", "dependencies": { @@ -76,7 +74,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.16", + "version": "2.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -92,7 +90,7 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework": { - "version": "2.2.2", + "version": "3.1.3", "depth": 0, "source": "registry", "dependencies": { @@ -109,7 +107,7 @@ "url": "https://packages.unity.com" }, "com.unity.memoryprofiler": { - "version": "0.5.0-preview.1", + "version": "1.0.0", "depth": 0, "source": "registry", "dependencies": { @@ -129,7 +127,7 @@ } }, "com.unity.multiplayer.tools": { - "version": "1.1.0", + "version": "2.0.0-pre.3", "depth": 0, "source": "registry", "dependencies": { @@ -137,7 +135,9 @@ "com.unity.nuget.newtonsoft-json": "2.0.0", "com.unity.nuget.mono-cecil": "1.10.1", "com.unity.collections": "1.1.0", - "com.unity.modules.uielements": "1.0.0" + "com.unity.modules.uielements": "1.0.0", + "com.unity.burst": "1.6.6", + "com.unity.mathematics": "1.2.6" }, "url": "https://packages.unity.com" }, @@ -152,21 +152,21 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.mono-cecil": { - "version": "1.10.1", + "version": "1.11.4", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", + "version": "3.2.1", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.performance.profile-analyzer": { - "version": "1.1.1", + "version": "1.2.2", "depth": 0, "source": "registry", "dependencies": {}, @@ -189,52 +189,53 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.8", + "version": "14.0.7", "depth": 1, "source": "builtin", "dependencies": { "com.unity.ugui": "1.0.0", "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.render-pipelines.universal": { - "version": "12.1.8", + "version": "14.0.7", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.7.3", - "com.unity.render-pipelines.core": "12.1.8", - "com.unity.shadergraph": "12.1.8" + "com.unity.burst": "1.8.4", + "com.unity.render-pipelines.core": "14.0.7", + "com.unity.shadergraph": "14.0.7" } }, "com.unity.searcher": { - "version": "4.9.1", + "version": "4.9.2", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "2.3.1", + "version": "2.5.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.services.core": "1.4.3", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.services.core": "1.9.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.ugui": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.6.0", + "version": "1.9.0", "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.modules.androidjni": "1.0.0" }, "url": "https://packages.unity.com" @@ -257,7 +258,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.qos": { - "version": "1.0.1", + "version": "1.2.0", "depth": 1, "source": "registry", "dependencies": { @@ -265,68 +266,68 @@ "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.services.authentication": "2.0.0", - "com.unity.collections": "1.2.3" + "com.unity.collections": "1.2.4" }, "url": "https://packages.unity.com" }, "com.unity.services.relay": { - "version": "1.0.3", + "version": "1.0.5", "depth": 0, "source": "registry", "dependencies": { "com.unity.services.core": "1.4.0", "com.unity.services.authentication": "2.0.0", - "com.unity.services.qos": "1.0.1", + "com.unity.services.qos": "1.1.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.unitywebrequestassetbundle": "1.0.0", "com.unity.modules.unitywebrequestaudio": "1.0.0", "com.unity.modules.unitywebrequesttexture": "1.0.0", "com.unity.modules.unitywebrequestwww": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.transport": "1.0.0" + "com.unity.transport": "1.3.0" }, "url": "https://packages.unity.com" }, "com.unity.services.wire": { - "version": "1.1.1", - "depth": 1, + "version": "1.1.5", + "depth": 0, "source": "registry", "dependencies": { - "com.unity.services.core": "1.4.2", + "com.unity.services.core": "1.8.1", "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.services.authentication": "2.1.1" + "com.unity.services.authentication": "2.4.0" }, "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "1.0.3", + "version": "2.0.1", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.8", + "version": "14.0.7", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.8", - "com.unity.searcher": "4.9.1" + "com.unity.render-pipelines.core": "14.0.7", + "com.unity.searcher": "4.9.2" } }, "com.unity.sysroot": { - "version": "1.0.0", + "version": "2.0.5", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.sysroot.linux-x86_64": { - "version": "1.0.0", + "version": "2.0.4", "depth": 1, "source": "registry", "dependencies": { - "com.unity.sysroot": "1.0.0" + "com.unity.sysroot": "2.0.5" }, "url": "https://packages.unity.com" }, @@ -351,7 +352,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.7.4", "depth": 0, "source": "registry", "dependencies": { @@ -363,17 +364,17 @@ "url": "https://packages.unity.com" }, "com.unity.toolchain.macos-x86_64-linux-x86_64": { - "version": "1.0.0", + "version": "2.0.4", "depth": 0, "source": "registry", "dependencies": { - "com.unity.sysroot": "1.0.0", - "com.unity.sysroot.linux-x86_64": "1.0.0" + "com.unity.sysroot": "2.0.5", + "com.unity.sysroot.linux-x86_64": "2.0.4" }, "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.3", + "version": "1.3.4", "depth": 1, "source": "registry", "dependencies": { @@ -540,17 +541,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json b/ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json index 98b40ec90..a08ca69ea 100644 --- a/ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json +++ b/ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json @@ -1,12 +1,15 @@ { - "m_Name": "Settings", - "m_Path": "ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json", "m_Dictionary": { "m_DictionaryValues": [ { "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "IET.ShowTutorialsClosedDialog", "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "IET.DisplayWelcomeDialogOnStartup", + "value": "{\"m_Value\":false}" } ] } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3223fd191..ee5841bfc 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4f9e39c4eab1fd9657810bad1f940055450bcbca579468daa5cf187144a1dad -size 25665 +oid sha256:22be047b4bd9919df98928f051e8c8d7ba53faa63e0a7abf5cb280aa96385c81 +size 26762 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index eabd63377..56ddb83a4 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.15f1 -m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834) +m_EditorVersion: 2022.3.0f1 +m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476) diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset index 6a742e5e8..dfca260c9 100644 --- a/ProjectSettings/URPProjectSettings.asset +++ b/ProjectSettings/URPProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2dbf9c39ca82860c3a8b27d5d4984ac74fba39ed2d690d9f2d4fbcbfe8dd7621 +oid sha256:3e9d9f824875297ef6b9315fa7a3ac7ec1b047042395404a23c368fc971a8f3e size 410 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 68603f7bf..147c5c51b 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e19c2d77de966d5f982464d6a2f7ee94eddf34053baf2f0eb4bf1c3fd31d7bd -size 901 +oid sha256:d6034acbef6c9e3179866486c31eab81fcbe5e7ed350ce71e0fa2b1449b77109 +size 943 diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb..000000000 diff --git a/README.md b/README.md index 0ab134a60..457ee6187 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ### Made with and Including Utilities for Netcode for GameObjects
-[![UnityVersion](https://img.shields.io/badge/Unity%20Version:-2021.3%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/qa/lts-releases?version=2021.3#:~:text=December%2015%2C%202022-,LTS%20Release,2021.3.15f1,-Released%3A%20December) +[![UnityVersion](https://img.shields.io/badge/Unity%20Version:-2022.3%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/2022.3.0) [![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-1.2.0-57b9d3.svg?logo=unity&color=2196F3)](https://docs-multiplayer.unity3d.com/netcode/current/about) [![LatestRelease](https://img.shields.io/badge/Latest%20Github%20Release:-v2.0.4-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop/releases/tag/v2.0.4)

@@ -86,9 +86,9 @@ For more information on the art of Boss Room, see [ART_NOTES.md](Documentation/A ## Requirements -BossRoom is compatible with the latest Unity Long Term Support (LTS) editor version, currently [2021 LTS](https://unity.com/releases/2021-lts). Please include standalone support for Windows/Mac in your installation. +BossRoom is compatible with the latest Unity Long Term Support (LTS) editor version, currently [2022 LTS](https://unity.com/releases/editor/qa/lts-releases?version=2022.3). Please include standalone support for Windows/Mac in your installation. -**PLEASE NOTE:** You will also need Netcode for Game Objects to use these samples. Complete the [Hello World Tutorial](https://docs-multiplayer.unity3d.com/netcode/current/tutorials/helloworld) to prepare your environment. +**PLEASE NOTE:** You will also need Netcode for Game Objects to use these samples. See the [Installation Documentation](https://docs-multiplayer.unity3d.com/netcode/current/installation) to prepare your environment. You can also complete the [Get Started With NGO](https://docs-multiplayer.unity3d.com/netcode/current/tutorials/get-started-ngo) tutorial to familiarize yourself with Netcode For Game Objects.

#### Boss Room has been developed and tested on the following platforms: