diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 3030e604d..2177212b3 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -4,7 +4,7 @@ # Therefore, **do not** put an older V1-lifecycle ver. # like 2020.x or 2019.x on top of 'test_editors' test_editors: - - 2021.3 + - 2022.3 # Platforms that will be tested. The first entry in this array will also # be used for validation diff --git a/Basic/2DSpaceShooter/Assets/Materials/asteroids.mat b/Basic/2DSpaceShooter/Assets/Materials/asteroids.mat index 4d76f3377..d97c2c407 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/asteroids.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/asteroids.mat @@ -10,6 +10,8 @@ Material: m_Name: asteroids m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, 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: @@ -49,6 +52,7 @@ Material: m_Floats: - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _CastShadows: 0 - _Cull: 2 @@ -80,4 +84,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/blockGlow.mat b/Basic/2DSpaceShooter/Assets/Materials/blockGlow.mat index 1dbc6e73a..f751f02ea 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/blockGlow.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/blockGlow.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 @@ -23,6 +23,8 @@ Material: m_Name: blockGlow m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -35,6 +37,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -95,6 +98,7 @@ Material: - PixelSnap: 0 - _Alpha: 0.3 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/blockGlow02.mat b/Basic/2DSpaceShooter/Assets/Materials/blockGlow02.mat index e3c0a587b..6315e3312 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/blockGlow02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/blockGlow02.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 @@ -23,6 +23,8 @@ Material: m_Name: blockGlow02 m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -35,6 +37,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -95,6 +98,7 @@ Material: - PixelSnap: 0 - _Alpha: 0.3 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/blocks.mat b/Basic/2DSpaceShooter/Assets/Materials/blocks.mat index 855cab03d..5e6686f67 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/blocks.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/blocks.mat @@ -2,7 +2,7 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -10,13 +10,20 @@ Material: m_Name: blocks m_Shader: {fileID: -6465566751694194690, guid: 79336e0b0e19a5c46be170f3cb26de75, type: 3} - m_ShaderKeywords: _ALPHABLEND_ON _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _ALPHABLEND_ON + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -72,6 +79,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - PixelSnap: 0 - _Alpha: 1 @@ -120,3 +128,16 @@ Material: - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] +--- !u!114 &6249219236255181419 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/bounds.mat b/Basic/2DSpaceShooter/Assets/Materials/bounds.mat index 68eb1cf07..8fb84f9ee 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/bounds.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/bounds.mat @@ -10,6 +10,8 @@ Material: m_Name: bounds m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, 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: @@ -49,6 +52,7 @@ Material: m_Floats: - _Alpha: 0.67 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _CastShadows: 0 - _Cull: 2 @@ -79,4 +83,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/bounds02.mat b/Basic/2DSpaceShooter/Assets/Materials/bounds02.mat index d4109c536..ddecd89f9 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/bounds02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/bounds02.mat @@ -10,6 +10,8 @@ Material: m_Name: bounds02 m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, 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: @@ -49,6 +52,7 @@ Material: m_Floats: - _Alpha: 0.67 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _CastShadows: 0 - _Cull: 2 @@ -80,4 +84,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/bullet.mat b/Basic/2DSpaceShooter/Assets/Materials/bullet.mat index 7e13c2beb..8f737a999 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/bullet.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/bullet.mat @@ -10,6 +10,8 @@ Material: m_Name: bullet m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, 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: @@ -49,6 +52,7 @@ Material: m_Floats: - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _CastShadows: 0 - _Cull: 2 @@ -79,4 +83,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/bullet02.mat b/Basic/2DSpaceShooter/Assets/Materials/bullet02.mat index 2f8be1a42..b44dda08c 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/bullet02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/bullet02.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 @@ -23,6 +23,8 @@ Material: m_Name: bullet02 m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -35,6 +37,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -62,6 +65,7 @@ Material: m_Floats: - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _CastShadows: 0 - _Cull: 2 diff --git a/Basic/2DSpaceShooter/Assets/Materials/bulletTrail.mat b/Basic/2DSpaceShooter/Assets/Materials/bulletTrail.mat index d52296dc5..b14246d23 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/bulletTrail.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/bulletTrail.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 @@ -23,6 +23,8 @@ Material: m_Name: bulletTrail m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -35,6 +37,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -62,6 +65,7 @@ Material: m_Floats: - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _CastShadows: 0 - _Cull: 2 diff --git a/Basic/2DSpaceShooter/Assets/Materials/bulletTrail02.mat b/Basic/2DSpaceShooter/Assets/Materials/bulletTrail02.mat index 20507e9ca..485f29ae2 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/bulletTrail02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/bulletTrail02.mat @@ -10,6 +10,8 @@ Material: m_Name: bulletTrail02 m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, 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: @@ -49,6 +52,7 @@ Material: m_Floats: - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _CastShadows: 0 - _Cull: 2 @@ -79,4 +83,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/edgeGradient.mat b/Basic/2DSpaceShooter/Assets/Materials/edgeGradient.mat index a8fbf21aa..4310394dd 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/edgeGradient.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/edgeGradient.mat @@ -10,6 +10,8 @@ Material: m_Name: edgeGradient m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, 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: @@ -82,6 +85,7 @@ Material: - PixelSnap: 0 - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -147,4 +151,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/explosion.mat b/Basic/2DSpaceShooter/Assets/Materials/explosion.mat index 7c75eb7a8..598f47e7a 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/explosion.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/explosion.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: explosion m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _COLORADDSUBDIFF_ON - _EMISSION @@ -37,6 +39,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -101,6 +104,7 @@ Material: - PixelSnap: 0 - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -116,6 +120,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnableExternalAlpha: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -133,6 +138,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 diff --git a/Basic/2DSpaceShooter/Assets/Materials/explosion02.mat b/Basic/2DSpaceShooter/Assets/Materials/explosion02.mat index ade38b9fd..a9325fe2c 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/explosion02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/explosion02.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: explosion02 m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, 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: @@ -86,6 +89,7 @@ Material: - PixelSnap: 0 - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -101,6 +105,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnableExternalAlpha: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -118,6 +123,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _ZWrite: 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/Basic/2DSpaceShooter/Assets/Materials/explosionGlow.mat b/Basic/2DSpaceShooter/Assets/Materials/explosionGlow.mat index a491da05a..54e905354 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/explosionGlow.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/explosionGlow.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 @@ -23,6 +23,8 @@ Material: m_Name: explosionGlow m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -35,6 +37,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -95,6 +98,7 @@ Material: - PixelSnap: 0 - _Alpha: 0.42 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/explosionSparks.mat b/Basic/2DSpaceShooter/Assets/Materials/explosionSparks.mat index 732a81e6e..67cdaedcb 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/explosionSparks.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/explosionSparks.mat @@ -10,6 +10,8 @@ Material: m_Name: explosionSparks m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, 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: @@ -82,6 +85,7 @@ Material: - PixelSnap: 0 - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -149,4 +153,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/frictionGlow.mat b/Basic/2DSpaceShooter/Assets/Materials/frictionGlow.mat index 3c6c27f04..8f20becb5 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/frictionGlow.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/frictionGlow.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: frictionGlow m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, 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: @@ -81,6 +84,7 @@ Material: m_Floats: - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -96,6 +100,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 - _GlossMapScale: 1 @@ -112,6 +117,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _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/Basic/2DSpaceShooter/Assets/Materials/frictionSparks.mat b/Basic/2DSpaceShooter/Assets/Materials/frictionSparks.mat index 18471acb1..f2defef53 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/frictionSparks.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/frictionSparks.mat @@ -10,6 +10,8 @@ Material: m_Name: frictionSparks m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, 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: @@ -82,6 +85,7 @@ Material: - PixelSnap: 0 - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -149,4 +153,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/godRays.mat b/Basic/2DSpaceShooter/Assets/Materials/godRays.mat index a23fd9f5b..34a349c9c 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/godRays.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/godRays.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 @@ -23,6 +23,8 @@ Material: m_Name: godRays m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -35,6 +37,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -62,6 +65,7 @@ Material: m_Floats: - _Alpha: 0.15 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _CastShadows: 0 - _Cull: 2 diff --git a/Basic/2DSpaceShooter/Assets/Materials/matte.mat b/Basic/2DSpaceShooter/Assets/Materials/matte.mat index 2e5e92afb..1a3cd361a 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/matte.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/matte.mat @@ -10,6 +10,8 @@ Material: m_Name: matte m_Shader: {fileID: -6465566751694194690, guid: 55480049bc0b4b646b7091ee30dd83bf, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 0 @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -95,4 +98,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/metal.mat b/Basic/2DSpaceShooter/Assets/Materials/metal.mat index 27b4868aa..6f7ba6971 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/metal.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/metal.mat @@ -10,6 +10,8 @@ Material: m_Name: metal m_Shader: {fileID: -6465566751694194690, guid: 55480049bc0b4b646b7091ee30dd83bf, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -56,4 +59,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/planet.mat b/Basic/2DSpaceShooter/Assets/Materials/planet.mat index a720efe1e..0eaf25a74 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/planet.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/planet.mat @@ -2,7 +2,7 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -10,8 +10,15 @@ Material: m_Name: planet m_Shader: {fileID: -6465566751694194690, guid: 79336e0b0e19a5c46be170f3cb26de75, type: 3} - m_ShaderKeywords: _ALPHABLEND_ON _COLOROVERLAY_ON _EMISSION _GLOSSYREFLECTIONS_OFF - _SPECULARHIGHLIGHTS_OFF + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _ALPHABLEND_ON + - _COLOROVERLAY_ON + - _EMISSION + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -19,6 +26,7 @@ Material: stringTagMap: {} disabledShaderPasses: - ALWAYS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -74,6 +82,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - PixelSnap: 0 - _Alpha: 1 @@ -123,3 +132,16 @@ Material: - _Tiling: {r: 1, g: 1, b: 0, a: 0} - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] +--- !u!114 &1592046647412693563 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/planet02.mat b/Basic/2DSpaceShooter/Assets/Materials/planet02.mat index aaf350c2e..e8f5c918b 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/planet02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/planet02.mat @@ -10,6 +10,8 @@ Material: m_Name: planet02 m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _ALPHABLEND_ON @@ -25,6 +27,7 @@ Material: RenderType: Opaque disabledShaderPasses: - ALWAYS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,6 +88,7 @@ Material: - PixelSnap: 0 - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 @@ -150,4 +154,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/planetGlow.mat b/Basic/2DSpaceShooter/Assets/Materials/planetGlow.mat index 5a17df1af..f6cc7f542 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/planetGlow.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/planetGlow.mat @@ -10,6 +10,8 @@ Material: m_Name: planetGlow m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -23,6 +25,7 @@ Material: - ALWAYS - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -83,6 +86,7 @@ Material: - PixelSnap: 0 - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -148,4 +152,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/planetRings.mat b/Basic/2DSpaceShooter/Assets/Materials/planetRings.mat index af19a7946..f188eb750 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/planetRings.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/planetRings.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 @@ -23,6 +23,8 @@ Material: m_Name: planetRings m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -35,6 +37,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -62,6 +65,7 @@ Material: m_Floats: - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _CastShadows: 0 - _Cull: 2 diff --git a/Basic/2DSpaceShooter/Assets/Materials/planetRings02.mat b/Basic/2DSpaceShooter/Assets/Materials/planetRings02.mat index b9354e834..a5210ec6d 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/planetRings02.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/planetRings02.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 @@ -23,6 +23,8 @@ Material: m_Name: planetRings02 m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -35,6 +37,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -62,6 +65,7 @@ Material: m_Floats: - _Alpha: 0.77 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _CastShadows: 0 - _Cull: 2 diff --git a/Basic/2DSpaceShooter/Assets/Materials/planetShadow.mat b/Basic/2DSpaceShooter/Assets/Materials/planetShadow.mat index 6dc78bd0f..80c29912c 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/planetShadow.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/planetShadow.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 @@ -23,6 +23,8 @@ Material: m_Name: planetShadow m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -35,6 +37,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -95,6 +98,7 @@ Material: - PixelSnap: 0 - _Alpha: 1.58 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/powerUpRing.mat b/Basic/2DSpaceShooter/Assets/Materials/powerUpRing.mat index 4a6afac96..fb00fe4d5 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/powerUpRing.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/powerUpRing.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 @@ -23,6 +23,8 @@ Material: m_Name: powerUpRing m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -35,6 +37,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -62,6 +65,7 @@ Material: m_Floats: - _Alpha: 0.5 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _CastShadows: 0 - _Cull: 2 diff --git a/Basic/2DSpaceShooter/Assets/Materials/ship.mat b/Basic/2DSpaceShooter/Assets/Materials/ship.mat index 0cf398b29..d6edd3c35 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/ship.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/ship.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 @@ -23,6 +23,8 @@ Material: m_Name: ship m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -35,6 +37,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -90,6 +93,7 @@ Material: m_Floats: - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 - _CastShadows: 0 diff --git a/Basic/2DSpaceShooter/Assets/Materials/shipGlow.mat b/Basic/2DSpaceShooter/Assets/Materials/shipGlow.mat index 9071950c1..45ac9df4b 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/shipGlow.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/shipGlow.mat @@ -10,6 +10,8 @@ Material: m_Name: shipGlow m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, 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: @@ -90,6 +93,7 @@ Material: - PixelSnap: 0 - _Alpha: 0.72 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _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/Basic/2DSpaceShooter/Assets/Materials/spriteAdditive.mat b/Basic/2DSpaceShooter/Assets/Materials/spriteAdditive.mat index 059b789a5..0a8a60a0c 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/spriteAdditive.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/spriteAdditive.mat @@ -2,7 +2,7 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -10,13 +10,17 @@ Material: m_Name: spriteAdditive m_Shader: {fileID: -6465566751694194690, guid: 79336e0b0e19a5c46be170f3cb26de75, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -76,6 +80,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Alpha: 1 - _AlphaClip: 0 @@ -126,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 4 + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/starSingle.mat b/Basic/2DSpaceShooter/Assets/Materials/starSingle.mat index 24b5e14d2..ee577cecf 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/starSingle.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/starSingle.mat @@ -2,7 +2,7 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -10,13 +10,21 @@ Material: m_Name: starSingle m_Shader: {fileID: -6465566751694194690, guid: 79336e0b0e19a5c46be170f3cb26de75, type: 3} - m_ShaderKeywords: _ALPHABLEND_ON _EMISSION _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _ALPHABLEND_ON + - _EMISSION + - _GLOSSYREFLECTIONS_OFF + - _SPECULARHIGHLIGHTS_OFF m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -72,6 +80,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - PixelSnap: 0 - _Alpha: 1 @@ -120,5 +129,19 @@ Material: - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _Tiling: {r: 1, g: 1, b: 0, a: 0} + - _TilingOffset: {r: 1, g: 1, b: 0, a: 0} - _TintColor: {r: 0.376, g: 0.67759985, b: 1, a: 0.7372549} m_BuildTextureStacks: [] +--- !u!114 &140447399497326293 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Basic/2DSpaceShooter/Assets/Materials/stars.mat b/Basic/2DSpaceShooter/Assets/Materials/stars.mat index 5f455d0ed..ab84526bf 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/stars.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/stars.mat @@ -1,8 +1,21 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4583645889245828564 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -10,13 +23,18 @@ Material: m_Name: stars m_Shader: {fileID: -6465566751694194690, guid: 79336e0b0e19a5c46be170f3cb26de75, type: 3} - m_ShaderKeywords: _ALPHABLEND_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _ALPHABLEND_ON m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -44,6 +62,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Alpha: 1 - _BlendOp: 0 diff --git a/Basic/2DSpaceShooter/Assets/Materials/sun.mat b/Basic/2DSpaceShooter/Assets/Materials/sun.mat index e1a53ca80..f680da759 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/sun.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/sun.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 @@ -23,6 +23,8 @@ Material: m_Name: sun m_Shader: {fileID: -6465566751694194690, guid: 95c504d90ae813849bd0dc5cde1b0f2f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -35,6 +37,7 @@ Material: disabledShaderPasses: - SHADOWCASTER - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -95,6 +98,7 @@ Material: - PixelSnap: 0 - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 diff --git a/Basic/2DSpaceShooter/Assets/Materials/thrust.mat b/Basic/2DSpaceShooter/Assets/Materials/thrust.mat index df1936788..095e3b318 100644 --- a/Basic/2DSpaceShooter/Assets/Materials/thrust.mat +++ b/Basic/2DSpaceShooter/Assets/Materials/thrust.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: thrust m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, 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: @@ -81,6 +84,7 @@ Material: m_Floats: - _Alpha: 1 - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 2 - _BlendOp: 0 - _BumpScale: 1 @@ -96,6 +100,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _FlipbookBlending: 0 - _FlipbookMode: 0 - _GlossMapScale: 1 @@ -112,6 +117,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _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/Basic/2DSpaceShooter/Assets/Prefabs/Block01.prefab b/Basic/2DSpaceShooter/Assets/Prefabs/Block01.prefab index 2e7a37d40..30b9085f8 100644 --- a/Basic/2DSpaceShooter/Assets/Prefabs/Block01.prefab +++ b/Basic/2DSpaceShooter/Assets/Prefabs/Block01.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 16.068033, y: -0.8891716, z: 0} m_LocalScale: {x: 1.8, y: 1.8, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1230818098960960655} m_Father: {fileID: 0} @@ -44,6 +45,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -94,6 +96,25 @@ BoxCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 6200000, guid: 01b2dec7004cd734b9f0430b2ed4fd8e, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -139,6 +160,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.021} m_LocalScale: {x: 0.941946, y: 0.941946, z: 0.941946} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 400000} m_RootOrder: 0 @@ -162,6 +184,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -203,3 +226,4 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: -1 + m_SortAtRoot: 0 diff --git a/Basic/2DSpaceShooter/Assets/Prefabs/Block02.prefab b/Basic/2DSpaceShooter/Assets/Prefabs/Block02.prefab index ad2fd9d29..2079a73e5 100644 --- a/Basic/2DSpaceShooter/Assets/Prefabs/Block02.prefab +++ b/Basic/2DSpaceShooter/Assets/Prefabs/Block02.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 16.068033, y: -0.8891716, z: 0} m_LocalScale: {x: 1.8, y: 1.8, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1591265106909314115} m_Father: {fileID: 0} @@ -44,6 +45,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -94,6 +96,25 @@ BoxCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 6200000, guid: 01b2dec7004cd734b9f0430b2ed4fd8e, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -139,6 +160,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.021} m_LocalScale: {x: 0.9419445, y: 0.9419445, z: 0.94194996} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 400000} m_RootOrder: 0 @@ -162,6 +184,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -203,3 +226,4 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: -1 + m_SortAtRoot: 0 diff --git a/Basic/2DSpaceShooter/Assets/Prefabs/Block03.prefab b/Basic/2DSpaceShooter/Assets/Prefabs/Block03.prefab index 7dae9d5ee..ebc52d787 100644 --- a/Basic/2DSpaceShooter/Assets/Prefabs/Block03.prefab +++ b/Basic/2DSpaceShooter/Assets/Prefabs/Block03.prefab @@ -96,6 +96,25 @@ BoxCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 6200000, guid: 01b2dec7004cd734b9f0430b2ed4fd8e, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -207,3 +226,4 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: -1 + m_SortAtRoot: 0 diff --git a/Basic/2DSpaceShooter/Assets/Prefabs/EnvironmentObjects.prefab b/Basic/2DSpaceShooter/Assets/Prefabs/EnvironmentObjects.prefab index aeb898025..00a0c785d 100644 --- a/Basic/2DSpaceShooter/Assets/Prefabs/EnvironmentObjects.prefab +++ b/Basic/2DSpaceShooter/Assets/Prefabs/EnvironmentObjects.prefab @@ -217,9 +217,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 616234713822875267} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -234,6 +242,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 4 + m_SortAtRoot: 0 --- !u!1 &1285198783452850252 GameObject: m_ObjectHideFlags: 0 @@ -329,6 +338,7 @@ SortingGroup: m_SortingLayerID: -808201055 m_SortingLayer: 3 m_SortingOrder: 3 + m_SortAtRoot: 0 --- !u!1 &2116021329049453341 GameObject: m_ObjectHideFlags: 0 @@ -493,6 +503,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 2 + m_SortAtRoot: 0 --- !u!1 &2334341848134769806 GameObject: m_ObjectHideFlags: 0 @@ -756,6 +767,7 @@ SortingGroup: m_SortingLayerID: -808201055 m_SortingLayer: 3 m_SortingOrder: -1 + m_SortAtRoot: 0 --- !u!1 &2334341848321749299 GameObject: m_ObjectHideFlags: 0 @@ -1019,6 +1031,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 3 + m_SortAtRoot: 0 --- !u!1 &2334341848505050464 GameObject: m_ObjectHideFlags: 0 @@ -1200,6 +1213,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 2 + m_SortAtRoot: 0 --- !u!1 &2334341848729139342 GameObject: m_ObjectHideFlags: 0 @@ -1380,6 +1394,7 @@ SortingGroup: m_SortingLayerID: -808201055 m_SortingLayer: 3 m_SortingOrder: -1 + m_SortAtRoot: 0 --- !u!1 &2334341848800825694 GameObject: m_ObjectHideFlags: 0 @@ -1475,6 +1490,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 3 + m_SortAtRoot: 0 --- !u!1 &2334341848831583990 GameObject: m_ObjectHideFlags: 0 @@ -1571,6 +1587,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 2 + m_SortAtRoot: 0 --- !u!1 &2334341848897660811 GameObject: m_ObjectHideFlags: 0 @@ -1666,6 +1683,7 @@ SortingGroup: m_SortingLayerID: -808201055 m_SortingLayer: 3 m_SortingOrder: -1 + m_SortAtRoot: 0 --- !u!1 &2334341849121918800 GameObject: m_ObjectHideFlags: 0 @@ -1762,6 +1780,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 2 + m_SortAtRoot: 0 --- !u!1 &2334341849191011477 GameObject: m_ObjectHideFlags: 0 @@ -1941,6 +1960,7 @@ SortingGroup: m_SortingLayerID: -808201055 m_SortingLayer: 3 m_SortingOrder: 3 + m_SortAtRoot: 0 --- !u!1 &2334341849244067846 GameObject: m_ObjectHideFlags: 0 @@ -2036,6 +2056,7 @@ SortingGroup: m_SortingLayerID: -808201055 m_SortingLayer: 3 m_SortingOrder: -1 + m_SortAtRoot: 0 --- !u!1 &2334341849332520648 GameObject: m_ObjectHideFlags: 0 @@ -2132,6 +2153,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &2334341849389181553 GameObject: m_ObjectHideFlags: 0 @@ -2227,6 +2249,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 3 + m_SortAtRoot: 0 --- !u!1 &2334341849401648248 GameObject: m_ObjectHideFlags: 0 @@ -2407,6 +2430,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 3 + m_SortAtRoot: 0 --- !u!1 &2334341849481984942 GameObject: m_ObjectHideFlags: 0 @@ -2670,6 +2694,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: -1 + m_SortAtRoot: 0 --- !u!1 &2334341849663305332 GameObject: m_ObjectHideFlags: 0 @@ -3605,9 +3630,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2334341850108088489} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -3622,6 +3655,7 @@ SortingGroup: m_SortingLayerID: -1768536665 m_SortingLayer: 1 m_SortingOrder: -1 + m_SortAtRoot: 0 --- !u!1 &2334341850163248311 GameObject: m_ObjectHideFlags: 0 @@ -3888,9 +3922,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2334341850210196040} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -3905,6 +3947,7 @@ SortingGroup: m_SortingLayerID: -1768536665 m_SortingLayer: 1 m_SortingOrder: -1 + m_SortAtRoot: 0 --- !u!1 &2337794011868086332 GameObject: m_ObjectHideFlags: 0 @@ -4071,9 +4114,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3721055467520438565} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -4088,6 +4139,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 4 + m_SortAtRoot: 0 --- !u!1 &4471646302162077172 GameObject: m_ObjectHideFlags: 0 @@ -4302,6 +4354,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: -1 + m_SortAtRoot: 0 --- !u!1 &6198515204237609632 GameObject: m_ObjectHideFlags: 0 @@ -4398,6 +4451,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &6304578685505385742 GameObject: m_ObjectHideFlags: 0 @@ -4494,6 +4548,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &6453894774673214076 GameObject: m_ObjectHideFlags: 0 @@ -4754,9 +4809,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6969362785764367763} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -4771,6 +4834,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 4 + m_SortAtRoot: 0 --- !u!1 &7108793286304556053 GameObject: m_ObjectHideFlags: 0 @@ -4866,6 +4930,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: -1 + m_SortAtRoot: 0 --- !u!1 &7222885695817139321 GameObject: m_ObjectHideFlags: 0 @@ -4959,9 +5024,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7222885695817139321} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -4976,6 +5049,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 4 + m_SortAtRoot: 0 --- !u!1 &7345830039489408383 GameObject: m_ObjectHideFlags: 0 @@ -5141,6 +5215,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: -1 + m_SortAtRoot: 0 --- !u!1 &8825691444335653497 GameObject: m_ObjectHideFlags: 0 @@ -5237,6 +5312,7 @@ SortingGroup: m_SortingLayerID: -1097225445 m_SortingLayer: 6 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &8981781005820529336 GameObject: m_ObjectHideFlags: 0 @@ -5366,6 +5442,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2334341850167293615} m_Modifications: - target: {fileID: -8679921383154817045, guid: cc9f92838493bd14e81c6a6122312740, @@ -5449,6 +5526,13 @@ PrefabInstance: value: PlanetRings objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: cc9f92838493bd14e81c6a6122312740, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2334341849368245910} m_SourcePrefab: {fileID: 100100000, guid: cc9f92838493bd14e81c6a6122312740, type: 3} --- !u!4 &2877667080034249101 stripped Transform: @@ -5473,11 +5557,13 @@ SortingGroup: m_SortingLayerID: -808201055 m_SortingLayer: 3 m_SortingOrder: -2 + m_SortAtRoot: 0 --- !u!1001 &2334341849281985036 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2334341850167293615} m_Modifications: - target: {fileID: -8679921383154817045, guid: cc9f92838493bd14e81c6a6122312740, @@ -5561,6 +5647,13 @@ PrefabInstance: value: PlanetRings (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: cc9f92838493bd14e81c6a6122312740, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2334341848213935204} m_SourcePrefab: {fileID: 100100000, guid: cc9f92838493bd14e81c6a6122312740, type: 3} --- !u!4 &2877667078980672999 stripped Transform: @@ -5585,11 +5678,13 @@ SortingGroup: m_SortingLayerID: -808201055 m_SortingLayer: 3 m_SortingOrder: 3 + m_SortAtRoot: 0 --- !u!1001 &4362687712643798022 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2334341850167293615} m_Modifications: - target: {fileID: -8679921383154817045, guid: cc9f92838493bd14e81c6a6122312740, @@ -5678,6 +5773,13 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: cc9f92838493bd14e81c6a6122312740, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2548975291701075852} m_SourcePrefab: {fileID: 100100000, guid: cc9f92838493bd14e81c6a6122312740, type: 3} --- !u!1 &3479603067372267863 stripped GameObject: @@ -5696,6 +5798,7 @@ SortingGroup: m_SortingLayerID: -808201055 m_SortingLayer: 3 m_SortingOrder: -2 + m_SortAtRoot: 0 --- !u!4 &4251917160745874413 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: cc9f92838493bd14e81c6a6122312740, @@ -5707,6 +5810,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2334341850167293615} m_Modifications: - target: {fileID: -8679921383154817045, guid: cc9f92838493bd14e81c6a6122312740, @@ -5795,6 +5899,13 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: cc9f92838493bd14e81c6a6122312740, + type: 3} + insertIndex: -1 + addedObject: {fileID: 9132520836114207871} m_SourcePrefab: {fileID: 100100000, guid: cc9f92838493bd14e81c6a6122312740, type: 3} --- !u!4 &8251079379330054196 stripped Transform: @@ -5819,3 +5930,4 @@ SortingGroup: m_SortingLayerID: -808201055 m_SortingLayer: 3 m_SortingOrder: 3 + m_SortAtRoot: 0 diff --git a/Basic/2DSpaceShooter/Assets/Prefabs/Powerup.prefab b/Basic/2DSpaceShooter/Assets/Prefabs/Powerup.prefab index 8b5db90b6..36322a83f 100644 --- a/Basic/2DSpaceShooter/Assets/Prefabs/Powerup.prefab +++ b/Basic/2DSpaceShooter/Assets/Prefabs/Powerup.prefab @@ -120,6 +120,25 @@ CircleCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -143,6 +162,12 @@ Rigidbody2D: m_AngularDrag: 0.05 m_GravityScale: 0 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 @@ -258,6 +283,9 @@ MonoBehaviour: m_EditorClassIdentifier: GlobalObjectIdHash: 951099334 AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 0 + SceneMigrationSynchronization: 1 DontDestroyWithOwner: 0 AutoObjectParentSync: 0 --- !u!114 &5428136450459688780 @@ -372,6 +400,7 @@ SortingGroup: m_SortingLayerID: -1733889141 m_SortingLayer: 5 m_SortingOrder: 1 + m_SortAtRoot: 0 --- !u!1 &8691963684265257474 GameObject: m_ObjectHideFlags: 0 @@ -467,3 +496,4 @@ SortingGroup: m_SortingLayerID: -1733889141 m_SortingLayer: 5 m_SortingOrder: 1 + m_SortAtRoot: 0 diff --git a/Basic/2DSpaceShooter/Assets/Prefabs/Ship.prefab b/Basic/2DSpaceShooter/Assets/Prefabs/Ship.prefab index 2083489f7..9017b0c71 100644 --- a/Basic/2DSpaceShooter/Assets/Prefabs/Ship.prefab +++ b/Basic/2DSpaceShooter/Assets/Prefabs/Ship.prefab @@ -60,6 +60,12 @@ Rigidbody2D: m_AngularDrag: 0.05 m_GravityScale: 0 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 m_Interpolate: 1 m_SleepingMode: 1 m_CollisionDetection: 1 @@ -74,6 +80,25 @@ CircleCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -359,6 +384,9 @@ MonoBehaviour: m_EditorClassIdentifier: GlobalObjectIdHash: 951099334 AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 0 + SceneMigrationSynchronization: 1 DontDestroyWithOwner: 0 AutoObjectParentSync: 1 --- !u!114 &-360930162699739946 @@ -385,8 +413,12 @@ MonoBehaviour: PositionThreshold: 0.001 RotAngleThreshold: 0.01 ScaleThreshold: 0.01 + UseQuaternionSynchronization: 0 + UseQuaternionCompression: 0 + UseHalfFloatPrecision: 0 InLocalSpace: 0 Interpolate: 1 + SlerpPosition: 0 --- !u!114 &-8406883944196582507 MonoBehaviour: m_ObjectHideFlags: 0 @@ -427,6 +459,7 @@ SortingGroup: m_SortingLayerID: 1115722359 m_SortingLayer: 7 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &100002 GameObject: m_ObjectHideFlags: 0 @@ -678,6 +711,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -707,6 +741,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -1028,6 +1063,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 100 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -1766,6 +1802,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -1795,6 +1832,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -4015,6 +4053,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4044,6 +4083,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -4427,6 +4467,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4469,6 +4510,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4498,6 +4540,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4585,6 +4628,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4614,6 +4658,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4652,6 +4697,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4681,6 +4727,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4934,6 +4981,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4963,6 +5011,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -5505,6 +5554,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -5534,6 +5584,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -5855,6 +5906,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -6593,6 +6645,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 3 minGradient: @@ -6622,6 +6675,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -8842,6 +8896,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8871,6 +8926,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -9254,6 +9310,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -9296,6 +9353,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9325,6 +9383,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -9412,6 +9471,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9441,6 +9501,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -9479,6 +9540,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9508,6 +9570,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -9761,6 +9824,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9790,6 +9854,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color diff --git a/Basic/2DSpaceShooter/Assets/UI Toolkit/Panel Settings.asset b/Basic/2DSpaceShooter/Assets/UI Toolkit/Panel Settings.asset index 65f333ad7..a54399f29 100644 --- a/Basic/2DSpaceShooter/Assets/UI Toolkit/Panel Settings.asset +++ b/Basic/2DSpaceShooter/Assets/UI Toolkit/Panel Settings.asset @@ -16,6 +16,7 @@ MonoBehaviour: type: 3} m_TargetTexture: {fileID: 0} m_ScaleMode: 2 + m_ReferenceSpritePixelsPerUnit: 100 m_Scale: 1 m_ReferenceDpi: 144 m_FallbackDpi: 96 diff --git a/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset.asset b/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset.asset index d86186879..3725eaf2b 100644 --- a/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset.asset +++ b/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRenderPipelineAsset m_EditorClassIdentifier: - k_AssetVersion: 9 - k_AssetPreviousVersion: 9 + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,13 +23,16 @@ MonoBehaviour: m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 0 - m_StoreActionsOptimization: 0 m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 m_MSAA: 1 m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 m_MainLightRenderingMode: 0 m_MainLightShadowsSupported: 0 m_MainLightShadowmapResolution: 2048 @@ -50,16 +53,21 @@ MonoBehaviour: m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 0 m_ConservativeEnclosingSphere: 0 m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 2 m_AdditionalLightsCookieResolution: 2048 m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 0 + m_SupportsLightCookies: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 + m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 @@ -69,6 +77,33 @@ MonoBehaviour: m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 1 + m_PrefilterXRKeywords: 0 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 1 + m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilterDebugKeywords: 0 + m_PrefilterWriteRenderingLayers: 0 + m_PrefilterHDROutput: 0 + m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAOSourceDepthLow: 0 + m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOSampleCountLow: 0 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 0 + m_PrefilterDBufferMRT1: 0 + m_PrefilterDBufferMRT2: 0 + m_PrefilterDBufferMRT3: 0 + m_PrefilterScreenCoord: 0 + m_PrefilterNativeRenderPass: 0 + m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset b/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset index 8696c8afe..de6be61b1 100644 --- a/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset +++ b/Basic/2DSpaceShooter/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset @@ -15,6 +15,7 @@ MonoBehaviour: debugShaders: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 @@ -28,15 +29,17 @@ MonoBehaviour: samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} + blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} - m_AssetVersion: 1 + m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 2147483647 @@ -53,7 +56,6 @@ MonoBehaviour: m_ShadowTransparentReceive: 0 m_RenderingMode: 0 m_DepthPrimingMode: 0 + m_CopyDepthMode: 0 m_AccurateGbufferNormals: 0 - m_ClusteredRendering: 0 - m_TileSize: 32 m_IntermediateTextureMode: 1 diff --git a/Basic/2DSpaceShooter/Assets/UniversalRenderPipelineGlobalSettings.asset b/Basic/2DSpaceShooter/Assets/UniversalRenderPipelineGlobalSettings.asset index a996a2e6e..98f0dfda6 100644 --- a/Basic/2DSpaceShooter/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Basic/2DSpaceShooter/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -12,7 +12,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 2 + k_AssetVersion: 3 + m_RenderingLayerNames: + - Light Layer default + - Light Layer 1 + - Light Layer 2 + - Light Layer 3 + - Light Layer 4 + - Light Layer 5 + - Light Layer 6 + - Light Layer 7 + m_ValidRenderingLayers: 255 lightLayerName0: Light Layer default lightLayerName1: Light Layer 1 lightLayerName2: Light Layer 2 @@ -24,4 +34,8 @@ MonoBehaviour: m_StripDebugVariants: 1 m_StripUnusedPostProcessingVariants: 0 m_StripUnusedVariants: 1 + m_StripUnusedLODCrossFadeVariants: 1 + m_StripScreenCoordOverrideVariants: 1 supportRuntimeDebugDisplay: 0 + m_ShaderVariantLogLevel: 0 + m_ExportShaderVariants: 1 diff --git a/Basic/2DSpaceShooter/Packages/manifest.json b/Basic/2DSpaceShooter/Packages/manifest.json index 76b8f7023..783e86632 100644 --- a/Basic/2DSpaceShooter/Packages/manifest.json +++ b/Basic/2DSpaceShooter/Packages/manifest.json @@ -1,17 +1,18 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.collab-proxy": "2.0.3", - "com.unity.ide.rider": "3.0.20", + "com.unity.ai.navigation": "1.1.3", + "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.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop", "com.unity.netcode.gameobjects": "1.4.0", "com.unity.postprocessing": "3.2.2", - "com.unity.render-pipelines.universal": "12.1.11", - "com.unity.test-framework": "1.1.31", + "com.unity.render-pipelines.universal": "14.0.7", + "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", + "com.unity.timeline": "1.7.4", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", "com.unity.modules.ai": "1.0.0", diff --git a/Basic/2DSpaceShooter/Packages/packages-lock.json b/Basic/2DSpaceShooter/Packages/packages-lock.json index 81c2c87dc..e13a2c781 100644 --- a/Basic/2DSpaceShooter/Packages/packages-lock.json +++ b/Basic/2DSpaceShooter/Packages/packages-lock.json @@ -6,6 +6,15 @@ "source": "builtin", "dependencies": {} }, + "com.unity.ai.navigation": { + "version": "1.1.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.8.4", "depth": 1, @@ -16,7 +25,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.3", + "version": "2.0.4", "depth": 0, "source": "registry", "dependencies": {}, @@ -47,7 +56,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.20", + "version": "3.0.21", "depth": 0, "source": "registry", "dependencies": { @@ -72,7 +81,7 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework": { - "version": "3.1.1", + "version": "3.1.3", "depth": 1, "source": "registry", "dependencies": { @@ -124,14 +133,14 @@ "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.1.0", + "version": "3.2.1", "depth": 2, "source": "registry", "dependencies": {}, @@ -154,52 +163,53 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.11", + "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.11", + "version": "14.0.7", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.8.4", - "com.unity.render-pipelines.core": "12.1.11", - "com.unity.shadergraph": "12.1.11" + "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.4.0", + "version": "2.5.0", "depth": 2, "source": "registry", "dependencies": { - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.services.core": "1.7.0", + "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.8.2", + "version": "1.9.0", "depth": 2, "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" @@ -236,23 +246,23 @@ "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "1.0.3", + "version": "2.0.1", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.11", + "version": "14.0.7", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.11", - "com.unity.searcher": "4.9.1" + "com.unity.render-pipelines.core": "14.0.7", + "com.unity.searcher": "4.9.2" } }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -272,7 +282,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.7.4", "depth": 0, "source": "registry", "dependencies": { @@ -284,7 +294,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.3", + "version": "1.3.4", "depth": 1, "source": "registry", "dependencies": { @@ -442,17 +452,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/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset b/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset index 8004f4a06..afcf8d725 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset +++ b/Basic/2DSpaceShooter/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 26 productGUID: 56c97ca33ead60942a273d3ef29b1be4 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,15 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -119,8 +120,11 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -128,12 +132,7 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 bundleVersion: 1.2.1 preloadedAssets: [] metroInputSource: 1 @@ -147,7 +146,7 @@ PlayerSettings: enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -178,12 +177,13 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -247,6 +247,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 @@ -254,6 +255,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 @@ -267,7 +269,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -533,7 +534,15 @@ PlayerSettings: m_EncodingQuality: 1 - m_BuildTarget: PS4 m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: + - m_BuildTarget: Standalone + m_EncodingQuality: 2 + - m_BuildTarget: XboxOne + m_EncodingQuality: 2 + - m_BuildTarget: PS4 + m_EncodingQuality: 2 m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 @@ -546,6 +555,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -557,6 +567,7 @@ PlayerSettings: switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -630,7 +641,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -672,6 +682,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -772,6 +783,7 @@ PlayerSettings: webGLMemorySize: 256 webGLExceptionSupport: 0 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 0 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -784,16 +796,25 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: Android: UNITY_POST_PROCESSING_STACK_V2 CloudRendering: UNITY_POST_PROCESSING_STACK_V2 EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2 + GameCoreScarlett: UNITY_POST_PROCESSING_STACK_V2 GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2 + LinuxHeadlessSimulation: UNITY_POST_PROCESSING_STACK_V2 Lumin: UNITY_POST_PROCESSING_STACK_V2 Nintendo Switch: UNITY_POST_PROCESSING_STACK_V2 PS4: UNITY_POST_PROCESSING_STACK_V2 PS5: UNITY_POST_PROCESSING_STACK_V2 + QNX: UNITY_POST_PROCESSING_STACK_V2 Stadia: UNITY_POST_PROCESSING_STACK_V2 Standalone: UNITY_POST_PROCESSING_STACK_V2 WebGL: UNITY_POST_PROCESSING_STACK_V2 @@ -805,17 +826,29 @@ PlayerSettings: scriptingBackend: WebGL: 1 il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + il2cppCodeGeneration: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + QNX: 1 + Stadia: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -895,6 +928,11 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 windowsGamepadBackendHint: 0 @@ -905,6 +943,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 1 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt b/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt index 6c676f051..56ddb83a4 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt +++ b/Basic/2DSpaceShooter/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.24f1 -m_EditorVersionWithRevision: 2021.3.24f1 (cf10dcf7010d) +m_EditorVersion: 2022.3.0f1 +m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476) diff --git a/Basic/2DSpaceShooter/ProjectSettings/URPProjectSettings.asset b/Basic/2DSpaceShooter/ProjectSettings/URPProjectSettings.asset index c1f118ad3..cd7fd8c61 100644 --- a/Basic/2DSpaceShooter/ProjectSettings/URPProjectSettings.asset +++ b/Basic/2DSpaceShooter/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 5 + m_LastMaterialVersion: 7 diff --git a/Basic/2DSpaceShooter/ProjectSettings/boot.config b/Basic/2DSpaceShooter/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb..000000000 diff --git a/Basic/ClientDriven/Assets/Materials/Black.mat b/Basic/ClientDriven/Assets/Materials/Black.mat index dd3584b13..373d3ce26 100644 --- a/Basic/ClientDriven/Assets/Materials/Black.mat +++ b/Basic/ClientDriven/Assets/Materials/Black.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Black m_Shader: {fileID: -6465566751694194690, guid: ca58319a8d28b4743ac79e9d48635f5c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -76,7 +79,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _CastShadows: 1 - _Cull: 2 @@ -120,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/Materials/DarkGray.mat b/Basic/ClientDriven/Assets/Materials/DarkGray.mat index 063c2c6d2..3f9990354 100644 --- a/Basic/ClientDriven/Assets/Materials/DarkGray.mat +++ b/Basic/ClientDriven/Assets/Materials/DarkGray.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DarkGray m_Shader: {fileID: -6465566751694194690, guid: ca58319a8d28b4743ac79e9d48635f5c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -76,7 +79,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _CastShadows: 1 - _Cull: 2 @@ -120,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/Materials/DarkGray_02.mat b/Basic/ClientDriven/Assets/Materials/DarkGray_02.mat index 1bf33fe52..55c173e88 100644 --- a/Basic/ClientDriven/Assets/Materials/DarkGray_02.mat +++ b/Basic/ClientDriven/Assets/Materials/DarkGray_02.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DarkGray_02 m_Shader: {fileID: -6465566751694194690, guid: ca58319a8d28b4743ac79e9d48635f5c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -76,7 +79,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _CastShadows: 1 - _Cull: 2 @@ -120,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/Materials/Gradient.mat b/Basic/ClientDriven/Assets/Materials/Gradient.mat index 6876671d1..79f554568 100644 --- a/Basic/ClientDriven/Assets/Materials/Gradient.mat +++ b/Basic/ClientDriven/Assets/Materials/Gradient.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: Gradient m_Shader: {fileID: -6465566751694194690, guid: eb69f86d4ffad794db385f132c2c6afd, 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: diff --git a/Basic/ClientDriven/Assets/Materials/Gray.mat b/Basic/ClientDriven/Assets/Materials/Gray.mat index 372b10fc7..f5786f6da 100644 --- a/Basic/ClientDriven/Assets/Materials/Gray.mat +++ b/Basic/ClientDriven/Assets/Materials/Gray.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Gray m_Shader: {fileID: -6465566751694194690, guid: ca58319a8d28b4743ac79e9d48635f5c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -84,7 +87,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _CastShadows: 1 - _ClearCoatMask: 0 @@ -132,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/Materials/Gray_02.mat b/Basic/ClientDriven/Assets/Materials/Gray_02.mat index b9caddb81..3f1b802df 100644 --- a/Basic/ClientDriven/Assets/Materials/Gray_02.mat +++ b/Basic/ClientDriven/Assets/Materials/Gray_02.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Gray_02 m_Shader: {fileID: -6465566751694194690, guid: ca58319a8d28b4743ac79e9d48635f5c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -84,7 +87,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _CastShadows: 1 - _ClearCoatMask: 0 @@ -132,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/Materials/GridDark.mat b/Basic/ClientDriven/Assets/Materials/GridDark.mat index 9c9b493f2..0e7c1b7e0 100644 --- a/Basic/ClientDriven/Assets/Materials/GridDark.mat +++ b/Basic/ClientDriven/Assets/Materials/GridDark.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: GridDark m_Shader: {fileID: -6465566751694194690, guid: b8d7679189d4a5940af46004f3870920, 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: diff --git a/Basic/ClientDriven/Assets/Materials/GridDarkest.mat b/Basic/ClientDriven/Assets/Materials/GridDarkest.mat index 0e355e174..4d7cf7a8e 100644 --- a/Basic/ClientDriven/Assets/Materials/GridDarkest.mat +++ b/Basic/ClientDriven/Assets/Materials/GridDarkest.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: GridDarkest m_Shader: {fileID: -6465566751694194690, guid: b8d7679189d4a5940af46004f3870920, 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: diff --git a/Basic/ClientDriven/Assets/Materials/GridLight.mat b/Basic/ClientDriven/Assets/Materials/GridLight.mat index d2a08c679..8aaf0ce8c 100644 --- a/Basic/ClientDriven/Assets/Materials/GridLight.mat +++ b/Basic/ClientDriven/Assets/Materials/GridLight.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: GridLight m_Shader: {fileID: -6465566751694194690, guid: b8d7679189d4a5940af46004f3870920, 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: diff --git a/Basic/ClientDriven/Assets/Materials/GridMed.mat b/Basic/ClientDriven/Assets/Materials/GridMed.mat index 3689e72ca..527b958f1 100644 --- a/Basic/ClientDriven/Assets/Materials/GridMed.mat +++ b/Basic/ClientDriven/Assets/Materials/GridMed.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: GridMed m_Shader: {fileID: -6465566751694194690, guid: b8d7679189d4a5940af46004f3870920, 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: diff --git a/Basic/ClientDriven/Assets/Materials/PickupBlue.mat b/Basic/ClientDriven/Assets/Materials/PickupBlue.mat index c93e6df13..b4695726a 100644 --- a/Basic/ClientDriven/Assets/Materials/PickupBlue.mat +++ b/Basic/ClientDriven/Assets/Materials/PickupBlue.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: PickupBlue m_Shader: {fileID: -6465566751694194690, guid: 1f9c3af292997fa4783a3cb60dfc7ee5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAPREMULTIPLY_ON - _RECEIVE_SHADOWS_OFF @@ -30,11 +32,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -89,7 +92,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _CastShadows: 1 - _Cull: 2 diff --git a/Basic/ClientDriven/Assets/Materials/PickupPurple.mat b/Basic/ClientDriven/Assets/Materials/PickupPurple.mat index fa0a4ed4f..a9180855e 100644 --- a/Basic/ClientDriven/Assets/Materials/PickupPurple.mat +++ b/Basic/ClientDriven/Assets/Materials/PickupPurple.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PickupPurple m_Shader: {fileID: -6465566751694194690, guid: 1f9c3af292997fa4783a3cb60dfc7ee5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAPREMULTIPLY_ON - _RECEIVE_SHADOWS_OFF @@ -17,11 +19,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -76,7 +79,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _CastShadows: 1 - _Cull: 2 @@ -129,4 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/Materials/PickupRed.mat b/Basic/ClientDriven/Assets/Materials/PickupRed.mat index d91eaa935..e8e51682e 100644 --- a/Basic/ClientDriven/Assets/Materials/PickupRed.mat +++ b/Basic/ClientDriven/Assets/Materials/PickupRed.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: PickupRed m_Shader: {fileID: -6465566751694194690, guid: 1f9c3af292997fa4783a3cb60dfc7ee5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAPREMULTIPLY_ON - _RECEIVE_SHADOWS_OFF @@ -17,11 +19,12 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -76,7 +79,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 1 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _CastShadows: 1 - _Cull: 2 @@ -129,4 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/Materials/White.mat b/Basic/ClientDriven/Assets/Materials/White.mat index a5a1bd670..5df513bf3 100644 --- a/Basic/ClientDriven/Assets/Materials/White.mat +++ b/Basic/ClientDriven/Assets/Materials/White.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: White m_Shader: {fileID: -6465566751694194690, guid: ca58319a8d28b4743ac79e9d48635f5c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -84,7 +87,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _CastShadows: 1 - _ClearCoatMask: 0 @@ -132,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/Materials/White_02.mat b/Basic/ClientDriven/Assets/Materials/White_02.mat index abff9fe46..ec5df39dc 100644 --- a/Basic/ClientDriven/Assets/Materials/White_02.mat +++ b/Basic/ClientDriven/Assets/Materials/White_02.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: White_02 m_Shader: {fileID: -6465566751694194690, guid: ca58319a8d28b4743ac79e9d48635f5c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -84,7 +87,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _CastShadows: 1 - _ClearCoatMask: 0 @@ -132,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/Materials/Yellow.mat b/Basic/ClientDriven/Assets/Materials/Yellow.mat index 4c5af3ea3..254920a7b 100644 --- a/Basic/ClientDriven/Assets/Materials/Yellow.mat +++ b/Basic/ClientDriven/Assets/Materials/Yellow.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: Yellow m_Shader: {fileID: -6465566751694194690, guid: ca58319a8d28b4743ac79e9d48635f5c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -89,7 +92,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _CastShadows: 1 - _Cull: 2 diff --git a/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab b/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab index 328a79d87..1d42614b3 100644 --- a/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab +++ b/Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab @@ -51,9 +51,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8321201880322001125} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 1 m_Center: {x: 0, y: 0, z: 0} --- !u!54 &7759258758774188825 @@ -63,10 +71,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8321201880322001125} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -110,8 +129,12 @@ MonoBehaviour: PositionThreshold: 0 RotAngleThreshold: 0 ScaleThreshold: 0 + UseQuaternionSynchronization: 1 + UseQuaternionCompression: 1 + UseHalfFloatPrecision: 1 InLocalSpace: 0 Interpolate: 1 + SlerpPosition: 0 --- !u!114 &5818429371130516787 MonoBehaviour: m_ObjectHideFlags: 0 @@ -126,6 +149,9 @@ MonoBehaviour: m_EditorClassIdentifier: GlobalObjectIdHash: 951099334 AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 0 + SceneMigrationSynchronization: 1 DontDestroyWithOwner: 0 AutoObjectParentSync: 1 --- !u!114 &5607146804455042385 @@ -161,6 +187,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4621998539424734916} m_Modifications: - target: {fileID: -8679921383154817045, guid: f7698f93880c2514a860d6ca1245a6a5, type: 3} @@ -236,6 +263,9 @@ PrefabInstance: value: Border objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7698f93880c2514a860d6ca1245a6a5, type: 3} --- !u!4 &2558306008476788773 stripped Transform: @@ -247,6 +277,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4621998539424734916} m_Modifications: - target: {fileID: -8679921383154817045, guid: f7698f93880c2514a860d6ca1245a6a5, type: 3} @@ -322,6 +353,9 @@ PrefabInstance: value: CenterHemisphere objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7698f93880c2514a860d6ca1245a6a5, type: 3} --- !u!4 &3824548929439723645 stripped Transform: @@ -333,6 +367,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4621998539424734916} m_Modifications: - target: {fileID: -8679921383154817045, guid: f7698f93880c2514a860d6ca1245a6a5, type: 3} @@ -400,6 +435,9 @@ PrefabInstance: value: ColorMesh objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7698f93880c2514a860d6ca1245a6a5, type: 3} --- !u!4 &5073984626218265924 stripped Transform: @@ -416,6 +454,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4621998539424734916} m_Modifications: - target: {fileID: -8679921383154817045, guid: f7698f93880c2514a860d6ca1245a6a5, type: 3} @@ -491,6 +530,9 @@ PrefabInstance: value: Middle objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7698f93880c2514a860d6ca1245a6a5, type: 3} --- !u!4 &7478805024049242977 stripped Transform: @@ -502,6 +544,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4621998539424734916} m_Modifications: - target: {fileID: -8679921383154817045, guid: f7698f93880c2514a860d6ca1245a6a5, type: 3} @@ -573,6 +616,9 @@ PrefabInstance: value: BlackHemisphere objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7698f93880c2514a860d6ca1245a6a5, type: 3} --- !u!4 &9198908101586070433 stripped Transform: diff --git a/Basic/ClientDriven/Assets/Prefabs/PlayerArmature_Networked.prefab b/Basic/ClientDriven/Assets/Prefabs/PlayerArmature_Networked.prefab index bdfab96bf..654ae9a4b 100644 --- a/Basic/ClientDriven/Assets/Prefabs/PlayerArmature_Networked.prefab +++ b/Basic/ClientDriven/Assets/Prefabs/PlayerArmature_Networked.prefab @@ -41,9 +41,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7567938585585123398} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.78 m_Center: {x: 0, y: 0.78, z: 0} --- !u!114 &7639751301732027371 @@ -64,6 +72,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} @@ -148,6 +157,33 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5885216827943657505, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3893294197879345259, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} + insertIndex: -1 + addedObject: {fileID: 7602079168910818369} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4416926081852918481, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} + insertIndex: -1 + addedObject: {fileID: 1021551417513153853} + - targetCorrespondingSourceObject: {fileID: 4416926081852918481, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} + insertIndex: -1 + addedObject: {fileID: -3062321976565574425} + - targetCorrespondingSourceObject: {fileID: 4416926081852918481, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} + insertIndex: -1 + addedObject: {fileID: -2755784201116707001} + - targetCorrespondingSourceObject: {fileID: 4416926081852918481, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} + insertIndex: -1 + addedObject: {fileID: 5667156634780145037} + - targetCorrespondingSourceObject: {fileID: 4416926081852918481, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} + insertIndex: -1 + addedObject: {fileID: 5801232430748397462} + - targetCorrespondingSourceObject: {fileID: 4416926081852918481, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} + insertIndex: -1 + addedObject: {fileID: 7243582772389402832} + - targetCorrespondingSourceObject: {fileID: 8187455079231382173, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} + insertIndex: -1 + addedObject: {fileID: 3615669438616969171} m_SourcePrefab: {fileID: 100100000, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} --- !u!4 &303777381631976334 stripped Transform: @@ -167,8 +203,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1116025501350672692} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 0 + serializedVersion: 2 m_Radius: 0.28 m_Height: 1.8 m_Direction: 1 @@ -187,6 +232,9 @@ MonoBehaviour: m_EditorClassIdentifier: GlobalObjectIdHash: 951099334 AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 0 + SceneMigrationSynchronization: 1 DontDestroyWithOwner: 0 AutoObjectParentSync: 1 --- !u!114 &-2755784201116707001 @@ -201,7 +249,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c521a646e08a84279a7bcf9c775080a4, type: 3} m_Name: m_EditorClassIdentifier: - m_ClientPlayerMove: {fileID: 5667156634780145037} isObjectPickedUp: m_InternalValue: 0 m_LocalHeldPosition: {x: 0, y: 2.85, z: 0} @@ -261,8 +308,12 @@ MonoBehaviour: PositionThreshold: 0.001 RotAngleThreshold: 0.01 ScaleThreshold: 0.01 + UseQuaternionSynchronization: 0 + UseQuaternionCompression: 0 + UseHalfFloatPrecision: 1 InLocalSpace: 0 Interpolate: 1 + SlerpPosition: 0 --- !u!114 &1116025501350672696 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4416926081852918493, guid: 64dce48905ffd9b4293e595fa6941544, type: 3} diff --git a/Basic/ClientDriven/Assets/StarterAssets/Editor/PackageChecker/StarterAssetsPackageChecker.dll b/Basic/ClientDriven/Assets/StarterAssets/Editor/PackageChecker/StarterAssetsPackageChecker.dll index ffd623788..ea661cb1b 100644 Binary files a/Basic/ClientDriven/Assets/StarterAssets/Editor/PackageChecker/StarterAssetsPackageChecker.dll and b/Basic/ClientDriven/Assets/StarterAssets/Editor/PackageChecker/StarterAssetsPackageChecker.dll differ diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Blue_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Blue_Mat.mat index daeb9e251..070c6df72 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Blue_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Blue_Mat.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Blue_Mat m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -18,6 +20,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -80,7 +83,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -89,6 +94,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -103,6 +109,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 @@ -125,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Built-in_RP/BuiltInTriplanar_01_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Built-in_RP/BuiltInTriplanar_01_Mat.mat index 8dc760c56..d83b69a27 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Built-in_RP/BuiltInTriplanar_01_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/Built-in_RP/BuiltInTriplanar_01_Mat.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: BuiltInTriplanar_01_Mat m_Shader: {fileID: -6465566751694194690, guid: b8d7679189d4a5940af46004f3870920, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -127,4 +130,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GreyBlue_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GreyBlue_Mat.mat index 98350b4fa..f17121bed 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GreyBlue_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GreyBlue_Mat.mat @@ -9,14 +9,18 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: GreyBlue_Mat m_Shader: {fileID: -6465566751694194690, guid: ca58319a8d28b4743ac79e9d48635f5c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -74,7 +78,13 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 + - _CastShadows: 1 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -87,11 +97,17 @@ Material: - _Parallax: 0.02 - _QueueControl: 0 - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteControl: 0 m_Colors: - _Base_Color: {r: 0.50980395, g: 0.627451, b: 0.6901961, a: 1} - _Color: {r: 0.5110952, g: 0.62652487, b: 0.6886792, a: 1} @@ -109,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridBlue_01_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridBlue_01_Mat.mat index e249d81e7..018cf6444 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridBlue_01_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridBlue_01_Mat.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: GridBlue_01_Mat m_Shader: {fileID: -6465566751694194690, guid: b8d7679189d4a5940af46004f3870920, 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: diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridOrange_01_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridOrange_01_Mat.mat index f8c1880a8..429945096 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridOrange_01_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridOrange_01_Mat.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: GridOrange_01_Mat m_Shader: {fileID: -6465566751694194690, guid: b8d7679189d4a5940af46004f3870920, 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: @@ -148,4 +151,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridWhite_01_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridWhite_01_Mat.mat index 4c3d3d398..7482e026a 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridWhite_01_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/GridWhite_01_Mat.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: GridWhite_01_Mat m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _EMISSION - _NORMALMAP @@ -33,6 +35,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -95,7 +98,9 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -104,6 +109,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.477 @@ -118,6 +124,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/URP_HDRP_ShaderGraph/ShaderGraphGrid_01_Mat.mat b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/URP_HDRP_ShaderGraph/ShaderGraphGrid_01_Mat.mat index bad93756e..5161ac9b8 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/URP_HDRP_ShaderGraph/ShaderGraphGrid_01_Mat.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/Environment/Art/Materials/URP_HDRP_ShaderGraph/ShaderGraphGrid_01_Mat.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ShaderGraphGrid_01_Mat m_Shader: {fileID: -6465566751694194690, guid: b8d7679189d4a5940af46004f3870920, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -44,6 +47,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Grid_Normal_Map: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: d9c0dd5cdac07b145be73329e489869a, type: 3} m_Scale: {x: 1, y: 1} @@ -60,6 +67,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - Boolean_35A71344: 0 @@ -82,10 +101,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.119 - _GlossyReflections: 1 + - _Grid_Normal_Strength: 1 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 0 - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -109,4 +131,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Arms.mat b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Arms.mat index 2930865e9..20ca07cd3 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Arms.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Arms.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_ArmatureColor_Arms m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _NORMALMAP m_InvalidKeywords: [] @@ -32,6 +34,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -106,9 +109,11 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _BaseGlossiness: 0.855 - _BaseMetallic: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -117,6 +122,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -135,6 +141,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Body.mat b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Body.mat index ca3ed7eb3..ef94ceb97 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Body.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Body.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_ArmatureColor_Body m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _NORMALMAP m_InvalidKeywords: [] @@ -32,6 +34,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -106,9 +109,11 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _BaseGlossiness: 0.531 - _BaseMetallic: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -117,6 +122,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -135,6 +141,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Legs.mat b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Legs.mat index 26f5c6147..c73f3304e 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Legs.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/Built-in_RP/M_ArmatureColor_Legs.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_ArmatureColor_Legs m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _NORMALMAP m_InvalidKeywords: [] @@ -32,6 +34,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -106,9 +109,11 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _BaseGlossiness: 0.957 - _BaseMetallic: 1 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -117,6 +122,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -135,6 +141,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Arms.mat b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Arms.mat index d94be9513..3252ea075 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Arms.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Arms.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,9 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_Armature_Arms m_Shader: {fileID: -6465566751694194690, guid: 5090cfbe48875df4a875fdd99f978069, type: 3} - m_ValidKeywords: - - _COLOR_INDEX_ZERO + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] m_InvalidKeywords: + - _COLOR_INDEX_ZERO - _PLAYERINDEX_ZERO m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -33,6 +35,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,8 +126,10 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Ambient_Strength: 0.1 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _COLOR_INDEX: 0 - _CastShadows: 1 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Body.mat b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Body.mat index 3a1ebe973..e5b8682cc 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Body.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Body.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,9 +22,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_Armature_Body m_Shader: {fileID: -6465566751694194690, guid: 5090cfbe48875df4a875fdd99f978069, type: 3} - m_ValidKeywords: - - _COLOR_INDEX_ZERO + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] m_InvalidKeywords: + - _COLOR_INDEX_ZERO - _PLAYERINDEX_ZERO m_LightmapFlags: 2 m_EnableInstancingVariants: 0 @@ -33,6 +35,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,8 +126,10 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Ambient_Strength: 0.1 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _COLOR_INDEX: 0 - _CastShadows: 1 diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Legs.mat b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Legs.mat index 841b27ca9..fdefe9188 100644 --- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Legs.mat +++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Character/Materials/M_Armature_Legs.mat @@ -9,9 +9,11 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_Armature_Legs m_Shader: {fileID: -6465566751694194690, guid: 5090cfbe48875df4a875fdd99f978069, type: 3} - m_ValidKeywords: - - _COLOR_INDEX_ZERO + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] m_InvalidKeywords: + - _COLOR_INDEX_ZERO - _PLAYERINDEX_ZERO m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -20,6 +22,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -110,8 +113,10 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaToMask: 0 - _Ambient_Strength: 0.1 - _Blend: 0 + - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _COLOR_INDEX: 0 - _CastShadows: 1 @@ -188,4 +193,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 7 diff --git a/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset.asset b/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset.asset index 39d65c3d4..1f85daa89 100644 --- a/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset.asset +++ b/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRenderPipelineAsset m_EditorClassIdentifier: - k_AssetVersion: 9 - k_AssetPreviousVersion: 9 + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,13 +23,16 @@ MonoBehaviour: m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 0 - m_StoreActionsOptimization: 0 m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 m_MSAA: 4 m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 2048 @@ -50,16 +53,21 @@ MonoBehaviour: m_CascadeBorder: 0.2 m_ShadowDepthBias: 0.74 m_ShadowNormalBias: 0 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 1 m_ConservativeEnclosingSphere: 1 m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 2 m_AdditionalLightsCookieResolution: 2048 m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 0 + m_SupportsLightCookies: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 + m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 1 m_ColorGradingLutSize: 32 @@ -69,6 +77,33 @@ MonoBehaviour: m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 1 + m_PrefilterXRKeywords: 0 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 1 + m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilterDebugKeywords: 0 + m_PrefilterWriteRenderingLayers: 0 + m_PrefilterHDROutput: 0 + m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAOSourceDepthLow: 0 + m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOSampleCountLow: 0 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 0 + m_PrefilterDBufferMRT1: 0 + m_PrefilterDBufferMRT2: 0 + m_PrefilterDBufferMRT3: 0 + m_PrefilterScreenCoord: 0 + m_PrefilterNativeRenderPass: 0 + m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset b/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset index a8dceb799..7027c8161 100644 --- a/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset +++ b/Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: debugShaders: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 @@ -26,9 +27,11 @@ MonoBehaviour: samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} + blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} m_AssetVersion: 2 @@ -50,6 +53,4 @@ MonoBehaviour: m_DepthPrimingMode: 0 m_CopyDepthMode: 0 m_AccurateGbufferNormals: 0 - m_ClusteredRendering: 0 - m_TileSize: 32 m_IntermediateTextureMode: 1 diff --git a/Basic/ClientDriven/Assets/UniversalRenderPipelineGlobalSettings.asset b/Basic/ClientDriven/Assets/UniversalRenderPipelineGlobalSettings.asset index a996a2e6e..98f0dfda6 100644 --- a/Basic/ClientDriven/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Basic/ClientDriven/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -12,7 +12,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 2 + k_AssetVersion: 3 + m_RenderingLayerNames: + - Light Layer default + - Light Layer 1 + - Light Layer 2 + - Light Layer 3 + - Light Layer 4 + - Light Layer 5 + - Light Layer 6 + - Light Layer 7 + m_ValidRenderingLayers: 255 lightLayerName0: Light Layer default lightLayerName1: Light Layer 1 lightLayerName2: Light Layer 2 @@ -24,4 +34,8 @@ MonoBehaviour: m_StripDebugVariants: 1 m_StripUnusedPostProcessingVariants: 0 m_StripUnusedVariants: 1 + m_StripUnusedLODCrossFadeVariants: 1 + m_StripScreenCoordOverrideVariants: 1 supportRuntimeDebugDisplay: 0 + m_ShaderVariantLogLevel: 0 + m_ExportShaderVariants: 1 diff --git a/Basic/ClientDriven/Packages/manifest.json b/Basic/ClientDriven/Packages/manifest.json index e323b38ee..ad87ba0b2 100644 --- a/Basic/ClientDriven/Packages/manifest.json +++ b/Basic/ClientDriven/Packages/manifest.json @@ -1,17 +1,18 @@ { "dependencies": { - "com.unity.cinemachine": "2.8.9", - "com.unity.collab-proxy": "2.0.3", - "com.unity.ide.rider": "3.0.20", + "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.inputsystem": "1.5.1", "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop", "com.unity.netcode.gameobjects": "1.4.0", - "com.unity.render-pipelines.universal": "12.1.11", - "com.unity.test-framework": "1.1.31", + "com.unity.render-pipelines.universal": "14.0.7", + "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", + "com.unity.timeline": "1.7.4", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", "com.unity.modules.ai": "1.0.0", diff --git a/Basic/ClientDriven/Packages/packages-lock.json b/Basic/ClientDriven/Packages/packages-lock.json index 2d812a42a..de4ffdc4c 100644 --- a/Basic/ClientDriven/Packages/packages-lock.json +++ b/Basic/ClientDriven/Packages/packages-lock.json @@ -1,5 +1,14 @@ { "dependencies": { + "com.unity.ai.navigation": { + "version": "1.1.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.8.4", "depth": 1, @@ -10,7 +19,7 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.8.9", + "version": "2.9.5", "depth": 0, "source": "registry", "dependencies": { @@ -19,7 +28,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.3", + "version": "2.0.4", "depth": 0, "source": "registry", "dependencies": {}, @@ -50,7 +59,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.20", + "version": "3.0.21", "depth": 0, "source": "registry", "dependencies": { @@ -84,7 +93,7 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework": { - "version": "3.1.1", + "version": "3.1.3", "depth": 1, "source": "registry", "dependencies": { @@ -136,14 +145,14 @@ "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.1.0", + "version": "3.2.1", "depth": 2, "source": "registry", "dependencies": {}, @@ -157,52 +166,53 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.11", + "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.11", + "version": "14.0.7", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.8.4", - "com.unity.render-pipelines.core": "12.1.11", - "com.unity.shadergraph": "12.1.11" + "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.4.0", + "version": "2.5.0", "depth": 2, "source": "registry", "dependencies": { - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.services.core": "1.7.0", + "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.8.2", + "version": "1.9.0", "depth": 2, "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" @@ -239,23 +249,23 @@ "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "1.0.3", + "version": "2.0.1", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.11", + "version": "14.0.7", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.11", - "com.unity.searcher": "4.9.1" + "com.unity.render-pipelines.core": "14.0.7", + "com.unity.searcher": "4.9.2" } }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -275,7 +285,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.7.4", "depth": 0, "source": "registry", "dependencies": { @@ -287,7 +297,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.3", + "version": "1.3.4", "depth": 1, "source": "registry", "dependencies": { @@ -445,17 +455,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/Basic/ClientDriven/ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json b/Basic/ClientDriven/ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json index 9b0521c0c..377adb9a6 100644 --- a/Basic/ClientDriven/ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json +++ b/Basic/ClientDriven/ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json @@ -1,7 +1,11 @@ { - "m_Name": "Settings", - "m_Path": "ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json", "m_Dictionary": { - "m_DictionaryValues": [] + "m_DictionaryValues": [ + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "IET.DisplayWelcomeDialogOnStartup", + "value": "{\"m_Value\":false}" + } + ] } } \ No newline at end of file diff --git a/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt b/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt index 6c676f051..56ddb83a4 100644 --- a/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt +++ b/Basic/ClientDriven/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.24f1 -m_EditorVersionWithRevision: 2021.3.24f1 (cf10dcf7010d) +m_EditorVersion: 2022.3.0f1 +m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476) diff --git a/Basic/ClientDriven/ProjectSettings/URPProjectSettings.asset b/Basic/ClientDriven/ProjectSettings/URPProjectSettings.asset index c1f118ad3..cd7fd8c61 100644 --- a/Basic/ClientDriven/ProjectSettings/URPProjectSettings.asset +++ b/Basic/ClientDriven/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 5 + m_LastMaterialVersion: 7 diff --git a/Basic/ClientDriven/ProjectSettings/boot.config b/Basic/ClientDriven/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb..000000000 diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json b/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json index dee368bc0..8d118d3bf 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json +++ b/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json @@ -1,7 +1,8 @@ { "dependencies": { - "com.unity.addressables": "1.19.19", - "com.unity.ide.rider": "3.0.20", + "com.unity.addressables": "1.21.12", + "com.unity.ai.navigation": "1.1.3", + "com.unity.ide.rider": "3.0.21", "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", "com.unity.multiplayer.tools": "1.0.0", diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json b/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json index 5102dcb18..6dd8d95bc 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json +++ b/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.addressables": { - "version": "1.19.19", + "version": "1.21.12", "depth": 0, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.19.6", + "com.unity.scriptablebuildpipeline": "1.21.5", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", @@ -14,8 +14,17 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ai.navigation": { + "version": "1.1.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { - "version": "1.6.6", + "version": "1.8.4", "depth": 2, "source": "registry", "dependencies": { @@ -41,7 +50,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.20", + "version": "3.0.21", "depth": 0, "source": "registry", "dependencies": { @@ -96,14 +105,14 @@ "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.1.0", + "version": "3.2.1", "depth": 1, "source": "registry", "dependencies": {}, @@ -117,14 +126,14 @@ "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "1.20.1", + "version": "1.21.5", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 1, "source": "registry", "dependencies": { @@ -144,7 +153,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.3", + "version": "1.3.4", "depth": 1, "source": "registry", "dependencies": { @@ -170,6 +179,12 @@ "dependencies": {}, "hash": "f45424822189ebd875d864a17d7f03b72eafbff7" }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.assetbundle": { "version": "1.0.0", "depth": 1, @@ -204,17 +219,6 @@ "version": "1.0.0", "depth": 1, "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": 2, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt index 6c676f051..56ddb83a4 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt +++ b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.24f1 -m_EditorVersionWithRevision: 2021.3.24f1 (cf10dcf7010d) +m_EditorVersion: 2022.3.0f1 +m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476) diff --git a/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/boot.config b/Basic/DynamicAddressablesNetworkPrefabs/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb..000000000 diff --git a/Basic/Invaders/Assets/Materials/BackgroundColor.mat b/Basic/Invaders/Assets/Materials/BackgroundColor.mat index e35d8118c..28211a16b 100644 --- a/Basic/Invaders/Assets/Materials/BackgroundColor.mat +++ b/Basic/Invaders/Assets/Materials/BackgroundColor.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 @@ -23,6 +23,8 @@ Material: m_Name: BackgroundColor m_Shader: {fileID: -6465566751694194690, guid: 553fa7cd63530c247bdbfca450406407, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Basic/Invaders/Assets/Materials/Blob.mat b/Basic/Invaders/Assets/Materials/Blob.mat index 3a87a7aac..09ee0233e 100644 --- a/Basic/Invaders/Assets/Materials/Blob.mat +++ b/Basic/Invaders/Assets/Materials/Blob.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 @@ -23,6 +23,8 @@ Material: m_Name: Blob m_Shader: {fileID: -6465566751694194690, guid: 5c4d7ce8ac308f047a3182aba595f663, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Basic/Invaders/Assets/Materials/CloudsEdges.mat b/Basic/Invaders/Assets/Materials/CloudsEdges.mat index 388c3dd3e..719496385 100644 --- a/Basic/Invaders/Assets/Materials/CloudsEdges.mat +++ b/Basic/Invaders/Assets/Materials/CloudsEdges.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 @@ -23,6 +23,8 @@ Material: m_Name: CloudsEdges m_Shader: {fileID: -6465566751694194690, guid: fa92998c2200bf449b2e82afe4fb6698, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Basic/Invaders/Assets/Materials/CloudsMain.mat b/Basic/Invaders/Assets/Materials/CloudsMain.mat index d7d71c8ed..6b9efc09f 100644 --- a/Basic/Invaders/Assets/Materials/CloudsMain.mat +++ b/Basic/Invaders/Assets/Materials/CloudsMain.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 @@ -23,6 +23,8 @@ Material: m_Name: CloudsMain m_Shader: {fileID: -6465566751694194690, guid: fa92998c2200bf449b2e82afe4fb6698, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Basic/Invaders/Assets/Materials/Explosion.mat b/Basic/Invaders/Assets/Materials/Explosion.mat index 19d1e37ee..b996b1139 100644 --- a/Basic/Invaders/Assets/Materials/Explosion.mat +++ b/Basic/Invaders/Assets/Materials/Explosion.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 @@ -23,6 +23,8 @@ Material: m_Name: Explosion m_Shader: {fileID: -6465566751694194690, guid: 5c4d7ce8ac308f047a3182aba595f663, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Basic/Invaders/Assets/Materials/ForegroundColor.mat b/Basic/Invaders/Assets/Materials/ForegroundColor.mat index 3b6310924..cb75e431a 100644 --- a/Basic/Invaders/Assets/Materials/ForegroundColor.mat +++ b/Basic/Invaders/Assets/Materials/ForegroundColor.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 @@ -23,6 +23,8 @@ Material: m_Name: ForegroundColor m_Shader: {fileID: -6465566751694194690, guid: 2ac96c55b8ddcaf4e917986daf979d03, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Basic/Invaders/Assets/Materials/Glow.mat b/Basic/Invaders/Assets/Materials/Glow.mat index 8cdd17ee0..c7f1b91cc 100644 --- a/Basic/Invaders/Assets/Materials/Glow.mat +++ b/Basic/Invaders/Assets/Materials/Glow.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 @@ -23,6 +23,8 @@ Material: m_Name: Glow m_Shader: {fileID: -6465566751694194690, guid: 5c4d7ce8ac308f047a3182aba595f663, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Basic/Invaders/Assets/Materials/Glow02.mat b/Basic/Invaders/Assets/Materials/Glow02.mat index 8b9ecc59b..ba5a80935 100644 --- a/Basic/Invaders/Assets/Materials/Glow02.mat +++ b/Basic/Invaders/Assets/Materials/Glow02.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 @@ -23,6 +23,8 @@ Material: m_Name: Glow02 m_Shader: {fileID: -6465566751694194690, guid: 5c4d7ce8ac308f047a3182aba595f663, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Basic/Invaders/Assets/Materials/Gradient01.mat b/Basic/Invaders/Assets/Materials/Gradient01.mat index a4d40f7e5..818a43cd1 100644 --- a/Basic/Invaders/Assets/Materials/Gradient01.mat +++ b/Basic/Invaders/Assets/Materials/Gradient01.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 @@ -23,6 +23,8 @@ Material: m_Name: Gradient01 m_Shader: {fileID: -6465566751694194690, guid: 2ac96c55b8ddcaf4e917986daf979d03, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Basic/Invaders/Assets/Materials/Gradient02.mat b/Basic/Invaders/Assets/Materials/Gradient02.mat index dd7f5ad21..372c53815 100644 --- a/Basic/Invaders/Assets/Materials/Gradient02.mat +++ b/Basic/Invaders/Assets/Materials/Gradient02.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 @@ -23,6 +23,8 @@ Material: m_Name: Gradient02 m_Shader: {fileID: -6465566751694194690, guid: 2ac96c55b8ddcaf4e917986daf979d03, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Basic/Invaders/Assets/Materials/Square.mat b/Basic/Invaders/Assets/Materials/Square.mat index fd93d4870..d485cc821 100644 --- a/Basic/Invaders/Assets/Materials/Square.mat +++ b/Basic/Invaders/Assets/Materials/Square.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 @@ -23,6 +23,8 @@ Material: m_Name: Square m_Shader: {fileID: -6465566751694194690, guid: 5c4d7ce8ac308f047a3182aba595f663, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Basic/Invaders/Assets/Materials/Stars.mat b/Basic/Invaders/Assets/Materials/Stars.mat index e7ce05f8e..4e3a39746 100644 --- a/Basic/Invaders/Assets/Materials/Stars.mat +++ b/Basic/Invaders/Assets/Materials/Stars.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 @@ -23,6 +23,8 @@ Material: m_Name: Stars m_Shader: {fileID: -6465566751694194690, guid: fa92998c2200bf449b2e82afe4fb6698, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Basic/Invaders/Assets/Prefabs/EnvironmentObjects.prefab b/Basic/Invaders/Assets/Prefabs/EnvironmentObjects.prefab index 95140328a..e7f7f0500 100644 --- a/Basic/Invaders/Assets/Prefabs/EnvironmentObjects.prefab +++ b/Basic/Invaders/Assets/Prefabs/EnvironmentObjects.prefab @@ -30,6 +30,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.3548275, w: 0.9349318} m_LocalPosition: {x: 25.926, y: 27.123, z: 10.408} m_LocalScale: {x: -61.591793, y: 34.48108, z: 30.795897} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 16 @@ -53,6 +54,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -91,9 +93,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59200187744845853} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -108,6 +118,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &789524184367766733 GameObject: m_ObjectHideFlags: 0 @@ -137,6 +148,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.44157413, w: -0.8972248} m_LocalPosition: {x: -1.5874, y: 9.1004, z: -1.3223} m_LocalScale: {x: 74.19519, y: 36.81559, z: 74.195175} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 5 @@ -160,6 +172,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -198,9 +211,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789524184367766733} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -234,6 +255,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.9002026, w: -0.43547142} m_LocalPosition: {x: 9.8951, y: 12.986, z: 0.075616} m_LocalScale: {x: 38.81452, y: 21.729622, z: 19.407259} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 10 @@ -257,6 +279,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -295,9 +318,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789524184556935511} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -312,6 +343,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &789524184790008443 GameObject: m_ObjectHideFlags: 0 @@ -342,6 +374,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.22897735, w: 0.97343177} m_LocalPosition: {x: -9.703, y: -2.411, z: 0.075616} m_LocalScale: {x: -38.038227, y: 21.295033, z: 19.019114} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 9 @@ -365,6 +398,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -403,9 +437,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789524184790008443} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -420,6 +462,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &789524184830446170 GameObject: m_ObjectHideFlags: 0 @@ -450,6 +493,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.38268277, w: 0.92387986} m_LocalPosition: {x: 0.53393, y: 4.552, z: 19.585} m_LocalScale: {x: 75.26219, y: 75.26219, z: 75.262184} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 2 @@ -473,6 +517,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -511,9 +556,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789524184830446170} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -528,6 +581,7 @@ SortingGroup: m_SortingLayerID: -2007048437 m_SortingLayer: 2 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &789524185026523157 GameObject: m_ObjectHideFlags: 0 @@ -557,6 +611,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.92388, w: -0.38268226} m_LocalPosition: {x: 0.29698, y: 6.364, z: 12.646} m_LocalScale: {x: 78.09478, y: 38.75057, z: 78.09478} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 4 @@ -580,6 +635,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -618,9 +674,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789524185026523157} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -654,6 +718,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.000000014901159, w: 1} m_LocalPosition: {x: 0.53393, y: 4.552, z: 25.596} m_LocalScale: {x: 73.87712, y: 73.87712, z: 73.87712} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 1 @@ -677,6 +742,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -715,9 +781,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789524185280051691} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -732,6 +806,7 @@ SortingGroup: m_SortingLayerID: 1486387335 m_SortingLayer: 1 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &789524185479989124 GameObject: m_ObjectHideFlags: 0 @@ -762,6 +837,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.8114544, w: 0.58441573} m_LocalPosition: {x: 0.075589, y: 4.0843, z: 0.32586} m_LocalScale: {x: 26.905926, y: 39.564537, z: 29.20506} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 8 @@ -785,6 +861,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -823,9 +900,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789524185479989124} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -840,6 +925,7 @@ SortingGroup: m_SortingLayerID: -165891777 m_SortingLayer: 4 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &789524185556656452 GameObject: m_ObjectHideFlags: 0 @@ -870,6 +956,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.95615077, w: -0.29287493} m_LocalPosition: {x: -23.938, y: -9.3927, z: -0.11158} m_LocalScale: {x: 60.044086, y: 33.614616, z: 30.022043} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 25 @@ -893,6 +980,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -931,9 +1019,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789524185556656452} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -948,6 +1044,7 @@ SortingGroup: m_SortingLayerID: 1587523519 m_SortingLayer: 5 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &789524185674699131 GameObject: m_ObjectHideFlags: 0 @@ -978,6 +1075,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.91656345, w: -0.39988938} m_LocalPosition: {x: 20.142, y: 17.1, z: -0.11158} m_LocalScale: {x: -60.044075, y: 33.614616, z: 30.022043} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 24 @@ -1001,6 +1099,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1039,9 +1138,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789524185674699131} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -1056,6 +1163,7 @@ SortingGroup: m_SortingLayerID: 1587523519 m_SortingLayer: 5 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &789524185727802498 GameObject: m_ObjectHideFlags: 0 @@ -1086,6 +1194,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.70710623, w: 0.70710737} m_LocalPosition: {x: 0.075589, y: 4.0843, z: 0.32586} m_LocalScale: {x: 38.68073, y: 45.819958, z: 37.309685} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 7 @@ -1109,6 +1218,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1147,9 +1257,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789524185727802498} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -1164,6 +1282,7 @@ SortingGroup: m_SortingLayerID: -165891777 m_SortingLayer: 4 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &789524186245611897 GameObject: m_ObjectHideFlags: 0 @@ -1194,6 +1313,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.060367122, w: -0.9981763} m_LocalPosition: {x: -0.27729, y: 4.3589, z: -0.11158} m_LocalScale: {x: 53.590546, y: 30.001728, z: 26.795273} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 23 @@ -1217,6 +1337,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1255,9 +1376,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789524186245611897} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -1272,6 +1401,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 1 + m_SortAtRoot: 0 --- !u!1 &789524186330650401 GameObject: m_ObjectHideFlags: 0 @@ -1302,6 +1432,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.000000014901159, w: 1} m_LocalPosition: {x: 0.53393, y: 4.552, z: 7.5632} m_LocalScale: {x: 70.85699, y: 70.85699, z: 70.85699} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 3 @@ -1325,6 +1456,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1363,9 +1495,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789524186330650401} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -1380,6 +1520,7 @@ SortingGroup: m_SortingLayerID: -2007048437 m_SortingLayer: 2 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &975875245284421640 GameObject: m_ObjectHideFlags: 0 @@ -1407,6 +1548,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.1922052, y: 5.443905, z: -2.8955522} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 0 @@ -1423,7 +1565,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -1458,6 +1600,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.3548275, w: 0.9349318} m_LocalPosition: {x: 25.926, y: 27.123, z: 10.408} m_LocalScale: {x: -61.591793, y: 34.48108, z: 30.795897} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 17 @@ -1481,6 +1624,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1519,9 +1663,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1020910547616128238} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -1536,6 +1688,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &1355998340062944034 GameObject: m_ObjectHideFlags: 0 @@ -1562,6 +1715,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8996392919526707304} - {fileID: 789524185280051671} @@ -1623,6 +1777,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.15244934, w: -0.98831135} m_LocalPosition: {x: -6.3432, y: 8.8856, z: 4.4433} m_LocalScale: {x: -70.333916, y: 39.375202, z: 35.166958} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 6 @@ -1646,6 +1801,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1684,9 +1840,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1467750098369179087} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -1701,6 +1865,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &2592888928966957710 GameObject: m_ObjectHideFlags: 0 @@ -1731,6 +1896,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: 0.000000014901159, w: 1} m_LocalPosition: {x: 0.53393, y: 4.552, z: -0.53282} m_LocalScale: {x: 73.87712, y: 73.87712, z: 73.87712} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 26 @@ -1754,6 +1920,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1792,9 +1959,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2592888928966957710} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -1809,6 +1984,7 @@ SortingGroup: m_SortingLayerID: 1587523519 m_SortingLayer: 5 m_SortingOrder: 1 + m_SortAtRoot: 0 --- !u!1 &2993214065151075407 GameObject: m_ObjectHideFlags: 0 @@ -1839,6 +2015,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.22897735, w: 0.97343177} m_LocalPosition: {x: -23.037, y: -5.1763, z: 10.408} m_LocalScale: {x: -53.730656, y: 30.08016, z: 26.865328} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 11 @@ -1862,6 +2039,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1900,9 +2078,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2993214065151075407} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -1917,6 +2103,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &3883117135978283391 GameObject: m_ObjectHideFlags: 0 @@ -1947,6 +2134,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.3548275, w: 0.9349318} m_LocalPosition: {x: 25.926, y: 27.123, z: 10.408} m_LocalScale: {x: -61.591793, y: 34.48108, z: 30.795897} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 21 @@ -1970,6 +2158,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2008,9 +2197,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3883117135978283391} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -2025,6 +2222,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &3885180235289160197 GameObject: m_ObjectHideFlags: 0 @@ -2055,6 +2253,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.2876469, w: -0.9577366} m_LocalPosition: {x: -20.166, y: 19.874, z: 5.4359} m_LocalScale: {x: -48.406, y: 27.099245, z: 24.203} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 14 @@ -2078,6 +2277,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2116,9 +2316,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3885180235289160197} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -2133,6 +2341,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &4490127757973376726 GameObject: m_ObjectHideFlags: 0 @@ -2163,6 +2372,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.934932, w: -0.35482696} m_LocalPosition: {x: -23.889, y: -9.2802, z: -1.4128} m_LocalScale: {x: -43.219646, y: 24.195757, z: 21.609823} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 22 @@ -2186,6 +2396,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2224,9 +2435,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4490127757973376726} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -2241,6 +2460,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &5338305882936325945 GameObject: m_ObjectHideFlags: 0 @@ -2271,6 +2491,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.3548275, w: 0.9349318} m_LocalPosition: {x: 15.129, y: 21.544, z: -1.4128} m_LocalScale: {x: -43.219646, y: 24.195757, z: 21.609823} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 12 @@ -2294,6 +2515,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2332,9 +2554,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5338305882936325945} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -2349,6 +2579,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &6912692650034829472 GameObject: m_ObjectHideFlags: 0 @@ -2379,6 +2610,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.934932, w: -0.35482696} m_LocalPosition: {x: -23.889, y: -9.2802, z: -1.4128} m_LocalScale: {x: -43.219646, y: 24.195757, z: 21.609823} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 13 @@ -2402,6 +2634,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2440,9 +2673,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6912692650034829472} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -2457,6 +2698,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &6913610226934377460 GameObject: m_ObjectHideFlags: 0 @@ -2487,6 +2729,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.934932, w: -0.35482696} m_LocalPosition: {x: -23.889, y: -9.2802, z: -1.4128} m_LocalScale: {x: -43.219646, y: 24.195757, z: 21.609823} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 19 @@ -2510,6 +2753,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2548,9 +2792,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6913610226934377460} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -2565,6 +2817,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &7058754285913696476 GameObject: m_ObjectHideFlags: 0 @@ -2595,6 +2848,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.9349328, w: -0.35482487} m_LocalPosition: {x: -30.637, y: -9.7864, z: 9.0168} m_LocalScale: {x: -61.591793, y: 34.48108, z: 30.795897} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 20 @@ -2618,6 +2872,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2656,9 +2911,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7058754285913696476} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -2673,6 +2936,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &8392601204989820690 GameObject: m_ObjectHideFlags: 0 @@ -2703,6 +2967,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.2876469, w: -0.9577366} m_LocalPosition: {x: 11.988, y: -11.943, z: -0.52644} m_LocalScale: {x: -43.219646, y: 24.195757, z: 21.609823} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 15 @@ -2726,6 +2991,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2764,9 +3030,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8392601204989820690} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -2781,6 +3055,7 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!1 &8584428679233637667 GameObject: m_ObjectHideFlags: 0 @@ -2811,6 +3086,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0.934932, w: -0.35482696} m_LocalPosition: {x: -23.889, y: -9.2802, z: -1.4128} m_LocalScale: {x: -43.219646, y: 24.195757, z: 21.609823} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5245194028518351456} m_RootOrder: 18 @@ -2834,6 +3110,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2872,9 +3149,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8584428679233637667} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -2889,3 +3174,4 @@ SortingGroup: m_SortingLayerID: -1039750121 m_SortingLayer: 3 m_SortingOrder: 0 + m_SortAtRoot: 0 diff --git a/Basic/Invaders/Assets/Scripts/SceneTransitionHandler.cs b/Basic/Invaders/Assets/Scripts/SceneTransitionHandler.cs index c3432144c..79515437a 100644 --- a/Basic/Invaders/Assets/Scripts/SceneTransitionHandler.cs +++ b/Basic/Invaders/Assets/Scripts/SceneTransitionHandler.cs @@ -130,7 +130,11 @@ public bool AllClientsAreLoaded() /// public void ExitAndLoadStartMenu() { - NetworkManager.Singleton.SceneManager.OnLoadComplete -= OnLoadComplete; + if (NetworkManager.Singleton != null && NetworkManager.Singleton.SceneManager != null) + { + NetworkManager.Singleton.SceneManager.OnLoadComplete -= OnLoadComplete; + } + OnClientLoadedScene = null; SetSceneState(SceneStates.Start); SceneManager.LoadScene(1); diff --git a/Basic/Invaders/Assets/URP/UniversalRenderPipelineAsset.asset b/Basic/Invaders/Assets/URP/UniversalRenderPipelineAsset.asset index d3506ff5f..877291cc4 100644 --- a/Basic/Invaders/Assets/URP/UniversalRenderPipelineAsset.asset +++ b/Basic/Invaders/Assets/URP/UniversalRenderPipelineAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRenderPipelineAsset m_EditorClassIdentifier: - k_AssetVersion: 9 - k_AssetPreviousVersion: 9 + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,13 +23,16 @@ MonoBehaviour: m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 3 m_SupportsTerrainHoles: 0 - m_StoreActionsOptimization: 0 m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 m_MSAA: 1 m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 m_MainLightRenderingMode: 0 m_MainLightShadowsSupported: 0 m_MainLightShadowmapResolution: 2048 @@ -50,16 +53,21 @@ MonoBehaviour: m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 0 m_ConservativeEnclosingSphere: 0 m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 2 m_AdditionalLightsCookieResolution: 2048 m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 0 + m_SupportsLightCookies: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 + m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 @@ -69,6 +77,33 @@ MonoBehaviour: m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeAdditionalLight: 4 + m_PrefilteringModeAdditionalLightShadows: 1 + m_PrefilterXRKeywords: 0 + m_PrefilteringModeForwardPlus: 1 + m_PrefilteringModeDeferredRendering: 1 + m_PrefilteringModeScreenSpaceOcclusion: 1 + m_PrefilterDebugKeywords: 0 + m_PrefilterWriteRenderingLayers: 0 + m_PrefilterHDROutput: 0 + m_PrefilterSSAODepthNormals: 0 + m_PrefilterSSAOSourceDepthLow: 0 + m_PrefilterSSAOSourceDepthMedium: 0 + m_PrefilterSSAOSourceDepthHigh: 0 + m_PrefilterSSAOInterleaved: 0 + m_PrefilterSSAOBlueNoise: 0 + m_PrefilterSSAOSampleCountLow: 0 + m_PrefilterSSAOSampleCountMedium: 0 + m_PrefilterSSAOSampleCountHigh: 0 + m_PrefilterDBufferMRT1: 0 + m_PrefilterDBufferMRT2: 0 + m_PrefilterDBufferMRT3: 0 + m_PrefilterScreenCoord: 0 + m_PrefilterNativeRenderPass: 0 + m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/Basic/Invaders/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset b/Basic/Invaders/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset index c9be5a4df..c42357a57 100644 --- a/Basic/Invaders/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset +++ b/Basic/Invaders/Assets/URP/UniversalRenderPipelineAsset_Renderer.asset @@ -15,6 +15,7 @@ MonoBehaviour: debugShaders: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 @@ -27,10 +28,12 @@ MonoBehaviour: samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} + blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, @@ -54,6 +57,4 @@ MonoBehaviour: m_DepthPrimingMode: 0 m_CopyDepthMode: 0 m_AccurateGbufferNormals: 0 - m_ClusteredRendering: 0 - m_TileSize: 32 m_IntermediateTextureMode: 1 diff --git a/Basic/Invaders/Assets/UniversalRenderPipelineGlobalSettings.asset b/Basic/Invaders/Assets/UniversalRenderPipelineGlobalSettings.asset index a996a2e6e..98f0dfda6 100644 --- a/Basic/Invaders/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Basic/Invaders/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -12,7 +12,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 2 + k_AssetVersion: 3 + m_RenderingLayerNames: + - Light Layer default + - Light Layer 1 + - Light Layer 2 + - Light Layer 3 + - Light Layer 4 + - Light Layer 5 + - Light Layer 6 + - Light Layer 7 + m_ValidRenderingLayers: 255 lightLayerName0: Light Layer default lightLayerName1: Light Layer 1 lightLayerName2: Light Layer 2 @@ -24,4 +34,8 @@ MonoBehaviour: m_StripDebugVariants: 1 m_StripUnusedPostProcessingVariants: 0 m_StripUnusedVariants: 1 + m_StripUnusedLODCrossFadeVariants: 1 + m_StripScreenCoordOverrideVariants: 1 supportRuntimeDebugDisplay: 0 + m_ShaderVariantLogLevel: 0 + m_ExportShaderVariants: 1 diff --git a/Basic/Invaders/Assets/VFX/EnemyExplosion.prefab b/Basic/Invaders/Assets/VFX/EnemyExplosion.prefab index b2e302d73..ba853e6e6 100644 --- a/Basic/Invaders/Assets/VFX/EnemyExplosion.prefab +++ b/Basic/Invaders/Assets/VFX/EnemyExplosion.prefab @@ -29,6 +29,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5225047174785897196} - {fileID: 5443404097468431811} @@ -45,19 +46,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3661394524417975039} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -256,6 +257,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -285,6 +287,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -606,7 +609,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -1450,6 +1455,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -1479,6 +1485,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -3699,6 +3706,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3728,6 +3736,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -4105,6 +4114,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4147,6 +4157,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4176,6 +4187,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4263,6 +4275,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4292,6 +4305,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4330,6 +4344,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4359,6 +4374,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4612,6 +4628,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4641,6 +4658,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4872,6 +4890,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4902,6 +4921,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -4925,6 +4945,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!210 &1645817306904331173 SortingGroup: @@ -4937,6 +4961,7 @@ SortingGroup: m_SortingLayerID: 764760053 m_SortingLayer: 6 m_SortingOrder: 2 + m_SortAtRoot: 0 --- !u!1 &4275540490966819228 GameObject: m_ObjectHideFlags: 0 @@ -4965,6 +4990,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 2 @@ -4976,19 +5002,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4275540490966819228} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -5187,6 +5213,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -5216,6 +5243,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -5537,7 +5565,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 30 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -6439,6 +6469,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -6468,6 +6499,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -8688,6 +8720,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8717,6 +8750,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -9094,6 +9128,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -9136,6 +9171,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9165,6 +9201,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -9252,6 +9289,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9281,6 +9319,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -9319,6 +9358,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9348,6 +9388,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -9601,6 +9642,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9630,6 +9672,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -9861,6 +9904,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9891,6 +9935,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -9914,6 +9959,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &6412894595073785660 GameObject: @@ -9943,6 +9992,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 1 @@ -9954,19 +10004,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6412894595073785660} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -10165,6 +10215,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10194,6 +10245,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -10515,7 +10567,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -11301,6 +11355,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -11330,6 +11385,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -13550,6 +13606,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13579,6 +13636,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -13956,6 +14014,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -13998,6 +14057,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14027,6 +14087,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -14114,6 +14175,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14143,6 +14205,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -14181,6 +14244,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14210,6 +14274,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -14463,6 +14528,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14492,6 +14558,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -14723,6 +14790,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14753,6 +14821,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -14776,6 +14845,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &6725459352433901233 GameObject: @@ -14805,6 +14878,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 4 @@ -14816,19 +14890,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6725459352433901233} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -15027,6 +15101,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -15056,6 +15131,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -15377,7 +15453,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0.5 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -16163,6 +16241,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -16192,6 +16271,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -18412,6 +18492,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18441,6 +18522,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -18818,6 +18900,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -18860,6 +18943,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18889,6 +18973,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -18976,6 +19061,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19005,6 +19091,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -19043,6 +19130,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19072,6 +19160,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -19325,6 +19414,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19354,6 +19444,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -19585,6 +19676,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19615,6 +19707,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -19638,6 +19731,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &8470305504089524620 GameObject: @@ -19667,6 +19764,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 0 @@ -19678,19 +19776,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8470305504089524620} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -19889,6 +19987,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19918,6 +20017,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -20239,7 +20339,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -21025,6 +21127,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 4 m_NumAlphaKeys: 4 minGradient: @@ -21054,6 +21157,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -23283,6 +23387,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23312,6 +23417,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -23689,6 +23795,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -23731,6 +23838,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23760,6 +23868,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -23847,6 +23956,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23876,6 +23986,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -23914,6 +24025,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23943,6 +24055,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -24196,6 +24309,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -24225,6 +24339,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -24456,6 +24571,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -24486,6 +24602,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -24509,6 +24626,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &8500916560466165230 GameObject: @@ -24538,6 +24659,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 3 @@ -24549,19 +24671,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8500916560466165230} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -24760,6 +24882,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -24789,6 +24912,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -25110,7 +25234,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -25905,6 +26031,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 4 m_NumAlphaKeys: 4 minGradient: @@ -25934,6 +26061,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -28154,6 +28282,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28183,6 +28312,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -28560,6 +28690,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -28602,6 +28733,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28631,6 +28763,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -28718,6 +28851,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28747,6 +28881,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -28785,6 +28920,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28814,6 +28950,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -29067,6 +29204,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -29096,6 +29234,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -29327,6 +29466,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -29357,6 +29497,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -29380,4 +29521,8 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 diff --git a/Basic/Invaders/Assets/VFX/PlayerExplosion.prefab b/Basic/Invaders/Assets/VFX/PlayerExplosion.prefab index ae542949c..31c87cb08 100644 --- a/Basic/Invaders/Assets/VFX/PlayerExplosion.prefab +++ b/Basic/Invaders/Assets/VFX/PlayerExplosion.prefab @@ -29,6 +29,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5225047174785897196} - {fileID: 5443404097468431811} @@ -45,19 +46,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3661394524417975039} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -256,6 +257,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -285,6 +287,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -606,7 +609,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -1450,6 +1455,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -1479,6 +1485,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -3699,6 +3706,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3728,6 +3736,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -4105,6 +4114,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4147,6 +4157,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4176,6 +4187,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4263,6 +4275,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4292,6 +4305,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4330,6 +4344,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4359,6 +4374,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4612,6 +4628,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4641,6 +4658,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4872,6 +4890,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4902,6 +4921,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -4925,6 +4945,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!210 &1645817306904331173 SortingGroup: @@ -4937,6 +4961,7 @@ SortingGroup: m_SortingLayerID: 764760053 m_SortingLayer: 6 m_SortingOrder: 2 + m_SortAtRoot: 0 --- !u!1 &4275540490966819228 GameObject: m_ObjectHideFlags: 0 @@ -4965,6 +4990,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 2 @@ -4976,19 +5002,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4275540490966819228} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -5187,6 +5213,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -5216,6 +5243,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -5537,7 +5565,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 30 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -6439,6 +6469,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -6468,6 +6499,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -8688,6 +8720,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8717,6 +8750,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -9094,6 +9128,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -9136,6 +9171,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9165,6 +9201,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -9252,6 +9289,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9281,6 +9319,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -9319,6 +9358,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9348,6 +9388,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -9601,6 +9642,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9630,6 +9672,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -9861,6 +9904,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9891,6 +9935,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -9914,6 +9959,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &6412894595073785660 GameObject: @@ -9943,6 +9992,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 1 @@ -9954,19 +10004,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6412894595073785660} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -10165,6 +10215,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10194,6 +10245,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -10515,7 +10567,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -11301,6 +11355,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -11330,6 +11385,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -13550,6 +13606,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13579,6 +13636,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -13956,6 +14014,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -13998,6 +14057,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14027,6 +14087,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -14114,6 +14175,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14143,6 +14205,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -14181,6 +14244,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14210,6 +14274,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -14463,6 +14528,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14492,6 +14558,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -14723,6 +14790,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14753,6 +14821,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -14776,6 +14845,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &6725459352433901233 GameObject: @@ -14805,6 +14878,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 4 @@ -14816,19 +14890,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6725459352433901233} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -15027,6 +15101,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -15056,6 +15131,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -15377,7 +15453,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0.5 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -16163,6 +16241,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -16192,6 +16271,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -18412,6 +18492,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18441,6 +18522,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -18818,6 +18900,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -18860,6 +18943,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18889,6 +18973,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -18976,6 +19061,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19005,6 +19091,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -19043,6 +19130,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19072,6 +19160,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -19325,6 +19414,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19354,6 +19444,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -19585,6 +19676,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19615,6 +19707,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -19638,6 +19731,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &8470305504089524620 GameObject: @@ -19667,6 +19764,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 0 @@ -19678,19 +19776,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8470305504089524620} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -19889,6 +19987,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19918,6 +20017,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -20239,7 +20339,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -21025,6 +21127,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 4 m_NumAlphaKeys: 4 minGradient: @@ -21054,6 +21157,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -23283,6 +23387,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23312,6 +23417,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -23689,6 +23795,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -23731,6 +23838,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23760,6 +23868,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -23847,6 +23956,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23876,6 +23986,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -23914,6 +24025,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23943,6 +24055,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -24196,6 +24309,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -24225,6 +24339,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -24456,6 +24571,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -24486,6 +24602,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -24509,6 +24626,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &8500916560466165230 GameObject: @@ -24538,6 +24659,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 3 @@ -24549,19 +24671,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8500916560466165230} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -24760,6 +24882,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -24789,6 +24912,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -25110,7 +25234,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -25905,6 +26031,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 4 m_NumAlphaKeys: 4 minGradient: @@ -25934,6 +26061,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -28154,6 +28282,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28183,6 +28312,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -28560,6 +28690,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -28602,6 +28733,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28631,6 +28763,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -28718,6 +28851,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28747,6 +28881,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -28785,6 +28920,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28814,6 +28950,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -29067,6 +29204,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -29096,6 +29234,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -29327,6 +29466,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -29357,6 +29497,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -29380,4 +29521,8 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 diff --git a/Basic/Invaders/Assets/VFX/PlayerHit.prefab b/Basic/Invaders/Assets/VFX/PlayerHit.prefab index ba2bff4cf..96f741d8a 100644 --- a/Basic/Invaders/Assets/VFX/PlayerHit.prefab +++ b/Basic/Invaders/Assets/VFX/PlayerHit.prefab @@ -29,6 +29,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5443404097468431811} - {fileID: 2841863530446548196} @@ -44,19 +45,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3661394524417975039} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -255,6 +256,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -284,6 +286,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -605,7 +608,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -1449,6 +1454,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -1478,6 +1484,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -3698,6 +3705,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3727,6 +3735,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -4104,6 +4113,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4146,6 +4156,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4175,6 +4186,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4262,6 +4274,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4291,6 +4304,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4329,6 +4343,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4358,6 +4373,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4611,6 +4627,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4640,6 +4657,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4871,6 +4889,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4901,6 +4920,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -4924,6 +4944,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!210 &1645817306904331173 SortingGroup: @@ -4936,6 +4960,7 @@ SortingGroup: m_SortingLayerID: 764760053 m_SortingLayer: 6 m_SortingOrder: 2 + m_SortAtRoot: 0 --- !u!1 &4275540490966819228 GameObject: m_ObjectHideFlags: 0 @@ -4964,6 +4989,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 1 @@ -4975,19 +5001,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4275540490966819228} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -5186,6 +5212,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -5215,6 +5242,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -5536,7 +5564,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 30 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -6438,6 +6468,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 3 minGradient: @@ -6467,6 +6498,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -8687,6 +8719,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8716,6 +8749,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -9093,6 +9127,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -9135,6 +9170,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9164,6 +9200,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -9251,6 +9288,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9280,6 +9318,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -9318,6 +9357,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9347,6 +9387,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -9600,6 +9641,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9629,6 +9671,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -9860,6 +9903,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9890,6 +9934,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -9913,6 +9958,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &4603319375030809221 GameObject: @@ -9942,6 +9991,7 @@ Transform: m_LocalRotation: {x: 0.21790968, y: 0.67269266, z: -0.6726927, w: -0.21790959} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 3 @@ -9953,19 +10003,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4603319375030809221} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -10164,6 +10214,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10193,6 +10244,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -10514,7 +10566,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 30 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -11416,6 +11470,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 3 minGradient: @@ -11445,6 +11500,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -13665,6 +13721,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13694,6 +13751,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -14071,6 +14129,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -14113,6 +14172,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14142,6 +14202,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -14229,6 +14290,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14258,6 +14320,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -14296,6 +14359,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14325,6 +14389,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -14578,6 +14643,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14607,6 +14673,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -14838,6 +14905,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14868,6 +14936,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -14891,6 +14960,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &6412894595073785660 GameObject: @@ -14920,6 +14993,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 0 @@ -14931,19 +15005,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6412894595073785660} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -15142,6 +15216,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -15171,6 +15246,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -15492,7 +15568,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -16278,6 +16356,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -16307,6 +16386,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -18527,6 +18607,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18556,6 +18637,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -18933,6 +19015,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -18975,6 +19058,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19004,6 +19088,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -19091,6 +19176,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19120,6 +19206,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -19158,6 +19245,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19187,6 +19275,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -19440,6 +19529,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19469,6 +19559,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -19700,6 +19791,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19730,6 +19822,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -19753,6 +19846,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &8500916560466165230 GameObject: @@ -19782,6 +19879,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 2 @@ -19793,19 +19891,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8500916560466165230} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -20004,6 +20102,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -20033,6 +20132,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -20354,7 +20454,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -21149,6 +21251,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 4 m_NumAlphaKeys: 4 minGradient: @@ -21178,6 +21281,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -23398,6 +23502,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23427,6 +23532,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -23804,6 +23910,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -23846,6 +23953,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23875,6 +23983,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -23962,6 +24071,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23991,6 +24101,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -24029,6 +24140,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -24058,6 +24170,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -24311,6 +24424,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -24340,6 +24454,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -24571,6 +24686,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -24601,6 +24717,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -24624,4 +24741,8 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 diff --git a/Basic/Invaders/Assets/VFX/ShieldExplosion.prefab b/Basic/Invaders/Assets/VFX/ShieldExplosion.prefab index 41d2ee801..efc5f41d5 100644 --- a/Basic/Invaders/Assets/VFX/ShieldExplosion.prefab +++ b/Basic/Invaders/Assets/VFX/ShieldExplosion.prefab @@ -29,6 +29,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5225047174785897196} - {fileID: 5443404097468431811} @@ -45,19 +46,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3661394524417975039} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -256,6 +257,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -285,6 +287,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -606,7 +609,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -1450,6 +1455,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -1479,6 +1485,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -3699,6 +3706,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3728,6 +3736,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -4105,6 +4114,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4147,6 +4157,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4176,6 +4187,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4263,6 +4275,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4292,6 +4305,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4330,6 +4344,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4359,6 +4374,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4612,6 +4628,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4641,6 +4658,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4872,6 +4890,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -4902,6 +4921,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -4925,6 +4945,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!210 &1645817306904331173 SortingGroup: @@ -4937,6 +4961,7 @@ SortingGroup: m_SortingLayerID: 764760053 m_SortingLayer: 6 m_SortingOrder: 2 + m_SortAtRoot: 0 --- !u!1 &4275540490966819228 GameObject: m_ObjectHideFlags: 0 @@ -4965,6 +4990,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 2 @@ -4976,19 +5002,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4275540490966819228} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -5187,6 +5213,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -5216,6 +5243,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -5537,7 +5565,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 30 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -6439,6 +6469,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -6468,6 +6499,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -8688,6 +8720,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8717,6 +8750,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -9094,6 +9128,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -9136,6 +9171,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9165,6 +9201,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -9252,6 +9289,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9281,6 +9319,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -9319,6 +9358,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9348,6 +9388,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -9601,6 +9642,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9630,6 +9672,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -9861,6 +9904,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9891,6 +9935,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -9914,6 +9959,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &6412894595073785660 GameObject: @@ -9943,6 +9992,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 1 @@ -9954,19 +10004,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6412894595073785660} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -10165,6 +10215,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10194,6 +10245,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -10515,7 +10567,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -11301,6 +11355,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -11330,6 +11385,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -13550,6 +13606,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13579,6 +13636,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -13956,6 +14014,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -13998,6 +14057,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14027,6 +14087,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -14114,6 +14175,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14143,6 +14205,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -14181,6 +14244,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14210,6 +14274,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -14463,6 +14528,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14492,6 +14558,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -14723,6 +14790,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -14753,6 +14821,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -14776,6 +14845,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &6725459352433901233 GameObject: @@ -14805,6 +14878,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 4 @@ -14816,19 +14890,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6725459352433901233} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -15027,6 +15101,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -15056,6 +15131,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -15377,7 +15453,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0.5 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -16163,6 +16241,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -16192,6 +16271,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -18412,6 +18492,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18441,6 +18522,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -18818,6 +18900,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -18860,6 +18943,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18889,6 +18973,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -18976,6 +19061,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19005,6 +19091,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -19043,6 +19130,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19072,6 +19160,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -19325,6 +19414,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19354,6 +19444,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -19585,6 +19676,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -19615,6 +19707,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -19638,6 +19731,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &8470305504089524620 GameObject: @@ -19667,6 +19764,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 0 @@ -19678,19 +19776,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8470305504089524620} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -19889,6 +19987,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19918,6 +20017,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -20239,7 +20339,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -21025,6 +21127,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 4 m_NumAlphaKeys: 4 minGradient: @@ -21054,6 +21157,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -23283,6 +23387,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23312,6 +23417,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -23689,6 +23795,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -23731,6 +23838,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23760,6 +23868,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -23847,6 +23956,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23876,6 +23986,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -23914,6 +24025,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23943,6 +24055,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -24196,6 +24309,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -24225,6 +24339,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -24456,6 +24571,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -24486,6 +24602,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -24509,6 +24626,10 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &8500916560466165230 GameObject: @@ -24538,6 +24659,7 @@ Transform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689626309221755757} m_RootOrder: 3 @@ -24549,19 +24671,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8500916560466165230} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 0.6 simulationSpeed: 1 stopAction: 2 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -24760,6 +24882,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -24789,6 +24912,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -25110,7 +25234,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -25905,6 +26031,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 4 m_NumAlphaKeys: 4 minGradient: @@ -25934,6 +26061,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -28154,6 +28282,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28183,6 +28312,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -28560,6 +28690,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -28602,6 +28733,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28631,6 +28763,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -28718,6 +28851,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28747,6 +28881,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -28785,6 +28920,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28814,6 +28950,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -29067,6 +29204,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -29096,6 +29234,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -29327,6 +29466,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -29357,6 +29497,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -29380,4 +29521,8 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 diff --git a/Basic/Invaders/Packages/manifest.json b/Basic/Invaders/Packages/manifest.json index fd2a8dc7f..12aab9509 100644 --- a/Basic/Invaders/Packages/manifest.json +++ b/Basic/Invaders/Packages/manifest.json @@ -1,15 +1,16 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.ide.rider": "3.0.20", + "com.unity.ai.navigation": "1.1.3", + "com.unity.ide.rider": "3.0.21", "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop", "com.unity.multiplayer.tools": "1.0.0", "com.unity.netcode.gameobjects": "1.4.0", - "com.unity.render-pipelines.universal": "12.1.11", + "com.unity.render-pipelines.universal": "14.0.7", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", + "com.unity.timeline": "1.7.4", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", "com.unity.modules.ai": "1.0.0", diff --git a/Basic/Invaders/Packages/packages-lock.json b/Basic/Invaders/Packages/packages-lock.json index fe78512e5..6b2576373 100644 --- a/Basic/Invaders/Packages/packages-lock.json +++ b/Basic/Invaders/Packages/packages-lock.json @@ -6,6 +6,15 @@ "source": "builtin", "dependencies": {} }, + "com.unity.ai.navigation": { + "version": "1.1.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.8.4", "depth": 1, @@ -40,7 +49,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.20", + "version": "3.0.21", "depth": 0, "source": "registry", "dependencies": { @@ -65,7 +74,7 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework": { - "version": "3.1.1", + "version": "3.1.3", "depth": 1, "source": "registry", "dependencies": { @@ -117,14 +126,14 @@ "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.1.0", + "version": "3.2.1", "depth": 1, "source": "registry", "dependencies": {}, @@ -138,52 +147,53 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.11", + "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.11", + "version": "14.0.7", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.8.4", - "com.unity.render-pipelines.core": "12.1.11", - "com.unity.shadergraph": "12.1.11" + "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.4.0", + "version": "2.5.0", "depth": 2, "source": "registry", "dependencies": { - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.services.core": "1.7.0", + "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.8.2", + "version": "1.9.0", "depth": 2, "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" @@ -220,23 +230,23 @@ "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "1.0.3", + "version": "2.0.1", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.11", + "version": "14.0.7", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.11", - "com.unity.searcher": "4.9.1" + "com.unity.render-pipelines.core": "14.0.7", + "com.unity.searcher": "4.9.2" } }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 1, "source": "registry", "dependencies": { @@ -256,7 +266,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.7.4", "depth": 0, "source": "registry", "dependencies": { @@ -268,7 +278,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.3", + "version": "1.3.4", "depth": 1, "source": "registry", "dependencies": { @@ -410,17 +420,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/Basic/Invaders/ProjectSettings/ProjectVersion.txt b/Basic/Invaders/ProjectSettings/ProjectVersion.txt index 6c676f051..56ddb83a4 100644 --- a/Basic/Invaders/ProjectSettings/ProjectVersion.txt +++ b/Basic/Invaders/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.24f1 -m_EditorVersionWithRevision: 2021.3.24f1 (cf10dcf7010d) +m_EditorVersion: 2022.3.0f1 +m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476) diff --git a/Basic/Invaders/ProjectSettings/URPProjectSettings.asset b/Basic/Invaders/ProjectSettings/URPProjectSettings.asset index c1f118ad3..cd7fd8c61 100644 --- a/Basic/Invaders/ProjectSettings/URPProjectSettings.asset +++ b/Basic/Invaders/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 5 + m_LastMaterialVersion: 7 diff --git a/Basic/Invaders/ProjectSettings/boot.config b/Basic/Invaders/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb..000000000 diff --git a/CHANGELOG.md b/CHANGELOG.md index d64c351fe..587faf06c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ #### Changed - Upgrade to Netcode for GameObjects 1.4.0 (#118) - Upgraded sample to 2021.3.24f1 LTS (#119) +- Upgraded sample to 2022.3.0f1 LTS (#124) #### Fixed - Resolved visual bug where the load status of dynamic prefabs on the host was not correct (#111) @@ -16,22 +17,26 @@ #### Changed - Upgrade to Netcode for GameObjects 1.4.0 (#118) - Upgraded sample to 2021.3.24f1 LTS (#119) +- Upgraded sample to 2022.3.0f1 LTS (#124) ### Client Driven #### Changed - Upgrade to Netcode for GameObjects 1.4.0 (#118) - Upgraded sample to 2021.3.24f1 LTS (#119) +- Upgraded sample to 2022.3.0f1 LTS (#124) ### Invaders #### Changed - Upgrade to Netcode for GameObjects 1.4.0 (#118) - Upgraded sample to 2021.3.24f1 LTS (#119) +- Upgraded sample to 2022.3.0f1 LTS (#124) #### Fixed - IP address input field text value is now passed into UTP's ConnectionData, allowing for remote IP address hosting (#112) - Enemy and Player bullet explosion FX are now replicated on clients via ClientRpcs (#113) +- Fixed an error produced when a client disconnected once the host disconnected after the game was complete (#124) ### Bitesize Samples Repository diff --git a/README.md b/README.md index 10e69da4e..fb318a164 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

# Netcode for GameObjects Bitesize Samples -[![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#:~:text=February%2014%2C%202023-,LTS%20Release,2021.3.18f1,-Released%3A%20February) +[![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.4.0-57b9d3.svg?logo=unity&color=2196F3)](https://docs-multiplayer.unity3d.com/netcode/current/about) [![LatestRelease](https://img.shields.io/badge/Latest%20%20Github%20Release:-v1.2.1-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/releases/tag/v1.2.1)

@@ -63,7 +63,7 @@ Check out the new [Dynamic Addressables Network Prefabs Sample](https://github.c ## Requirements -The bitesize samples are compatible with the latest Unity Long Term Support (LTS) editor version, currently [2021 LTS](https://unity.com/releases/2021-lts) and are supported on the Windows 10 and Mac OSX platforms. Please include standalone support for Windows/Mac in your installation. +The bitesize samples are 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) and are supported on the Windows 10 and Mac OSX platforms. Please include standalone support for Windows/Mac in your installation. **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.