Author SHA1 Message Date
MrTorex 2cca6d8ffb siski 2025-12-05 14:43:04 +03:00
MrTorex 6f777ba8a3 Merge branch 'Fixes' into Dev 2025-12-05 12:56:15 +03:00
ThomasCharester bffbf2db3b Добавление звуков и приколов 2025-12-05 12:44:59 +03:00
MrTorex a997a0682f Слайд и дэш стопаются после коллизий 2025-12-05 11:55:49 +03:00
MrTorex 5fc70e1db6 Merge branch 'Dev' of https://notscam.serveminecraft.net/Tetramino/CourierOld into Dev 2025-12-05 11:19:28 +03:00
MrTorex f67d3972a9 блядски фог 2025-12-05 11:19:26 +03:00
ThomasCharester 727e9a3c17 Анимация на загр экране 2025-12-05 11:09:38 +03:00
ThomasCharester 48e11dd3b0 Коробка 2025-12-05 10:23:32 +03:00
ThomasCharester 4b98ec0129 Фикс звуков курьера, а модет и поломка 2025-12-05 10:07:48 +03:00
ThomasCharester 304bfc6e1f Патч на аддресаблы 2025-12-05 09:41:27 +03:00
MrTorex d2c5c45604 небольшой фиксик (симка) воллрана 2025-12-05 08:37:16 +03:00
ThomasCharester 0fca1a32f9 Удалил важные файлы 2025-12-05 01:18:00 +03:00
ThomasCharester 9103cb0a5a Вставляем доделанный контент 2025-12-05 01:03:28 +03:00
MrTorex f6e8131d22 Добавление задержки для прыжков + секретный переход на юнити 6.3 2025-12-04 23:43:15 +03:00
MrTorex 6732aef384 Плавность это круто 2025-12-04 21:44:11 +03:00
MrTorex ecff1e69cd Меняется таргет камеры (и высота коллайдера) при слайде 2025-12-04 21:33:37 +03:00
MrTorex eb4dff803e При касани с землёй прекращается залазание, убрано движение на A/D 2025-12-04 20:09:02 +03:00
MrTorex 4c16a63abd я ксиька :3 2025-12-04 17:38:45 +03:00
MrTorex b4de41894f Убрано НАХУЙ _Recovery, добавлено движение в воздухе, деду добавлен стан как от дэша, так и от слайда, воллран вынесен в конфиг 2025-12-04 17:34:12 +03:00
MrTorex 77fd9af29d Убран бег (просто заменён на ходьбу с такой же скоростью), прошлый слайд заменён на дэщ, добавлен новый слайд 2025-12-04 17:14:24 +03:00
ThomasCharester a1c2c5fd18 Музыка меня отменила 2025-12-03 20:15:34 +03:00
ThomasCharester 485d54f272 Поудалял важные компоненты 2025-12-03 20:07:36 +03:00
ThomasCharester 0d0787b887 Звуки поражения 2025-12-03 19:32:10 +03:00
ThomasCharester 5d856ae162 Получение урона теперь чуть более заметно (плейсхолдер) 2025-12-03 17:39:26 +03:00
309 changed files with 400119 additions and 355183 deletions

No files matched your search

