diff --git a/FPS/Assets/FPS/Materials.meta b/FPS/Assets/FPS/Materials.meta new file mode 100644 index 0000000..1af4136 --- /dev/null +++ b/FPS/Assets/FPS/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5913fb3a67f1873499a0d59416e7f1ba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FPS/Assets/FPS/Materials/Black.mat b/FPS/Assets/FPS/Materials/Black.mat new file mode 100644 index 0000000..6721c5d --- /dev/null +++ b/FPS/Assets/FPS/Materials/Black.mat @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Black + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} +--- !u!114 &881882987134785284 +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: 1 diff --git a/FPS/Assets/FPS/Materials/Black.mat.meta b/FPS/Assets/FPS/Materials/Black.mat.meta new file mode 100644 index 0000000..412a994 --- /dev/null +++ b/FPS/Assets/FPS/Materials/Black.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2f7a21bdbc73fb4ba4f9dbdd1dd3503 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FPS/Assets/FPS/Materials/Blue.mat b/FPS/Assets/FPS/Materials/Blue.mat new file mode 100644 index 0000000..72b9cbb --- /dev/null +++ b/FPS/Assets/FPS/Materials/Blue.mat @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blue + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0, g: 0.050801992, b: 1, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} +--- !u!114 &6239807578959567490 +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: 1 diff --git a/FPS/Assets/FPS/Materials/Blue.mat.meta b/FPS/Assets/FPS/Materials/Blue.mat.meta new file mode 100644 index 0000000..33c25aa --- /dev/null +++ b/FPS/Assets/FPS/Materials/Blue.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19574f1c2d00ce149aa40ebb9aa869a6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FPS/Assets/FPS/Materials/Red.mat b/FPS/Assets/FPS/Materials/Red.mat new file mode 100644 index 0000000..af0b21a --- /dev/null +++ b/FPS/Assets/FPS/Materials/Red.mat @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7285622200898090338 +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: 1 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Red + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 0, b: 0, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 1, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} diff --git a/FPS/Assets/FPS/Materials/Red.mat.meta b/FPS/Assets/FPS/Materials/Red.mat.meta new file mode 100644 index 0000000..b07c8a8 --- /dev/null +++ b/FPS/Assets/FPS/Materials/Red.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b99e98b88644cd4fa3c0bcfc6cbcceb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FPS/Assets/FPS/Materials/White.mat b/FPS/Assets/FPS/Materials/White.mat new file mode 100644 index 0000000..5585337 --- /dev/null +++ b/FPS/Assets/FPS/Materials/White.mat @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: White + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} +--- !u!114 &3279439230197994387 +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: 1 diff --git a/FPS/Assets/FPS/Materials/White.mat.meta b/FPS/Assets/FPS/Materials/White.mat.meta new file mode 100644 index 0000000..882a647 --- /dev/null +++ b/FPS/Assets/FPS/Materials/White.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 10aa5902e9227a64a856357ea4635f77 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FPS/Assets/FPS/Prefabs/Enemies/Enemy_HoverBot.prefab b/FPS/Assets/FPS/Prefabs/Enemies/Enemy_HoverBot.prefab index 63c46e8..3329982 100644 --- a/FPS/Assets/FPS/Prefabs/Enemies/Enemy_HoverBot.prefab +++ b/FPS/Assets/FPS/Prefabs/Enemies/Enemy_HoverBot.prefab @@ -106,16 +106,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3de939d976a5bb0419ccd8dbd0b6836b, type: 3} m_Name: m_EditorClassIdentifier: - weapons: - - {fileID: 2104015986810675393} - detectionModule: {fileID: 6809973363424661249} - detectionSourcePoint: {fileID: 6571005840976436832} selfDestructYHeight: -20 pathReachingRadius: 2 orientationSpeed: 10 - detectionRange: 20 - attackRange: 10 - knownTargetTimeout: 12 deathDuration: 0 eyeColorMaterial: {fileID: 2100000, guid: e6fdfd4e017234d43ac116abee8fa90a, type: 2} defaultEyeColor: {r: 23.968628, g: 6.6509805, b: 0, a: 1} @@ -597,7 +590,7 @@ MonoBehaviour: m_GameObject: {fileID: 7448957880145452174} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -615,6 +608,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7471052639545543870 GameObject: m_ObjectHideFlags: 0 @@ -685,7 +679,7 @@ MonoBehaviour: m_GameObject: {fileID: 7471052639545543870} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 0 @@ -707,7 +701,7 @@ MonoBehaviour: m_GameObject: {fileID: 7471052639545543870} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -942,7 +936,7 @@ MonoBehaviour: m_GameObject: {fileID: 8350463800019646436} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -960,6 +954,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 1 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8815063736924141185 GameObject: m_ObjectHideFlags: 0 @@ -1080,18 +1075,38 @@ PrefabInstance: propertyPath: m_Controller value: objectReference: {fileID: 9100000, guid: e029e430e913b374387843833ab0b593, type: 2} - - target: {fileID: 13700004, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + - target: {fileID: 13700000, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} propertyPath: m_CastShadows value: 0 objectReference: {fileID: 0} + - target: {fileID: 13700000, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} - target: {fileID: 13700002, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} propertyPath: m_CastShadows value: 0 objectReference: {fileID: 0} - - target: {fileID: 13700000, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + - target: {fileID: 13700002, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f2f7a21bdbc73fb4ba4f9dbdd1dd3503, type: 2} + - target: {fileID: 13700002, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: f2f7a21bdbc73fb4ba4f9dbdd1dd3503, type: 2} + - target: {fileID: 13700002, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: f2f7a21bdbc73fb4ba4f9dbdd1dd3503, type: 2} + - target: {fileID: 13700004, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} propertyPath: m_CastShadows value: 0 objectReference: {fileID: 0} + - target: {fileID: 13700004, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} --- !u!95 &320366457759794871 stripped @@ -1303,11 +1318,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 320366457750808957} m_Modifications: - - target: {fileID: 4134168188543666222, guid: f77e2130c96652640accf8b9f6990d6b, - type: 3} - propertyPath: m_Name - value: VFX_AngrySteam - objectReference: {fileID: 0} - target: {fileID: 878787690634796009, guid: f77e2130c96652640accf8b9f6990d6b, type: 3} propertyPath: m_LocalPosition.x @@ -1363,6 +1373,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4134168188543666222, guid: f77e2130c96652640accf8b9f6990d6b, + type: 3} + propertyPath: m_Name + value: VFX_AngrySteam + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f77e2130c96652640accf8b9f6990d6b, type: 3} --- !u!198 &8934028655093144013 stripped @@ -1463,6 +1478,21 @@ PrefabInstance: propertyPath: m_Name value: VFX_Alert objectReference: {fileID: 0} + - target: {fileID: 8855434715677272939, guid: 1bc9e4f49c67a6a41af3e7cb3d30bb43, + type: 3} + propertyPath: m_SortingLayerID + value: -372683831 + objectReference: {fileID: 0} + - target: {fileID: 8855434715677272939, guid: 1bc9e4f49c67a6a41af3e7cb3d30bb43, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8855434715677272939, guid: 1bc9e4f49c67a6a41af3e7cb3d30bb43, + type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8855434715677272941, guid: 1bc9e4f49c67a6a41af3e7cb3d30bb43, type: 3} propertyPath: m_LocalPosition.x @@ -1533,21 +1563,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.36048147 objectReference: {fileID: 0} - - target: {fileID: 8855434715677272939, guid: 1bc9e4f49c67a6a41af3e7cb3d30bb43, - type: 3} - propertyPath: m_SortingLayerID - value: -372683831 - objectReference: {fileID: 0} - - target: {fileID: 8855434715677272939, guid: 1bc9e4f49c67a6a41af3e7cb3d30bb43, - type: 3} - propertyPath: m_SortingLayer - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8855434715677272939, guid: 1bc9e4f49c67a6a41af3e7cb3d30bb43, - type: 3} - propertyPath: m_SortingOrder - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1bc9e4f49c67a6a41af3e7cb3d30bb43, type: 3} --- !u!198 &6104096765092005263 stripped @@ -1563,11 +1578,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 320366457750808899} m_Modifications: - - target: {fileID: 748781637555137343, guid: 3f5b545b9a1e74c418b061bba5bb9e2c, - type: 3} - propertyPath: m_Name - value: VFX_EnemyMuzzleFlash - objectReference: {fileID: 0} - target: {fileID: 264520514954343661, guid: 3f5b545b9a1e74c418b061bba5bb9e2c, type: 3} propertyPath: m_LocalPosition.x @@ -1638,6 +1648,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.7510419 objectReference: {fileID: 0} + - target: {fileID: 748781637555137343, guid: 3f5b545b9a1e74c418b061bba5bb9e2c, + type: 3} + propertyPath: m_Name + value: VFX_EnemyMuzzleFlash + objectReference: {fileID: 0} - target: {fileID: 7692336672675980230, guid: 3f5b545b9a1e74c418b061bba5bb9e2c, type: 3} propertyPath: ColorModule.gradient.maxGradient.key1.a @@ -1783,11 +1798,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 320366457750808945} m_Modifications: - - target: {fileID: 4134168188543666222, guid: f77e2130c96652640accf8b9f6990d6b, - type: 3} - propertyPath: m_Name - value: VFX_AngrySteam - objectReference: {fileID: 0} - target: {fileID: 878787690634796009, guid: f77e2130c96652640accf8b9f6990d6b, type: 3} propertyPath: m_LocalPosition.x @@ -1843,6 +1853,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4134168188543666222, guid: f77e2130c96652640accf8b9f6990d6b, + type: 3} + propertyPath: m_Name + value: VFX_AngrySteam + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f77e2130c96652640accf8b9f6990d6b, type: 3} --- !u!198 &1407167163009738010 stripped diff --git a/FPS/Assets/FPS/Prefabs/Enemies/Enemy_HoverBot2.prefab b/FPS/Assets/FPS/Prefabs/Enemies/Enemy_HoverBot2.prefab index bc5647c..2838d1e 100644 --- a/FPS/Assets/FPS/Prefabs/Enemies/Enemy_HoverBot2.prefab +++ b/FPS/Assets/FPS/Prefabs/Enemies/Enemy_HoverBot2.prefab @@ -590,7 +590,7 @@ MonoBehaviour: m_GameObject: {fileID: 7448957880145452174} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -608,6 +608,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7471052639545543870 GameObject: m_ObjectHideFlags: 0 @@ -678,7 +679,7 @@ MonoBehaviour: m_GameObject: {fileID: 7471052639545543870} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 0 @@ -700,7 +701,7 @@ MonoBehaviour: m_GameObject: {fileID: 7471052639545543870} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -935,7 +936,7 @@ MonoBehaviour: m_GameObject: {fileID: 8350463800019646436} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -953,6 +954,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 1 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8815063736924141185 GameObject: m_ObjectHideFlags: 0 @@ -1077,14 +1079,34 @@ PrefabInstance: propertyPath: m_CastShadows value: 0 objectReference: {fileID: 0} + - target: {fileID: 13700000, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} - target: {fileID: 13700002, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} propertyPath: m_CastShadows value: 0 objectReference: {fileID: 0} + - target: {fileID: 13700002, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f2f7a21bdbc73fb4ba4f9dbdd1dd3503, type: 2} + - target: {fileID: 13700002, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: f2f7a21bdbc73fb4ba4f9dbdd1dd3503, type: 2} + - target: {fileID: 13700002, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: f2f7a21bdbc73fb4ba4f9dbdd1dd3503, type: 2} - target: {fileID: 13700004, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} propertyPath: m_CastShadows value: 0 objectReference: {fileID: 0} + - target: {fileID: 13700004, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} --- !u!95 &320366457759794871 stripped @@ -1282,6 +1304,11 @@ PrefabInstance: propertyPath: m_Name value: WizardHat objectReference: {fileID: 0} + - target: {fileID: 2805368772355291552, guid: 942c2c1bb4e544cb09d3494e89bb8041, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 9b99e98b88644cd4fa3c0bcfc6cbcceb, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 942c2c1bb4e544cb09d3494e89bb8041, type: 3} --- !u!1001 &1787833773761626380 diff --git a/FPS/Assets/FPS/Prefabs/Enemies/Enemy_HoverBot3.prefab b/FPS/Assets/FPS/Prefabs/Enemies/Enemy_HoverBot3.prefab index 0df17ce..13f81d9 100644 --- a/FPS/Assets/FPS/Prefabs/Enemies/Enemy_HoverBot3.prefab +++ b/FPS/Assets/FPS/Prefabs/Enemies/Enemy_HoverBot3.prefab @@ -589,7 +589,7 @@ MonoBehaviour: m_GameObject: {fileID: 7448957880145452174} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -607,6 +607,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7471052639545543870 GameObject: m_ObjectHideFlags: 0 @@ -677,7 +678,7 @@ MonoBehaviour: m_GameObject: {fileID: 7471052639545543870} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 0 @@ -699,7 +700,7 @@ MonoBehaviour: m_GameObject: {fileID: 7471052639545543870} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -934,7 +935,7 @@ MonoBehaviour: m_GameObject: {fileID: 8350463800019646436} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -952,6 +953,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 1 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8815063736924141185 GameObject: m_ObjectHideFlags: 0 @@ -1076,14 +1078,34 @@ PrefabInstance: propertyPath: m_CastShadows value: 0 objectReference: {fileID: 0} + - target: {fileID: 13700000, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} - target: {fileID: 13700002, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} propertyPath: m_CastShadows value: 0 objectReference: {fileID: 0} + - target: {fileID: 13700002, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f2f7a21bdbc73fb4ba4f9dbdd1dd3503, type: 2} + - target: {fileID: 13700002, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: f2f7a21bdbc73fb4ba4f9dbdd1dd3503, type: 2} + - target: {fileID: 13700002, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: f2f7a21bdbc73fb4ba4f9dbdd1dd3503, type: 2} - target: {fileID: 13700004, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} propertyPath: m_CastShadows value: 0 objectReference: {fileID: 0} + - target: {fileID: 13700004, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8e64c7aa328349d4ea713298f19a414f, type: 3} --- !u!95 &320366457759794871 stripped @@ -1781,6 +1803,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 320366457750808949} m_Modifications: + - target: {fileID: 3916634885051813941, guid: 332a6a14085b74fdd9c8f81357a61185, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f2f7a21bdbc73fb4ba4f9dbdd1dd3503, type: 2} - target: {fileID: 9055817469080827956, guid: 332a6a14085b74fdd9c8f81357a61185, type: 3} propertyPath: m_Name @@ -1841,6 +1868,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 90 objectReference: {fileID: 0} + - target: {fileID: 9055817469928155220, guid: 332a6a14085b74fdd9c8f81357a61185, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f2f7a21bdbc73fb4ba4f9dbdd1dd3503, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 332a6a14085b74fdd9c8f81357a61185, type: 3} --- !u!1001 &8320672172411124102 diff --git a/FPS/Assets/FPS/Prefabs/Level/Floors/Basic_Floor.prefab b/FPS/Assets/FPS/Prefabs/Level/Floors/Basic_Floor.prefab index 7f58da3..1b91a08 100644 --- a/FPS/Assets/FPS/Prefabs/Level/Floors/Basic_Floor.prefab +++ b/FPS/Assets/FPS/Prefabs/Level/Floors/Basic_Floor.prefab @@ -38,6 +38,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4477206535605542485} m_Modifications: + - target: {fileID: 528559090865760040, guid: 2a86e4ba493cd034cbc2c5713da1a643, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 10aa5902e9227a64a856357ea4635f77, type: 2} + - target: {fileID: 528559090865760040, guid: 2a86e4ba493cd034cbc2c5713da1a643, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 10aa5902e9227a64a856357ea4635f77, type: 2} - target: {fileID: 528559090867763688, guid: 2a86e4ba493cd034cbc2c5713da1a643, type: 3} propertyPath: m_Name diff --git a/FPS/Assets/FPS/Prefabs/Level/Signs/Sign_Basic_Floor.prefab b/FPS/Assets/FPS/Prefabs/Level/Signs/Sign_Basic_Floor.prefab index 8b91d1c..f0e439d 100644 --- a/FPS/Assets/FPS/Prefabs/Level/Signs/Sign_Basic_Floor.prefab +++ b/FPS/Assets/FPS/Prefabs/Level/Signs/Sign_Basic_Floor.prefab @@ -38,6 +38,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4477206535605542485} m_Modifications: + - target: {fileID: 528559090865760040, guid: 2a86e4ba493cd034cbc2c5713da1a643, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 10aa5902e9227a64a856357ea4635f77, type: 2} + - target: {fileID: 528559090865760040, guid: 2a86e4ba493cd034cbc2c5713da1a643, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 10aa5902e9227a64a856357ea4635f77, type: 2} - target: {fileID: 528559090867763688, guid: 2a86e4ba493cd034cbc2c5713da1a643, type: 3} propertyPath: m_Name @@ -103,16 +113,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 528559090865760040, guid: 2a86e4ba493cd034cbc2c5713da1a643, - type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 2100000, guid: f265aebb27994b642b7483b3ab817694, type: 2} - - target: {fileID: 528559090865760040, guid: 2a86e4ba493cd034cbc2c5713da1a643, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: a8f80855e983a7e4290e228f45185f94, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2a86e4ba493cd034cbc2c5713da1a643, type: 3} --- !u!4 &5054831612178438059 stripped diff --git a/FPS/Assets/FPS/Prefabs/Level/Walls/Wall_4m.prefab b/FPS/Assets/FPS/Prefabs/Level/Walls/Wall_4m.prefab index 7f0d777..976e0c4 100644 --- a/FPS/Assets/FPS/Prefabs/Level/Walls/Wall_4m.prefab +++ b/FPS/Assets/FPS/Prefabs/Level/Walls/Wall_4m.prefab @@ -38,6 +38,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2497406903890568550} m_Modifications: + - target: {fileID: 2863981429959941074, guid: 4f42672477f836a4281ef4c3bdfe6d05, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 10aa5902e9227a64a856357ea4635f77, type: 2} + - target: {fileID: 2863981429959941074, guid: 4f42672477f836a4281ef4c3bdfe6d05, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 10aa5902e9227a64a856357ea4635f77, type: 2} - target: {fileID: 2863981429961868562, guid: 4f42672477f836a4281ef4c3bdfe6d05, type: 3} propertyPath: m_Name diff --git a/FPS/Assets/FPS/RenderPipeline.meta b/FPS/Assets/FPS/RenderPipeline.meta new file mode 100644 index 0000000..2cdc6bf --- /dev/null +++ b/FPS/Assets/FPS/RenderPipeline.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0a2340f205b90284895ce27683eef288 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FPS/Assets/FPS/RenderPipeline/UniversalRenderPipelineAsset.asset b/FPS/Assets/FPS/RenderPipeline/UniversalRenderPipelineAsset.asset new file mode 100644 index 0000000..956b166 --- /dev/null +++ b/FPS/Assets/FPS/RenderPipeline/UniversalRenderPipelineAsset.asset @@ -0,0 +1,54 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: bf2edee5c58d82540a51f03df9d42094, type: 3} + m_Name: UniversalRenderPipelineAsset + m_EditorClassIdentifier: + k_AssetVersion: 5 + k_AssetPreviousVersion: 5 + m_RendererType: 1 + m_RendererData: {fileID: 0} + m_RendererDataList: + - {fileID: 11400000, guid: dc7f2af3b41b1f0478cc982ae88c17a5, type: 2} + m_DefaultRendererIndex: 0 + m_RequireDepthTexture: 0 + m_RequireOpaqueTexture: 0 + m_OpaqueDownsampling: 1 + m_SupportsTerrainHoles: 1 + m_SupportsHDR: 0 + m_MSAA: 1 + m_RenderScale: 1 + m_MainLightRenderingMode: 1 + m_MainLightShadowsSupported: 1 + m_MainLightShadowmapResolution: 2048 + m_AdditionalLightsRenderingMode: 1 + m_AdditionalLightsPerObjectLimit: 4 + m_AdditionalLightShadowsSupported: 0 + m_AdditionalLightsShadowmapResolution: 512 + m_ShadowDistance: 50 + m_ShadowCascades: 0 + m_Cascade2Split: 0.25 + m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_ShadowDepthBias: 1 + m_ShadowNormalBias: 1 + m_SoftShadowsSupported: 0 + m_UseSRPBatcher: 1 + m_SupportsDynamicBatching: 0 + m_MixedLightingSupported: 1 + m_DebugLevel: 0 + m_ColorGradingMode: 0 + m_ColorGradingLutSize: 32 + m_ShadowType: 1 + m_LocalShadowsSupported: 0 + m_LocalShadowsAtlasResolution: 256 + m_MaxPixelLights: 0 + m_ShadowAtlasResolution: 256 + m_ShaderVariantLogLevel: 0 diff --git a/FPS/Assets/FPS/RenderPipeline/UniversalRenderPipelineAsset.asset.meta b/FPS/Assets/FPS/RenderPipeline/UniversalRenderPipelineAsset.asset.meta new file mode 100644 index 0000000..d943462 --- /dev/null +++ b/FPS/Assets/FPS/RenderPipeline/UniversalRenderPipelineAsset.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 44ef6b6f24920fd4bac21ec977b7b56c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FPS/Assets/FPS/RenderPipeline/UniversalRenderPipelineAsset_Renderer.asset b/FPS/Assets/FPS/RenderPipeline/UniversalRenderPipelineAsset_Renderer.asset new file mode 100644 index 0000000..7745f5c --- /dev/null +++ b/FPS/Assets/FPS/RenderPipeline/UniversalRenderPipelineAsset_Renderer.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} + m_Name: UniversalRenderPipelineAsset_Renderer + m_EditorClassIdentifier: + m_RendererFeatures: [] + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + shaders: + blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} + copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, + type: 3} + samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + m_OpaqueLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_TransparentLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_DefaultStencilState: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 0 + failOperation: 0 + zFailOperation: 0 diff --git a/FPS/Assets/FPS/RenderPipeline/UniversalRenderPipelineAsset_Renderer.asset.meta b/FPS/Assets/FPS/RenderPipeline/UniversalRenderPipelineAsset_Renderer.asset.meta new file mode 100644 index 0000000..722b047 --- /dev/null +++ b/FPS/Assets/FPS/RenderPipeline/UniversalRenderPipelineAsset_Renderer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc7f2af3b41b1f0478cc982ae88c17a5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FPS/Assets/FPS/Scenes/MainScene.unity b/FPS/Assets/FPS/Scenes/MainScene.unity index f8faaca..b80aeb2 100644 --- a/FPS/Assets/FPS/Scenes/MainScene.unity +++ b/FPS/Assets/FPS/Scenes/MainScene.unity @@ -184,6 +184,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2729281213352223116} m_Modifications: + - target: {fileID: 5035642871225371316, guid: a7566d85b04856b42a956c9b162ee747, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} - target: {fileID: 5035642871227140182, guid: a7566d85b04856b42a956c9b162ee747, type: 3} propertyPath: m_LocalPosition.x @@ -287,7 +292,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 79c0d93b237b09b41aa23121f5b9599c, type: 2} + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} - target: {fileID: 5035642871227140182, guid: a7566d85b04856b42a956c9b162ee747, type: 3} propertyPath: m_LocalPosition.x @@ -421,6 +426,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1291632636} m_Modifications: + - target: {fileID: 5035642871225371316, guid: a7566d85b04856b42a956c9b162ee747, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} - target: {fileID: 5035642871227140182, guid: a7566d85b04856b42a956c9b162ee747, type: 3} propertyPath: m_LocalPosition.x @@ -610,6 +620,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.75 objectReference: {fileID: 0} + - target: {fileID: 7015621310884690955, guid: 406361925eb618a49b3e29d64b5b734d, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 406361925eb618a49b3e29d64b5b734d, type: 3} --- !u!4 &1022098257 stripped @@ -930,6 +945,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -90 objectReference: {fileID: 0} + - target: {fileID: 7015621310884690955, guid: 406361925eb618a49b3e29d64b5b734d, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 406361925eb618a49b3e29d64b5b734d, type: 3} --- !u!4 &1346842412 stripped @@ -1020,6 +1040,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.75 objectReference: {fileID: 0} + - target: {fileID: 7015621310884690955, guid: 406361925eb618a49b3e29d64b5b734d, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 406361925eb618a49b3e29d64b5b734d, type: 3} --- !u!4 &1357953776 stripped @@ -1202,12 +1227,12 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 807df0a3bd5fb484687907be1b8246c0, type: 2} + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} - target: {fileID: 5054831612180206923, guid: 509d754db50222f46b673c4778f267e4, type: 3} propertyPath: m_Materials.Array.data[1] value: - objectReference: {fileID: 2100000, guid: 1151f4057e77ab5429143caedba0a672, type: 2} + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 509d754db50222f46b673c4778f267e4, type: 3} --- !u!4 &1664643400 stripped @@ -1385,6 +1410,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3465290198676060991, guid: 6041303870b466c40b30fcc1ff88e6da, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} + - target: {fileID: 3465290198676060991, guid: 6041303870b466c40b30fcc1ff88e6da, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6041303870b466c40b30fcc1ff88e6da, type: 3} --- !u!4 &1880561205 stripped @@ -1522,11 +1557,26 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2363721386959974307, guid: 35af8bf2573f2d9458eb42510e2d6006, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 10aa5902e9227a64a856357ea4635f77, type: 2} + - target: {fileID: 3386376371091853518, guid: 35af8bf2573f2d9458eb42510e2d6006, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 10aa5902e9227a64a856357ea4635f77, type: 2} - target: {fileID: 4247711576551091238, guid: 35af8bf2573f2d9458eb42510e2d6006, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6022705265511476074, guid: 35af8bf2573f2d9458eb42510e2d6006, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 10aa5902e9227a64a856357ea4635f77, type: 2} - target: {fileID: 8660203859262875705, guid: 35af8bf2573f2d9458eb42510e2d6006, type: 3} propertyPath: m_Name @@ -2402,6 +2452,21 @@ PrefabInstance: propertyPath: aimingPivotVerticalOffset value: 1.5 objectReference: {fileID: 0} + - target: {fileID: 7886326314635015769, guid: e29d43f43cc5d82499dd9926e01847d3, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} + - target: {fileID: 7886326314635015773, guid: e29d43f43cc5d82499dd9926e01847d3, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f2f7a21bdbc73fb4ba4f9dbdd1dd3503, type: 2} + - target: {fileID: 7886326314635015775, guid: e29d43f43cc5d82499dd9926e01847d3, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 19574f1c2d00ce149aa40ebb9aa869a6, type: 2} - target: {fileID: 9087143436424816424, guid: e29d43f43cc5d82499dd9926e01847d3, type: 3} propertyPath: dropRate @@ -2969,6 +3034,11 @@ PrefabInstance: propertyPath: m_Name value: Floor_18x18 objectReference: {fileID: 0} + - target: {fileID: 7799111105800880624, guid: 7042f8fe21debc944b5bdc894f478d63, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 10aa5902e9227a64a856357ea4635f77, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7042f8fe21debc944b5bdc894f478d63, type: 3} --- !u!1001 &2729281214124946789 @@ -3204,6 +3274,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3559189830383548379, guid: 91e047326c7121248bcdf81ab6f4a6fa, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 10aa5902e9227a64a856357ea4635f77, type: 2} - target: {fileID: 7070730279172493884, guid: 91e047326c7121248bcdf81ab6f4a6fa, type: 3} propertyPath: m_Name @@ -3214,6 +3289,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7543143136783045006, guid: 91e047326c7121248bcdf81ab6f4a6fa, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 10aa5902e9227a64a856357ea4635f77, type: 2} - target: {fileID: 7839735751213365594, guid: 91e047326c7121248bcdf81ab6f4a6fa, type: 3} propertyPath: m_IsActive @@ -3619,6 +3699,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5649880935820430217, guid: d40ae884302b6684a8b3b6f3d55a71ba, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 9b99e98b88644cd4fa3c0bcfc6cbcceb, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d40ae884302b6684a8b3b6f3d55a71ba, type: 3} --- !u!1001 &2729281214355838732 @@ -4537,6 +4622,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5649880935820430217, guid: d40ae884302b6684a8b3b6f3d55a71ba, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 9b99e98b88644cd4fa3c0bcfc6cbcceb, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d40ae884302b6684a8b3b6f3d55a71ba, type: 3} --- !u!1001 &2729281214911784181 diff --git a/FPS/Packages/manifest.json b/FPS/Packages/manifest.json index 9218845..a816316 100644 --- a/FPS/Packages/manifest.json +++ b/FPS/Packages/manifest.json @@ -7,6 +7,7 @@ "com.unity.multiplayer-hlapi": "1.0.4", "com.unity.probuilder": "4.2.1", "com.unity.progrids": "3.0.3-preview.4", + "com.unity.render-pipelines.lightweight": "7.1.7", "com.unity.test-framework": "1.1.3", "com.unity.textmeshpro": "2.0.1", "com.unity.timeline": "1.2.6", diff --git a/FPS/ProjectSettings/InputManager.asset b/FPS/ProjectSettings/InputManager.asset index 83b70c6..257de35 100644 --- a/FPS/ProjectSettings/InputManager.asset +++ b/FPS/ProjectSettings/InputManager.asset @@ -389,3 +389,195 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: Enable Debug Button 1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left ctrl + altNegativeButton: + altPositiveButton: joystick button 8 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Enable Debug Button 2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: backspace + altNegativeButton: + altPositiveButton: joystick button 9 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Reset + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left alt + altNegativeButton: + altPositiveButton: joystick button 1 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Next + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: page down + altNegativeButton: + altPositiveButton: joystick button 5 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Previous + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: page up + altNegativeButton: + altPositiveButton: joystick button 4 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Validate + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: return + altNegativeButton: + altPositiveButton: joystick button 0 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Persistent + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: right shift + altNegativeButton: + altPositiveButton: joystick button 2 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Multiplier + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left shift + altNegativeButton: + altPositiveButton: joystick button 3 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 2 + axis: 6 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 2 + axis: 5 + joyNum: 0 diff --git a/FPS/ProjectSettings/ProjectSettings.asset b/FPS/ProjectSettings/ProjectSettings.asset index 8007b3c..8c443f2 100644 --- a/FPS/ProjectSettings/ProjectSettings.asset +++ b/FPS/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 18 + serializedVersion: 20 productGUID: fe8b8efff397e9646b72dfb289029ae5 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -52,7 +52,6 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - displayResolutionDialog: 1 iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 @@ -65,6 +64,7 @@ PlayerSettings: disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 + androidUseSwappy: 0 androidBlitType: 0 defaultIsNativeResolution: 0 macRetinaSupport: 1 @@ -79,11 +79,11 @@ PlayerSettings: usePlayerLog: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 + useFlipModelSwapchain: 1 resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 - graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -91,7 +91,6 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - graphicsJobMode: 0 fullscreenMode: 3 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 @@ -111,6 +110,7 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: 4:3: 0 @@ -125,7 +125,6 @@ PlayerSettings: m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 - isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: depthFormat: 0 @@ -140,6 +139,12 @@ PlayerSettings: hololens: depthFormat: 1 depthBufferSharingEnabled: 0 + lumin: + depthFormat: 0 + frameTiming: 2 + enableGLCache: 0 + glCacheMaxBlobSize: 524288 + glCacheMaxFileSize: 8388608 oculus: sharedDepthBuffer: 0 dashSupport: 0 @@ -147,9 +152,10 @@ PlayerSettings: protectedContext: 0 v2Signing: 0 enable360StereoCapture: 0 - protectGraphicsMemory: 0 + isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 + D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -159,7 +165,7 @@ PlayerSettings: Standalone: com.cortexarts.fps buildNumber: {} AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 16 + AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -174,10 +180,10 @@ PlayerSettings: StripUnusedMeshComponents: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 9.0 + iOSTargetOSVersionString: 10.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 9.0 + tvOSTargetOSVersionString: 10.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -196,6 +202,10 @@ PlayerSettings: iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} + iPhone65inPortraitSplashScreen: {fileID: 0} + iPhone65inLandscapeSplashScreen: {fileID: 0} + iPhone61inPortraitSplashScreen: {fileID: 0} + iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -255,12 +265,14 @@ PlayerSettings: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 + androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - resolutionDialogBanner: {fileID: 0} + AndroidValidateAppBundleSize: 1 + AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: @@ -279,6 +291,38 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetGraphicsJobs: + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 0 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 0 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 0 + - m_BuildTarget: LuminSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 0b00000015000000 @@ -298,9 +342,9 @@ PlayerSettings: m_Devices: - Oculus - OpenVR - m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 + openGLRequireES32: 0 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 @@ -493,6 +537,7 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 + playerPrefsMaxSize: 32768 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 @@ -523,9 +568,11 @@ PlayerSettings: ps4contentSearchFeaturesUsed: 0 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} + blurSplashScreenBackground: 1 spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 1 @@ -540,8 +587,9 @@ PlayerSettings: webGLCompressionFormat: 1 webGLLinkerTarget: 1 webGLThreadsSupport: 0 + webGLWasmStreaming: 0 scriptingDefineSymbols: - 1: MANUAL_SHADER_STRIPPING + 1: MANUAL_SHADER_STRIPPING;UNITY_POST_PROCESSING_STACK_V2 4: UNITY_POST_PROCESSING_STACK_V2 7: UNITY_POST_PROCESSING_STACK_V2 13: UNITY_POST_PROCESSING_STACK_V2;MANUAL_SHADER_STRIPPING @@ -552,6 +600,7 @@ PlayerSettings: 26: UNITY_POST_PROCESSING_STACK_V2 27: UNITY_POST_PROCESSING_STACK_V2 28: UNITY_POST_PROCESSING_STACK_V2 + 29: UNITY_POST_PROCESSING_STACK_V2 platformArchitecture: {} scriptingBackend: Standalone: 0 @@ -561,6 +610,8 @@ PlayerSettings: allowUnsafeCode: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 + gcIncremental: 0 + gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: Standalone: 3 m_RenderingPath: 1 @@ -592,7 +643,6 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: - metroCompilationOverrides: 1 XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -617,7 +667,6 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 0 XboxOneOverrideIdentityName: vrEditorSettings: daydream: @@ -630,18 +679,11 @@ PlayerSettings: m_PortalFolderPath: luminCert: m_CertPath: - m_PrivateKeyPath: + m_SignPackage: 1 luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 m_VersionName: - facebookSdkVersion: 7.9.4 - facebookAppId: - facebookCookies: 1 - facebookLogging: 1 - facebookStatus: 1 - facebookXfbml: 0 - facebookFrictionlessRequests: 1 apiCompatibilityLevel: 6 cloudProjectId: framebufferDepthMemorylessMode: 0 diff --git a/FPS/ProjectSettings/QualitySettings.asset b/FPS/ProjectSettings/QualitySettings.asset index 646f000..0861a21 100644 --- a/FPS/ProjectSettings/QualitySettings.asset +++ b/FPS/ProjectSettings/QualitySettings.asset @@ -18,7 +18,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 @@ -40,6 +40,8 @@ QualitySettings: asyncUploadBufferSize: 4 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 11400000, guid: 44ef6b6f24920fd4bac21ec977b7b56c, + type: 2} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Standalone: 0