From 485d54f27235a8ca9371acc6816839e35180d26f Mon Sep 17 00:00:00 2001 From: ThomasCharester Date: Wed, 3 Dec 2025 20:07:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=83=D0=B4=D0=B0=D0=BB=D1=8F?= =?UTF-8?q?=D0=BB=20=D0=B2=D0=B0=D0=B6=D0=BD=D1=8B=D0=B5=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetGroups/Default Local Group.asset | 40 - .../Code/App/AppStates/GameOverState.cs | 4 + .../Assets/Code/App/BootstrapInstaller.cs | 4 +- .../Assets/Code/Audio/AudioService.cs | 2 + .../Assets/Code/UI/Panels/LoadingScreen.cs | 15 +- .../Configs/App/GeneratorConfig.asset | 30 +- .../Assets/Resources/Materials/TestOnTop.mat | 143 - .../Resources/Materials/TestOnTop.mat.meta | 8 - .../Assets/Resources/Models/DoorPolotno 1.fbx | 3 - .../Resources/Models/DoorPolotno 1.fbx.meta | 110 - .../Resources/Models/Furniture/лестница.fbx | 3 - .../Models/Furniture/лестница.fbx.meta | 110 - .../Assets/Resources/Models/Levels/Box1.fbx | 3 - .../Resources/Models/Levels/Box1.fbx.meta | 130 - .../Assets/Resources/Models/дверь.fbx | 3 - .../Assets/Resources/Models/дверь.fbx.meta | 110 - .../Assets/Resources/Models/комната.fbx | 3 - .../Assets/Resources/Models/комната.fbx.meta | 110 - .../Resources/Prefabs/Furniture/testroom.fbx | 3 - .../Prefabs/Furniture/testroom.fbx.meta | 115 - .../Scenes/DimkaBakery/LightingData.asset | Bin 18224 -> 0 bytes .../DimkaBakery/LightingData.asset.meta | 8 - .../DimkaBakery/Lightmap-0_comp_dir.png | 3 - .../DimkaBakery/Lightmap-0_comp_light.exr | 3 - .../UI/Fonts/VCR_OSD_MONO_1.001 SDF.asset | 414 +- .../Resources/UI/Sprites/загрузка фон.png | 3 + .../Sprites/загрузка фон.png.meta} | 20 +- .../UI/Sprites/загрузка_загрузка.png | 3 + .../Sprites/загрузка_загрузка.png.meta} | 26 +- .../Prefabs/Levels/Box1.prefab | 923 ---- .../Prefabs/Levels/Box1.prefab.meta | 7 - .../Prefabs/Levels/Level1.prefab | 780 --- .../Prefabs/Levels/Level1.prefab.meta | 7 - .../Prefabs/Levels/Level1Save.prefab | 400 -- .../Prefabs/Levels/Level1Save.prefab.meta | 7 - .../Prefabs/Levels/Level2_Down.prefab | 59 - .../Prefabs/Levels/Level2_Down.prefab.meta | 7 - .../Prefabs/Levels/Level3_Big.prefab | 4034 --------------- .../Prefabs/Levels/Level3_Big.prefab.meta | 7 - .../Prefabs/Levels/Level4_Parkur.prefab | 2227 -------- .../Prefabs/Levels/Level4_Parkur.prefab.meta | 7 - .../Prefabs/Levels/Level5.prefab | 4499 ----------------- .../Prefabs/Levels/Level5.prefab.meta | 7 - .../Prefabs/Levels/Level6.prefab | 165 +- .../Prefabs/Levels/Save1.prefab | 83 - .../Prefabs/Levels/Stars1.prefab | 713 --- .../Prefabs/Levels/Stars1.prefab.meta | 7 - .../Resources_moved/UI/LoadingCanvas.prefab | 119 +- 48 files changed, 565 insertions(+), 14922 deletions(-) delete mode 100644 Game/CourierOld/Assets/Resources/Materials/TestOnTop.mat delete mode 100644 Game/CourierOld/Assets/Resources/Materials/TestOnTop.mat.meta delete mode 100644 Game/CourierOld/Assets/Resources/Models/DoorPolotno 1.fbx delete mode 100644 Game/CourierOld/Assets/Resources/Models/DoorPolotno 1.fbx.meta delete mode 100644 Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx delete mode 100644 Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx.meta delete mode 100644 Game/CourierOld/Assets/Resources/Models/Levels/Box1.fbx delete mode 100644 Game/CourierOld/Assets/Resources/Models/Levels/Box1.fbx.meta delete mode 100644 Game/CourierOld/Assets/Resources/Models/дверь.fbx delete mode 100644 Game/CourierOld/Assets/Resources/Models/дверь.fbx.meta delete mode 100644 Game/CourierOld/Assets/Resources/Models/комната.fbx delete mode 100644 Game/CourierOld/Assets/Resources/Models/комната.fbx.meta delete mode 100644 Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx delete mode 100644 Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx.meta delete mode 100644 Game/CourierOld/Assets/Resources/Scenes/DimkaBakery/LightingData.asset delete mode 100644 Game/CourierOld/Assets/Resources/Scenes/DimkaBakery/LightingData.asset.meta delete mode 100644 Game/CourierOld/Assets/Resources/Scenes/DimkaBakery/Lightmap-0_comp_dir.png delete mode 100644 Game/CourierOld/Assets/Resources/Scenes/DimkaBakery/Lightmap-0_comp_light.exr create mode 100644 Game/CourierOld/Assets/Resources/UI/Sprites/загрузка фон.png rename Game/CourierOld/Assets/Resources/{Scenes/DimkaBakery/Lightmap-0_comp_light.exr.meta => UI/Sprites/загрузка фон.png.meta} (91%) create mode 100644 Game/CourierOld/Assets/Resources/UI/Sprites/загрузка_загрузка.png rename Game/CourierOld/Assets/Resources/{Scenes/DimkaBakery/Lightmap-0_comp_dir.png.meta => UI/Sprites/загрузка_загрузка.png.meta} (89%) delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Box1.prefab delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Box1.prefab.meta delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level1.prefab delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level1.prefab.meta delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level1Save.prefab delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level1Save.prefab.meta delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level2_Down.prefab delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level2_Down.prefab.meta delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level3_Big.prefab delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level3_Big.prefab.meta delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level4_Parkur.prefab delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level4_Parkur.prefab.meta delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level5.prefab delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Level5.prefab.meta delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Stars1.prefab delete mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Stars1.prefab.meta diff --git a/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 73e2908..8d869bf 100644 --- a/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -32,11 +32,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 19bfe93240786974ea9d7cd70a7bb635 - m_Address: Prefabs/Rooms/Level5 - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 1cc66c0b13a946e1c9ec37026268e144 m_Address: Audio/Enemies/pl_metal2 m_ReadOnly: 0 @@ -112,11 +107,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 4283d6553fc7f3f4583b9bb0be9d7979 - m_Address: Prefabs/Rooms/Box1 - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 48aebfe8826dc0df79d047b5afbf8f5b m_Address: Canvas m_ReadOnly: 0 @@ -193,11 +183,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: a1d9e5a04ac11a1468c744b27d442a00 - m_Address: Prefabs/Rooms/Stars1 - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: a306df57f348ce7cf900d0b9431739ee m_Address: launch_selectmenu m_ReadOnly: 0 @@ -208,11 +193,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: ab5926b5200bedc49aec36c0afe6b028 - m_Address: Prefabs/Rooms/Level3_Big - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: ae6ab2c88ae248ce1b6efca892f17659 m_Address: Assets/Resources_moved/Audio/Music/TestDeath.ogg m_ReadOnly: 0 @@ -228,11 +208,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: b3471d165fe389f479380f61034bea57 - m_Address: Assets/Resources_moved/Prefabs/Levels/Level1 1.prefab - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: b37ea8c61cc322afdad529d678612d22 m_Address: Assets/Resources_moved/Audio/Enemies/zo_attack2.wav m_ReadOnly: 0 @@ -263,21 +238,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: d4eaf1439c2788c458127b9ba67e4fbf - m_Address: Prefabs/Levels/Level1 - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: d5b22c0e6700543419ae667d77aadaa2 - m_Address: Prefabs/Rooms/Level2_Down - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: dc328d8aadb0e8545978741d451e0544 - m_Address: Prefabs/Rooms/Level4_Parkur - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: e3a3840a7963bf841872cddb02e90151 m_Address: Prefabs/Levels/MainMenu 1 m_ReadOnly: 0 diff --git a/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs b/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs index bf40101..262a4ec 100644 --- a/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs +++ b/Game/CourierOld/Assets/Code/App/AppStates/GameOverState.cs @@ -2,6 +2,8 @@ using Code.App.StateMachine; using Code.Audio; using Code.Gameplay.Player; using Code.Input; +using Code.Scenes; +using Code.Scenes.SceneEnvironments; using Code.StateMachine; using Code.UI; using Cysharp.Threading.Tasks; @@ -33,6 +35,8 @@ namespace Code.App.AppStates Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Death); + Context.AudioService.ApplyStun(5000,0.5f); + GameOver().Forget(); base.EnterState(); diff --git a/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs index e83328a..c9e702d 100644 --- a/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs +++ b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs @@ -119,9 +119,7 @@ namespace Code.App AttributeInjector.Inject(cameraStateMachine.StateMachineContext, container); cameraStateMachine.Initialize(); -#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed - BootstrapFinish(container); -#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed + BootstrapFinish(container).Forget(); } private async UniTaskVoid BootstrapFinish(Container container) { diff --git a/Game/CourierOld/Assets/Code/Audio/AudioService.cs b/Game/CourierOld/Assets/Code/Audio/AudioService.cs index ecb95eb..82a5de0 100644 --- a/Game/CourierOld/Assets/Code/Audio/AudioService.cs +++ b/Game/CourierOld/Assets/Code/Audio/AudioService.cs @@ -174,6 +174,8 @@ namespace Code.Audio { _peacefulMusicSource.Stop(); _actionMusicSource.Stop(); + _cancellationTokenSources[MusicType.Peaceful].Cancel(); + _cancellationTokenSources[MusicType.Action].Cancel(); } public void GladlyAskToStopMusic(Action callback = null) diff --git a/Game/CourierOld/Assets/Code/UI/Panels/LoadingScreen.cs b/Game/CourierOld/Assets/Code/UI/Panels/LoadingScreen.cs index 55efffe..9d85eca 100644 --- a/Game/CourierOld/Assets/Code/UI/Panels/LoadingScreen.cs +++ b/Game/CourierOld/Assets/Code/UI/Panels/LoadingScreen.cs @@ -7,21 +7,24 @@ namespace Code.UI.Panels public class LoadingScreen : UIElement { [SerializeField] private Image background; - [SerializeField] private TMP_Text loadingTitle; - [SerializeField] private TMP_Text vyapWatermark; + [SerializeField] private Image loadingImage; + // [SerializeField] private TMP_Text loadingTitle; + // [SerializeField] private TMP_Text vyapWatermark; public override void Hide() { Shown = false; background.enabled = false; - loadingTitle.enabled = false; - vyapWatermark.enabled = false; + loadingImage.enabled = false; + // loadingTitle.enabled = false; + // vyapWatermark.enabled = false; } public override void Show() { Shown = true; background.enabled = true; - loadingTitle.enabled = true; - vyapWatermark.enabled = true; + loadingImage.enabled = true; + // loadingTitle.enabled = true; + // vyapWatermark.enabled = true; } } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Resources/Configs/App/GeneratorConfig.asset b/Game/CourierOld/Assets/Resources/Configs/App/GeneratorConfig.asset index d642d62..0020edd 100644 --- a/Game/CourierOld/Assets/Resources/Configs/App/GeneratorConfig.asset +++ b/Game/CourierOld/Assets/Resources/Configs/App/GeneratorConfig.asset @@ -13,21 +13,6 @@ MonoBehaviour: m_Name: GeneratorConfig m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.GeneratorConfig roomAssetReferences: - - m_AssetGUID: d4eaf1439c2788c458127b9ba67e4fbf - m_SubObjectName: - m_SubObjectType: - m_SubObjectGUID: - m_EditorAssetChanged: 0 - - m_AssetGUID: 28a6c7a4124141341ab7c2b7dfd3e95b - m_SubObjectName: - m_SubObjectType: - m_SubObjectGUID: - m_EditorAssetChanged: 1 - - m_AssetGUID: e3a3840a7963bf841872cddb02e90151 - m_SubObjectName: - m_SubObjectType: - m_SubObjectGUID: - m_EditorAssetChanged: 0 - m_AssetGUID: c938de3174f184741925c407a43a47f2 m_SubObjectName: m_SubObjectType: @@ -38,13 +23,18 @@ MonoBehaviour: m_SubObjectType: m_SubObjectGUID: m_EditorAssetChanged: 0 + - m_AssetGUID: 28a6c7a4124141341ab7c2b7dfd3e95b + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 + - m_AssetGUID: e3a3840a7963bf841872cddb02e90151 + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 - m_AssetGUID: 7067a5248027e74478f4f0f53ddf06a4 m_SubObjectName: m_SubObjectType: m_SubObjectGUID: m_EditorAssetChanged: 0 - - m_AssetGUID: 3f8f2171cc252d953b82083cc16bd1ae - m_SubObjectName: - m_SubObjectType: - m_SubObjectGUID: - m_EditorAssetChanged: 0 diff --git a/Game/CourierOld/Assets/Resources/Materials/TestOnTop.mat b/Game/CourierOld/Assets/Resources/Materials/TestOnTop.mat deleted file mode 100644 index 6d367dc..0000000 --- a/Game/CourierOld/Assets/Resources/Materials/TestOnTop.mat +++ /dev/null @@ -1,143 +0,0 @@ -%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: TestOnTop - m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - 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: - - MOTIONVECTORS - m_LockedProperties: - 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} - - _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: 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} - - _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 - - _ColorMask: 15 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _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 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _Surface: 0 - - _UseUIAlphaClip: 0 - - _WorkflowMode: 1 - - _XRMotionVectorsPass: 1 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 ---- !u!114 &1261182030382286586 -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/TestOnTop.mat.meta b/Game/CourierOld/Assets/Resources/Materials/TestOnTop.mat.meta deleted file mode 100644 index 56fa3e4..0000000 --- a/Game/CourierOld/Assets/Resources/Materials/TestOnTop.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a1f1b5a364203f14d8a6023ed28c1977 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/DoorPolotno 1.fbx b/Game/CourierOld/Assets/Resources/Models/DoorPolotno 1.fbx deleted file mode 100644 index 041276a..0000000 --- a/Game/CourierOld/Assets/Resources/Models/DoorPolotno 1.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eabdff5cad8ba30c87f31a0dc5f47e1d2f1ed79d73813d96a2761fb25e881b51 -size 44732 diff --git a/Game/CourierOld/Assets/Resources/Models/DoorPolotno 1.fbx.meta b/Game/CourierOld/Assets/Resources/Models/DoorPolotno 1.fbx.meta deleted file mode 100644 index d1d24ca..0000000 --- a/Game/CourierOld/Assets/Resources/Models/DoorPolotno 1.fbx.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 9e385488db96058c49ea9a0e6311088b -ModelImporter: - serializedVersion: 24200 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 0 - importBlendShapes: 0 - importCameras: 0 - importLights: 0 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - generateMeshLods: 0 - meshLodGenerationFlags: 0 - maximumMeshLod: -1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 0 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx b/Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx deleted file mode 100644 index b40a832..0000000 --- a/Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d37f7a7154a3eed683bd4f49362f98a00ea5361aaf05e4842bd4753fef97c78b -size 15660 diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx.meta deleted file mode 100644 index 53db09b..0000000 --- a/Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 6ba8e76344dabbf13af813f7bea7f6e6 -ModelImporter: - serializedVersion: 24200 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - generateMeshLods: 0 - meshLodGenerationFlags: 0 - maximumMeshLod: -1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/Levels/Box1.fbx b/Game/CourierOld/Assets/Resources/Models/Levels/Box1.fbx deleted file mode 100644 index a4f32a1..0000000 --- a/Game/CourierOld/Assets/Resources/Models/Levels/Box1.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66066da80c873ad0ada67436efe9faee0aae35ef4c8ce7b9ce3a6f1ad2714afd -size 30188 diff --git a/Game/CourierOld/Assets/Resources/Models/Levels/Box1.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Levels/Box1.fbx.meta deleted file mode 100644 index 8bd330e..0000000 --- a/Game/CourierOld/Assets/Resources/Models/Levels/Box1.fbx.meta +++ /dev/null @@ -1,130 +0,0 @@ -fileFormatVersion: 2 -guid: c610fe0062ef2ea46aba3a5e2bcd0851 -ModelImporter: - serializedVersion: 24200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: concretefloor01a.001 - second: {fileID: 2100000, guid: f8c8c9015cc4df84fbbbe32a4f003660, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: plasterwall01a.003 - second: {fileID: 2100000, guid: 46c32c803fa6b354e927b3c37077003f, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: plasterwall01b.003 - second: {fileID: 2100000, guid: 826e07efb851b074080835cf3caee1fa, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: tilefloor01a.002 - second: {fileID: 2100000, guid: e1471edc218f70c40b50f687b839b9c8, type: 2} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 0 - importLights: 0 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - generateMeshLods: 0 - meshLodGenerationFlags: 0 - maximumMeshLod: -1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 0 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 0 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/дверь.fbx b/Game/CourierOld/Assets/Resources/Models/дверь.fbx deleted file mode 100644 index 2de3906..0000000 --- a/Game/CourierOld/Assets/Resources/Models/дверь.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2716e989d32ec2373d75059a1e758586d94daf5c838604566d8d20fbe6bad0b2 -size 12428 diff --git a/Game/CourierOld/Assets/Resources/Models/дверь.fbx.meta b/Game/CourierOld/Assets/Resources/Models/дверь.fbx.meta deleted file mode 100644 index f7d652d..0000000 --- a/Game/CourierOld/Assets/Resources/Models/дверь.fbx.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 54da2999d81550ec198032d2ebb76ba0 -ModelImporter: - serializedVersion: 24200 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - generateMeshLods: 0 - meshLodGenerationFlags: 0 - maximumMeshLod: -1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/комната.fbx b/Game/CourierOld/Assets/Resources/Models/комната.fbx deleted file mode 100644 index b6aaaa2..0000000 --- a/Game/CourierOld/Assets/Resources/Models/комната.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c930a0a0f8eafba5d3424aee881b5d74b0c5cd577974760e06a69a0da742c507 -size 481164 diff --git a/Game/CourierOld/Assets/Resources/Models/комната.fbx.meta b/Game/CourierOld/Assets/Resources/Models/комната.fbx.meta deleted file mode 100644 index 4830f6f..0000000 --- a/Game/CourierOld/Assets/Resources/Models/комната.fbx.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 425e074725c3d964b86e9e7f0bc9b440 -ModelImporter: - serializedVersion: 24200 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - generateMeshLods: 0 - meshLodGenerationFlags: 0 - maximumMeshLod: -1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx deleted file mode 100644 index 3c9902a..0000000 --- a/Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efac23fd405635e2324650f1e88c1099f606453c43df07e23941e3d5d8a81389 -size 24332 diff --git a/Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx.meta b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx.meta deleted file mode 100644 index b68f5c4..0000000 --- a/Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx.meta +++ /dev/null @@ -1,115 +0,0 @@ -fileFormatVersion: 2 -guid: 6a32cf8d6aa3dfe90bbcc79809d1d40d -ModelImporter: - serializedVersion: 24200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: plasterwall01b.001 - second: {fileID: 2100000, guid: 826e07efb851b074080835cf3caee1fa, type: 2} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - generateMeshLods: 0 - meshLodGenerationFlags: 0 - maximumMeshLod: -1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Scenes/DimkaBakery/LightingData.asset b/Game/CourierOld/Assets/Resources/Scenes/DimkaBakery/LightingData.asset deleted file mode 100644 index 322db1baaaf07100d85c636d8a1ee2a5e8f61895..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18224 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