@@ -13,5 +13,8 @@ MonoBehaviour:
m_Name: AddressableAssetGroupSortSettings m_Name: AddressableAssetGroupSortSettings
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.AddressableAssetGroupSortSettings m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.AddressableAssetGroupSortSettings
sortOrder: sortOrder:
- 3f67261f611d8cd43a09d4d5cf638d8d
- 1e9bc7e1e4087c0488fccf896b0ed49f
- d7e4a8c4f2a42c64587c34ab7446f091
- 7e9d70e73e500eb9287683466ebf646f - 7e9d70e73e500eb9287683466ebf646f
- d447fc60305c17a17bf20948ab295a45 - d447fc60305c17a17bf20948ab295a45
@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: d447fc60305c17a17bf20948ab295a45 m_DefaultGroup: d447fc60305c17a17bf20948ab295a45
m_currentHash: m_currentHash:
serializedVersion: 2 serializedVersion: 2
Hash: 6940a0d24ee0b7d842fd97d11e078c94 Hash: 00000000000000000000000000000000
m_OptimizeCatalogSize: 0 m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0 m_BuildRemoteCatalog: 0
m_CatalogRequestsTimeout: 0 m_CatalogRequestsTimeout: 0
@@ -60,8 +60,11 @@ MonoBehaviour:
m_BuildAddressablesWithPlayerBuild: 0 m_BuildAddressablesWithPlayerBuild: 0
m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]' m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
m_GroupAssets: m_GroupAssets:
- {fileID: 11400000, guid: df8f8d52915542e49a11fbc177f3cf2c, type: 2}
- {fileID: 11400000, guid: 3eb9af1699b33ee4fa3ddeb0a1a9f793, type: 2}
- {fileID: 11400000, guid: ba51c0b85beab267d8f41a72df4fb657, type: 2} - {fileID: 11400000, guid: ba51c0b85beab267d8f41a72df4fb657, type: 2}
- {fileID: 11400000, guid: 7c592a6445170e8379910601b962cb30, type: 2} - {fileID: 11400000, guid: 7c592a6445170e8379910601b962cb30, type: 2}
- {fileID: 11400000, guid: 6334e9a905fd7634a8c646d57a23968d, type: 2}
m_BuildSettings: m_BuildSettings:
m_LogResourceManagerExceptions: 1 m_LogResourceManagerExceptions: 1
m_BundleBuildPath: Temp/com.unity.addressables/AssetBundles m_BundleBuildPath: Temp/com.unity.addressables/AssetBundles
@@ -14,8 +14,124 @@ MonoBehaviour:
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
m_GroupName: Audio m_GroupName: Audio
m_GUID: 7e9d70e73e500eb9287683466ebf646f m_GUID: 7e9d70e73e500eb9287683466ebf646f
m_SerializeEntries: [] m_SerializeEntries:
- m_GUID: 087d498be2e5a044f97f313a3fc0ae05
m_Address: Assets/Resources_moved/Audio/Enemies/ded_step.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 144ab5188f8ad7a0a92c75703bd12e60
m_Address: launch_upmenu1
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1f79c7b1e492a4ea2a8d666cdead0c52
m_Address: Assets/Resources_moved/Audio/Dispatcher/take_damage4.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 21c2eaf85c31d604395153b364970a7d
m_Address: Assets/Resources_moved/Audio/SFX/pl_plain2.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 29bff8011973e4e519906b9da8fca0fc
m_Address: Assets/Resources_moved/Audio/Dispatcher/late3.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 29ee630aab7bbef8799dc76ed0c239f7
m_Address: Assets/Resources_moved/Audio/Dispatcher/late4.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2ef564b38a3c6fb4a85c16adb33d095c
m_Address: Assets/Resources_moved/Audio/Enemies/rch_walk.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 31f16c866d3224ab8a7e0fabf3745ec5
m_Address: Assets/Resources_moved/Audio/Dispatcher/late5.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4bd64d1fcecc9c6b09d81e78b7dcfebe
m_Address: Assets/Resources_moved/Audio/Dispatcher/take_damage1.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4c9661de6f76e8c48a0116840b1ac7fd
m_Address: Assets/Resources_moved/Audio/UI/launch_upmenu1 1.wav
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 735f38402ea347fa381408293503a24e
m_Address: Assets/Resources_moved/Audio/Dispatcher/receiving_an_order1.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7accc805b4e5f404d9e777c0a662ede4
m_Address: Assets/Resources_moved/Audio/UI/launch_upmenu1 2.wav
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7c5caf3ceee44f71588860c5c1fbdbe0
m_Address: Assets/Resources_moved/Audio/Dispatcher/take_damage3.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8c2be26d359d54063825fedfad7a493b
m_Address: Assets/Resources_moved/Audio/Dispatcher/late2.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8fa89a492fc3a3768a0f0ba1bb7080e0
m_Address: Assets/Resources_moved/Audio/Dispatcher/late1.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: a306df57f348ce7cf900d0b9431739ee
m_Address: launch_selectmenu
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: aa138b2e21adfbf4bbbfa5bf9d54b8f2
m_Address: Assets/Resources_moved/Audio/UI/buttonclickrelease.wav
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ae6ab2c88ae248ce1b6efca892f17659
m_Address: Assets/Resources_moved/Audio/Music/TestDeath.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: beea6ce1de81706478a700993b273000
m_Address: Assets/Resources_moved/Audio/Enemies/bc_bite2.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: cab4b1ff78dd6b1fba61aa165aa17b4d
m_Address: Assets/Resources_moved/Audio/Dispatcher/receiving_an_order2.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e54541120fe1c5a4799a4698a689bb5c
m_Address: Assets/Resources_moved/Audio/SFX/pl_step1.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f74a409bf11b25148ad305acc05b14f5
m_Address: Assets/Resources_moved/Audio/Dispatcher/take_damage2.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: fb8972b33f4c43749add9d98b439b447
m_Address: Assets/Resources_moved/Audio/SFX/pl_plain5.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0 m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2} m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2}
m_SchemaSet: m_SchemaSet:
m_Schemas: [] m_Schemas:
- {fileID: 11400000, guid: 5a1eefed8456ba0479d7c04e6a5f4122, type: 2}
@@ -15,70 +15,13 @@ MonoBehaviour:
m_GroupName: Default Local Group m_GroupName: Default Local Group
m_GUID: d447fc60305c17a17bf20948ab295a45 m_GUID: d447fc60305c17a17bf20948ab295a45
m_SerializeEntries: m_SerializeEntries:
- m_GUID: 144ab5188f8ad7a0a92c75703bd12e60
m_Address: launch_upmenu1
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 16562a5c87213914cad415f10c65a3b0
m_Address: "Assets/Resources_moved/Audio/Music/LASKX3I - \u041F\u0440\u043E\u0442\u0438\u0432
\u0446\u0430\u0440\u044F (\u041A\u0430\u0440\u0430\u043E\u043A\u0435).mp3"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 170b1a70ddee4d948abea041b9b805e4
m_Address: Assets/Resources_moved/Audio/Music/Half Life Original Soundtrack -
Track 8 - Diabolical Adrenaline Guitar.mp3
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
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1d4767c722c05b5d6b96bb226d378c65 - m_GUID: 1d4767c722c05b5d6b96bb226d378c65
m_Address: Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab m_Address: Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab
m_ReadOnly: 0 m_ReadOnly: 0
m_SerializedLabels: [] m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0 FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1d7110a045075b22fa27d62bd5f2784e - m_GUID: 24959d51467fd0d4f957ed6e846f73a5
m_Address: 357_shot1 m_Address: Assets/Resources_moved/Audio/Enemies/ded_attack1.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 1f79c7b1e492a4ea2a8d666cdead0c52
m_Address: Audio/Dispatcher/take_damage4
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 23e11d2c8a4f12f4ea9a7a43d1118464
m_Address: Gameplay
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 28a6c7a4124141341ab7c2b7dfd3e95b
m_Address: Assets/Resources_moved/Prefabs/Levels/Level1 2.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 29bff8011973e4e519906b9da8fca0fc
m_Address: Audio/Dispatcher/late3
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 29ee630aab7bbef8799dc76ed0c239f7
m_Address: Audio/Dispatcher/late4
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2c6a984e4a1b42647b48e6b7bc69b158
m_Address: Prefabs/Levels/Level6
m_ReadOnly: 0 m_ReadOnly: 0
m_SerializedLabels: [] m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0 FlaggedDuringContentUpdateRestriction: 0
@@ -87,210 +30,28 @@ MonoBehaviour:
m_ReadOnly: 0 m_ReadOnly: 0
m_SerializedLabels: [] m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0 FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2f6134357dc2a5641a846a7478ce4c2c
m_Address: bravo!
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 31f16c866d3224ab8a7e0fabf3745ec5
m_Address: Audio/Dispatcher/late5
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3831a36e0c8e48f659517a6bb99378b6
m_Address: cbar_hit1
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
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4b279429428a13040b6d1713122cd0de
m_Address: Assets/Resources_moved/Audio/SFX/pl_pain5.wav
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4bd64d1fcecc9c6b09d81e78b7dcfebe
m_Address: Audio/Dispatcher/take_damage1
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7067a5248027e74478f4f0f53ddf06a4
m_Address: Prefabs/Rooms/Save1
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 735f38402ea347fa381408293503a24e
m_Address: Audio/Dispatcher/receiving_an_order1
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 751890caa1647ec6689f24933fbcb770
m_Address: "Prefabs/Furniture/\u0442\u0440\u0443\u0431\u0430"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7c5caf3ceee44f71588860c5c1fbdbe0
m_Address: Audio/Dispatcher/take_damage3
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 803e40b883c823b89a91aa8b9d9fc483
m_Address: valve_sound
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 81844a99f5b786b41b831174f8fb6d3a - m_GUID: 81844a99f5b786b41b831174f8fb6d3a
m_Address: Prefabs/Player/CharacterController m_Address: Prefabs/Player/CharacterController
m_ReadOnly: 0 m_ReadOnly: 0
m_SerializedLabels: [] m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0 FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8187ea542d6ed824d81230966a3b7499
m_Address: Assets/Resources_moved/Audio/Music/Bauhaus - Bela Lugosi's Dead (No
Vocals Remix).mp3
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 82c71411174bfa86ca1f676b9d389f94
m_Address: bastard!
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8c2be26d359d54063825fedfad7a493b
m_Address: Audio/Dispatcher/late2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8fa89a492fc3a3768a0f0ba1bb7080e0
m_Address: Audio/Dispatcher/late1
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9293380a88bf6736889be29722b94269 - m_GUID: 9293380a88bf6736889be29722b94269
m_Address: Audio/AudioSource m_Address: Audio/AudioSource
m_ReadOnly: 0 m_ReadOnly: 0
m_SerializedLabels: [] m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0 FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9d78f017876abed4c9cd8957f1e140cb
m_Address: Prefabs/Rooms/Level1_2
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
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: aa138b2e21adfbf4bbbfa5bf9d54b8f2
m_Address: Assets/Resources_moved/Audio/UI/buttonclickrelease.wav
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: b2e8dc2aeb0311cd8a826b51cf8e94dc
m_Address: GameOver
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b33855c694de89386a25c56cbe463a0e - m_GUID: b33855c694de89386a25c56cbe463a0e
m_Address: Assets/Resources_moved/Prefabs/Enemies/DrunkenGrandpa.prefab m_Address: Assets/Resources_moved/Prefabs/Enemies/DrunkenGrandpa.prefab
m_ReadOnly: 0 m_ReadOnly: 0
m_SerializedLabels: [] m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0 FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b3471d165fe389f479380f61034bea57
m_Address: Assets/Resources_moved/Prefabs/Levels/Level1 1.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: bf87bc9ac43df86be8c818de81d44a54
m_Address: Assets/Resources_moved/Audio/SFX/pl_step1.wav
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c566fc932edefbbee9e53271eac3c560
m_Address: MainMenu
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c5a0ad8a615841547ac2ee613af526d8
m_Address: Assets/Resources_moved/Audio/SFX/pl_pain2.wav
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c938de3174f184741925c407a43a47f2
m_Address: Prefabs/Rooms/Level1
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: cab4b1ff78dd6b1fba61aa165aa17b4d
m_Address: Audio/Dispatcher/receiving_an_order2
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
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e84e3a3c26ccbd50d92f13627403f148
m_Address: Audio/Enemies/rch_walk
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ebe18293a5ef86704b23dad3a1786476
m_Address: Half-Life01
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f23b9fce9594618e5b75845f1cae50de
m_Address: LoadingScreen
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f3d7dc64b34919ad7b50a3dd307a935b - m_GUID: f3d7dc64b34919ad7b50a3dd307a935b
m_Address: Assets/Resources_moved/Prefabs/Enemies/Fog.prefab m_Address: Assets/Resources_moved/Prefabs/Enemies/Fog.prefab
m_ReadOnly: 0 m_ReadOnly: 0
m_SerializedLabels: [] m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0 FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f74a409bf11b25148ad305acc05b14f5
m_Address: Audio/Dispatcher/take_damage2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0 m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2} m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2}
m_SchemaSet: m_SchemaSet:
m_Schemas: m_Schemas:
- {fileID: 11400000, guid: 75ffac7db08d9615c994048949431551, type: 2} - {fileID: 11400000, guid: 75ffac7db08d9615c994048949431551, type: 2}
- {fileID: 11400000, guid: 6d6fed27b8c8a3eebb9bc5289b7a6956, type: 2}
@@ -0,0 +1,57 @@
%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Levels
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
m_GroupName: Levels
m_GUID: d7e4a8c4f2a42c64587c34ab7446f091
m_SerializeEntries:
- m_GUID: 28a6c7a4124141341ab7c2b7dfd3e95b
m_Address: Assets/Resources_moved/Prefabs/Levels/Level1 2.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2c6a984e4a1b42647b48e6b7bc69b158
m_Address: Prefabs/Levels/Level6
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3f8f2171cc252d953b82083cc16bd1ae
m_Address: Assets/Resources_moved/Prefabs/Levels/Level6_1.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7067a5248027e74478f4f0f53ddf06a4
m_Address: Prefabs/Rooms/Save1
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9d78f017876abed4c9cd8957f1e140cb
m_Address: Prefabs/Rooms/Level1_2
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c938de3174f184741925c407a43a47f2
m_Address: Prefabs/Rooms/Level1
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e3a3840a7963bf841872cddb02e90151
m_Address: Prefabs/Levels/MainMenu 1
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 41705eee932aeb341b6921d8a793acc3, type: 2}
@@ -1,8 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 1c47a9db23597b54b81c3148b0da9cb1 guid: 6334e9a905fd7634a8c646d57a23968d
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 112000000 mainObjectFileID: 11400000
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
@@ -0,0 +1,70 @@
%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Music
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
m_GroupName: Music
m_GUID: 1e9bc7e1e4087c0488fccf896b0ed49f
m_SerializeEntries:
- m_GUID: 16562a5c87213914cad415f10c65a3b0
m_Address: "Assets/Resources_moved/Audio/Music/LASKX3I - \u041F\u0440\u043E\u0442\u0438\u0432
\u0446\u0430\u0440\u044F (\u041A\u0430\u0440\u0430\u043E\u043A\u0435).mp3"
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 170b1a70ddee4d948abea041b9b805e4
m_Address: Assets/Resources_moved/Audio/Music/Half Life Original Soundtrack -
Track 8 - Diabolical Adrenaline Guitar.mp3
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 414d8dcca794556478c1a79e705e138e
m_Address: Assets/Resources_moved/Audio/Music/soft_music.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 803e40b883c823b89a91aa8b9d9fc483
m_Address: valve_sound
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8187ea542d6ed824d81230966a3b7499
m_Address: Assets/Resources_moved/Audio/Music/Bauhaus - Bela Lugosi's Dead (No
Vocals Remix).mp3
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8f913b505c805c74da84e00a22ff5fc2
m_Address: Assets/Resources_moved/Audio/Music/bedlam_music.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9ea414d55e6a0b94c944556ff0754c48
m_Address: Assets/Resources_moved/Audio/Music/order_music.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ebe18293a5ef86704b23dad3a1786476
m_Address: Half-Life01
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: fc08098e6384c904aa0583859ee45ce5
m_Address: Assets/Resources_moved/Audio/Music/death_music.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: ad1eba3497492f54c8ca95e03d446775, type: 2}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: df8f8d52915542e49a11fbc177f3cf2c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,48 @@
%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: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: Audio_BundledAssetGroupSchema
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema
m_Group: {fileID: 11400000, guid: ba51c0b85beab267d8f41a72df4fb657, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_StripDownloadOptions: 0
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 3dfc1a15d30236e7a8856b2164e14280
m_LoadPath:
m_Id: 6c794a757c731a0319b43709731ad88b
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_UseDefaultSchemaSettings: 0
m_SelectedPathPairIndex: 0
m_BundleNaming: 0
m_AssetLoadMode: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5a1eefed8456ba0479d7c04e6a5f4122
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -2,7 +2,7 @@ fileFormatVersion: 2
guid: 6d6fed27b8c8a3eebb9bc5289b7a6956 guid: 6d6fed27b8c8a3eebb9bc5289b7a6956
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000 mainObjectFileID: 0
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
@@ -0,0 +1,48 @@
%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: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: Levels_BundledAssetGroupSchema
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema
m_Group: {fileID: 11400000, guid: 6334e9a905fd7634a8c646d57a23968d, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_StripDownloadOptions: 0
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 3dfc1a15d30236e7a8856b2164e14280
m_LoadPath:
m_Id: 6c794a757c731a0319b43709731ad88b
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_UseDefaultSchemaSettings: 0
m_SelectedPathPairIndex: 0
m_BundleNaming: 0
m_AssetLoadMode: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 41705eee932aeb341b6921d8a793acc3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,48 @@
%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: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: Music_BundledAssetGroupSchema
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema
m_Group: {fileID: 11400000, guid: df8f8d52915542e49a11fbc177f3cf2c, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_StripDownloadOptions: 0
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 3dfc1a15d30236e7a8856b2164e14280
m_LoadPath:
m_Id: 6c794a757c731a0319b43709731ad88b
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_UseDefaultSchemaSettings: 0
m_SelectedPathPairIndex: 0
m_BundleNaming: 0
m_AssetLoadMode: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ad1eba3497492f54c8ca95e03d446775
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,48 @@
%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: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: UI_BundledAssetGroupSchema
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema
m_Group: {fileID: 11400000, guid: 3eb9af1699b33ee4fa3ddeb0a1a9f793, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_StripDownloadOptions: 0
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 3dfc1a15d30236e7a8856b2164e14280
m_LoadPath:
m_Id: 6c794a757c731a0319b43709731ad88b
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_UseDefaultSchemaSettings: 0
m_SelectedPathPairIndex: 0
m_BundleNaming: 0
m_AssetLoadMode: 0
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5b0e1794b785fb54988037373b6bb1f3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,47 @@
%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: UI
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
m_GroupName: UI
m_GUID: 3f67261f611d8cd43a09d4d5cf638d8d
m_SerializeEntries:
- m_GUID: 23e11d2c8a4f12f4ea9a7a43d1118464
m_Address: Gameplay
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 48aebfe8826dc0df79d047b5afbf8f5b
m_Address: Canvas
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b2e8dc2aeb0311cd8a826b51cf8e94dc
m_Address: GameOver
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: c566fc932edefbbee9e53271eac3c560
m_Address: MainMenu
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f23b9fce9594618e5b75845f1cae50de
m_Address: LoadingScreen
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 5b0e1794b785fb54988037373b6bb1f3, type: 2}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3eb9af1699b33ee4fa3ddeb0a1a9f793
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -1,6 +1,9 @@
using Code.App.StateMachine; using Code.App.StateMachine;
using Code.Audio;
using Code.Gameplay.Player; using Code.Gameplay.Player;
using Code.Input; using Code.Input;
using Code.Scenes;
using Code.Scenes.SceneEnvironments;
using Code.StateMachine; using Code.StateMachine;
using Code.UI; using Code.UI;
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
@@ -30,7 +33,11 @@ namespace Code.App.AppStates
Context.InputService.EnableMap(ActionMappings.UI); Context.InputService.EnableMap(ActionMappings.UI);
Context.InputService.DebugBindAction((int)ActionMappings.UI,(int)UIActions.Continue, TryToExit); Context.InputService.DebugBindAction((int)ActionMappings.UI,(int)UIActions.Continue, TryToExit);
GameOver(); Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Death);
Context.AudioService.ApplyStun(5000,0.5f);
GameOver().Forget();
base.EnterState(); base.EnterState();
} }
@@ -45,7 +52,7 @@ namespace Code.App.AppStates
await Context.UIService.AsyncSwitchPanelTo(UIPanel.GameOver); await Context.UIService.AsyncSwitchPanelTo(UIPanel.GameOver);
_gameOverPanel = (GameOverPanel)Context.UIService.CurrentPanel; _gameOverPanel = (GameOverPanel)Context.UIService.CurrentPanel;
_gameOverPanel.Show();
} }
private void ToMainMenu() private void ToMainMenu()
@@ -71,6 +78,8 @@ namespace Code.App.AppStates
Context.InputService.DisableMap(ActionMappings.UI); Context.InputService.DisableMap(ActionMappings.UI);
Context.InputService.DebugUnbindAction((int)ActionMappings.UI,(int)UIActions.Continue, TryToExit); Context.InputService.DebugUnbindAction((int)ActionMappings.UI,(int)UIActions.Continue, TryToExit);
Context.AudioService.GladlyAskToStopMusic(MusicType.Death, callback: Context.AudioFactory.ReleaseDeathMusic);
Context.AudioService.TransitToSnapshot(AudioSnapshotState.None);
base.ExitState(); base.ExitState();
} }
} }
@@ -13,10 +13,12 @@ using Code.StateMachine;
using Code.UI; using Code.UI;
using Code.UI.Panels; using Code.UI.Panels;
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using DG.Tweening;
using Reflex.Core; using Reflex.Core;
using Reflex.Extensions; using Reflex.Extensions;
using UnityEngine; using UnityEngine;
using UnityEngine.InputSystem; using UnityEngine.InputSystem;
using UnityEngine.Rendering;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
namespace Code.App.AppStates namespace Code.App.AppStates
@@ -43,26 +45,17 @@ namespace Code.App.AppStates
.RegisterLoading(LoadingWork.LoadModelResource) .RegisterLoading(LoadingWork.LoadModelResource)
.RegisterLoading(LoadingWork.LoadAudio); .RegisterLoading(LoadingWork.LoadAudio);
//_playerHealth = Context.PlayerFactory.CreatePlayerHealth();
//_playerHealth.OnDamage += PlayerDamageTaken;
//_playerHealth.OnDeath += EndGame;
Context.AudioService.TransitToSnapshot(AudioSnapshotState.None); Context.AudioService.TransitToSnapshot(AudioSnapshotState.None);
Context.InputService.EnableMap(ActionMappings.Gameplay); Context.InputService.EnableMap(ActionMappings.Gameplay);
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, InstaKillDEBUG); Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, InstaKillDEBUG);
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG); Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, TakeGamageDEBUG);
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, Tube);
// Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.DevGen);
Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.DevGen); Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.DevGen);
Context.LoadingManager.OnLoadingEnded += AfterSceneLoaded; Context.LoadingManager.OnLoadingEnded += AfterSceneLoaded;
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed WaitForLoad().Forget();
WaitForLoad();
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
} }
private async UniTask WaitForPlayerCharacterLoad() => _playerCharacter = await Context.PlayerFactory.CreatePlayer(); private async UniTask WaitForPlayerCharacterLoad() => _playerCharacter = await Context.PlayerFactory.CreatePlayer();
@@ -71,7 +64,8 @@ namespace Code.App.AppStates
await UniTask.WhenAll( await UniTask.WhenAll(
Context.UIService.AsyncSwitchPanelTo(UIPanel.Gameplay), Context.UIService.AsyncSwitchPanelTo(UIPanel.Gameplay),
Context.AudioFactory.WarmGameplayMusic(), Context.AudioFactory.WarmGameplayMusic(),
Context.AudioFactory.WarmSFX(), Context.AudioFactory.WarmDeathMusic(),
// Context.AudioFactory.WarmSFX(),
Context.AudioFactory.WarmDispatcher(), Context.AudioFactory.WarmDispatcher(),
Context.AudioFactory.WarmEnemies(), Context.AudioFactory.WarmEnemies(),
Context.AudioFactory.WarmCourier() Context.AudioFactory.WarmCourier()
@@ -118,6 +112,8 @@ namespace Code.App.AppStates
GameplaySceneEnvironment sceneEnvironment = SceneEnvironmentVariables(sceneContainer); GameplaySceneEnvironment sceneEnvironment = SceneEnvironmentVariables(sceneContainer);
_volume = sceneEnvironment.volume;
PlayerInitialize(sceneEnvironment); PlayerInitialize(sceneEnvironment);
CameraInitialize(); CameraInitialize();
@@ -160,21 +156,29 @@ namespace Code.App.AppStates
{ {
Context.AudioService.PlayDispatcher((DispatcherSounds)Random.Range((int)DispatcherSounds.TakeDamage1,(int)DispatcherSounds.TakeDamage4)); Context.AudioService.PlayDispatcher((DispatcherSounds)Random.Range((int)DispatcherSounds.TakeDamage1,(int)DispatcherSounds.TakeDamage4));
Context.AudioService.PlayCourier((CourierSounds)Random.Range((int)CourierSounds.Damage1,(int)CourierSounds.Damage2)); Context.AudioService.PlayCourier((CourierSounds)Random.Range((int)CourierSounds.Damage1,(int)CourierSounds.Damage2));
DamageEffectProcess().Forget();
}
// TODO В конфиг
private async UniTaskVoid DamageEffectProcess()
{
_damagePanel.Show();
Context.AudioService.ApplyStun(200, 0.5f);
DOTween.To(() => _volume.weight, x => _volume.weight = x, 1f, 0.5f);
await UniTask.WaitForSeconds(3f);
DOTween.To(() => _volume.weight, x => _volume.weight = x, 0f, 1f);
Context.AudioService.ApplyStun(5000, 1f);
_damagePanel.Hide();
} }
// DEBUG // DEBUG
private void InstaKillDEBUG(InputAction.CallbackContext context) private void InstaKillDEBUG(InputAction.CallbackContext context)
{ {
_playerHealth.InstaKill(); _playerHealth.InstaKill();
} }
private void RoomPassedDEBUG(InputAction.CallbackContext context) private void TakeGamageDEBUG(InputAction.CallbackContext context)
{ {
_orderService.RoomPassed(); _playerHealth.GetDamage(1);
}
private OrderDispenser _debugTube;
private void Tube(InputAction.CallbackContext context)
{
_debugTube.ThrowOrder();
} }
// DEBUG // DEBUG
private bool _tickEnabled; private bool _tickEnabled;
@@ -208,17 +212,16 @@ namespace Code.App.AppStates
Context.AudioService.OnDispatcherEnded -= _gameplayPanel.CloseDispatcher; Context.AudioService.OnDispatcherEnded -= _gameplayPanel.CloseDispatcher;
Context.InputService.DisableMap(ActionMappings.Gameplay); Context.InputService.DisableMap(ActionMappings.Gameplay);
Context.AudioService.GladlyAskToStopMusic(MusicType.Action, callback: Context.AudioFactory.ReleaseActionMusic); Context.AudioService.GladlyAskToStopMusic(MusicType.Action, time: 0f, callback: Context.AudioFactory.ReleaseActionMusic);
Context.AudioService.GladlyAskToStopMusic(MusicType.Peaceful, callback: Context.AudioFactory.ReleasePeacefulMusic); Context.AudioService.GladlyAskToStopMusic(MusicType.Peaceful, time: 0f, callback: Context.AudioFactory.ReleasePeacefulMusic);
Context.AudioFactory.ReleaseCourier(); Context.AudioFactory.ReleaseCourier();
Context.AudioFactory.ReleaseDispatcher(); Context.AudioFactory.ReleaseDispatcher();
Context.AudioFactory.ReleaseEnemies(); Context.AudioFactory.ReleaseEnemies();
Context.AudioFactory.ReleaseSFX(); // Context.AudioFactory.ReleaseSFX();
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, InstaKillDEBUG); Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, InstaKillDEBUG);
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG); Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, TakeGamageDEBUG);
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, Tube);
base.ExitState(); base.ExitState();
} }
@@ -235,13 +238,15 @@ namespace Code.App.AppStates
private GameplayPanel _gameplayPanel; private GameplayPanel _gameplayPanel;
private ArmsMeshProvider _armsMesh; private ArmsMeshProvider _armsMesh;
private DamagePanel _damagePanel;
private void UIInitialize() private void UIInitialize()
{ {
_gameplayPanel = (GameplayPanel)Context.UIService.CurrentPanel; _gameplayPanel = (GameplayPanel)Context.UIService.CurrentPanel;
_gameplayPanel.Initialize(_playerScore, _playerHealth, _orderService); _gameplayPanel.Initialize(_playerScore, _playerHealth, _orderService);
Context.AudioService.OnDispatcherStarted += _gameplayPanel.SummonDispatcher; Context.AudioService.OnDispatcherStarted += _gameplayPanel.SummonDispatcher;
Context.AudioService.OnDispatcherEnded += _gameplayPanel.CloseDispatcher; Context.AudioService.OnDispatcherEnded += _gameplayPanel.CloseDispatcher;
_damagePanel = _gameplayPanel.DamagePanel;
} }
private void MusicInitialize() private void MusicInitialize()
{ {
@@ -263,11 +268,12 @@ namespace Code.App.AppStates
_orderService.OnOrderDelivered += OrderDelivered; _orderService.OnOrderDelivered += OrderDelivered;
_orderService.OnOrderFailure += OrderFailure; _orderService.OnOrderFailure += OrderFailure;
} }
private Volume _volume;
private GameplaySceneEnvironment SceneEnvironmentVariables(Container sceneContainer) private GameplaySceneEnvironment SceneEnvironmentVariables(Container sceneContainer)
{ {
var sceneEnvironment = (GameplaySceneEnvironment)sceneContainer.Resolve<CurrentSceneEnvironment>(); var sceneEnvironment = (GameplaySceneEnvironment)sceneContainer.Resolve<CurrentSceneEnvironment>();
return sceneEnvironment; return sceneEnvironment;
} }
} }
@@ -119,9 +119,7 @@ namespace Code.App
AttributeInjector.Inject(cameraStateMachine.StateMachineContext, container); AttributeInjector.Inject(cameraStateMachine.StateMachineContext, container);
cameraStateMachine.Initialize(); 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).Forget();
BootstrapFinish(container);
#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
} }
private async UniTaskVoid BootstrapFinish(Container container) private async UniTaskVoid BootstrapFinish(Container container)
{ {
@@ -0,0 +1,42 @@
using UnityEngine;
namespace Code.App.Debug
{
public class Logger : MonoBehaviour
{
//#if !UNITY_EDITOR
static string myLog = "";
private string output;
private string stack;
void OnEnable()
{
Application.logMessageReceived += Log;
}
void OnDisable()
{
Application.logMessageReceived -= Log;
}
public void Log(string logString, string stackTrace, LogType type)
{
output = logString;
stack = stackTrace;
myLog = output + " " + myLog;
if (myLog.Length > 5000)
{
myLog = myLog.Substring(0, 4000);
}
}
void OnGUI()
{
//if (!Application.isEditor) //Do not display in editor ( or you can use the UNITY_EDITOR macro to also disable the rest)
{
myLog = GUI.TextArea(new Rect(10, 10, Screen.width - 10, Screen.height - 10), myLog);
}
}
//#endif
}
}
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: dc474668ede54a9aa1e0f29c59f067f5
timeCreated: 1764915992
@@ -46,9 +46,9 @@ namespace Code.App.SceneInstallers
private async UniTaskVoid LoadRooms(Container container, ILoadingManager loadingManager) private async UniTaskVoid LoadRooms(Container container, ILoadingManager loadingManager)
{ {
// await container.Resolve<IRoomGeneratorFactory>().PreloadRooms(container.Resolve<IOrderService>()); await container.Resolve<IRoomGeneratorFactory>().PreloadRooms(container.Resolve<IOrderService>());
// container.Resolve<RoomGenerator>().Initialize(); container.Resolve<RoomGenerator>().Initialize();
loadingManager.UnregisterLoading(LoadingWork.LoadModelResource); loadingManager.UnregisterLoading(LoadingWork.LoadModelResource);
} }
@@ -2,19 +2,16 @@ namespace Code.Audio
{ {
public enum SFXSounds public enum SFXSounds
{ {
Crowbar,
Shot357
} }
public enum UISounds public enum UISounds
{ {
Crowbar
} }
public enum EnemiesSounds public enum EnemiesSounds
{ {
Bastard, GrandpaAttack,
Bravo, GrandpaStep,
RoachStep, RoachAttack,
GrandpaStep RoachStep
} }
public enum DispatcherSounds public enum DispatcherSounds
{ {
@@ -19,6 +19,7 @@ namespace Code.Audio
private AssetReference[] _audioTestClipsReferences; private AssetReference[] _audioTestClipsReferences;
private AssetReference[] _peacefulSoundtrack; private AssetReference[] _peacefulSoundtrack;
private AssetReference[] _actionSoundtrack; private AssetReference[] _actionSoundtrack;
private AssetReference[] _deathSoundtrack;
private AssetReference[] _menuSoundtrack; private AssetReference[] _menuSoundtrack;
private AssetReference[] _SFX; private AssetReference[] _SFX;
private AssetReference[] _enemies; private AssetReference[] _enemies;
@@ -27,6 +28,7 @@ namespace Code.Audio
private AsyncOperationHandle<IList<AudioClip>> _audioTestClipsHandle; private AsyncOperationHandle<IList<AudioClip>> _audioTestClipsHandle;
private AsyncOperationHandle<IList<AudioClip>> _menuMusicHandle; private AsyncOperationHandle<IList<AudioClip>> _menuMusicHandle;
private AsyncOperationHandle<IList<AudioClip>> _deathMusicHandle;
private AsyncOperationHandle<IList<AudioClip>> _actionMusicHandle; private AsyncOperationHandle<IList<AudioClip>> _actionMusicHandle;
private AsyncOperationHandle<IList<AudioClip>> _peacefulMusicHandle; private AsyncOperationHandle<IList<AudioClip>> _peacefulMusicHandle;
private AsyncOperationHandle<IList<AudioClip>> _SFXHandle; private AsyncOperationHandle<IList<AudioClip>> _SFXHandle;
@@ -55,6 +57,7 @@ namespace Code.Audio
_peacefulSoundtrack = soundtrackListConfig.peacefulSoundtrack; _peacefulSoundtrack = soundtrackListConfig.peacefulSoundtrack;
_actionSoundtrack = soundtrackListConfig.actionSoundtrack; _actionSoundtrack = soundtrackListConfig.actionSoundtrack;
_deathSoundtrack = soundtrackListConfig.deathSoundtrack;
_menuSoundtrack = soundtrackListConfig.menuSoundtrack; _menuSoundtrack = soundtrackListConfig.menuSoundtrack;
_SFX = sfxListConfig.SFX; _SFX = sfxListConfig.SFX;
_enemies = enemiesSoundListConfig.enemies; _enemies = enemiesSoundListConfig.enemies;
@@ -63,8 +66,9 @@ namespace Code.Audio
_audioTestClipsReferences = audioTestClipsConfig.audioTestClips; _audioTestClipsReferences = audioTestClipsConfig.audioTestClips;
MusicDictionary.Add(MusicType.Menu, new ()); MusicDictionary.Add(MusicType.Menu, new ());
MusicDictionary.Add(MusicType.Peaceful, new ()); MusicDictionary.Add(MusicType.Death, new ());
MusicDictionary.Add(MusicType.Action, new ()); MusicDictionary.Add(MusicType.Action, new ());
MusicDictionary.Add(MusicType.Peaceful, new ());
} }
public async UniTask LoadAudioSourcePrefab(Action<GameObject> callback) => public async UniTask LoadAudioSourcePrefab(Action<GameObject> callback) =>
@@ -116,6 +120,29 @@ namespace Code.Audio
// foreach (var assetReference in _menuSoundtrack) assetReference.ReleaseAsset(); // foreach (var assetReference in _menuSoundtrack) assetReference.ReleaseAsset();
_menuMusicHandle.Release(); _menuMusicHandle.Release();
} }
public async UniTask WarmCourier()
{
// _courierHandle = Addressables.LoadAssetsAsync<AudioClip>(_courier, OnCourierLoaded, Addressables.MergeMode.Union);
foreach (var assetReference in _courier) CourierAudios.Add(await Addressables.LoadAssetAsync<AudioClip>(assetReference));
// await _courierHandle.ToUniTask();
}
public void ReleaseCourier()
{
foreach (var assetReference in CourierAudios) Addressables.Release(assetReference);
CourierAudios.Clear();
// _courierHandle.Release();
}
public async UniTask WarmDeathMusic()
{
_deathMusicHandle = Addressables.LoadAssetsAsync<AudioClip>(_deathSoundtrack, OnDeathTrackLoaded, Addressables.MergeMode.Union);
await _deathMusicHandle.ToUniTask();
}
public void ReleaseDeathMusic()
{
MusicDictionary[MusicType.Death].Clear();
_deathMusicHandle.Release();
}
public async UniTask WarmSFX( ) public async UniTask WarmSFX( )
{ {
_SFXHandle = Addressables.LoadAssetsAsync<AudioClip>(_SFX, OnSFXLoaded, Addressables.MergeMode.Union); _SFXHandle = Addressables.LoadAssetsAsync<AudioClip>(_SFX, OnSFXLoaded, Addressables.MergeMode.Union);
@@ -141,18 +168,6 @@ namespace Code.Audio
EnemiesAudios.Clear(); EnemiesAudios.Clear();
_enemiesHandle.Release(); _enemiesHandle.Release();
} }
public async UniTask WarmCourier()
{
_courierHandle = Addressables.LoadAssetsAsync<AudioClip>(_courier, OnCourierLoaded, Addressables.MergeMode.Union);
await _courierHandle.ToUniTask();
}
public void ReleaseCourier()
{
CourierAudios.Clear();
_courierHandle.Release();
}
public async UniTask WarmDispatcher( ) public async UniTask WarmDispatcher( )
{ {
@@ -172,6 +187,10 @@ namespace Code.Audio
{ {
MusicDictionary[MusicType.Menu].Add(audioClip); MusicDictionary[MusicType.Menu].Add(audioClip);
} }
private void OnDeathTrackLoaded(AudioClip audioClip)
{
MusicDictionary[MusicType.Death].Add(audioClip);
}
// private int _audioTestClipCounter; // private int _audioTestClipCounter;
private void OnAudioTestClipLoaded(AudioClip audioClip) private void OnAudioTestClipLoaded(AudioClip audioClip)
@@ -25,7 +25,6 @@ namespace Code.Audio
private Dictionary<AudioType, AudioMixerGroup> _audioMixerGroups = new(); private Dictionary<AudioType, AudioMixerGroup> _audioMixerGroups = new();
private readonly AudioSourcePool _audioSourcePool; private readonly AudioSourcePool _audioSourcePool;
// private Dictionary<AudioSnapshotState, AudioMixerSnapshot> _snapshots = new();
// Юнити не может - говнокод поможет. // Юнити не может - говнокод поможет.
private Dictionary<AudioSnapshotState, Dictionary<AudioType, float>> _snapshotsVolumes = new(); private Dictionary<AudioSnapshotState, Dictionary<AudioType, float>> _snapshotsVolumes = new();
private Dictionary<AudioSourceType, AudioSourceSettingsConfig> _settings; private Dictionary<AudioSourceType, AudioSourceSettingsConfig> _settings;
@@ -58,6 +57,7 @@ namespace Code.Audio
float volume = Mathf.Log10(value) * 20; float volume = Mathf.Log10(value) * 20;
switch (type) switch (type)
{ {
case AudioType.DeathMusic:
case AudioType.Master: case AudioType.Master:
_snapshotsVolumes[AudioSnapshotState.Menu][type] = value; _snapshotsVolumes[AudioSnapshotState.Menu][type] = value;
_snapshotsVolumes[AudioSnapshotState.Action][type] = value; _snapshotsVolumes[AudioSnapshotState.Action][type] = value;
@@ -92,14 +92,17 @@ namespace Code.Audio
_mixer = _audioFactory.AudioMixer; _mixer = _audioFactory.AudioMixer;
_musicAudioGroups.Add(MusicType.Menu, _mixer.FindMatchingGroups(AudioGroups.MenuMusicGroup)[0]); _musicAudioGroups.Add(MusicType.Menu, _mixer.FindMatchingGroups(AudioGroups.MenuMusicGroup)[0]);
_musicAudioGroups.Add(MusicType.Death, _mixer.FindMatchingGroups(AudioGroups.DeathMusicGroup)[0]);
_musicAudioGroups.Add(MusicType.Action, _mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0]); _musicAudioGroups.Add(MusicType.Action, _mixer.FindMatchingGroups(AudioGroups.ActionMusicGroup)[0]);
_musicAudioGroups.Add(MusicType.Peaceful, _mixer.FindMatchingGroups(AudioGroups.PeacefulMusicGroup)[0]); _musicAudioGroups.Add(MusicType.Peaceful, _mixer.FindMatchingGroups(AudioGroups.PeacefulMusicGroup)[0]);
_cancellationTokenSources.Add(MusicType.Menu, new()); _cancellationTokenSources.Add(MusicType.Menu, new());
_cancellationTokenSources.Add(MusicType.Death, new());
_cancellationTokenSources.Add(MusicType.Action, new()); _cancellationTokenSources.Add(MusicType.Action, new());
_cancellationTokenSources.Add(MusicType.Peaceful, new()); _cancellationTokenSources.Add(MusicType.Peaceful, new());
_musicAudioSources.Add(MusicType.Menu, null); _musicAudioSources.Add(MusicType.Menu, null);
_musicAudioSources.Add(MusicType.Death, null);
_musicAudioSources.Add(MusicType.Action, null); _musicAudioSources.Add(MusicType.Action, null);
_musicAudioSources.Add(MusicType.Peaceful, null); _musicAudioSources.Add(MusicType.Peaceful, null);
@@ -109,6 +112,7 @@ namespace Code.Audio
_audioMixerGroups.Add(AudioType.Courier, _mixer.FindMatchingGroups(AudioGroups.CourierGroup)[0]); _audioMixerGroups.Add(AudioType.Courier, _mixer.FindMatchingGroups(AudioGroups.CourierGroup)[0]);
_audioMixerGroups.Add(AudioType.Enemies, _mixer.FindMatchingGroups(AudioGroups.EnemiesGroup)[0]); _audioMixerGroups.Add(AudioType.Enemies, _mixer.FindMatchingGroups(AudioGroups.EnemiesGroup)[0]);
_audioMixerGroups.Add(AudioType.MenuMusic, _musicAudioGroups[MusicType.Menu]); _audioMixerGroups.Add(AudioType.MenuMusic, _musicAudioGroups[MusicType.Menu]);
_audioMixerGroups.Add(AudioType.DeathMusic, _musicAudioGroups[MusicType.Death]);
_audioMixerGroups.Add(AudioType.ActionMusic, _musicAudioGroups[MusicType.Action]); _audioMixerGroups.Add(AudioType.ActionMusic, _musicAudioGroups[MusicType.Action]);
_audioMixerGroups.Add(AudioType.PeacefulMusic, _musicAudioGroups[MusicType.Peaceful]); _audioMixerGroups.Add(AudioType.PeacefulMusic, _musicAudioGroups[MusicType.Peaceful]);
@@ -157,7 +161,7 @@ namespace Code.Audio
public async UniTaskVoid GladlyAskToStopMusic(MusicType musicType, public async UniTaskVoid GladlyAskToStopMusic(MusicType musicType,
AudioSnapshotState audioSnapshotState = AudioSnapshotState.None, float time = 1f, Action callback = null) AudioSnapshotState audioSnapshotState = AudioSnapshotState.None, float time = 1f, Action callback = null)
{ {
// TransitToSnapshot(audioSnapshotState, time); //TransitToSnapshot(audioSnapshotState, time);
await UniTask.WaitForSeconds(time); await UniTask.WaitForSeconds(time);
@@ -170,6 +174,8 @@ namespace Code.Audio
{ {
_peacefulMusicSource.Stop(); _peacefulMusicSource.Stop();
_actionMusicSource.Stop(); _actionMusicSource.Stop();
_cancellationTokenSources[MusicType.Peaceful].Cancel();
_cancellationTokenSources[MusicType.Action].Cancel();
} }
public void GladlyAskToStopMusic(Action callback = null) public void GladlyAskToStopMusic(Action callback = null)
@@ -193,6 +199,10 @@ namespace Code.Audio
_audioSourcePool _audioSourcePool
.PlayOneShot(_audioFactory.SFXAudios[(int)sfxId], position, _audioMixerGroups[AudioType.SFX]).Forget(); .PlayOneShot(_audioFactory.SFXAudios[(int)sfxId], position, _audioMixerGroups[AudioType.SFX]).Forget();
} }
public void ApplyStun(float value, float time)
{
_mixer.DOSetFloat("Stun", value, time);
}
public void PlayEnemy(EnemiesSounds enemySoundId, Vector3 position) public void PlayEnemy(EnemiesSounds enemySoundId, Vector3 position)
{ {
@@ -31,5 +31,7 @@ namespace Code.Audio
void ReleaseDispatcher(); void ReleaseDispatcher();
UniTask WarmCourier(); UniTask WarmCourier();
void ReleaseCourier(); void ReleaseCourier();
UniTask WarmDeathMusic( );
void ReleaseDeathMusic();
} }
} }
@@ -26,5 +26,6 @@ namespace Code.Audio
AudioSource GetSourceOfGroup(AudioType group); AudioSource GetSourceOfGroup(AudioType group);
void ReleaseSourceOfGroup(AudioSource source); void ReleaseSourceOfGroup(AudioSource source);
void PlayCourier(CourierSounds range); void PlayCourier(CourierSounds range);
void ApplyStun(float value, float time);
} }
} }
@@ -4,7 +4,8 @@ namespace Code.Audio
{ {
Menu, Menu,
Peaceful, Peaceful,
Action Action,
Death
} }
public enum AudioType public enum AudioType
{ {
@@ -15,6 +16,7 @@ namespace Code.Audio
Courier, Courier,
Enemies, Enemies,
ActionMusic, ActionMusic,
PeacefulMusic PeacefulMusic,
DeathMusic
} }
} }
@@ -5,31 +5,51 @@ namespace Code.Configs
[CreateAssetMenu(fileName = "CharacterConfig", menuName = "Config/CharacterConfig")] [CreateAssetMenu(fileName = "CharacterConfig", menuName = "Config/CharacterConfig")]
public class CharacterConfig : ScriptableObject public class CharacterConfig : ScriptableObject
{ {
// Основное движение по земле
public float public float
maxStableMoveSpeed = 8f, // Максимальная скорость движения по устойчивой поверхности maxStableMoveSpeed = 12f,
stableMovementSharpness = 15f, // Резкость изменения скорости движения (чем выше - тем резче) stableMovementSharpness = 15f,
orientationSharpness = 10f, // Резкость изменения вращения персонажа (чем выше - тем резче) orientationSharpness = 10f;
jumpSpeed = 10f; // Скорость прыжка
// Спринт
public float public float
sprintMoveSpeed = 12f, // Максимальная скорость спринта jumpSpeed = 10f,
sprintAngleThreshold = 90f; // Максимальный угол (в градусах) от направления вперёд, при котором разрешён спринт jumpCooldown = 0.4f;
// Слайд
public float public float
slideSpeed = 20f, // Скорость слайда dashSpeed = 20f,
slideDuration = 0.8f, // Длительность слайда в секундах dashDuration = 0.35f,
slideCooldown = 1.5f; // Время перезарядки слайда в секундах dashCooldown = 1.2f;
public AnimationCurve slideVelocityCurve = new(
new Keyframe(0.0f, 1.0f),
new Keyframe(0.3f, 1.4f),
new Keyframe(1.0f, 0.2f)
);
public float
slideMinVelocityThreshold = 3f,
slideCooldown = 1.5f,
slideColliderHeightScale = 0.5f,
slideCameraOffsetY = -0.5f,
slideEnterDuration = 0.2f,
slideExitDuration = 0.25f;
// Наклон при залазании на стены
public float public float
leanAngle = 25f, leanAngle = 25f,
leanThreshold = 0.3f, leanThreshold = 0.3f,
leanSmoothSpeed = 10f; leanSmoothSpeed = 10f;
// Гравитация public Vector3 gravity = new(0f, -30f, 0f);
public Vector3 gravity = new(0f, -30f, 0f); // Вектор, отвечающий за применение гравитации public float
maxAirSpeed = 10f,
airControlSharpness = 8f;
public float
wallRunMaxTime = 1.75f,
wallRunSpeed = 15f,
wallRunAcceleration = 25f,
wallRunGravityScale = 0.25f,
wallDetachImpulse = 7f,
wallContactAngleThreshold = 45f,
minLookWithNormal = 30f,
maxLookWithNormal = 60f;
} }
} }
@@ -8,6 +8,7 @@ namespace Code.Configs
{ {
public AssetReference[] peacefulSoundtrack; public AssetReference[] peacefulSoundtrack;
public AssetReference[] actionSoundtrack; public AssetReference[] actionSoundtrack;
public AssetReference[] deathSoundtrack;
public AssetReference[] menuSoundtrack; public AssetReference[] menuSoundtrack;
} }
} }
@@ -27,5 +27,6 @@ namespace Code.Constants
public const string NoneSnapshot = "None"; public const string NoneSnapshot = "None";
public const string MenuSnapshot = "Menu"; public const string MenuSnapshot = "Menu";
public const string MenuMusicGroup = "Menu"; public const string MenuMusicGroup = "Menu";
public const string DeathMusicGroup = "Death";
} }
} }
@@ -0,0 +1,82 @@
using UnityEngine;
using Code.Gameplay.Camera;
using KinematicCharacterController;
namespace Code.Gameplay.Character.Controller.Abilities
{
public class DashMechanic
{
private readonly float _dashSpeed;
private readonly float _dashDuration;
private readonly float _dashCooldown;
private float _dashTimer;
private float _dashCooldownTimer;
private Vector3 _dashDirection;
private bool _dashRequested;
public bool IsDashing { get; private set; }
public DashMechanic(float dashSpeed, float dashDuration, float dashCooldown)
{
_dashSpeed = dashSpeed;
_dashDuration = dashDuration;
_dashCooldown = dashCooldown;
}
public void TickCooldown(float deltaTime)
{
if (_dashCooldownTimer > 0f) _dashCooldownTimer -= deltaTime;
}
public void RequestDash(bool dashPressed)
{
if (dashPressed && !_dashRequested && _dashCooldownTimer <= 0f)
_dashRequested = true;
}
public void TryStartDash(KinematicCharacterMotor motor,
CameraMode currentCameraMode,
Quaternion firstPersonCameraRotation,
Vector3 lookInputVector)
{
if (!_dashRequested || !motor.GroundingStatus.IsStableOnGround || _dashCooldownTimer > 0f)
{
_dashRequested = false;
return;
}
IsDashing = true;
_dashTimer = _dashDuration;
var dir = currentCameraMode == CameraMode.FirstPerson
? firstPersonCameraRotation * Vector3.forward
: lookInputVector;
_dashDirection = Vector3.ProjectOnPlane(dir, motor.CharacterUp).normalized;
if (_dashDirection.sqrMagnitude < 0.01f) _dashDirection = motor.CharacterForward;
_dashCooldownTimer = _dashCooldown;
_dashRequested = false;
}
public void HandleDash(ref Vector3 currentVelocity, float deltaTime, KinematicCharacterMotor motor)
{
_dashTimer -= deltaTime;
if (_dashTimer <= 0f || !motor.GroundingStatus.IsStableOnGround)
{
EndDash();
return;
}
currentVelocity = _dashDirection * _dashSpeed;
currentVelocity += motor.CharacterUp * 1.5f;
}
public void EndDash()
{
IsDashing = false;
_dashTimer = 0f;
}
}
}
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 6d62efb53e0c4d49be9fc658484e2575
timeCreated: 1764856437
@@ -1,122 +1,91 @@
using UnityEngine;
using Code.Gameplay.Camera; using Code.Gameplay.Camera;
using KinematicCharacterController; using KinematicCharacterController;
using UnityEngine;
namespace Code.Gameplay.Character.Controller.Abilities namespace Code.Gameplay.Character.Controller.Abilities
{ {
/*
* Механика слайда для персонажа
* Отвечает за управление состоянием, таймерами и скоростью слайда
*/
public class SlideMechanic public class SlideMechanic
{ {
// Скорость слайда private readonly AnimationCurve _velocityCurve;
private readonly float _slideSpeed; private readonly float _minVelocityThreshold;
// Длительность слайда в секундах private readonly float _cooldown;
private readonly float _slideDuration;
// Время перезарядки слайда
private readonly float _slideCooldown;
// Таймер слайда private float _slideTime;
private float _slideTimer; private float _cooldownTimer;
// Таймер перезарядки слайда
private float _slideCooldownTimer;
// Направление слайда
private Vector3 _slideDirection; private Vector3 _slideDirection;
// Флаг запроса слайда
private bool _slideRequested; private bool _slideRequested;
private float _initialSpeed;
// Свойство-флаг, активен ли слайд
public bool IsSliding { get; private set; } public bool IsSliding { get; private set; }
// Конструктор механики слайда public SlideMechanic(AnimationCurve velocityCurve, float minVelocityThreshold, float cooldown)
public SlideMechanic(float slideSpeed, float slideDuration, float slideCooldown)
{ {
_slideSpeed = slideSpeed; _velocityCurve = velocityCurve;
_slideDuration = slideDuration; _minVelocityThreshold = minVelocityThreshold;
_slideCooldown = slideCooldown; _cooldown = cooldown;
} }
// Обновляем таймер перезарядки слайда
public void TickCooldown(float deltaTime) public void TickCooldown(float deltaTime)
{ {
if (_slideCooldownTimer > 0f) if (_cooldownTimer > 0f) _cooldownTimer -= deltaTime;
{
_slideCooldownTimer -= deltaTime;
}
} }
// Обработка слайда
public void RequestSlide(bool slidePressed) public void RequestSlide(bool slidePressed)
{ {
if (slidePressed && !_slideRequested && _slideCooldownTimer <= 0f) if (slidePressed && !_slideRequested && _cooldownTimer <= 0f)
{
_slideRequested = true; _slideRequested = true;
} }
}
// Начало слайда
public void TryStartSlide(KinematicCharacterMotor motor, public void TryStartSlide(KinematicCharacterMotor motor,
CameraMode currentCameraMode, CameraMode currentCameraMode,
Quaternion firstPersonCameraRotation, Quaternion firstPersonCameraRotation,
Vector3 lookInputVector) Vector3 lookInputVector)
{ {
// Проверяем условия для старта слайда if (!_slideRequested || !motor.GroundingStatus.IsStableOnGround || _cooldownTimer > 0f)
if (!_slideRequested || !motor.GroundingStatus.IsStableOnGround || _slideCooldownTimer > 0f)
{ {
_slideRequested = false; _slideRequested = false;
return; return;
} }
IsSliding = true; IsSliding = true;
_slideTimer = _slideDuration; _slideTime = 0f;
// НАПРАВЛЕНИЕ СЛАЙДА - ВСЕГДА ВПЕРЕД ПО КАМЕРЕ var dir = currentCameraMode == CameraMode.FirstPerson
// Используем направление камеры, но проецируем на горизонтальную плоскость ? firstPersonCameraRotation * Vector3.forward
var slideDir = currentCameraMode == CameraMode.FirstPerson ? : lookInputVector;
firstPersonCameraRotation * Vector3.forward :
lookInputVector;
// Проецируем на горизонтальную плоскость и нормализуем _slideDirection = Vector3.ProjectOnPlane(dir, motor.CharacterUp).normalized;
_slideDirection = Vector3.ProjectOnPlane(slideDir, motor.CharacterUp).normalized; if (_slideDirection.sqrMagnitude < 0.01f) _slideDirection = motor.CharacterForward;
// Если направление нулевое (персонаж стоит на месте), используем направление вперед _initialSpeed = motor.Velocity.magnitude;
if (_slideDirection.sqrMagnitude < 0.01f) if (_initialSpeed < 12f) _initialSpeed = 12f; // fallback
{
_slideDirection = motor.CharacterForward;
}
// Устанавливаем перезарядку _cooldownTimer = _cooldown;
_slideCooldownTimer = _slideCooldown;
_slideRequested = false; _slideRequested = false;
} }
// Обработка слайда
public void HandleSlide(ref Vector3 currentVelocity, float deltaTime, KinematicCharacterMotor motor) public void HandleSlide(ref Vector3 currentVelocity, float deltaTime, KinematicCharacterMotor motor)
{ {
// Уменьшаем таймер слайда if (!IsSliding) return;
_slideTimer -= deltaTime;
// Если время слайда вышло, персонаж в воздухе - заканчиваем слайд _slideTime += deltaTime;
if (_slideTimer <= 0f || !motor.GroundingStatus.IsStableOnGround)
{ var t = Mathf.Clamp01(_slideTime / 2.5f);
var speedMult = _velocityCurve.Evaluate(t);
var targetSpeed = _initialSpeed * speedMult;
currentVelocity = _slideDirection * targetSpeed;
currentVelocity += motor.CharacterUp * 1f;
if (targetSpeed < _minVelocityThreshold || !motor.GroundingStatus.IsStableOnGround)
EndSlide(); EndSlide();
return;
} }
// Устанавливаем скорость слайда вперед
// Используем прямую установку скорости вместо сложных вычислений
currentVelocity = _slideDirection * _slideSpeed;
// Добавляем небольшую вертикальную компоненту для лучшего скольжения по неровностям
currentVelocity += motor.CharacterUp * 2f;
}
// Завершение слайда
public void EndSlide() public void EndSlide()
{ {
IsSliding = false; IsSliding = false;
_slideTimer = 0f; _slideTime = 0f;
} }
} }
} }
@@ -1,4 +1,3 @@
using Code.Gameplay.Character.Controller.Input;
using Code.Gameplay.Character.Core; using Code.Gameplay.Character.Core;
using KinematicCharacterController; using KinematicCharacterController;
using UnityEngine; using UnityEngine;
@@ -7,14 +6,13 @@ namespace Code.Gameplay.Character.Controller.Abilities
{ {
public class WallRunningMechanic public class WallRunningMechanic
{ {
public float MaxWallRunTime = 1.75f; private readonly float _maxWallRunTime;
public float WallRunSpeed = 8.0f; private readonly float _wallRunSpeed;
public float WallRunAcceleration = 25.0f; private readonly float _wallRunAcceleration;
public float WallRunGravityScale = 0.25f; private readonly float _wallRunGravityScale;
public float WallDetachImpulse = 7.0f; private readonly float _wallDetachImpulse;
public float WallContactAngleThreshold = 45.0f; private readonly float _wallContactAngleThreshold;
private bool _isWallRunning;
private float _wallRunTimer; private float _wallRunTimer;
private Vector3 _wallNormal; private Vector3 _wallNormal;
private Vector3 _wallTangentRight; private Vector3 _wallTangentRight;
@@ -24,112 +22,136 @@ namespace Code.Gameplay.Character.Controller.Abilities
private float _surfaceAngleCos; private float _surfaceAngleCos;
private bool _canWallRun; private bool _canWallRun;
public float WallContactHeight { get; private set; }
public Vector3 WallRunStartForward { get; private set; } private readonly float _minLookAngleToWallPlane;
private readonly float _maxLookAngleToWallPlane;
private float _minLookDotWithNormal;
private float _maxLookDotWithNormal;
private KinematicCharacterMotor _motor; private KinematicCharacterMotor _motor;
private CharacterInputHandler _inputHandler;
public bool IsWallRunning => _isWallRunning; public bool IsWallRunning { get; private set; }
public void Initialize(KinematicCharacterMotor motor, CharacterInputHandler inputHandler) public WallRunningMechanic(
float maxWallRunTime,
float wallRunSpeed,
float wallRunAcceleration,
float wallRunGravityScale,
float wallDetachImpulse,
float wallContactAngleThreshold,
float minLookAngleToWallPlane,
float maxLookAngleToWallPlane)
{ {
_motor = motor; _maxWallRunTime = maxWallRunTime;
_inputHandler = inputHandler; _wallRunSpeed = wallRunSpeed;
_surfaceAngleCos = Mathf.Cos(Mathf.Deg2Rad * WallContactAngleThreshold); _wallRunAcceleration = wallRunAcceleration;
_wallRunGravityScale = wallRunGravityScale;
_wallDetachImpulse = wallDetachImpulse;
_wallContactAngleThreshold = wallContactAngleThreshold;
_minLookAngleToWallPlane = Mathf.Clamp(minLookAngleToWallPlane, 0f, 90f);
_maxLookAngleToWallPlane = Mathf.Clamp(maxLookAngleToWallPlane, 0f, 90f);
} }
public void Reset() public void Initialize(KinematicCharacterMotor motor)
{ {
_isWallRunning = false; _motor = motor;
_wallRunTimer = 0f; _surfaceAngleCos = Mathf.Cos(Mathf.Deg2Rad * _wallContactAngleThreshold);
_wallNormal = Vector3.zero;
var minAngleWithNormal = 90f - _maxLookAngleToWallPlane;
var maxAngleWithNormal = 90f - _minLookAngleToWallPlane;
_maxLookDotWithNormal = Mathf.Cos(Mathf.Deg2Rad * minAngleWithNormal);
_minLookDotWithNormal = Mathf.Cos(Mathf.Deg2Rad * maxAngleWithNormal);
} }
public void Tick(float deltaTime) public void Tick(float deltaTime)
{ {
if (_isWallRunning) if (!IsWallRunning) return;
{
_wallRunTimer += deltaTime; _wallRunTimer += deltaTime;
if (_wallRunTimer > MaxWallRunTime) if (_wallRunTimer > _maxWallRunTime)
{ {
DetachFromWall(false); DetachFromWall(false);
} }
} }
}
public bool TryStartWallRun(Vector3 hitNormal, Vector3 hitPoint) public bool TryStartWallRun(Vector3 hitNormal, Vector3 hitPoint, Vector3 lookDirection)
{ {
if (_isWallRunning) return false; if (IsWallRunning) return false;
float dotWithUp = Vector3.Dot(hitNormal, _motor.CharacterUp);
bool isWall = Mathf.Abs(dotWithUp) < _surfaceAngleCos;
var dotWithUp = Vector3.Dot(hitNormal, _motor.CharacterUp);
var isWall = Mathf.Abs(dotWithUp) < _surfaceAngleCos;
if (!isWall) return false; if (!isWall) return false;
if (_motor.GroundingStatus.IsStableOnGround) return false; if (_motor.GroundingStatus.IsStableOnGround) return false;
float velocityIntoWall = Vector3.Dot(_motor.Velocity, -hitNormal); var velocityIntoWall = Vector3.Dot(_motor.Velocity, -hitNormal);
if (velocityIntoWall < 1f) return false; if (velocityIntoWall < 1f) return false;
var lookDirNormalized = lookDirection.normalized;
var dotWithNormal = Vector3.Dot(lookDirNormalized, hitNormal);
if (Mathf.Abs(dotWithNormal) < _minLookDotWithNormal || Mathf.Abs(dotWithNormal) > _maxLookDotWithNormal)
return false;
StartWallRun(hitNormal, hitPoint); StartWallRun(hitNormal, hitPoint);
return true; return true;
} }
private void StartWallRun(Vector3 wallNormal, Vector3 contactPoint) private void StartWallRun(Vector3 wallNormal, Vector3 contactPoint)
{ {
_isWallRunning = true; IsWallRunning = true;
_wallRunTimer = 0f; _wallRunTimer = 0f;
_wallNormal = wallNormal.normalized; _wallNormal = wallNormal.normalized;
_wallContactPoint = contactPoint; _wallContactPoint = contactPoint;
WallContactHeight = contactPoint.y;
//_wallTangentUp = Vector3.ProjectOnPlane(_motor.CharacterUp, _wallNormal).normalized; var forwardInWallPlane = Vector3.ProjectOnPlane(_motor.CharacterForward, _wallNormal).normalized;
if (_wallTangentUp.sqrMagnitude < 0.01f) _wallTangentUp = Vector3.up; if (forwardInWallPlane.sqrMagnitude < 0.01f)
{
var candidateRight = Vector3.Cross(_wallNormal, _motor.CharacterUp);
candidateRight = Vector3.ProjectOnPlane(candidateRight, _wallNormal).normalized;
_wallTangentRight = Vector3.Cross(_wallNormal, _wallTangentUp).normalized; if (candidateRight.sqrMagnitude < 0.01f)
{
candidateRight = Vector3.Cross(_wallNormal, Vector3.up);
candidateRight = Vector3.ProjectOnPlane(candidateRight, _wallNormal).normalized;
}
_wallTangentUp = Vector3.Cross(_wallTangentRight, _wallNormal).normalized; if (candidateRight.sqrMagnitude < 0.01f)
if (Vector3.Dot(_wallTangentUp, Vector3.up) < 0) {
_wallTangentUp = -_wallTangentUp; candidateRight = Vector3.Cross(_wallNormal, Vector3.right).normalized;
}
var dotWithRight = Vector3.Dot(_motor.CharacterRight, _wallNormal);
forwardInWallPlane = dotWithRight < 0 ? candidateRight : -candidateRight;
}
_wallTangentRight = forwardInWallPlane.normalized;
_wallTangentUp = Vector3.Cross(_wallTangentRight, -_wallNormal).normalized;
WallRunStartForward = _motor.CharacterForward;
_motor.ForceUnground(); _motor.ForceUnground();
} }
public void HandleWallRun(ref Vector3 currentVelocity, CharacterInputs inputs, float deltaTime) public void HandleWallRun(ref Vector3 currentVelocity, CharacterInputs inputs, float deltaTime)
{ {
if (!_isWallRunning) return; if (!IsWallRunning) return;
if (!IsWallStillPresent()) { DetachFromWall(false); return; } if (!IsWallStillPresent()) { DetachFromWall(false); return; }
Vector3 moveInputWorld = _inputHandler.MoveInputVector; var forwardInput = inputs.MoveAxisForward;
Vector3 moveInWallPlane = Vector3.ProjectOnPlane(moveInputWorld, _wallNormal); var moveDirection = _wallTangentRight * forwardInput;
Vector3 wsMove = Vector3.Project(moveInWallPlane, _wallTangentRight); var targetSpeed = moveDirection.sqrMagnitude > 0.01f ? _wallRunSpeed : currentVelocity.magnitude;
var targetVelocity = moveDirection.normalized * targetSpeed;
float ad = inputs.MoveAxisRight;
float sideDot = Vector3.Dot(_wallNormal, _motor.CharacterRight);
if (sideDot < 0)
ad = -ad;
Vector3 adMove = _wallTangentUp * (-ad);
Vector3 finalMove = wsMove + adMove;
finalMove = finalMove.normalized * moveInputWorld.magnitude;
Vector3 targetVelocity = finalMove * WallRunSpeed;
currentVelocity = Vector3.Lerp( currentVelocity = Vector3.Lerp(
currentVelocity, currentVelocity,
targetVelocity, targetVelocity,
1f - Mathf.Exp(-WallRunAcceleration * deltaTime) 1f - Mathf.Exp(-_wallRunAcceleration * deltaTime)
); );
currentVelocity += Physics.gravity * (WallRunGravityScale * deltaTime); currentVelocity += Physics.gravity * (_wallRunGravityScale * deltaTime);
float distanceToWall = Vector3.Dot(_motor.TransientPosition - _wallContactPoint, _wallNormal); var distanceToWall = Vector3.Dot(_motor.TransientPosition - _wallContactPoint, _wallNormal);
if (Mathf.Abs(distanceToWall) > 0.8f) if (Mathf.Abs(distanceToWall) > 0.8f)
{ {
DetachFromWall(false); DetachFromWall(false);
@@ -144,16 +166,17 @@ namespace Code.Gameplay.Character.Controller.Abilities
private bool IsWallStillPresent() private bool IsWallStillPresent()
{ {
if (_motor == null) return false; if (!_motor) return false;
Vector3 characterCenter = _motor.TransientPosition; if (_motor.GroundingStatus.IsStableOnGround) return false;
Vector3 characterForward = _motor.CharacterForward;
Vector3 characterRight = _motor.CharacterRight;
Vector3 characterUp = _motor.CharacterUp;
float checkDistance = 0.45f; var characterCenter = _motor.TransientPosition;
Vector3 rayOrigin = characterCenter + characterUp * 0.2f; var characterRight = _motor.CharacterRight;
Vector3 rayDir = -_wallNormal; var characterUp = _motor.CharacterUp;
const float checkDistance = 0.45f;
var rayOrigin = characterCenter + characterUp * 0.2f;
var rayDir = -_wallNormal;
Vector3[] offsets = { Vector3[] offsets = {
Vector3.zero, Vector3.zero,
@@ -165,92 +188,70 @@ namespace Code.Gameplay.Character.Controller.Abilities
foreach (var offset in offsets) foreach (var offset in offsets)
{ {
if (Physics.Raycast(rayOrigin + offset, rayDir, out RaycastHit hit, checkDistance, if (!Physics.Raycast(rayOrigin + offset, rayDir, out var hit, checkDistance,
_motor.CollidableLayers, QueryTriggerInteraction.Ignore)) _motor.CollidableLayers, QueryTriggerInteraction.Ignore)) continue;
{
float dotWithUp = Mathf.Abs(Vector3.Dot(hit.normal, characterUp)); var dotWithUp = Mathf.Abs(Vector3.Dot(hit.normal, characterUp));
if (dotWithUp < _surfaceAngleCos)
{ if (!(dotWithUp < _surfaceAngleCos)) continue;
_wallNormal = hit.normal.normalized; _wallNormal = hit.normal.normalized;
_wallContactPoint = hit.point; _wallContactPoint = hit.point;
/*_wallTangentUp = Vector3.ProjectOnPlane(_motor.CharacterUp, _wallNormal).normalized;
if (_wallTangentUp.sqrMagnitude < 0.01f) _wallTangentUp = Vector3.up;
_wallTangentRight = Vector3.Cross(_wallNormal, _wallTangentUp).normalized;
*/
return true; return true;
} }
}
}
return false; return false;
} }
public void DetachFromWall(bool withImpulse) private void DetachFromWall(bool withImpulse)
{ {
if (!_isWallRunning) return; if (!IsWallRunning) return;
_isWallRunning = false; IsWallRunning = false;
if (withImpulse && _motor != null) if (!withImpulse || !_motor) return;
{
Vector3 detachImpulse = -_wallNormal * WallDetachImpulse; var detachImpulse = -_wallNormal * _wallDetachImpulse;
_motor.BaseVelocity += detachImpulse; _motor.BaseVelocity += detachImpulse;
} }
}
public Vector3 GetWallNormal() => _wallNormal; public Vector3 GetWallNormal() => _wallNormal;
public bool TryGetWallTangents(out Vector3 up, out Vector3 right)
{
if (!_isWallRunning)
{
up = right = Vector3.zero;
return false;
}
up = _wallTangentUp;
right = _wallTangentRight;
return true;
}
public bool CanWallRun()
{
return !_isWallRunning && !_motor.GroundingStatus.IsStableOnGround;
}
public void PerformWallJump(CharacterInputs inputs, Quaternion cameraRotation) public void PerformWallJump(CharacterInputs inputs, Quaternion cameraRotation)
{ {
if (!_isWallRunning || _motor == null) return; if (!IsWallRunning || !_motor) return;
_isWallRunning = false; if (_motor.CharacterController is not CustomCharacterController { CanJump: true } controller)
return;
Vector3 wallAway = _wallNormal; IsWallRunning = false;
Vector3 wallUp = _wallTangentUp;
Vector3 playerForward = cameraRotation * Vector3.forward; var wallAway = _wallNormal;
var wallUp = Vector3.ProjectOnPlane(_motor.CharacterUp, _wallNormal).normalized;
Vector3 forwardInWallPlane = Vector3.ProjectOnPlane(playerForward, _wallNormal).normalized; var playerForward = cameraRotation * Vector3.forward;
var forwardInWallPlane = Vector3.ProjectOnPlane(playerForward, _wallNormal).normalized;
if (forwardInWallPlane.sqrMagnitude < 0.01f) forwardInWallPlane = _wallTangentRight; if (forwardInWallPlane.sqrMagnitude < 0.01f) forwardInWallPlane = _wallTangentRight;
Vector3 jumpDirection = var jumpDirection =
forwardInWallPlane * 0.2f + forwardInWallPlane * 0.2f +
wallAway * 0.4f + wallAway * 0.6f +
wallUp * 0.4f; wallUp * 0.2f;
jumpDirection = jumpDirection.normalized; jumpDirection = jumpDirection.normalized;
float wallJumpForce = WallDetachImpulse * 2f; var wallJumpForce = _wallDetachImpulse * 2f;
Vector3 jumpImpulse = jumpDirection * wallJumpForce; var jumpImpulse = jumpDirection * wallJumpForce;
_motor.BaseVelocity += jumpImpulse; _motor.BaseVelocity += jumpImpulse;
_motor.SetPosition(_motor.TransientPosition + wallAway * 0.07f); _motor.SetPosition(_motor.TransientPosition + wallAway * 0.07f);
if (_motor.CharacterController is CustomCharacterController controller) controller.TriggerJump();
{
controller.BlockAbilities(0.12f); controller.BlockAbilities(0.12f);
} }
} }
}
} }
@@ -25,8 +25,28 @@ namespace Code.Gameplay.Character.Controller
[SerializeField] private Transform characterTransform; // Трансформ персонажа (с точкой отслеживания камеры) [SerializeField] private Transform characterTransform; // Трансформ персонажа (с точкой отслеживания камеры)
[SerializeField] private CapsuleCollider _capsuleCollider;
[SerializeField] private Transform _cameraFollowPoint;
private Vector3 _originalColliderCenter;
private float _originalColliderHeight;
private Vector3 _originalFollowPointLocalPosition;
private bool _isEnteringSlide;
private bool _isExitingSlide;
private float _slideTransitionTime;
private float _slideTransitionDuration;
private float _currentColliderHeight;
private Vector3 _currentColliderCenter;
private Vector3 _currentFollowPointLocalPosition;
private bool _wasSlidingLastFrame;
private float _jumpCooldownTimer;
private float _jumpCooldownDuration => _characterConfig.jumpCooldown;
public bool CanJump => !isAbilitiesBlocked && _jumpCooldownTimer <= 0f;
// Подсистемы // Подсистемы
private CharacterInputHandler _inputHandler; private CharacterInputHandler _inputHandler;
private DashMechanic _dashMechanic;
private SlideMechanic _slideMechanic; private SlideMechanic _slideMechanic;
// private WallClimbMechanic _wallClimbMechanic; // private WallClimbMechanic _wallClimbMechanic;
private WallRunningMechanic _wallRunningMechanic; private WallRunningMechanic _wallRunningMechanic;
@@ -35,6 +55,7 @@ namespace Code.Gameplay.Character.Controller
private AirMovementSystem _airMovement; private AirMovementSystem _airMovement;
public bool IsSliding => _slideMechanic.IsSliding; public bool IsSliding => _slideMechanic.IsSliding;
public bool IsDashing => _dashMechanic.IsDashing;
public bool IsWallRunning => _wallRunningMechanic.IsWallRunning; public bool IsWallRunning => _wallRunningMechanic.IsWallRunning;
private float abilityBlockTimer; private float abilityBlockTimer;
@@ -50,28 +71,27 @@ namespace Code.Gameplay.Character.Controller
{ {
_characterConfig = characterConfig; _characterConfig = characterConfig;
// Инициализация подсистем с параметрами из конфига // Инициализация подсистем с параметрами из конфига
_inputHandler = new CharacterInputHandler( _inputHandler = new CharacterInputHandler();
_characterConfig.sprintAngleThreshold _dashMechanic = new DashMechanic(
_characterConfig.dashSpeed,
_characterConfig.dashDuration,
_characterConfig.dashCooldown
); );
_slideMechanic = new SlideMechanic( _slideMechanic = new SlideMechanic(
_characterConfig.slideSpeed, _characterConfig.slideVelocityCurve,
_characterConfig.slideDuration, _characterConfig.slideMinVelocityThreshold,
_characterConfig.slideCooldown _characterConfig.slideCooldown
); );
// _wallClimbMechanic = new WallClimbMechanic( _wallRunningMechanic = new WallRunningMechanic(
// _characterConfig.wallClimbSpeedFactor, _characterConfig.wallRunMaxTime,
// _characterConfig.minWallClimbSpeed, _characterConfig.wallRunSpeed,
// _characterConfig.wallDetectionAngleThreshold _characterConfig.wallRunAcceleration,
// ); _characterConfig.wallRunGravityScale,
_wallRunningMechanic = new WallRunningMechanic(); _characterConfig.wallDetachImpulse,
// Настройка параметров WallRunningMechanic (можно вынести в конфиг позже) _characterConfig.wallContactAngleThreshold,
_wallRunningMechanic.MaxWallRunTime = 1.75f; _characterConfig.minLookWithNormal,
_wallRunningMechanic.WallRunSpeed = 15.0f; _characterConfig.maxLookWithNormal
_wallRunningMechanic.WallRunAcceleration = 25.0f; );
_wallRunningMechanic.WallRunGravityScale = 0.25f;
_wallRunningMechanic.WallDetachImpulse = 7.0f;
_wallRunningMechanic.WallContactAngleThreshold = 45.0f;
_wallLeanMechanic = new WallLeanMechanic( _wallLeanMechanic = new WallLeanMechanic(
_characterConfig.leanAngle, _characterConfig.leanAngle,
_characterConfig.leanThreshold, _characterConfig.leanThreshold,
@@ -79,18 +99,28 @@ namespace Code.Gameplay.Character.Controller
); );
_groundMovement = new GroundMovementSystem( _groundMovement = new GroundMovementSystem(
_characterConfig.maxStableMoveSpeed, _characterConfig.maxStableMoveSpeed,
_characterConfig.sprintMoveSpeed,
_characterConfig.stableMovementSharpness, _characterConfig.stableMovementSharpness,
_characterConfig.jumpSpeed _characterConfig.jumpSpeed
); );
_airMovement = new AirMovementSystem(_characterConfig.gravity); _airMovement = new AirMovementSystem(
_characterConfig.gravity,
_characterConfig.maxAirSpeed,
_characterConfig.airControlSharpness
);
motor.CharacterController = this; // Регистрация этого контроллера в движке motor.CharacterController = this; // Регистрация этого контроллера в движке
_inputHandler.FirstPersonCameraRotation = _inputHandler.FirstPersonCameraRotation =
motor.Transform.rotation; // Начальное вращение совпадает с персонажемс motor.Transform.rotation; // Начальное вращение совпадает с персонажемс
_wallLeanMechanic.SetModel(characterTransform); _wallLeanMechanic.SetModel(characterTransform);
_wallRunningMechanic.Initialize(motor, _inputHandler); _wallRunningMechanic.Initialize(motor);
_originalColliderCenter = _capsuleCollider.center;
_originalColliderHeight = _capsuleCollider.height;
_originalFollowPointLocalPosition = _cameraFollowPoint.localPosition;
_currentColliderHeight = _originalColliderHeight;
_currentColliderCenter = _originalColliderCenter;
_currentFollowPointLocalPosition = _originalFollowPointLocalPosition;
} }
// Текущий режим камеры для адаптации поведения // Текущий режим камеры для адаптации поведения
@@ -99,17 +129,15 @@ namespace Code.Gameplay.Character.Controller
public void SetInputs(ref CharacterInputs inputs) public void SetInputs(ref CharacterInputs inputs)
{ {
_lastInputs = inputs; _lastInputs = inputs;
// Обновляем таймеры механик _dashMechanic.TickCooldown(Time.deltaTime);
_slideMechanic.TickCooldown(Time.deltaTime); _slideMechanic.TickCooldown(Time.deltaTime);
// _wallClimbMechanic.TickCooldown(Time.deltaTime);
_wallRunningMechanic.Tick(Time.deltaTime); _wallRunningMechanic.Tick(Time.deltaTime);
// Если активен слайд - игнорируем весь остальной ввод // Если активен слайд - игнорируем весь остальной ввод
if (_slideMechanic.IsSliding) if (_dashMechanic.IsDashing || _slideMechanic.IsSliding)
{ {
_inputHandler.MoveInputVector = Vector3.zero; _inputHandler.MoveInputVector = Vector3.zero;
_inputHandler.LookInputVector = Vector3.one; _inputHandler.LookInputVector = Vector3.one;
_inputHandler.IsSprinting = false;
_groundMovement.RequestJump(inputs.JumpPressed); _groundMovement.RequestJump(inputs.JumpPressed);
return; return;
} }
@@ -125,19 +153,28 @@ namespace Code.Gameplay.Character.Controller
} }
else else
{ {
inputs.SprintPressed = false; inputs.DashPressed = false;
inputs.SlidePressed = false; inputs.SlidePressed = false;
} }
} }
// Обработка слайда _dashMechanic.RequestDash(inputs.DashPressed);
_slideMechanic.RequestSlide(inputs.SlidePressed); _slideMechanic.RequestSlide(inputs.SlidePressed);
// Обработка остального ввода // Обработка остального ввода
_inputHandler.ProcessInputs(ref inputs, motor); _inputHandler.ProcessInputs(ref inputs, motor);
// Передаём запрос прыжка // Передаём запрос прыжка
_groundMovement.RequestJump(inputs.JumpPressed); var jumpInput = inputs.JumpPressed;
if (jumpInput && CanJump)
{
_groundMovement.RequestJump(true);
}
else
{
_groundMovement.RequestJump(false);
}
} }
public void UpdateRotation(ref Quaternion currentRotation, float deltaTime) public void UpdateRotation(ref Quaternion currentRotation, float deltaTime)
@@ -172,22 +209,45 @@ namespace Code.Gameplay.Character.Controller
public void UpdateVelocity(ref Vector3 currentVelocity, float deltaTime) public void UpdateVelocity(ref Vector3 currentVelocity, float deltaTime)
{ {
if (_dashMechanic.IsDashing && _groundMovement.JumpRequested)
_dashMechanic.EndDash();
if (_slideMechanic.IsSliding && _groundMovement.JumpRequested) if (_slideMechanic.IsSliding && _groundMovement.JumpRequested)
{
_slideMechanic.EndSlide(); _slideMechanic.EndSlide();
}
if (!_slideMechanic.IsSliding) if (!_dashMechanic.IsDashing)
{ _dashMechanic.TryStartDash(motor, _currentCameraMode, _inputHandler.FirstPersonCameraRotation, _inputHandler.LookInputVector);
_slideMechanic.TryStartSlide(motor, _currentCameraMode, _inputHandler.FirstPersonCameraRotation,
_inputHandler.LookInputVector);
}
else else
{ {
_slideMechanic.HandleSlide(ref currentVelocity, deltaTime, motor); _dashMechanic.HandleDash(ref currentVelocity, deltaTime, motor);
return; return;
} }
var wasSliding = _wasSlidingLastFrame;
var isSlidingNow = _slideMechanic.IsSliding;
if (!isSlidingNow)
{
_slideMechanic.TryStartSlide(motor, _currentCameraMode, _inputHandler.FirstPersonCameraRotation, _inputHandler.LookInputVector);
isSlidingNow = _slideMechanic.IsSliding;
}
switch (isSlidingNow)
{
case true when !wasSliding:
EnterSlideState();
break;
case false when wasSliding:
ExitSlideState();
break;
}
if (isSlidingNow)
{
_slideMechanic.HandleSlide(ref currentVelocity, deltaTime, motor);
}
_wasSlidingLastFrame = isSlidingNow;
// === WALL RUNNING: обработка состояния === // === WALL RUNNING: обработка состояния ===
if (_wallRunningMechanic.IsWallRunning) if (_wallRunningMechanic.IsWallRunning)
{ {
@@ -212,7 +272,7 @@ namespace Code.Gameplay.Character.Controller
// Если персонаж не на земле — стандартное воздушное движение // Если персонаж не на земле — стандартное воздушное движение
else else
{ {
_airMovement.UpdateVelocity(ref currentVelocity, deltaTime); _airMovement.UpdateVelocity(ref currentVelocity, _inputHandler, motor, deltaTime);
_groundMovement.CancelJumpRequest(); _groundMovement.CancelJumpRequest();
} }
} }
@@ -223,20 +283,127 @@ namespace Code.Gameplay.Character.Controller
abilityBlockTimer = duration; abilityBlockTimer = duration;
} }
private void EnterSlideState()
{
_isEnteringSlide = true;
_isExitingSlide = false;
_slideTransitionTime = 0f;
_slideTransitionDuration = _characterConfig.slideEnterDuration;
}
private void ExitSlideState()
{
_isExitingSlide = true;
_isEnteringSlide = false;
_slideTransitionTime = 0f;
_slideTransitionDuration = _characterConfig.slideExitDuration;
}
private void UpdateSlideTransition(float deltaTime)
{
if (!_isEnteringSlide && !_isExitingSlide) return;
_slideTransitionTime += deltaTime;
var t = Mathf.Clamp01(_slideTransitionTime / _slideTransitionDuration);
t = Mathf.SmoothStep(0f, 1f, t);
if (_isEnteringSlide)
{
var targetHeight = _originalColliderHeight * _characterConfig.slideColliderHeightScale;
var targetCenterY = targetHeight * 0.5f - _originalColliderHeight * 0.5f;
var targetCenter = _originalColliderCenter + Vector3.up * targetCenterY;
var targetFollowPos = _originalFollowPointLocalPosition + Vector3.up * _characterConfig.slideCameraOffsetY;
_currentColliderHeight = Mathf.Lerp(_originalColliderHeight, targetHeight, t);
_currentColliderCenter = Vector3.Lerp(_originalColliderCenter, targetCenter, t);
_currentFollowPointLocalPosition = Vector3.Lerp(_originalFollowPointLocalPosition, targetFollowPos, t);
}
else if (_isExitingSlide)
{
_currentColliderHeight = Mathf.Lerp(_originalColliderHeight * _characterConfig.slideColliderHeightScale, _originalColliderHeight, t);
var prevHeight = _originalColliderHeight * _characterConfig.slideColliderHeightScale;
var prevCenterY = prevHeight * 0.5f - _originalColliderHeight * 0.5f;
var prevCenter = _originalColliderCenter + Vector3.up * prevCenterY;
var prevFollowPos = _originalFollowPointLocalPosition + Vector3.up * _characterConfig.slideCameraOffsetY;
_currentColliderCenter = Vector3.Lerp(prevCenter, _originalColliderCenter, t);
_currentFollowPointLocalPosition = Vector3.Lerp(prevFollowPos, _originalFollowPointLocalPosition, t);
}
if (_capsuleCollider)
{
_capsuleCollider.height = _currentColliderHeight;
_capsuleCollider.center = _currentColliderCenter;
}
if (_cameraFollowPoint)
{
_cameraFollowPoint.localPosition = _currentFollowPointLocalPosition;
}
if (!(t >= 1f)) return;
if (_isEnteringSlide)
{
_isEnteringSlide = false;
if (_capsuleCollider)
{
_capsuleCollider.height = _originalColliderHeight * _characterConfig.slideColliderHeightScale;
var h = _capsuleCollider.height;
_capsuleCollider.center = _originalColliderCenter + Vector3.up * (h * 0.5f - _originalColliderHeight * 0.5f);
}
if (_cameraFollowPoint)
{
_cameraFollowPoint.localPosition = _originalFollowPointLocalPosition + Vector3.up * _characterConfig.slideCameraOffsetY;
}
}
else if (_isExitingSlide)
{
_isExitingSlide = false;
if (_capsuleCollider)
{
_capsuleCollider.height = _originalColliderHeight;
_capsuleCollider.center = _originalColliderCenter;
}
if (_cameraFollowPoint)
{
_cameraFollowPoint.localPosition = _originalFollowPointLocalPosition;
}
}
_currentColliderHeight = _capsuleCollider ? _capsuleCollider.height : _originalColliderHeight;
_currentColliderCenter = _capsuleCollider ? _capsuleCollider.center : _originalColliderCenter;
_currentFollowPointLocalPosition = _cameraFollowPoint ? _cameraFollowPoint.localPosition : _originalFollowPointLocalPosition;
}
public void TriggerJump()
{
_jumpCooldownTimer = _jumpCooldownDuration;
}
public void BeforeCharacterUpdate(float deltaTime) public void BeforeCharacterUpdate(float deltaTime)
{ {
} }
public void PostGroundingUpdate(float deltaTime) public void PostGroundingUpdate(float deltaTime)
{ {
if (_dashMechanic.IsDashing && !motor.GroundingStatus.IsStableOnGround)
_dashMechanic.EndDash();
if (_slideMechanic.IsSliding && !motor.GroundingStatus.IsStableOnGround) if (_slideMechanic.IsSliding && !motor.GroundingStatus.IsStableOnGround)
{
_slideMechanic.EndSlide(); _slideMechanic.EndSlide();
} }
}
public void AfterCharacterUpdate(float deltaTime) public void AfterCharacterUpdate(float deltaTime)
{ {
UpdateSlideTransition(deltaTime);
_jumpCooldownTimer -= deltaTime;
if (_jumpCooldownTimer < 0f) _jumpCooldownTimer = 0f;
_wallLeanMechanic.Update( _wallLeanMechanic.Update(
_wallRunningMechanic.IsWallRunning, _wallRunningMechanic.IsWallRunning,
_wallRunningMechanic.GetWallNormal(), _wallRunningMechanic.GetWallNormal(),
@@ -257,9 +424,23 @@ namespace Code.Gameplay.Character.Controller
public void OnMovementHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint, public void OnMovementHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint,
ref HitStabilityReport hitStabilityReport) ref HitStabilityReport hitStabilityReport)
{ {
if (_wallRunningMechanic.TryStartWallRun(hitNormal, hitPoint)) if (_wallRunningMechanic.TryStartWallRun(hitNormal, hitPoint, motor.CharacterForward)) return;
{
} var horizontalVelocity = Vector3.ProjectOnPlane(motor.Velocity, motor.CharacterUp).normalized;
var velocitySqrMag = horizontalVelocity.sqrMagnitude;
if (!(velocitySqrMag > 0.01f)) return;
var dot = Vector3.Dot(horizontalVelocity, hitNormal);
const float impactThreshold = -0.3f;
if (!(dot < impactThreshold)) return;
if (_dashMechanic.IsDashing)
_dashMechanic.EndDash();
if (_slideMechanic.IsSliding)
_slideMechanic.EndSlide();
} }
public void ProcessHitStabilityReport(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint, public void ProcessHitStabilityReport(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint,
@@ -11,40 +11,23 @@ namespace Code.Gameplay.Character.Controller.Input
*/ */
public class CharacterInputHandler public class CharacterInputHandler
{ {
// Косинус порогового угла для спринта (предвычислен)
private readonly float _sprintAngleThresholdCos;
// Векторы движения и направления взгляда // Векторы движения и направления взгляда
public Vector3 MoveInputVector { get; set; } public Vector3 MoveInputVector { get; set; }
public Vector3 LookInputVector { get; set; } public Vector3 LookInputVector { get; set; }
// Флаг-свойство указывающий, что активен режим спринта
public bool IsSprinting { get; set; }
// Вращение камеры в FirstPerson режиме для синхронизации (только горизонтальная компонента) // Вращение камеры в FirstPerson режиме для синхронизации (только горизонтальная компонента)
public Quaternion FirstPersonCameraRotation { get; set; } public Quaternion FirstPersonCameraRotation { get; set; }
// Флаг-свойство указывающий, что нужно применить вращение камеры к персонажу // Флаг-свойство указывающий, что нужно применить вращение камеры к персонажу
public bool ShouldApplyCameraRotation { get; private set; } public bool ShouldApplyCameraRotation { get; private set; }
// Конструктор с пороговым углом
public CharacterInputHandler(float sprintAngleThreshold)
{
// Предвычисляем косинус порогового угла для эффективности
// Угол в градусах → радианы → косинус
// Чем меньше угол — тем строже условие
_sprintAngleThresholdCos = Mathf.Cos(Mathf.Deg2Rad * sprintAngleThreshold);
}
// Обработка и преобразование входных данных от персонажа // Обработка и преобразование входных данных от персонажа
public void ProcessInputs(ref CharacterInputs inputs, KinematicCharacterMotor motor) public void ProcessInputs(ref CharacterInputs inputs, KinematicCharacterMotor motor)
{ {
// Сохраняем текущий режим камеры // Сохраняем текущий режим камеры
var currentCameraMode = inputs.CameraMode; var currentCameraMode = inputs.CameraMode;
// Обработка спринта
IsSprinting = inputs.SprintPressed && inputs.MoveAxisForward > _sprintAngleThresholdCos; // Спринт только при движении на заданный в конфиге угол
// Нормализация вектора движения и ограничение его величины до 1 // Нормализация вектора движения и ограничение его величины до 1
var moveInputVector = var moveInputVector =
Vector3.ClampMagnitude(new Vector3(inputs.MoveAxisRight, 0, inputs.MoveAxisForward), 1f); Vector3.ClampMagnitude(new Vector3(inputs.MoveAxisRight, 0, inputs.MoveAxisForward), 1f);
@@ -1,26 +1,38 @@
using UnityEngine; using UnityEngine;
using Code.Gameplay.Character.Controller.Input;
using KinematicCharacterController;
namespace Code.Gameplay.Character.Controller.Movement namespace Code.Gameplay.Character.Controller.Movement
{ {
/*
* Система движения персонажа в воздухе
*/
public class AirMovementSystem public class AirMovementSystem
{ {
// Вектор, отвечающий за применение гравитации
private readonly Vector3 _gravity; private readonly Vector3 _gravity;
private readonly float _maxAirSpeed;
private readonly float _airControlSharpness;
// Конструктор системы движения в воздухе public AirMovementSystem(Vector3 gravity, float maxAirSpeed, float airControlSharpness)
public AirMovementSystem(Vector3 gravity)
{ {
_gravity = gravity; _gravity = gravity;
_maxAirSpeed = maxAirSpeed;
_airControlSharpness = airControlSharpness;
} }
// Обновление скорости движения персонажа в воздухе public void UpdateVelocity(ref Vector3 currentVelocity, CharacterInputHandler inputHandler, KinematicCharacterMotor motor, float deltaTime)
public void UpdateVelocity(ref Vector3 currentVelocity, float deltaTime)
{ {
// Применяем гравитацию
currentVelocity += _gravity * deltaTime; currentVelocity += _gravity * deltaTime;
var horizontalVelocity = Vector3.ProjectOnPlane(currentVelocity, motor.CharacterUp);
var verticalVelocity = Vector3.Dot(currentVelocity, motor.CharacterUp) * motor.CharacterUp;
var desiredHorizontalMovement = Vector3.ProjectOnPlane(inputHandler.MoveInputVector, motor.CharacterUp).normalized * _maxAirSpeed;
horizontalVelocity = Vector3.Lerp(
horizontalVelocity,
desiredHorizontalMovement,
1f - Mathf.Exp(-_airControlSharpness * deltaTime)
);
currentVelocity = horizontalVelocity + verticalVelocity;
} }
} }
} }
@@ -11,8 +11,6 @@ namespace Code.Gameplay.Character.Controller.Movement
{ {
// Максимальная скорость движения по устойчивой поверхности // Максимальная скорость движения по устойчивой поверхности
private readonly float _maxStableMoveSpeed; private readonly float _maxStableMoveSpeed;
// Максимальная скорость спринта
private readonly float _sprintMoveSpeed;
// Резкость изменения скорости движения (чем выше - тем резче) // Резкость изменения скорости движения (чем выше - тем резче)
private readonly float _stableMovementSharpness; private readonly float _stableMovementSharpness;
// Скорость прыжка // Скорость прыжка
@@ -22,10 +20,9 @@ namespace Code.Gameplay.Character.Controller.Movement
public bool JumpRequested { get; private set; } public bool JumpRequested { get; private set; }
// Конструктор системы движения на земле // Конструктор системы движения на земле
public GroundMovementSystem(float maxStableMoveSpeed, float sprintMoveSpeed, float stableMovementSharpness, float jumpSpeed) public GroundMovementSystem(float maxStableMoveSpeed, float stableMovementSharpness, float jumpSpeed)
{ {
_maxStableMoveSpeed = maxStableMoveSpeed; _maxStableMoveSpeed = maxStableMoveSpeed;
_sprintMoveSpeed = sprintMoveSpeed;
_stableMovementSharpness = stableMovementSharpness; _stableMovementSharpness = stableMovementSharpness;
_jumpSpeed = jumpSpeed; _jumpSpeed = jumpSpeed;
} }
@@ -66,8 +63,7 @@ namespace Code.Gameplay.Character.Controller.Movement
inputHandler.MoveInputVector.magnitude; inputHandler.MoveInputVector.magnitude;
// Расчет целевой скорости движения с учетом ограничения максимальной скорости и спринта // Расчет целевой скорости движения с учетом ограничения максимальной скорости и спринта
var targetSpeed = inputHandler.IsSprinting ? _sprintMoveSpeed : _maxStableMoveSpeed; var targetMovementVelocity = reorientedInput * _maxStableMoveSpeed;
var targetMovementVelocity = reorientedInput * targetSpeed;
// Плавная интерполяция текущей скорости к целевой с экспоненциальным сглаживанием // Плавная интерполяция текущей скорости к целевой с экспоненциальным сглаживанием
currentVelocity = Vector3.Lerp( currentVelocity = Vector3.Lerp(
@@ -80,8 +76,13 @@ namespace Code.Gameplay.Character.Controller.Movement
if (JumpRequested) if (JumpRequested)
{ {
currentVelocity += motor.CharacterUp * _jumpSpeed - Vector3.Project(currentVelocity, motor.CharacterUp); currentVelocity += motor.CharacterUp * _jumpSpeed - Vector3.Project(currentVelocity, motor.CharacterUp);
JumpRequested = false; // Сброс сразу после применения JumpRequested = false;
motor.ForceUnground(); motor.ForceUnground();
if (motor.CharacterController is CustomCharacterController controller)
{
controller.TriggerJump();
}
} }
} }
} }
@@ -45,8 +45,8 @@ namespace Code.Gameplay.Character.Core
inputs.MoveAxisForward = moveInput.y; // Vertical ось (W/S или Up/Down) inputs.MoveAxisForward = moveInput.y; // Vertical ось (W/S или Up/Down)
inputs.MoveAxisRight = moveInput.x; // Horizontal ось (A/D или Left/Right) inputs.MoveAxisRight = moveInput.x; // Horizontal ось (A/D или Left/Right)
inputs.JumpPressed = _inputService.JumpPressed; // Прыжки (Space) inputs.JumpPressed = _inputService.JumpPressed; // Прыжки (Space)
inputs.SprintPressed = _inputService.SprintPressed; // Спринт (Shift)
inputs.SlidePressed = _inputService.SlidePressed; // Слайд (Ctrl) inputs.SlidePressed = _inputService.SlidePressed; // Слайд (Ctrl)
inputs.DashPressed = _inputService.DashPressed; // Слайд (Ctrl)
inputs.CameraMode = ((ICameraState)_cameraStateMachine.CurrentBaseState).GetCameraMode(); inputs.CameraMode = ((ICameraState)_cameraStateMachine.CurrentBaseState).GetCameraMode();
// Передаем информацию о камере для адаптивного поведения // Передаем информацию о камере для адаптивного поведения
@@ -15,7 +15,7 @@ namespace Code.Gameplay.Character.Core
public CameraMode CameraMode; // Текущий режим камеры для адаптации поведения public CameraMode CameraMode; // Текущий режим камеры для адаптации поведения
public Vector3 CameraPlanarDirection; // Направление камеры в горизонтальной плоскости public Vector3 CameraPlanarDirection; // Направление камеры в горизонтальной плоскости
public bool JumpPressed; // Флаг указывающий, нажата ли кнопка прыжка public bool JumpPressed; // Флаг указывающий, нажата ли кнопка прыжка
public bool SprintPressed; // Флаг указывающий, нажата ли кнопка спринта public bool DashPressed;
public bool SlidePressed; // Флаг указывающий, нажата ли кнопка слайда public bool SlidePressed; // Флаг указывающий, нажата ли кнопка слайда
} }
} }
@@ -38,7 +38,7 @@ namespace Code.Gameplay.Character.Core
inputs.MoveAxisForward = moveInput.y; // Vertical ось (W/S или Up/Down) inputs.MoveAxisForward = moveInput.y; // Vertical ось (W/S или Up/Down)
inputs.MoveAxisRight = moveInput.x; // Horizontal ось (A/D или Left/Right) inputs.MoveAxisRight = moveInput.x; // Horizontal ось (A/D или Left/Right)
inputs.JumpPressed = _inputService.JumpPressed; // Прыжки (Space) inputs.JumpPressed = _inputService.JumpPressed; // Прыжки (Space)
inputs.SprintPressed = true;//_inputService.SprintPressed; // Спринт (Shift) inputs.DashPressed = _inputService.DashPressed;
inputs.SlidePressed = _inputService.SlidePressed; // Слайд (Ctrl) inputs.SlidePressed = _inputService.SlidePressed; // Слайд (Ctrl)
inputs.CameraMode = ((ICameraState)_cameraStateMachine.CurrentBaseState).GetCameraMode(); inputs.CameraMode = ((ICameraState)_cameraStateMachine.CurrentBaseState).GetCameraMode();
@@ -188,11 +188,10 @@ namespace Code.Gameplay.Enemies
_canAttack = false; _canAttack = false;
_attackCooldownTimer = AttackCooldown; _attackCooldownTimer = AttackCooldown;
} }
protected virtual void ApplyEffectsToPlayer() protected virtual void ApplyEffectsToPlayer()
{ {
if (PlayerController) if (PlayerController)
PlayerController.BlockAbilities(3f); PlayerController.BlockAbilities(3f); // TODO в конфиг
} }
private void OnDrawGizmosSelected() private void OnDrawGizmosSelected()
@@ -50,7 +50,7 @@ namespace Code.Gameplay.Enemies
if (!(distance <= AttackRange)) return; if (!(distance <= AttackRange)) return;
audioService.PlayEnemy(EnemiesSounds.Bravo,agent.transform.position); audioService.PlayEnemy(EnemiesSounds.RoachAttack, agent.transform.position);
DealDamage(); DealDamage();
} }
@@ -50,9 +50,9 @@ namespace Code.Gameplay.Enemies
if (!(distance <= AttackRange)) return; if (!(distance <= AttackRange)) return;
audioService.PlayEnemy(EnemiesSounds.Bastard,agent.transform.position); audioService.PlayEnemy(EnemiesSounds.GrandpaAttack,agent.transform.position);
if (Player.CustomCharacterController.IsSliding) if (Player.CustomCharacterController.IsDashing || Player.CustomCharacterController.IsSliding)
ApplyStun(); ApplyStun();
else else
DealDamage(); DealDamage();
@@ -17,13 +17,12 @@ namespace Code.Gameplay.Enemies
_audioService = audioService; _audioService = audioService;
_audioSource = audioService.GetSourceOfGroup(Audio.AudioType.Enemies); _audioSource = audioService.GetSourceOfGroup(Audio.AudioType.Enemies);
_audioSource.transform.position = transform.position; _audioSource.transform.position = transform.position;
_audioSource.spatialBlend = 0; _audioSource.spatialBlend = 1f;
_audioFactory = audioFactory; _audioFactory = audioFactory;
} }
public void PlayStep() public void PlayStep()
{ {
Debug.Log("Play Step");
_audioSource.transform.position = transform.position; _audioSource.transform.position = transform.position;
_audioSource.PlayOneShot(_audioFactory.EnemiesAudios[(int)stepId]); _audioSource.PlayOneShot(_audioFactory.EnemiesAudios[(int)stepId]);
} }
@@ -72,6 +72,8 @@ namespace Code.Gameplay.Enemies
{ {
if (!_spawnedEnemy) return; if (!_spawnedEnemy) return;
if (despawnRadius <= 0f) return;
_enemyFactory.ReleaseEnemy(_spawnedEnemy); _enemyFactory.ReleaseEnemy(_spawnedEnemy);
_spawnedEnemy = null; _spawnedEnemy = null;
} }
@@ -6,10 +6,13 @@ namespace Code.Gameplay.Orders.Order
public class OrderGiveTrigger : MonoBehaviour public class OrderGiveTrigger : MonoBehaviour
{ {
[Inject] private IOrderService _orderService; [Inject] private IOrderService _orderService;
[SerializeField] private Door.Door door;
private bool _playerEntered; private bool _playerEntered;
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
if (_playerEntered ) return; if (_playerEntered || _orderService.OrderState == OrderState.Recieved) return;
door.TranslationMode(false);
_playerEntered = true; _playerEntered = true;
_orderService.OrderGive(); _orderService.OrderGive();
@@ -2,7 +2,6 @@ using System.Collections.Generic;
using Code.Gameplay.Orders.Order; using Code.Gameplay.Orders.Order;
using Code.Scenes; using Code.Scenes;
using Code.Scenes.SceneEnvironments; using Code.Scenes.SceneEnvironments;
using Cysharp.Threading.Tasks;
using Reflex.Attributes; using Reflex.Attributes;
using UnityEngine; using UnityEngine;
@@ -36,19 +35,10 @@ namespace Code.Generator
public void Initialize() public void Initialize()
{ {
// _orderService.OrderGive();
_spawnedRooms = new List<Room>(); _spawnedRooms = new List<Room>();
_roomIndexesStack = new(); _roomIndexesStack = new();
Debug.LogWarning($"КОТЛЫ ГЕНЕРАЛЬСКИЕ{_orderService.DeliveryTimer}");
// CreateRoomsStack();
// SpawnInitialRoomsAsync();
_orderService.OnOrderGiven += CreateRoomsStack; _orderService.OnOrderGiven += CreateRoomsStack;
// RoomTrigger.PlayerEnteredRoom += OnPlayerEntered;
CreateInitialRoom(); CreateInitialRoom();
} }
@@ -61,7 +51,6 @@ namespace Code.Generator
Room roomToRemove = _spawnedRooms[0]; Room roomToRemove = _spawnedRooms[0];
_spawnedRooms.RemoveAt(0); _spawnedRooms.RemoveAt(0);
// _factory.ReleaseRoom(roomToRemove);
Object.Destroy(roomToRemove.gameObject); Object.Destroy(roomToRemove.gameObject);
} }
} }
@@ -81,16 +70,12 @@ namespace Code.Generator
_roomIndexesStack.Add(new(RoomType.Basic, roomIndex)); _roomIndexesStack.Add(new(RoomType.Basic, roomIndex));
remainingTime -= room.RoomTimer; remainingTime -= room.RoomTimer;
Debug.Log($"комната {room.name} время {room.RoomTimer} осталось: {remainingTime}");
} }
AddPickupRoom(); AddPickupRoom();
Debug.Log($"добавлена зона заказа");
AddSaveRoom(); AddSaveRoom();
Debug.Log($"добавлена сейв зона");
Debug.Log($"стек комнат: {_roomIndexesStack.Count}");
SpawnNextRoom(); SpawnNextRoom();
} }
@@ -125,8 +110,6 @@ namespace Code.Generator
gameplaySceneEnvironment.playerSpawnPoint = instantiated.playerSpawn; gameplaySceneEnvironment.playerSpawnPoint = instantiated.playerSpawn;
instantiated.Initialize(_orderService); instantiated.Initialize(_orderService);
Debug.Log($"Первая комната: {instantiated.name}");
} }
private void SpawnNextRoom() private void SpawnNextRoom()
{ {
@@ -206,17 +189,7 @@ namespace Code.Generator
segmentOriginPosition.y -= randomDoorOriginPosition.y; segmentOriginPosition.y -= randomDoorOriginPosition.y;
current.transform.position = segmentOriginPosition; current.transform.position = segmentOriginPosition;
current.transform.rotation = Quaternion.Euler(0, segmentOriginYRotation, 0); current.transform.rotation = Quaternion.Euler(0, segmentOriginYRotation, 0);
// locationSegment.isNeedSomeDoors = true;
// locationSegment.AddBadDoorId(locationSegment.LocationSegment.GetDoorOrigins.IndexOf(randomDoorOrigin));
current.Initialize(_orderService); current.Initialize(_orderService);
// float frameOnTheBallRotation = segmentOriginYRotation + randomDoorOriginRotation.eulerAngles.y;
// if (frameOnTheBallRotation > 305f) frameOnTheBallRotation -= 360f;
// else if (frameOnTheBallRotation < -45f) frameOnTheBallRotation += 360f;
// heOnTheBall.AddSlaveLocationSegment(locationSegment.Id);
// heOnTheBall.ReplaceSlaveSegmentDoorOriginYRotation(frameOnTheBallRotation);
// heOnTheBall.isGotOnTheBall = false;
} }
} }
} }
@@ -16,8 +16,8 @@ namespace Code.Input
// Для управления движением персонажа // Для управления движением персонажа
Vector2 MoveInput { get; } Vector2 MoveInput { get; }
bool JumpPressed { get; } bool JumpPressed { get; }
bool SprintPressed { get; }
bool SlidePressed { get; } bool SlidePressed { get; }
bool DashPressed { get; }
// Для переключения режима камеры // Для переключения режима камеры
bool ToggleCameraModePressed { get; } bool ToggleCameraModePressed { get; }
@@ -13,8 +13,8 @@ namespace Code.Input
public float ZoomInput { get; private set; } public float ZoomInput { get; private set; }
public Vector2 MoveInput { get; private set; } public Vector2 MoveInput { get; private set; }
public bool JumpPressed { get; private set; } public bool JumpPressed { get; private set; }
public bool SprintPressed { get; private set; }
public bool SlidePressed { get; private set; } public bool SlidePressed { get; private set; }
public bool DashPressed { get; private set; }
public bool ToggleCameraModePressed { get; private set; } public bool ToggleCameraModePressed { get; private set; }
public InputService(InputActionAsset inputActionAsset) public InputService(InputActionAsset inputActionAsset)
@@ -69,14 +69,6 @@ namespace Code.Input
jumpAction.canceled += OnJumpCanceled; jumpAction.canceled += OnJumpCanceled;
} }
// Обработка спринта (персонаж)
var sprintAction = gameplayMap.FindAction("Sprint");
if (sprintAction != null)
{
sprintAction.performed += OnSprintPerformed;
sprintAction.canceled += OnSprintCanceled;
}
// Обработка слайда (персонаж) // Обработка слайда (персонаж)
var slideAction = gameplayMap.FindAction("Slide"); var slideAction = gameplayMap.FindAction("Slide");
if (slideAction != null) if (slideAction != null)
@@ -85,6 +77,14 @@ namespace Code.Input
slideAction.canceled += OnSlideCanceled; slideAction.canceled += OnSlideCanceled;
} }
// Обработка слайда (персонаж)
var dashAction = gameplayMap.FindAction("Dash");
if (dashAction != null)
{
dashAction.performed += OnDashPerformed;
dashAction.canceled += OnDashCanceled;
}
// Обработка переключения режима камеры // Обработка переключения режима камеры
var toggleCameraModeAction = gameplayMap.FindAction("ToggleCameraMode"); var toggleCameraModeAction = gameplayMap.FindAction("ToggleCameraMode");
if (toggleCameraModeAction != null) if (toggleCameraModeAction != null)
@@ -134,16 +134,6 @@ namespace Code.Input
JumpPressed = false; JumpPressed = false;
} }
private void OnSprintPerformed(InputAction.CallbackContext context)
{
SprintPressed = true;
}
private void OnSprintCanceled(InputAction.CallbackContext context)
{
SprintPressed = false;
}
private void OnSlidePerformed(InputAction.CallbackContext context) private void OnSlidePerformed(InputAction.CallbackContext context)
{ {
SlidePressed = true; SlidePressed = true;
@@ -154,6 +144,16 @@ namespace Code.Input
SlidePressed = false; SlidePressed = false;
} }
private void OnDashPerformed(InputAction.CallbackContext context)
{
DashPressed = true;
}
private void OnDashCanceled(InputAction.CallbackContext context)
{
DashPressed = false;
}
private void OnToggleCameraModePerformed(InputAction.CallbackContext context) private void OnToggleCameraModePerformed(InputAction.CallbackContext context)
{ {
ToggleCameraModePressed = true; ToggleCameraModePressed = true;
@@ -189,12 +189,12 @@ namespace Code.Input
gameplayMap.FindAction("Jump").performed -= OnJumpPerformed; gameplayMap.FindAction("Jump").performed -= OnJumpPerformed;
gameplayMap.FindAction("Jump").canceled -= OnJumpCanceled; gameplayMap.FindAction("Jump").canceled -= OnJumpCanceled;
gameplayMap.FindAction("Sprint").performed -= OnSprintPerformed;
gameplayMap.FindAction("Sprint").canceled -= OnSprintCanceled;
gameplayMap.FindAction("Slide").performed -= OnSlidePerformed; gameplayMap.FindAction("Slide").performed -= OnSlidePerformed;
gameplayMap.FindAction("Slide").canceled -= OnSlideCanceled; gameplayMap.FindAction("Slide").canceled -= OnSlideCanceled;
gameplayMap.FindAction("Dash").performed -= OnDashPerformed;
gameplayMap.FindAction("Dash").canceled -= OnDashCanceled;
gameplayMap.FindAction("ToggleCameraMode").performed -= OnToggleCameraModePerformed; gameplayMap.FindAction("ToggleCameraMode").performed -= OnToggleCameraModePerformed;
gameplayMap.FindAction("ToggleCameraMode").canceled -= OnToggleCameraModeCanceled; gameplayMap.FindAction("ToggleCameraMode").canceled -= OnToggleCameraModeCanceled;
} }
@@ -1,5 +1,6 @@
using Code.Gameplay.Orders.Order; using Code.Gameplay.Orders.Order;
using UnityEngine; using UnityEngine;
using UnityEngine.Rendering;
using UnityEngine.Serialization; using UnityEngine.Serialization;
namespace Code.Scenes.SceneEnvironments namespace Code.Scenes.SceneEnvironments
@@ -8,10 +9,12 @@ namespace Code.Scenes.SceneEnvironments
public class GameplaySceneEnvironment : CurrentSceneEnvironment public class GameplaySceneEnvironment : CurrentSceneEnvironment
{ {
public Transform playerSpawnPoint; public Transform playerSpawnPoint;
public Volume volume;
public void TransitVariables(GameplaySceneEnvironment env) public void TransitVariables(GameplaySceneEnvironment env)
{ {
playerSpawnPoint = env.playerSpawnPoint; playerSpawnPoint = env.playerSpawnPoint;
volume = env.volume;
} }
} }
} }
@@ -0,0 +1,25 @@
using DG.Tweening;
using UnityEngine;
using UnityEngine.UI;
namespace Code.UI.Panels
{
public class DamagePanel : UIElement
{
[SerializeField] private Image background;
[SerializeField] private Color shownColor;
[SerializeField] private Color hiddenColor;
public override void Hide()
{
Shown = false;
// background.enabled = false;
background.DOColor(hiddenColor, 2f);
}
public override void Show()
{
Shown = true;
// background.enabled = true;
background.DOColor(shownColor, 0.3f);
}
}
}
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: b586dbc292c44261892460f578a38e50
timeCreated: 1764769541
@@ -1,3 +1,4 @@
using DG.Tweening;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
@@ -9,21 +10,27 @@ namespace Code.UI
[SerializeField] private TMP_Text scoreText; [SerializeField] private TMP_Text scoreText;
[SerializeField] private TMP_Text gameOverText; [SerializeField] private TMP_Text gameOverText;
[SerializeField] private Image _background; [SerializeField] private Image _background;
[SerializeField] private Color shownColor;
[SerializeField] private Color hiddenColor;
public void UpdateScoreText(int score) => scoreText.text = score.ToString(); public void UpdateScoreText(int score) => scoreText.text = score.ToString();
public override void Hide() public override void Hide()
{ {
_background.enabled = false; _background.enabled = false;
scoreText.enabled = false; // scoreText.enabled = true;
gameOverText.enabled = false; // gameOverText.enabled = false;
scoreText.DOColor(hiddenColor, 3f);
// gameOverText.DOColor(hiddenColor, 3f);
base.Hide(); base.Hide();
} }
public override void Show() public override void Show()
{ {
_background.enabled = true; // _background.enabled = true;
scoreText.enabled = true; // scoreText.enabled = true;
gameOverText.enabled = true; // gameOverText.enabled = true;
scoreText.DOColor(shownColor, 5f);
// gameOverText.DOColor(shownColor, 5f);
base.Show(); base.Show();
} }
} }
@@ -26,6 +26,9 @@ namespace Code.UI.Panels
[Header("MoneyBar")] [Header("MoneyBar")]
[SerializeField] private TMP_Text moneyText; [SerializeField] private TMP_Text moneyText;
[SerializeField] private DamagePanel damagePanel;
public DamagePanel DamagePanel => damagePanel;
private void ScoreUpdate(int count, int money) private void ScoreUpdate(int count, int money)
{ {
// TODO Анимация получения\потери // TODO Анимация получения\потери
@@ -7,21 +7,27 @@ namespace Code.UI.Panels
public class LoadingScreen : UIElement public class LoadingScreen : UIElement
{ {
[SerializeField] private Image background; [SerializeField] private Image background;
[SerializeField] private TMP_Text loadingTitle; [SerializeField] private Image loadingImage;
[SerializeField] private TMP_Text vyapWatermark; [SerializeField] private Image courierAnim;
// [SerializeField] private TMP_Text loadingTitle;
// [SerializeField] private TMP_Text vyapWatermark;
public override void Hide() public override void Hide()
{ {
Shown = false; Shown = false;
background.enabled = false; background.enabled = false;
loadingTitle.enabled = false; loadingImage.enabled = false;
vyapWatermark.enabled = false; courierAnim.enabled = false;
// loadingTitle.enabled = false;
// vyapWatermark.enabled = false;
} }
public override void Show() public override void Show()
{ {
Shown = true; Shown = true;
background.enabled = true; background.enabled = true;
loadingTitle.enabled = true; loadingImage.enabled = true;
vyapWatermark.enabled = true; courierAnim.enabled = true;
// loadingTitle.enabled = true;
// vyapWatermark.enabled = true;
} }
} }
} }
@@ -73,6 +73,7 @@ namespace Code.UI
private void OnMenuMusicUpdate(float value) private void OnMenuMusicUpdate(float value)
{ {
_audioService.ChangeSetting(AudioType.MenuMusic, value); _audioService.ChangeSetting(AudioType.MenuMusic, value);
_audioService.ChangeSetting(AudioType.DeathMusic, value);
_audioService.PlayTestClip(AudioType.MenuMusic); _audioService.PlayTestClip(AudioType.MenuMusic);
} }
private void OnGameplayUpdate(float value) private void OnGameplayUpdate(float value)
@@ -98,6 +98,7 @@ AudioMixerGroupController:
- {fileID: 1469200815455588746} - {fileID: 1469200815455588746}
- {fileID: 9214955797390454771} - {fileID: 9214955797390454771}
- {fileID: -5282050360126310577} - {fileID: -5282050360126310577}
- {fileID: -4091971700299788177}
m_Volume: 4c469b14481ac855fb9fb2989e6e6b94 m_Volume: 4c469b14481ac855fb9fb2989e6e6b94
m_Pitch: f5433a3ce2d2313f2b2d52521d9fa5bd m_Pitch: f5433a3ce2d2313f2b2d52521d9fa5bd
m_Send: 00000000000000000000000000000000 m_Send: 00000000000000000000000000000000
@@ -107,6 +108,25 @@ AudioMixerGroupController:
m_Mute: 0 m_Mute: 0
m_Solo: 0 m_Solo: 0
m_BypassEffects: 0 m_BypassEffects: 0
--- !u!243 &-4091971700299788177
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Death
m_AudioMixer: {fileID: 24100000}
m_GroupID: d182b3a0910fcc50582696670fbbefbb
m_Children: []
m_Volume: 2571658697e687a09ba5a37359645597
m_Pitch: a622161a99b93a866abe9ad88657b1e5
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: -3075867796492726800}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &-3136785715273091855 --- !u!244 &-3136785715273091855
AudioMixerEffectController: AudioMixerEffectController:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3
@@ -121,6 +141,20 @@ AudioMixerEffectController:
m_SendTarget: {fileID: 0} m_SendTarget: {fileID: 0}
m_EnableWetMix: 0 m_EnableWetMix: 0
m_Bypass: 0 m_Bypass: 0
--- !u!244 &-3075867796492726800
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 3be71c6f1ac4ac285837cf047cef9c5c
m_EffectName: Attenuation
m_MixLevel: b2430083ec8df78ef9efcbb496e0901c
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!243 &-2580822303892902013 --- !u!243 &-2580822303892902013
AudioMixerGroupController: AudioMixerGroupController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -180,12 +214,16 @@ AudioMixerController:
name: Courier name: Courier
- guid: 5e2f5c7e3d526b9aaa68f56dfb7d553b - guid: 5e2f5c7e3d526b9aaa68f56dfb7d553b
name: Creatures name: Creatures
- guid: 2571658697e687a09ba5a37359645597
name: Death
- guid: 19969023eed85c7999691c4897eebc2e - guid: 19969023eed85c7999691c4897eebc2e
name: Dispatcher name: Dispatcher
- guid: 803cb3ae2c302cb0aab098f6ad2dbc2f - guid: 803cb3ae2c302cb0aab098f6ad2dbc2f
name: Enemies name: Enemies
- guid: 9823d3a409fe914cdbb45f92705c5186 - guid: 9823d3a409fe914cdbb45f92705c5186
name: Master name: Master
- guid: e899c29ada648cdf5853c6bf318a763b
name: Stun
- guid: b9fc0df121fe7134e9cbd35aa5a65755 - guid: b9fc0df121fe7134e9cbd35aa5a65755
name: Menu name: Menu
- guid: dd0b3fe80d006124baa36e791e6953f0 - guid: dd0b3fe80d006124baa36e791e6953f0
@@ -204,6 +242,7 @@ AudioMixerController:
- e04cdd7cb505ba69ea76a16038de727a - e04cdd7cb505ba69ea76a16038de727a
- 9eb64ac0ca0e2f1098eafbba1f9633f5 - 9eb64ac0ca0e2f1098eafbba1f9633f5
- af6d3dead2e9e4848a2ca2fa55634108 - af6d3dead2e9e4848a2ca2fa55634108
- d182b3a0910fcc50582696670fbbefbb
name: View name: View
m_CurrentViewIndex: 0 m_CurrentViewIndex: 0
m_TargetSnapshot: {fileID: 8341788112416184532} m_TargetSnapshot: {fileID: 8341788112416184532}
@@ -227,6 +266,7 @@ AudioMixerGroupController:
m_Send: 00000000000000000000000000000000 m_Send: 00000000000000000000000000000000
m_Effects: m_Effects:
- {fileID: 24400004} - {fileID: 24400004}
- {fileID: 1162668595276432428}
m_UserColorIndex: 0 m_UserColorIndex: 0
m_Mute: 0 m_Mute: 0
m_Solo: 0 m_Solo: 0
@@ -272,6 +312,22 @@ AudioMixerEffectController:
m_SendTarget: {fileID: 0} m_SendTarget: {fileID: 0}
m_EnableWetMix: 0 m_EnableWetMix: 0
m_Bypass: 0 m_Bypass: 0
--- !u!244 &1162668595276432428
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: e2820072e9b5c14008f24fe53fce2288
m_EffectName: Lowpass Simple
m_MixLevel: 184e54eac7a93684f963617baf11cc82
m_Parameters:
- m_ParameterName: Cutoff freq
m_GUID: e899c29ada648cdf5853c6bf318a763b
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!243 &1469200815455588746 --- !u!243 &1469200815455588746
AudioMixerGroupController: AudioMixerGroupController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -425,8 +481,11 @@ AudioMixerSnapshotController:
m_FloatValues: m_FloatValues:
b9fc0df121fe7134e9cbd35aa5a65755: 0 b9fc0df121fe7134e9cbd35aa5a65755: 0
4c469b14481ac855fb9fb2989e6e6b94: 0 4c469b14481ac855fb9fb2989e6e6b94: 0
9823d3a409fe914cdbb45f92705c5186: 0
ddab7e07de3c686e296ff10b1cd77a47: 0 ddab7e07de3c686e296ff10b1cd77a47: 0
dd0b3fe80d006124baa36e791e6953f0: 0 dd0b3fe80d006124baa36e791e6953f0: 0
e899c29ada648cdf5853c6bf318a763b: 5000
6fb1f1bca680170cabb1a534be3d1a58: 1
m_TransitionOverrides: {} m_TransitionOverrides: {}
--- !u!243 &9214955797390454771 --- !u!243 &9214955797390454771
AudioMixerGroupController: AudioMixerGroupController:
@@ -12,19 +12,62 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 10cfaf8e57f64eddb8c2eda147e4739a, type: 3} m_Script: {fileID: 11500000, guid: 10cfaf8e57f64eddb8c2eda147e4739a, type: 3}
m_Name: CharacterConfig m_Name: CharacterConfig
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CharacterConfig m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CharacterConfig
maxStableMoveSpeed: 8 maxStableMoveSpeed: 12
stableMovementSharpness: 15 stableMovementSharpness: 15
orientationSharpness: 10 orientationSharpness: 10
jumpSpeed: 10 jumpSpeed: 10
sprintMoveSpeed: 12 jumpCooldown: 0.3
sprintAngleThreshold: 90 dashSpeed: 20
slideSpeed: 20 dashDuration: 0.35
slideDuration: 0.8 dashCooldown: 1.2
slideVelocityCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.3
value: 1.4
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0.2
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
slideMinVelocityThreshold: 3
slideCooldown: 1.5 slideCooldown: 1.5
wallClimbSpeedFactor: 0.8 slideColliderHeightScale: 0.5
minWallClimbSpeed: 9 slideCameraOffsetY: -0.5
wallDetectionAngleThreshold: 80 slideEnterDuration: 0.2
maxWallLeanAngle: 90 slideExitDuration: 0.25
wallLeanSharpness: 100 leanAngle: 25
wallLeanHeightScale: 0.1 leanThreshold: 0.3
leanSmoothSpeed: 10
gravity: {x: 0, y: -30, z: 0} gravity: {x: 0, y: -30, z: 0}
maxAirSpeed: 10
airControlSharpness: 8
wallRunMaxTime: 1.75
wallRunSpeed: 15
wallRunAcceleration: 25
wallRunGravityScale: 0.25
wallDetachImpulse: 7
wallContactAngleThreshold: 45
@@ -13,21 +13,6 @@ MonoBehaviour:
m_Name: GeneratorConfig m_Name: GeneratorConfig
m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.GeneratorConfig m_EditorClassIdentifier: Assembly-CSharp::Code.Generator.GeneratorConfig
roomAssetReferences: 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_AssetGUID: c938de3174f184741925c407a43a47f2
m_SubObjectName: m_SubObjectName:
m_SubObjectType: m_SubObjectType:
@@ -38,6 +23,16 @@ MonoBehaviour:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
m_EditorAssetChanged: 0 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_AssetGUID: 7067a5248027e74478f4f0f53ddf06a4
m_SubObjectName: m_SubObjectName:
m_SubObjectType: m_SubObjectType:
@@ -18,17 +18,7 @@ MonoBehaviour:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
m_EditorAssetChanged: 0 m_EditorAssetChanged: 0
- m_AssetGUID: 1d7110a045075b22fa27d62bd5f2784e - m_AssetGUID: 144ab5188f8ad7a0a92c75703bd12e60
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
- m_AssetGUID: 2f6134357dc2a5641a846a7478ce4c2c
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
- m_AssetGUID: 82c71411174bfa86ca1f676b9d389f94
m_SubObjectName: m_SubObjectName:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
@@ -38,12 +28,22 @@ MonoBehaviour:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
m_EditorAssetChanged: 0 m_EditorAssetChanged: 0
- m_AssetGUID: 3831a36e0c8e48f659517a6bb99378b6 - m_AssetGUID: aa138b2e21adfbf4bbbfa5bf9d54b8f2
m_SubObjectName: m_SubObjectName:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
m_EditorAssetChanged: 1 m_EditorAssetChanged: 0
- m_AssetGUID: 144ab5188f8ad7a0a92c75703bd12e60 - m_AssetGUID: 21c2eaf85c31d604395153b364970a7d
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
- m_AssetGUID: beea6ce1de81706478a700993b273000
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
- m_AssetGUID: 7accc805b4e5f404d9e777c0a662ede4
m_SubObjectName: m_SubObjectName:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
@@ -13,17 +13,17 @@ MonoBehaviour:
m_Name: CourierSoundListConfig m_Name: CourierSoundListConfig
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CourierSoundListConfig m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.CourierSoundListConfig
courierSounds: courierSounds:
- m_AssetGUID: bf87bc9ac43df86be8c818de81d44a54 - m_AssetGUID: e54541120fe1c5a4799a4698a689bb5c
m_SubObjectName: m_SubObjectName:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
m_EditorAssetChanged: 0 m_EditorAssetChanged: 0
- m_AssetGUID: 4b279429428a13040b6d1713122cd0de - m_AssetGUID: 21c2eaf85c31d604395153b364970a7d
m_SubObjectName: m_SubObjectName:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
m_EditorAssetChanged: 1 m_EditorAssetChanged: 0
- m_AssetGUID: c5a0ad8a615841547ac2ee613af526d8 - m_AssetGUID: fb8972b33f4c43749add9d98b439b447
m_SubObjectName: m_SubObjectName:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
@@ -15,7 +15,7 @@ MonoBehaviour:
menuVolume: menuVolume:
_serializedList: _serializedList:
- Key: 0 - Key: 0
Value: 1 Value: 0.5
- Key: 1 - Key: 1
Value: 1 Value: 1
- Key: 2 - Key: 2
@@ -30,12 +30,14 @@ MonoBehaviour:
Value: 1 Value: 1
- Key: 7 - Key: 7
Value: 1 Value: 1
- Key: 8
Value: 1
actionVolume: actionVolume:
_serializedList: _serializedList:
- Key: 0 - Key: 0
Value: 1 Value: 0.5
- Key: 1 - Key: 1
Value: 0.01 Value: 1
- Key: 2 - Key: 2
Value: 1 Value: 1
- Key: 3 - Key: 3
@@ -47,13 +49,15 @@ MonoBehaviour:
- Key: 6 - Key: 6
Value: 1 Value: 1
- Key: 7 - Key: 7
Value: 0.01 Value: 0.001
- Key: 8
Value: 1
peacefulVolume: peacefulVolume:
_serializedList: _serializedList:
- Key: 0 - Key: 0
Value: 1 Value: 0.5
- Key: 1 - Key: 1
Value: 0.01 Value: 1
- Key: 2 - Key: 2
Value: 1 Value: 1
- Key: 3 - Key: 3
@@ -63,24 +67,28 @@ MonoBehaviour:
- Key: 5 - Key: 5
Value: 1 Value: 1
- Key: 6 - Key: 6
Value: 0.01 Value: 0.001
- Key: 7 - Key: 7
Value: 1 Value: 1
- Key: 8
Value: 1
noneVolume: noneVolume:
_serializedList: _serializedList:
- Key: 0 - Key: 0
Value: 0.01 Value: 0.001
- Key: 1 - Key: 1
Value: 0.01 Value: 0.001
- Key: 2 - Key: 2
Value: 0.01 Value: 0.001
- Key: 3 - Key: 3
Value: 0.01 Value: 0.001
- Key: 4 - Key: 4
Value: 0.01 Value: 0.001
- Key: 5 - Key: 5
Value: 0.01 Value: 0.001
- Key: 6 - Key: 6
Value: 0.01 Value: 0.001
- Key: 7 - Key: 7
Value: 0.01 Value: 0.001
- Key: 8
Value: 0.001
@@ -13,22 +13,22 @@ MonoBehaviour:
m_Name: EnemiesSoundListConfig m_Name: EnemiesSoundListConfig
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.EnemiesSoundListConfig m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.EnemiesSoundListConfig
enemies: enemies:
- m_AssetGUID: 82c71411174bfa86ca1f676b9d389f94 - m_AssetGUID: 24959d51467fd0d4f957ed6e846f73a5
m_SubObjectName: m_SubObjectName:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
m_EditorAssetChanged: 0 m_EditorAssetChanged: 0
- m_AssetGUID: 2f6134357dc2a5641a846a7478ce4c2c - m_AssetGUID: 087d498be2e5a044f97f313a3fc0ae05
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 1
- m_AssetGUID: e84e3a3c26ccbd50d92f13627403f148
m_SubObjectName: m_SubObjectName:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
m_EditorAssetChanged: 0 m_EditorAssetChanged: 0
- m_AssetGUID: 1cc66c0b13a946e1c9ec37026268e144 - m_AssetGUID: beea6ce1de81706478a700993b273000
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
- m_AssetGUID: 2ef564b38a3c6fb4a85c16adb33d095c
m_SubObjectName: m_SubObjectName:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
@@ -12,14 +12,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: be49de18297645009c1e2092f382a670, type: 3} m_Script: {fileID: 11500000, guid: be49de18297645009c1e2092f382a670, type: 3}
m_Name: SFXListConfig m_Name: SFXListConfig
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.SFXListConfig m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.SFXListConfig
SFX: SFX: []
- m_AssetGUID: 1d7110a045075b22fa27d62bd5f2784e
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
- m_AssetGUID: 3831a36e0c8e48f659517a6bb99378b6
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
@@ -18,13 +18,24 @@ MonoBehaviour:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
m_EditorAssetChanged: 0 m_EditorAssetChanged: 0
actionSoundtrack: - m_AssetGUID: 9ea414d55e6a0b94c944556ff0754c48
- m_AssetGUID: ebe18293a5ef86704b23dad3a1786476
m_SubObjectName: m_SubObjectName:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
m_EditorAssetChanged: 0 m_EditorAssetChanged: 0
- m_AssetGUID: 170b1a70ddee4d948abea041b9b805e4 - m_AssetGUID: 414d8dcca794556478c1a79e705e138e
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
actionSoundtrack:
- m_AssetGUID: 8f913b505c805c74da84e00a22ff5fc2
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
deathSoundtrack:
- m_AssetGUID: fc08098e6384c904aa0583859ee45ce5
m_SubObjectName: m_SubObjectName:
m_SubObjectType: m_SubObjectType:
m_SubObjectGUID: m_SubObjectGUID:
@@ -22,7 +22,7 @@ MonoBehaviour:
attackCooldown: 0 attackCooldown: 0
detectionRange: 0 detectionRange: 0
attackRange: 5 attackRange: 5
speed: 1.5 speed: 3
isStunnable: 0 isStunnable: 0
stunDuration: 0 stunDuration: 0
usesIdleMovement: 0 usesIdleMovement: 0
@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: aa24c0d8a11438d4fb57332c144beab6 guid: 4b3f57da60db4444799ca8c7465d471c
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
@@ -0,0 +1,139 @@
%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: Box
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _METALLICSPECGLOSSMAP
- _NORMALMAP
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: f90a581faf2125c499a63b93597653f3, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 1eb938e007c23524fa145a6b635bedcc, type: 3}
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: 2800000, guid: f90a581faf2125c499a63b93597653f3, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 2800000, guid: cd6e592d6b2b18546bf8965713f71df3, type: 3}
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: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 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 &9055732877677571783
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
@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: a1f1b5a364203f14d8a6023ed28c1977 guid: c988417585b3ef04ca830cffa85a86bd
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 2100000 mainObjectFileID: 2100000
@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: bb64fc3f5b1166b488ee1791e4741b86 guid: f90a581faf2125c499a63b93597653f3
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0 normalMapFilter: 0
flipGreenChannel: 0 flipGreenChannel: 0
isReadable: 0 isReadable: 0
streamingMipmaps: 1 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
vTOnly: 0 vTOnly: 0
ignoreMipmapLimit: 0 ignoreMipmapLimit: 0
@@ -34,12 +34,12 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: 1 filterMode: 0
aniso: 3 aniso: 1
mipBias: 0 mipBias: 0
wrapU: 1 wrapU: 0
wrapV: 1 wrapV: 0
wrapW: 1 wrapW: 0
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0 alphaUsage: 1
alphaIsTransparency: 0 alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: 6 textureType: 0
textureShape: 1 textureShape: 1
singleChannelComponent: 0 singleChannelComponent: 0
flipbookRows: 1 flipbookRows: 1
@@ -72,7 +72,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 2 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: de90bfd62a4760e44a9560974b9ef9ec guid: 1eb938e007c23524fa145a6b635bedcc
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}
@@ -22,7 +22,7 @@ TextureImporter:
normalMapFilter: 0 normalMapFilter: 0
flipGreenChannel: 0 flipGreenChannel: 0
isReadable: 0 isReadable: 0
streamingMipmaps: 1 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
vTOnly: 0 vTOnly: 0
ignoreMipmapLimit: 0 ignoreMipmapLimit: 0
@@ -34,12 +34,12 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: 1 filterMode: 0
aniso: 3 aniso: 1
mipBias: 0 mipBias: 0
wrapU: 1 wrapU: 0
wrapV: 1 wrapV: 0
wrapW: 1 wrapW: 0
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
@@ -54,7 +54,7 @@ TextureImporter:
alphaUsage: 1 alphaUsage: 1
alphaIsTransparency: 0 alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: 12 textureType: 1
textureShape: 1 textureShape: 1
singleChannelComponent: 0 singleChannelComponent: 0
flipbookRows: 1 flipbookRows: 1
@@ -72,7 +72,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 2 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: cd6e592d6b2b18546bf8965713f71df3
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
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:
@@ -121,7 +121,7 @@ Material:
- _Parallax: 0.005 - _Parallax: 0.005
- _QueueOffset: 0 - _QueueOffset: 0
- _ReceiveShadows: 1 - _ReceiveShadows: 1
- _Smoothness: 0.5 - _Smoothness: 0
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1
@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: bc9a23cef60c78e46924e5d40b0c2a16 guid: 8c709e98f2aebc3e7897e77b50728de3
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
@@ -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
- _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
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cd92f58bae8219bf190b30d7c9e47e50
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
@@ -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:
@@ -31,7 +31,7 @@ Material:
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: 2050
stringTagMap: stringTagMap:
RenderType: Opaque RenderType: Opaque
disabledShaderPasses: disabledShaderPasses:
@@ -119,7 +119,7 @@ Material:
- _Metallic: 0 - _Metallic: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.005 - _Parallax: 0.005
- _QueueOffset: 0 - _QueueOffset: 50
- _ReceiveShadows: 1 - _ReceiveShadows: 1
- _Smoothness: 0.024 - _Smoothness: 0.024
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
@@ -31,7 +31,7 @@ Material:
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: 2050
stringTagMap: stringTagMap:
RenderType: Opaque RenderType: Opaque
disabledShaderPasses: disabledShaderPasses:
@@ -119,7 +119,7 @@ Material:
- _Metallic: 0 - _Metallic: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.005 - _Parallax: 0.005
- _QueueOffset: 0 - _QueueOffset: 50
- _ReceiveShadows: 1 - _ReceiveShadows: 1
- _Smoothness: 0.024 - _Smoothness: 0.024
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
Binary file not shown.
@@ -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:
@@ -1,110 +0,0 @@
fileFormatVersion: 2
guid: 89b8ea3befbb7ac3d9998f40fc1bb119
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:
@@ -9,7 +9,7 @@ BlendTree:
m_Name: Blend Tree m_Name: Blend Tree
m_Childs: m_Childs:
- serializedVersion: 2 - serializedVersion: 2
m_Motion: {fileID: -3471636723063426380, guid: 5980bf2db4921204b9dbc03ca40c60a9, type: 3} m_Motion: {fileID: 1032454674216479247, guid: 832c2ca81687522d1be9fd0ff1582b82, type: 3}
m_Threshold: 0 m_Threshold: 0
m_Position: {x: 0, y: 0} m_Position: {x: 0, y: 0}
m_TimeScale: 1 m_TimeScale: 1
@@ -17,7 +17,7 @@ BlendTree:
m_DirectBlendParameter: Blend m_DirectBlendParameter: Blend
m_Mirror: 0 m_Mirror: 0
- serializedVersion: 2 - serializedVersion: 2
m_Motion: {fileID: 7400000, guid: c30bba7f8c9df71fc96b4c0014e9c681, type: 2} m_Motion: {fileID: 7400000, guid: c74a8994d9fc63c14a718af8dea36a70, type: 2}
m_Threshold: 0.5 m_Threshold: 0.5
m_Position: {x: 0, y: 0} m_Position: {x: 0, y: 0}
m_TimeScale: 1 m_TimeScale: 1
@@ -25,7 +25,7 @@ BlendTree:
m_DirectBlendParameter: Blend m_DirectBlendParameter: Blend
m_Mirror: 0 m_Mirror: 0
- serializedVersion: 2 - serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 249b0825e3890002dab1cbacfa06346e, type: 2} m_Motion: {fileID: 7400000, guid: 641af561c10c280cba0fd457a94f4057, type: 2}
m_Threshold: 1 m_Threshold: 1
m_Position: {x: 0, y: 0} m_Position: {x: 0, y: 0}
m_TimeScale: 1 m_TimeScale: 1
@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 1ce80ea58c1a9154dab0a2f539b9b2a4 guid: 481cc2d70d0f62799bb8e0e45d57d0f7
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
@@ -1,5 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: f0a1f49824855efb0b1ffb2916cbeea9 guid: 50c614559db2c0f46a7d62cbb05ca499
folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:
@@ -7,8 +7,8 @@ Material:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: TestOnTop m_Name: ded_idle_last-No Name
m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: [] m_ValidKeywords: []
@@ -17,7 +17,8 @@ Material:
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: {} stringTagMap:
RenderType: Opaque
disabledShaderPasses: disabledShaderPasses:
- MOTIONVECTORS - MOTIONVECTORS
m_LockedProperties: m_LockedProperties:
@@ -90,7 +91,6 @@ Material:
- _BumpScale: 1 - _BumpScale: 1
- _ClearCoatMask: 0 - _ClearCoatMask: 0
- _ClearCoatSmoothness: 0 - _ClearCoatSmoothness: 0
- _ColorMask: 15
- _Cull: 2 - _Cull: 2
- _Cutoff: 0.5 - _Cutoff: 0.5
- _DetailAlbedoMapScale: 1 - _DetailAlbedoMapScale: 1
@@ -111,13 +111,7 @@ Material:
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1
- _SrcBlendAlpha: 1 - _SrcBlendAlpha: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _Surface: 0 - _Surface: 0
- _UseUIAlphaClip: 0
- _WorkflowMode: 1 - _WorkflowMode: 1
- _XRMotionVectorsPass: 1 - _XRMotionVectorsPass: 1
- _ZWrite: 1 - _ZWrite: 1
@@ -128,7 +122,7 @@ Material:
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
m_AllowLocking: 1 m_AllowLocking: 1
--- !u!114 &1261182030382286586 --- !u!114 &4648706784004926851
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fcab4c0364c17a346bdcb2225aa2593f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 54da2999d81550ec198032d2ebb76ba0 guid: 832c2ca81687522d1be9fd0ff1582b82
ModelImporter: ModelImporter:
serializedVersion: 24200 serializedVersion: 24200
internalIDToNameTable: [] internalIDToNameTable: []
@@ -41,8 +41,8 @@ ModelImporter:
importPhysicalCameras: 1 importPhysicalCameras: 1
importVisibility: 1 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 1 importCameras: 0
importLights: 1 importLights: 0
nodeNameCollisionStrategy: 1 nodeNameCollisionStrategy: 1
fileIdsGeneration: 2 fileIdsGeneration: 2
swapUVChannels: 0 swapUVChannels: 0
@@ -100,7 +100,7 @@ ModelImporter:
autoGenerateAvatarMappingIfUnspecified: 1 autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1
avatarSetup: 0 avatarSetup: 1
addHumanoidExtraRootOnlyWhenUsingAvatar: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1 importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0 remapMaterialsIfMaterialImportModeIsNone: 0
File diff suppressed because it is too large. Load diff
Loaded 100 of 309 files, more files were not shown because too many files have changed in this diff. Show more