diff --git a/Game/CourierOld/Assets/Code/Gameplay/Enemies/EnemySpawner.cs b/Game/CourierOld/Assets/Code/Gameplay/Enemies/EnemySpawner.cs index a347c30..517247d 100644 --- a/Game/CourierOld/Assets/Code/Gameplay/Enemies/EnemySpawner.cs +++ b/Game/CourierOld/Assets/Code/Gameplay/Enemies/EnemySpawner.cs @@ -71,6 +71,8 @@ namespace Code.Gameplay.Enemies private void Despawn() { if (!_spawnedEnemy) return; + + if (despawnRadius <= 0f) return; _enemyFactory.ReleaseEnemy(_spawnedEnemy); _spawnedEnemy = null; diff --git a/Game/CourierOld/Assets/Resources/Configs/Enemies/FogConfig.asset b/Game/CourierOld/Assets/Resources/Configs/Enemies/FogConfig.asset index d45d999..43f3aa4 100644 --- a/Game/CourierOld/Assets/Resources/Configs/Enemies/FogConfig.asset +++ b/Game/CourierOld/Assets/Resources/Configs/Enemies/FogConfig.asset @@ -22,7 +22,7 @@ MonoBehaviour: attackCooldown: 0 detectionRange: 0 attackRange: 5 - speed: 1.5 + speed: 3 isStunnable: 0 stunDuration: 0 usesIdleMovement: 0 diff --git a/Game/CourierOld/Assets/Resources/Materials/Fog.meta b/Game/CourierOld/Assets/Resources/Materials/Fog.meta new file mode 100644 index 0000000..d7821fb --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Fog.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c709e98f2aebc3e7897e77b50728de3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Materials/Fog/Fog.mat b/Game/CourierOld/Assets/Resources/Materials/Fog/Fog.mat new file mode 100644 index 0000000..f16ca81 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Fog/Fog.mat @@ -0,0 +1,141 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Fog + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 739073350e104920d9a94de897a81bd8, type: 3} + m_Scale: {x: 10, y: 10} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 5031c3df0691633c0ac8d752089b415c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 739073350e104920d9a94de897a81bd8, type: 3} + m_Scale: {x: 10, y: 10} + 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} + - _ParallaxMap: + 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} + - 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: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0.11320752, g: 0.11320752, b: 0.11320752, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &367265267071048680 +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: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Game/CourierOld/Assets/Resources/Materials/Fog/Fog.mat.meta b/Game/CourierOld/Assets/Resources/Materials/Fog/Fog.mat.meta new file mode 100644 index 0000000..e9e88c7 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Fog/Fog.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd92f58bae8219bf190b30d7c9e47e50 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Materials/Fog/Fog_Base.png b/Game/CourierOld/Assets/Resources/Materials/Fog/Fog_Base.png new file mode 100644 index 0000000..018beaa --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Fog/Fog_Base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a31b96a7fb54f0cd393b454b7e020f3c131064a163f7e10f09f1e25228812740 +size 156230 diff --git a/Game/CourierOld/Assets/Resources/Materials/Fog/Fog_Base.png.meta b/Game/CourierOld/Assets/Resources/Materials/Fog/Fog_Base.png.meta new file mode 100644 index 0000000..9ed30db --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Materials/Fog/Fog_Base.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 739073350e104920d9a94de897a81bd8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Scenes/GameplayMobsDev.unity b/Game/CourierOld/Assets/Resources/Scenes/GameplayMobsDev.unity index 2235b49..05d2326 100644 --- a/Game/CourierOld/Assets/Resources/Scenes/GameplayMobsDev.unity +++ b/Game/CourierOld/Assets/Resources/Scenes/GameplayMobsDev.unity @@ -206,6 +206,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &545729164 MeshFilter: @@ -289,6 +290,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Code.App.SceneInstallers.GameplaySceneInstaller _gameplaySceneEnvironment: playerSpawnPoint: {fileID: 1645301970} + volume: {fileID: 0} --- !u!1 &1420420438 GameObject: m_ObjectHideFlags: 0 @@ -407,6 +409,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1571744442 MeshFilter: @@ -549,6 +552,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1855107594 MeshFilter: diff --git a/Game/CourierOld/Assets/Resources_moved/Prefabs/Enemies/Fog.prefab b/Game/CourierOld/Assets/Resources_moved/Prefabs/Enemies/Fog.prefab index a015429..f6277d5 100644 --- a/Game/CourierOld/Assets/Resources_moved/Prefabs/Enemies/Fog.prefab +++ b/Game/CourierOld/Assets/Resources_moved/Prefabs/Enemies/Fog.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4026755623624074589 +--- !u!1 &4446044925301680734 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,47 +8,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6851873227215905915} - - component: {fileID: 155590838022113695} - - component: {fileID: 2022789956611087930} - - component: {fileID: 6290571850003227459} + - component: {fileID: 2479871120354898442} + - component: {fileID: 9176085615991257} + - component: {fileID: 1956513198132715439} + - component: {fileID: 4177341290213714994} m_Layer: 0 - m_Name: Mesh + m_Name: Fog m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6851873227215905915 +--- !u!4 &2479871120354898442 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026755623624074589} + m_GameObject: {fileID: 4446044925301680734} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 15, y: 15, z: 15} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4534305984332984655} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &155590838022113695 +--- !u!33 &9176085615991257 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026755623624074589} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &2022789956611087930 + m_GameObject: {fileID: 4446044925301680734} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1956513198132715439 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026755623624074589} + m_GameObject: {fileID: 4446044925301680734} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -67,7 +67,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: cd92f58bae8219bf190b30d7c9e47e50, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -89,68 +89,15 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &6290571850003227459 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026755623624074589} - 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: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &5163628409168092031 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4534305984332984655} - - component: {fileID: 6599307368941520056} - m_Layer: 0 - m_Name: Fog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4534305984332984655 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5163628409168092031} - serializedVersion: 2 - 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: 6851873227215905915} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6599307368941520056 +--- !u!114 &4177341290213714994 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5163628409168092031} + m_GameObject: {fileID: 4446044925301680734} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4c70370426e4457aa9a56c77689158ff, type: 3} diff --git a/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/MainMenu 1.prefab b/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/MainMenu 1.prefab index 7d2cde9..03c87c4 100644 --- a/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/MainMenu 1.prefab +++ b/Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/MainMenu 1.prefab @@ -1,5 +1,52 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1012994375721104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 871664724086050472} + - component: {fileID: 4918259337571347641} + m_Layer: 15 + m_Name: Spawner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &871664724086050472 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1012994375721104} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 15, y: -0.316, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7700873135742503863} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4918259337571347641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1012994375721104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e87d9529de45409781ec5bfc356518c7, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Enemies.EnemySpawner + spawnerType: 0 + spawnRadius: 33 + despawnRadius: -1 --- !u!1 &64826484060160537 GameObject: m_ObjectHideFlags: 0 @@ -101,6 +148,7 @@ Transform: - {fileID: 1009071999095589914} - {fileID: 2322590705863749314} - {fileID: 8252401583443196941} + - {fileID: 871664724086050472} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6733203349145437202 @@ -160,6 +208,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &3100783837446086906 MonoBehaviour: @@ -177,7 +226,9 @@ MonoBehaviour: roomTimer: 0 enterMarker: {fileID: 6569060501327057506} exitMarker: {fileID: 3035462985622627922} + doorSlot: {fileID: 0} door: {fileID: 8664037799804130812} + roomTrigger: {fileID: 0} playerSpawn: {fileID: 1009071999095589914} --- !u!64 &83297999707830705 MeshCollider: diff --git a/Game/CourierOld/Assets/Settings/Graphics/DefaultVolumeProfile.asset b/Game/CourierOld/Assets/Settings/Graphics/DefaultVolumeProfile.asset index 9e4bbfd..66d98de 100644 --- a/Game/CourierOld/Assets/Settings/Graphics/DefaultVolumeProfile.asset +++ b/Game/CourierOld/Assets/Settings/Graphics/DefaultVolumeProfile.asset @@ -379,6 +379,9 @@ MonoBehaviour: highQualityFiltering: m_OverrideState: 1 m_Value: 0 + filter: + m_OverrideState: 1 + m_Value: 0 downscale: m_OverrideState: 1 m_Value: 0 diff --git a/Game/CourierOld/Assets/Settings/Graphics/Mobile_RPAsset.asset b/Game/CourierOld/Assets/Settings/Graphics/Mobile_RPAsset.asset index 7ceffe7..fedee07 100644 --- a/Game/CourierOld/Assets/Settings/Graphics/Mobile_RPAsset.asset +++ b/Game/CourierOld/Assets/Settings/Graphics/Mobile_RPAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: Mobile_RPAsset m_EditorClassIdentifier: - k_AssetVersion: 12 - k_AssetPreviousVersion: 12 + k_AssetVersion: 13 + k_AssetPreviousVersion: 13 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -53,6 +53,7 @@ MonoBehaviour: m_AdditionalLightsShadowResolutionTierHigh: 1024 m_ReflectionProbeBlending: 1 m_ReflectionProbeBoxProjection: 1 + m_ReflectionProbeAtlas: 1 m_ShadowDistance: 50 m_ShadowCascadeCount: 1 m_Cascade2Split: 0.25 @@ -78,11 +79,11 @@ MonoBehaviour: m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 + m_AllowPostProcessAlphaOutput: 0 m_UseFastSRGBLinearConversion: 1 m_SupportDataDrivenLensFlare: 1 m_SupportScreenSpaceLensFlare: 1 m_GPUResidentDrawerMode: 0 - m_UseLegacyLightmaps: 0 m_SmallMeshScreenPercentage: 0 m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0 m_ShadowType: 1 @@ -109,6 +110,7 @@ MonoBehaviour: m_PrefilterDebugKeywords: 1 m_PrefilterWriteRenderingLayers: 1 m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 0 m_PrefilterSSAODepthNormals: 1 m_PrefilterSSAOSourceDepthLow: 1 m_PrefilterSSAOSourceDepthMedium: 0 @@ -126,8 +128,14 @@ MonoBehaviour: m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 m_PrefilterScreenCoord: 1 + m_PrefilterScreenSpaceIrradiance: 0 m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterBicubicLightmapSampling: 0 + m_PrefilterReflectionProbeRotation: 0 + m_PrefilterReflectionProbeBlending: 0 + m_PrefilterReflectionProbeBoxProjection: 0 + m_PrefilterReflectionProbeAtlas: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: diff --git a/Game/CourierOld/ProjectSettings/UnityConnectSettings.asset b/Game/CourierOld/ProjectSettings/UnityConnectSettings.asset index 029ad8b..7a17e8f 100644 --- a/Game/CourierOld/ProjectSettings/UnityConnectSettings.asset +++ b/Game/CourierOld/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events