From 388773129d911ca35bc7e64e50e4b0715f4e2dc1 Mon Sep 17 00:00:00 2001 From: ThomasCharester Date: Fri, 21 Nov 2025 20:27:11 +0300 Subject: [PATCH] CoreGameplay --- .../AddressableAssetSettings.asset | 2 +- .../AssetGroups/Default Local Group.asset | 10 + .../Code/App/AppStates/GameplayState.cs | 191 +- .../Assets/Code/App/BootstrapInstaller.cs | 5 +- .../SceneInstallers/GameplaySceneInstaller.cs | 3 + .../Assets/Code/Audio/AudioEnums.cs | 13 +- .../Assets/Code/Audio/AudioFactory.cs | 12 +- .../Assets/Code/Configs/OrderBoxConfig.cs | 12 + .../Code/Configs/OrderBoxConfig.cs.meta | 3 + .../Assets/Code/Configs/OrderServiceConfig.cs | 11 + .../Code/Configs/OrderServiceConfig.cs.meta | 3 + .../Assets/Code/Configs/PlayerConfig.cs | 1 + .../Gameplay/Camera/CameraStateMachine.cs | 1 + .../Character/Core/CharacterProvider.cs | 4 + .../Assets/Code/Gameplay/Orders.meta | 3 + .../Assets/Code/Gameplay/Orders/Order.meta | 3 + .../Gameplay/Orders/Order/IOrderService.cs | 20 + .../Orders/Order/IOrderService.cs.meta | 3 + .../Gameplay/Orders/Order/IScoreService.cs | 9 + .../Orders/Order/IScoreService.cs.meta | 3 + .../Code/Gameplay/Orders/Order/OrderBox.cs | 68 + .../Gameplay/Orders/Order/OrderBox.cs.meta | 3 + .../Orders/Order/OrderDeliveryTrigger.cs | 19 + .../Orders/Order/OrderDeliveryTrigger.cs.meta | 3 + .../Gameplay/Orders/Order/OrderDispenser.cs | 31 + .../Orders/Order/OrderDispenser.cs.meta | 3 + .../Gameplay/Orders/Order/OrderGiveTrigger.cs | 18 + .../Orders/Order/OrderGiveTrigger.cs.meta | 3 + .../Gameplay/Orders/Order/OrderService.cs | 61 + .../Orders/Order/OrderService.cs.meta | 3 + .../Code/Gameplay/Orders/Order/OrderState.cs | 9 + .../Gameplay/Orders/Order/OrderState.cs.meta | 3 + .../Gameplay/Orders/Order/ScoreService.cs | 11 + .../Orders/Order/ScoreService.cs.meta | 3 + .../Code/Gameplay/Player/ArmsMeshProvider.cs | 9 + .../Gameplay/Player/ArmsMeshProvider.cs.meta | 3 + .../Code/Gameplay/Player/IPlayerFactory.cs | 2 + .../Code/Gameplay/Player/PlayerAnimator.cs | 5 +- .../Code/Gameplay/Player/PlayerFactory.cs | 3 + .../GameplaySceneEnvironment.cs | 3 + .../Assets/Code/Scenes/SceneLoaderService.cs | 2 +- .../Code/StaticData/IStaticDataService.cs | 2 + .../Code/StaticData/StaticDataService.cs | 4 + .../Assets/Code/UI/Panels/GameplayPanel.cs | 9 +- .../Assets/Resources/Audio/MainMixer.mixer | 3 +- .../Resources/Configs/App/PlayerConfig.asset | 6 + .../Configs/Audio/SoundtrackListConfig.asset | 25 + .../Assets/Resources/Configs/Gameplay.meta | 8 + .../Configs/Gameplay/OrderBoxConfig.asset | 49 + .../Gameplay/OrderBoxConfig.asset.meta | 8 + .../Configs/Gameplay/OrderFactoryConfig.asset | 20 + .../Gameplay/OrderFactoryConfig.asset.meta | 8 + .../Configs/Gameplay/OrderServiceConfig.asset | 17 + .../Gameplay/OrderServiceConfig.asset.meta | 8 + .../Models/Enemies/cockroach_attack.fbx | 3 + .../cockroach_attack.fbx.meta} | 6 +- .../Models/Enemies/cockroach_walk.fbx | 3 + .../Models/Enemies/cockroach_walk.fbx.meta | 110 + .../Resources/Models/Furniture/лестница.fbx | 3 + .../Models/Furniture/лестница.fbx.meta | 110 + .../Resources/Models/Furniture/труба.fbx | 3 + .../Resources/Models/Furniture/труба.fbx.meta | 110 + .../Models/Player/PlayerAnimator.controller | 95 +- .../Resources/Models/Player/mp_anim_idle1.fbx | 3 - .../Models/Player/mp_anim_running1.fbx.meta | 10 +- .../Resources/Models/Player/mp_clapping.fbx | 3 + ...im_idle1.fbx.meta => mp_clapping.fbx.meta} | 64 +- .../Models/Player/mp_default_idle.fbx | 3 + .../Models/Player/mp_default_idle.fbx.meta | 110 + .../Resources/Models/Player/mp_getriddy_2.fbx | 3 + .../Models/Player/mp_getriddy_2.fbx.meta | 110 + .../Models/Player/mp_gun_volley_2.fbx | 3 + .../Models/Player/mp_gun_volley_2.fbx.meta | 110 + .../Resources/Models/Player/mp_idle.fbx | 3 + ...st2_running2.fbx.meta => mp_idle.fbx.meta} | 16 +- .../Resources/Models/Player/mp_stretching.fbx | 3 + .../Models/Player/mp_stretching.fbx.meta | 110 + .../Models/Player/test2_running1.fbx | 3 - .../Models/Player/test2_running2.fbx | 3 - .../Resources/Prefabs/App/Camera.prefab | 4 +- .../Resources/Prefabs/Furniture/Order.prefab | 178 ++ .../Prefabs/Furniture/Order.prefab.meta | 7 + .../Resources/Prefabs/Furniture/testroom.fbx | 3 + .../Prefabs/Furniture/testroom.fbx.meta | 115 + .../Player/CharacterControllerFullMono.prefab | 2 +- .../Assets/Resources/Scenes/Gameplay.unity | 326 ++- .../Assets/Resources/Scenes/MainMenu.unity | 2 +- .../Assets/Resources/Scenes/SoundTest.unity | 2364 ++--------------- .../Resources_moved/Prefabs/Furniture.meta | 8 + .../Prefabs/Furniture/труба.prefab | 428 +++ .../Prefabs/Furniture/труба.prefab.meta | 7 + .../Prefabs/Player/ArmsMesh.prefab | 1107 ++++++++ .../Prefabs/Player/ArmsMesh.prefab.meta | 7 + .../Prefabs/Player/CharacterController.prefab | 192 +- .../ProjectSettings/Physics2DSettings.asset | 26 +- .../ProjectSettings/TagManager.asset | 6 +- 96 files changed, 4037 insertions(+), 2489 deletions(-) create mode 100644 Game/CourierOld/Assets/Code/Configs/OrderBoxConfig.cs create mode 100644 Game/CourierOld/Assets/Code/Configs/OrderBoxConfig.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Configs/OrderServiceConfig.cs create mode 100644 Game/CourierOld/Assets/Code/Configs/OrderServiceConfig.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IOrderService.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IOrderService.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IScoreService.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IScoreService.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderBox.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderBox.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDeliveryTrigger.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDeliveryTrigger.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDispenser.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDispenser.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderGiveTrigger.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderGiveTrigger.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderService.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderService.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderState.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderState.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/ScoreService.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Orders/Order/ScoreService.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Player/ArmsMeshProvider.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Player/ArmsMeshProvider.cs.meta create mode 100644 Game/CourierOld/Assets/Resources/Configs/Gameplay.meta create mode 100644 Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderBoxConfig.asset create mode 100644 Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderBoxConfig.asset.meta create mode 100644 Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderFactoryConfig.asset create mode 100644 Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderFactoryConfig.asset.meta create mode 100644 Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderServiceConfig.asset create mode 100644 Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderServiceConfig.asset.meta create mode 100644 Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_attack.fbx rename Game/CourierOld/Assets/Resources/Models/{Player/test2_running1.fbx.meta => Enemies/cockroach_attack.fbx.meta} (97%) create mode 100644 Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_walk.fbx create mode 100644 Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_walk.fbx.meta create mode 100644 Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx create mode 100644 Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx.meta create mode 100644 Game/CourierOld/Assets/Resources/Models/Furniture/труба.fbx create mode 100644 Game/CourierOld/Assets/Resources/Models/Furniture/труба.fbx.meta delete mode 100644 Game/CourierOld/Assets/Resources/Models/Player/mp_anim_idle1.fbx create mode 100644 Game/CourierOld/Assets/Resources/Models/Player/mp_clapping.fbx rename Game/CourierOld/Assets/Resources/Models/Player/{mp_anim_idle1.fbx.meta => mp_clapping.fbx.meta} (58%) create mode 100644 Game/CourierOld/Assets/Resources/Models/Player/mp_default_idle.fbx create mode 100644 Game/CourierOld/Assets/Resources/Models/Player/mp_default_idle.fbx.meta create mode 100644 Game/CourierOld/Assets/Resources/Models/Player/mp_getriddy_2.fbx create mode 100644 Game/CourierOld/Assets/Resources/Models/Player/mp_getriddy_2.fbx.meta create mode 100644 Game/CourierOld/Assets/Resources/Models/Player/mp_gun_volley_2.fbx create mode 100644 Game/CourierOld/Assets/Resources/Models/Player/mp_gun_volley_2.fbx.meta create mode 100644 Game/CourierOld/Assets/Resources/Models/Player/mp_idle.fbx rename Game/CourierOld/Assets/Resources/Models/Player/{test2_running2.fbx.meta => mp_idle.fbx.meta} (91%) create mode 100644 Game/CourierOld/Assets/Resources/Models/Player/mp_stretching.fbx create mode 100644 Game/CourierOld/Assets/Resources/Models/Player/mp_stretching.fbx.meta delete mode 100644 Game/CourierOld/Assets/Resources/Models/Player/test2_running1.fbx delete mode 100644 Game/CourierOld/Assets/Resources/Models/Player/test2_running2.fbx create mode 100644 Game/CourierOld/Assets/Resources/Prefabs/Furniture/Order.prefab create mode 100644 Game/CourierOld/Assets/Resources/Prefabs/Furniture/Order.prefab.meta create mode 100644 Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx create mode 100644 Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx.meta create mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Furniture.meta create mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Furniture/труба.prefab create mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Furniture/труба.prefab.meta create mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab create mode 100644 Game/CourierOld/Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab.meta diff --git a/Game/CourierOld/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Game/CourierOld/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 08a0783..6e38b35 100644 --- a/Game/CourierOld/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Game/CourierOld/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: d447fc60305c17a17bf20948ab295a45 m_currentHash: serializedVersion: 2 - Hash: 7a64d7a2af9d510237bf092fcbceb308 + Hash: db97f0adbdaa5d76ea9341571ea44391 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 13ca45e..5761202 100644 --- a/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -30,6 +30,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 1d4767c722c05b5d6b96bb226d378c65 + m_Address: Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 1d7110a045075b22fa27d62bd5f2784e m_Address: 357_shot1 m_ReadOnly: 0 @@ -90,6 +95,11 @@ MonoBehaviour: 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 diff --git a/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs b/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs index 60a2231..9be13e2 100644 --- a/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs +++ b/Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs @@ -1,16 +1,23 @@ +using System.Globalization; +using System.Reflection.Emit; using Code.App.StateMachine; using Code.Audio; using Code.Gameplay.Camera; using Code.Gameplay.Camera.CameraStates; using Code.Gameplay.Character.Core; +using Code.Gameplay.Orders.Order; +using Code.Gameplay.Orders.Order; using Code.Gameplay.Player; using Code.Input; using Code.Scenes; using Code.Scenes.SceneEnvironments; using Code.StateMachine; using Code.UI; +using Code.UI.Panels; using Cysharp.Threading.Tasks; +using Reflex.Core; using Reflex.Extensions; +using Reflex.Injectors; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.SceneManagement; @@ -18,13 +25,13 @@ using UnityEngine.SceneManagement; namespace Code.App.AppStates { public class GameplayState : BaseState - { - // DEBUG - private Transform _testSFXTransform; - // DEBUG + { private PlayerHealth _playerHealth; private PlayerMoney _playerMoney; + + private IScoreService _scoreService; + private IOrderService _orderService; private CharacterProvider _playerCharacter; @@ -45,87 +52,101 @@ namespace Code.App.AppStates Context.InputService.EnableMap(ActionMappings.Gameplay); - Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, GiveHealth); - Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug3, GiveMoney); - Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug2, LooseHealth); - Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, LooseMoney); - Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, PlayDebugSFX); - Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug6, PlayDebugDispatcher); + Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, GiveOrderDEBUG); + Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug2, RecieveOrderDEBUG); + Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug3, DeliverOrderDEBUG); + Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG); + Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, Tube); + // Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug6, PlayDebugDispatcher); #pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed WaitForSceneToLoad(); #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 UniTaskVoid WaitForSceneToLoad() - { + { + await Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.Gameplay); + await UniTask.WhenAll( - Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.Gameplay), Context.UIService.AsyncSwitchPanelTo(UIPanel.Gameplay), + // TODO Context.AudioFactory.WarmGameplayMusic(), Context.AudioFactory.WarmSFX(), + Context.AudioFactory.WarmDispatcher(), + // TODO + WaitForPlayerArmsToInitialize(), WaitForPlayerCharacterLoad() - ); + ); + MusicInitialize(); - Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Peaceful); - Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Action); + Container sceneContainer = SceneManager.GetActiveScene().GetSceneContainer(); - var sceneEnvironment = ((GameplaySceneEnvironment)SceneManager.GetActiveScene() - .GetSceneContainer().Resolve()); + GameplaySceneEnvironment sceneEnvironment = SceneEnvironmentVariables(sceneContainer); - _testSFXTransform = sceneEnvironment.debugSfxTarget; + PlayerInitialize(sceneEnvironment); - _playerCharacter.Teleport(sceneEnvironment.playerSpawnPoint.position, sceneEnvironment.playerSpawnPoint.rotation); + UIInitialize(); - ((GameplayPanel)Context.UIService.CurrentPanel).Initialize(_playerMoney, _playerHealth); + CameraInitialize(); + + InputServiceInitialize(); + + GameplayServicesInitialize(sceneContainer); - Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson); - - ((BaseCameraState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(_playerCharacter.GetFollowTransform()); - - Context.InputService.EnableMap(ActionMappings.Gameplay); + _tickEnabled = true; Context.UIService.LoadingScreen.Hide(); } - private void OnCharacterSpawn(CharacterProvider characterProvider) - { - ((BaseCameraState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(_playerCharacter.GetFollowTransform()); - } - private void PlayDebugSFX(InputAction.CallbackContext context) - { - Context.AudioService.PlaySFX(SFXSounds.Crowbar, _testSFXTransform.position); - } - private void PlayDebugDispatcher(InputAction.CallbackContext context) - { - Context.AudioService.PlayDispatcher(DispatcherSounds.AhFreeman); - } - private void GiveHealth(InputAction.CallbackContext context) - { - _playerHealth.GetDamage(-1); - } + private async UniTask WaitForPlayerArmsToInitialize() => _armsMesh = await Context.PlayerFactory.CreateArms(Context.CameraStateMachine.Camera.transform); - private void LooseHealth(InputAction.CallbackContext context) - { - _playerHealth.GetDamage(1); + private void OrderGiven(float time) + { + } - - private void GiveMoney(InputAction.CallbackContext context) + private void OrderRecieved(float time) { - _playerMoney.GiveMoney(100); - ((GameplayPanel)(Context.UIService.CurrentPanel)).SummonDispatcher(); + Context.AudioService.PlayDispatcher((DispatcherSounds)Random.Range((int)DispatcherSounds.Recieve1,(int)DispatcherSounds.Recieve2)); } - - private void LooseMoney(InputAction.CallbackContext context) - { - _playerMoney.LooseMoney(100); - ((GameplayPanel)(Context.UIService.CurrentPanel)).CloseDispatcher(); + private void OrderDelivered(int score, float time) + { + if(time < 0f) Context.AudioService.PlayDispatcher((DispatcherSounds)Random.Range((int)DispatcherSounds.Late1,(int)DispatcherSounds.Late2)); + _playerMoney.GiveMoney(score); } // DEBUG + private void GiveOrderDEBUG(InputAction.CallbackContext context) + { + _orderService.OrderGive(); + } + + private void RecieveOrderDEBUG(InputAction.CallbackContext context) + { + _orderService.OrderRecieved(); + } + private void DeliverOrderDEBUG(InputAction.CallbackContext context) + { + _orderService.OrderDelivered(); + } + private void RoomPassedDEBUG(InputAction.CallbackContext context) + { + _orderService.RoomPassed(); + } + private OrderDispenser _debugTube; + + private void Tube(InputAction.CallbackContext context) + { + _debugTube.ThrowOrder(); + } + // DEBUG + private bool _tickEnabled; public override void Tick() { + if (!_tickEnabled) return; + + // TODO ГРЯЗь + _gameplayPanel.Timer.text = ((int)_orderService.DecreaseTimer(Time.deltaTime)).ToString(CultureInfo.CurrentCulture); } private void EndGame() @@ -139,21 +160,71 @@ namespace Code.App.AppStates _playerHealth = null; _playerMoney = null; + _tickEnabled = false; + Context.PlayerFactory.ReleasePlayer(_playerCharacter); _playerCharacter = null; + Context.PlayerFactory.ReleaseArms(_armsMesh); + _armsMesh = null; Context.InputService.DisableMap(ActionMappings.Gameplay); Context.AudioService.GladlyAskToStopMusic(MusicType.Action, callback: Context.AudioFactory.ReleaseActionMusic); Context.AudioService.GladlyAskToStopMusic(MusicType.Peaceful, callback: Context.AudioFactory.ReleasePeacefulMusic); - Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, GiveHealth); - Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug3, GiveHealth); - Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug2, LooseHealth); - Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, LooseMoney); - Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, PlayDebugSFX); - Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug6, PlayDebugDispatcher); + + Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, GiveOrderDEBUG); + Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug2, RecieveOrderDEBUG); + Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug3, DeliverOrderDEBUG); + Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG); + Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, Tube); + // Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug6, PlayDebugDispatcher); base.ExitState(); } + + private void InputServiceInitialize() + { + Context.InputService.EnableMap(ActionMappings.Gameplay); + } + private void CameraInitialize() + { + Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson); + ((BaseCameraState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(_playerCharacter.GetFollowTransform()); + } + + private GameplayPanel _gameplayPanel; + private ArmsMeshProvider _armsMesh; + + private void UIInitialize() + { + _gameplayPanel = (GameplayPanel)Context.UIService.CurrentPanel; + _gameplayPanel.Initialize(_playerMoney, _playerHealth); + } + private void MusicInitialize() + { + Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Peaceful); + Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Action); + } + private void PlayerInitialize(GameplaySceneEnvironment sceneEnvironment) + { + _playerCharacter.Teleport(sceneEnvironment.playerSpawnPoint.position, sceneEnvironment.playerSpawnPoint.rotation); + _playerCharacter.PlayerAnimator.SetAnimator(_armsMesh.ArmsAnimator); + } + private void GameplayServicesInitialize(Container sceneContainer) + { + _scoreService = sceneContainer.Resolve(); + _orderService = sceneContainer.Resolve(); + + _orderService.OnOrderGiven += OrderGiven; + _orderService.OnOrderRecieved += OrderRecieved; + _orderService.OnOrderDelivered += OrderDelivered; + } + private GameplaySceneEnvironment SceneEnvironmentVariables(Container sceneContainer) + { + var sceneEnvironment = (GameplaySceneEnvironment)sceneContainer.Resolve(); + + _debugTube = sceneEnvironment.debugTube; + return sceneEnvironment; + } } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs index ea4aaaf..ade0c7e 100644 --- a/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs +++ b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs @@ -3,6 +3,7 @@ using Code.Audio; using Code.Configs; using Code.Constants; using Code.Gameplay.Camera; +using Code.Gameplay.Orders.Order; using Code.Gameplay.Player; using Code.Input; using Code.Scenes; @@ -82,6 +83,9 @@ namespace Code.App containerBuilder.AddSingleton(staticDataService.SFXListConfig, typeof(SFXListConfig)); containerBuilder.AddSingleton(staticDataService.DispatcherSoundListConfig, typeof(DispatcherSoundListConfig)); containerBuilder.AddSingleton(staticDataService.EnemiesSoundListConfig, typeof(EnemiesSoundListConfig)); + + containerBuilder.AddSingleton(staticDataService.OrderServiceConfig, typeof(OrderServiceConfig)); + containerBuilder.AddSingleton(staticDataService.OrderBoxConfig, typeof(OrderBoxConfig)); } private AppStateMachine _appStateMachine; @@ -98,7 +102,6 @@ namespace Code.App #pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed BootstrapFinish(container); - #pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed } private async UniTaskVoid BootstrapFinish(Container container) diff --git a/Game/CourierOld/Assets/Code/App/SceneInstallers/GameplaySceneInstaller.cs b/Game/CourierOld/Assets/Code/App/SceneInstallers/GameplaySceneInstaller.cs index 3179a54..d2984b7 100644 --- a/Game/CourierOld/Assets/Code/App/SceneInstallers/GameplaySceneInstaller.cs +++ b/Game/CourierOld/Assets/Code/App/SceneInstallers/GameplaySceneInstaller.cs @@ -1,3 +1,4 @@ +using Code.Gameplay.Orders.Order; using Code.Scenes; using Code.Scenes.SceneEnvironments; using Reflex.Core; @@ -12,6 +13,8 @@ namespace Code.App.SceneInstallers public void InstallBindings(ContainerBuilder containerBuilder) { containerBuilder.AddScoped(typeof(GameplaySceneEnvironment), typeof(CurrentSceneEnvironment)); + containerBuilder.AddScoped(typeof(ScoreService), typeof(IScoreService)); + containerBuilder.AddScoped(typeof(OrderService), typeof(IOrderService)); containerBuilder.OnContainerBuilt += Initialize; } diff --git a/Game/CourierOld/Assets/Code/Audio/AudioEnums.cs b/Game/CourierOld/Assets/Code/Audio/AudioEnums.cs index 173234e..2757c9c 100644 --- a/Game/CourierOld/Assets/Code/Audio/AudioEnums.cs +++ b/Game/CourierOld/Assets/Code/Audio/AudioEnums.cs @@ -18,6 +18,17 @@ namespace Code.Audio { Absolutely, AbsolutelyNot, - AhFreeman + AhFreeman, + Recieve1, + Recieve2, + TakeDamage1, + TakeDamage2, + TakeDamage3, + TakeDamage4, + Late1, + Late2, + Late3, + Late4, + Late5 } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs b/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs index 64d3800..6fa3df4 100644 --- a/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs +++ b/Game/CourierOld/Assets/Code/Audio/AudioFactory.cs @@ -62,8 +62,8 @@ namespace Code.Audio public async UniTask WarmGameplayMusic( ) { - _actionMusicHandle = Addressables.LoadAssetsAsync(_actionSoundtrack, OnActionTrackLoaded, Addressables.MergeMode.None); - _peacefulMusicHandle = Addressables.LoadAssetsAsync(_peacefulSoundtrack, OnPeacefulTrackLoaded, Addressables.MergeMode.None); + _actionMusicHandle = Addressables.LoadAssetsAsync(_actionSoundtrack, OnActionTrackLoaded, Addressables.MergeMode.Union); + _peacefulMusicHandle = Addressables.LoadAssetsAsync(_peacefulSoundtrack, OnPeacefulTrackLoaded, Addressables.MergeMode.Union); await UniTask.WhenAll(_actionMusicHandle.ToUniTask(), _peacefulMusicHandle.ToUniTask()); } @@ -79,7 +79,7 @@ namespace Code.Audio } public async UniTask WarmMenuMusic( ) { - _menuMusicHandle = Addressables.LoadAssetsAsync(_menuSoundtrack, OnMenuTrackLoaded, Addressables.MergeMode.None); + _menuMusicHandle = Addressables.LoadAssetsAsync(_menuSoundtrack, OnMenuTrackLoaded, Addressables.MergeMode.Union); // foreach (var assetReference in _menuSoundtrack) MenuMusic.Add(await assetReference.LoadAssetAsync()); await _menuMusicHandle.ToUniTask(); @@ -92,7 +92,7 @@ namespace Code.Audio } public async UniTask WarmSFX( ) { - _SFXHandle = Addressables.LoadAssetsAsync(_SFX, OnSFXLoaded, Addressables.MergeMode.None); + _SFXHandle = Addressables.LoadAssetsAsync(_SFX, OnSFXLoaded, Addressables.MergeMode.Union); await _SFXHandle.ToUniTask(); @@ -104,7 +104,7 @@ namespace Code.Audio } public async UniTask WarmEnemies( ) { - _enemiesHandle = Addressables.LoadAssetsAsync(_enemies, OnEnemiesLoaded, Addressables.MergeMode.None); + _enemiesHandle = Addressables.LoadAssetsAsync(_enemies, OnEnemiesLoaded, Addressables.MergeMode.Union); await _enemiesHandle.ToUniTask(); @@ -118,7 +118,7 @@ namespace Code.Audio public async UniTask WarmDispatcher( ) { - _dispatcherHandle = Addressables.LoadAssetsAsync(_dispatcher, OnDispatcherLoaded, Addressables.MergeMode.None); + _dispatcherHandle = Addressables.LoadAssetsAsync(_dispatcher, OnDispatcherLoaded, Addressables.MergeMode.Union); await _dispatcherHandle.ToUniTask(); diff --git a/Game/CourierOld/Assets/Code/Configs/OrderBoxConfig.cs b/Game/CourierOld/Assets/Code/Configs/OrderBoxConfig.cs new file mode 100644 index 0000000..436223f --- /dev/null +++ b/Game/CourierOld/Assets/Code/Configs/OrderBoxConfig.cs @@ -0,0 +1,12 @@ +using UnityEngine; + +namespace Code.Configs +{ + [CreateAssetMenu(menuName = "Config/Gameplay/OrderBox", fileName = "OrderBoxConfig")] + public class OrderBoxConfig : ScriptableObject + { + public float activationTime; + public AnimationCurve floatingCurve; + public float curveLength; + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Configs/OrderBoxConfig.cs.meta b/Game/CourierOld/Assets/Code/Configs/OrderBoxConfig.cs.meta new file mode 100644 index 0000000..1aabc28 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Configs/OrderBoxConfig.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6af4f53d425a41c78ef889fd7e5c3197 +timeCreated: 1763735968 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Configs/OrderServiceConfig.cs b/Game/CourierOld/Assets/Code/Configs/OrderServiceConfig.cs new file mode 100644 index 0000000..a8db131 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Configs/OrderServiceConfig.cs @@ -0,0 +1,11 @@ +using UnityEngine; + +namespace Code.Configs +{ + [CreateAssetMenu(fileName = "OrderServiceConfig", menuName = "Config/Gameplay/OrderServiceConfig")] + public class OrderServiceConfig : ScriptableObject + { + public Vector2 timeBounds; + public float koefRooms, koefOvertime; + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Configs/OrderServiceConfig.cs.meta b/Game/CourierOld/Assets/Code/Configs/OrderServiceConfig.cs.meta new file mode 100644 index 0000000..1a54d52 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Configs/OrderServiceConfig.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ee2550c3e4874575ac3aecadfcc42475 +timeCreated: 1763559999 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Configs/PlayerConfig.cs b/Game/CourierOld/Assets/Code/Configs/PlayerConfig.cs index 708aee9..1c1a1bd 100644 --- a/Game/CourierOld/Assets/Code/Configs/PlayerConfig.cs +++ b/Game/CourierOld/Assets/Code/Configs/PlayerConfig.cs @@ -9,5 +9,6 @@ namespace Code.Configs public int maxHealth; public AssetReference characterPrefab; + public AssetReference armsMeshPrefab; } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStateMachine.cs b/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStateMachine.cs index 34308f7..e6153aa 100644 --- a/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStateMachine.cs +++ b/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStateMachine.cs @@ -17,6 +17,7 @@ namespace Code.Gameplay.Camera CurrentBaseState = States[CameraMode.UltraStatic]; } + public UnityEngine.Camera Camera => StateMachineContext.Camera; protected override bool CheckTransitionAllowed(CameraMode nextState) => true; diff --git a/Game/CourierOld/Assets/Code/Gameplay/Character/Core/CharacterProvider.cs b/Game/CourierOld/Assets/Code/Gameplay/Character/Core/CharacterProvider.cs index 4dbfb28..e40502d 100644 --- a/Game/CourierOld/Assets/Code/Gameplay/Character/Core/CharacterProvider.cs +++ b/Game/CourierOld/Assets/Code/Gameplay/Character/Core/CharacterProvider.cs @@ -1,6 +1,7 @@ using Code.Gameplay.Camera; using Code.Gameplay.Camera.CameraStates; using Code.Gameplay.Character.Controller; +using Code.Gameplay.Player; using Code.Input; using Reflex.Attributes; using UnityEngine; @@ -18,6 +19,9 @@ namespace Code.Gameplay.Character.Core [Inject] private IInputService _inputService; // Сервис ввода через DI + [SerializeField] private PlayerAnimator _animator; + public PlayerAnimator PlayerAnimator => _animator; + public void Teleport(Vector3 position, Quaternion rotation) { customCharacterController.SetPosition(position); diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders.meta b/Game/CourierOld/Assets/Code/Gameplay/Orders.meta new file mode 100644 index 0000000..01491bd --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e41c28f7828a44b7bc26d87886064d99 +timeCreated: 1763556651 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order.meta b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order.meta new file mode 100644 index 0000000..b4ad564 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4911436131e345ada949f2418595bbd8 +timeCreated: 1763559099 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IOrderService.cs b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IOrderService.cs new file mode 100644 index 0000000..4918002 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IOrderService.cs @@ -0,0 +1,20 @@ +namespace Code.Gameplay.Orders.Order +{ + public interface IOrderService + { + delegate void OrderProgressDelegate(float time); + + event OrderProgressDelegate OnOrderGiven; + event OrderProgressDelegate OnOrderRecieved; + + delegate void OrderDeliveredDelegate(int score, float time); + + event OrderDeliveredDelegate OnOrderDelivered; + OrderState OrderState { get; } + void RoomPassed(); + float DecreaseTimer(float delta); + void OrderGive(); + void OrderRecieved(); + void OrderDelivered(); + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IOrderService.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IOrderService.cs.meta new file mode 100644 index 0000000..aadcb9f --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IOrderService.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8b4467951c884c8dafeb633020696c24 +timeCreated: 1763561686 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IScoreService.cs b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IScoreService.cs new file mode 100644 index 0000000..03a534a --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IScoreService.cs @@ -0,0 +1,9 @@ +namespace Code.Gameplay.Orders.Order +{ + public interface IScoreService + { + int Score { get; } + void IncreaseScore(int amount); + void DecreaseScore(int amount); + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IScoreService.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IScoreService.cs.meta new file mode 100644 index 0000000..7ce9927 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/IScoreService.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 64668c9ef4c441af84c635365cfbb2de +timeCreated: 1763559523 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderBox.cs b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderBox.cs new file mode 100644 index 0000000..9b63b61 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderBox.cs @@ -0,0 +1,68 @@ +using System; +using Code.Configs; +using Code.Gameplay.Orders.Order; +using Cysharp.Threading.Tasks; +using Reflex.Attributes; +using UnityEngine; + +namespace Code.Gameplay.Orders.Order +{ + public class OrderBox : MonoBehaviour + { + [Inject] private IOrderService _orderService; + public Rigidbody rigidbody; + [SerializeField] private bool _pickupMode; + // [SerializeField] private AnimationCurve debugCurve; + + //DEBUG + // private void Start() + // { + // _capturedPosition = transform.position; + // _floatingCurve = debugCurve; + // _curveLength = 1f; + // } + // DEBUG + + private float _activationTime; + [Inject] + private void Construct(OrderBoxConfig config) + { + _floatingCurve = config.floatingCurve; + _activationTime = config.activationTime; + _curveLength = config.curveLength; + } + public void OnTriggerEnter(Collider other) + { + if (!_pickupMode) return; + + _orderService.OrderRecieved(); + Destroy(gameObject); + } + + public async UniTaskVoid SwitchMode() + { + Debug.LogWarning("Activating"); + await UniTask.WaitForSeconds(_activationTime); + Debug.LogWarning("Available"); + _pickupMode = true; + rigidbody.isKinematic = true; + _capturedPosition = transform.position; + } + + private Vector3 _capturedPosition; + private float _timeForMoving; + private AnimationCurve _floatingCurve; + private float _curveLength; + + private void FixedUpdate() + { + if (!_pickupMode) return; + _timeForMoving += Time.fixedDeltaTime; + + if (_timeForMoving > _curveLength) _timeForMoving = 0; + + transform.position = _capturedPosition + new Vector3(0, _floatingCurve.Evaluate(_timeForMoving), 0); + Debug.Log(transform.position); + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderBox.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderBox.cs.meta new file mode 100644 index 0000000..3d6f197 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderBox.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 067bc72af86a4fb8ac44d0c1fcfd25d5 +timeCreated: 1763573681 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDeliveryTrigger.cs b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDeliveryTrigger.cs new file mode 100644 index 0000000..6de668f --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDeliveryTrigger.cs @@ -0,0 +1,19 @@ +using System; +using Reflex.Attributes; +using UnityEngine; + +namespace Code.Gameplay.Orders.Order +{ + public class OrderDeliveryTrigger : MonoBehaviour + { + [Inject] private IOrderService _orderService; + private bool _playerEntered; + private void OnTriggerEnter(Collider other) + { + if (_playerEntered) return; + + _playerEntered = true; + _orderService.OrderDelivered(); + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDeliveryTrigger.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDeliveryTrigger.cs.meta new file mode 100644 index 0000000..7b2a57c --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDeliveryTrigger.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 47fbefab729047e5a11d8761e26f75a6 +timeCreated: 1763737623 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDispenser.cs b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDispenser.cs new file mode 100644 index 0000000..4e0a83b --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDispenser.cs @@ -0,0 +1,31 @@ +using DG.Tweening; +using UnityEngine; + +namespace Code.Gameplay.Orders.Order +{ + public class OrderDispenser : MonoBehaviour + { + [SerializeField] private Transform hatch; + [SerializeField] private OrderBox order; + + private bool _activated; + public void ThrowOrder() + { + hatch.DORotate(new Vector3(-130f, 0, 0), 0.2f); + + order.rigidbody.isKinematic = false; + order.rigidbody.AddForce(-transform.forward * 10f, ForceMode.Impulse); + } + + // DEBUG TODO ДИМКА УДАЛИ И ПРОПИШИ В СВОЕЙ ЛОГИКЕ + public void OnTriggerEnter(Collider other) + { + if(_activated) return; + _activated = true; + + ThrowOrder(); + order.SwitchMode(); + } + // DEBUG + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDispenser.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDispenser.cs.meta new file mode 100644 index 0000000..2e7912d --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderDispenser.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e50e3c42f5ee45e0b1087e0dbf7dd0f4 +timeCreated: 1763556675 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderGiveTrigger.cs b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderGiveTrigger.cs new file mode 100644 index 0000000..45c01c6 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderGiveTrigger.cs @@ -0,0 +1,18 @@ +using Reflex.Attributes; +using UnityEngine; + +namespace Code.Gameplay.Orders.Order +{ + public class OrderGiveTrigger : MonoBehaviour + { + [Inject] private IOrderService _orderService; + private bool _playerEntered; + private void OnTriggerEnter(Collider other) + { + if (_playerEntered) return; + + _playerEntered = true; + _orderService.OrderGive(); + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderGiveTrigger.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderGiveTrigger.cs.meta new file mode 100644 index 0000000..820d5d7 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderGiveTrigger.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d3966e4798d243abba9d85b9ad8aef33 +timeCreated: 1763742374 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderService.cs b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderService.cs new file mode 100644 index 0000000..bcb2f09 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderService.cs @@ -0,0 +1,61 @@ +using Code.Audio; +using Code.Configs; +using UnityEngine; + +namespace Code.Gameplay.Orders.Order +{ + public class OrderService : IOrderService + { + public event IOrderService.OrderProgressDelegate OnOrderGiven; + public event IOrderService.OrderProgressDelegate OnOrderRecieved; + public event IOrderService.OrderDeliveredDelegate OnOrderDelivered; + + private OrderState _orderState; + public OrderState OrderState => _orderState; + + private float _deliveryTimer = 0.0f; + + private Vector2 _timeBounds; + private float _koefRooms, _koefOvertime; + + private int _roomsPassed; + + public OrderService(OrderServiceConfig config) + { + _orderState = OrderState.Delivered; + + _timeBounds = config.timeBounds; + _koefRooms = config.koefRooms; + _koefOvertime = config.koefOvertime; + } + + public void RoomPassed() => _roomsPassed++; + public float DecreaseTimer(float delta) + { + return _deliveryTimer -= delta; + } + + public void OrderGive() + { + _orderState = OrderState.Given; + _roomsPassed = 0; + + _deliveryTimer = Random.Range(_timeBounds.x, _timeBounds.y); + OnOrderGiven?.Invoke(_deliveryTimer); + } + + public void OrderRecieved() + { + _orderState = OrderState.Recieved; + OnOrderRecieved?.Invoke(_deliveryTimer); + } + + public void OrderDelivered() + { + _orderState = OrderState.Delivered; + + int score = (int)(_koefRooms * _roomsPassed + _deliveryTimer * _koefOvertime); + OnOrderDelivered?.Invoke(score, _deliveryTimer); + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderService.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderService.cs.meta new file mode 100644 index 0000000..109be59 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderService.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b324c2a1be1546868cddf779445b286a +timeCreated: 1763559110 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderState.cs b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderState.cs new file mode 100644 index 0000000..17d5bb6 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderState.cs @@ -0,0 +1,9 @@ +namespace Code.Gameplay.Orders.Order +{ + public enum OrderState + { + Delivered, + Given, + Recieved, + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderState.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderState.cs.meta new file mode 100644 index 0000000..6268632 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderState.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0a8980a0cc034110ab3ccd948d40956b +timeCreated: 1763559535 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/ScoreService.cs b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/ScoreService.cs new file mode 100644 index 0000000..bac8498 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/ScoreService.cs @@ -0,0 +1,11 @@ +namespace Code.Gameplay.Orders.Order +{ + public class ScoreService : IScoreService + { + private int _score; + public int Score => _score; + + public void IncreaseScore(int amount) => _score += amount; + public void DecreaseScore(int amount) => _score -= amount; + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/ScoreService.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/ScoreService.cs.meta new file mode 100644 index 0000000..a279db5 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Orders/Order/ScoreService.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 619f2425460843aaa1f0f21e302158ce +timeCreated: 1763559528 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Player/ArmsMeshProvider.cs b/Game/CourierOld/Assets/Code/Gameplay/Player/ArmsMeshProvider.cs new file mode 100644 index 0000000..530cbda --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Player/ArmsMeshProvider.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +namespace Code.Gameplay.Player +{ + public class ArmsMeshProvider : MonoBehaviour + { + [SerializeField] public Animator ArmsAnimator; + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Player/ArmsMeshProvider.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Player/ArmsMeshProvider.cs.meta new file mode 100644 index 0000000..0d146b6 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Player/ArmsMeshProvider.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: cfe65f613bc54b4098acdba0d3fdd2a2 +timeCreated: 1763730814 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Player/IPlayerFactory.cs b/Game/CourierOld/Assets/Code/Gameplay/Player/IPlayerFactory.cs index 502764c..e922f57 100644 --- a/Game/CourierOld/Assets/Code/Gameplay/Player/IPlayerFactory.cs +++ b/Game/CourierOld/Assets/Code/Gameplay/Player/IPlayerFactory.cs @@ -11,5 +11,7 @@ namespace Code.Gameplay.Player PlayerMoney CreatePlayerMoney(int count = 0); UniTask CreatePlayer(); void ReleasePlayer(CharacterProvider characterProvider); + UniTask CreateArms(Transform papochka); + void ReleaseArms(ArmsMeshProvider arms); } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerAnimator.cs b/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerAnimator.cs index 3e5ca61..0bd6ca0 100644 --- a/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerAnimator.cs +++ b/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerAnimator.cs @@ -7,12 +7,13 @@ namespace Code.Gameplay.Player { private static readonly int Velocity = Animator.StringToHash("Velocity"); - [SerializeField] private Animator playerAnimator; + private Animator _playerAnimator; + public void SetAnimator(Animator animator) => _playerAnimator = animator; [SerializeField] private KinematicCharacterMotor kinematicCharacterMotor; private void SetVelocity(float velocity) { - playerAnimator.SetFloat(Velocity, velocity); + _playerAnimator.SetFloat(Velocity, velocity); } private void Update() diff --git a/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerFactory.cs b/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerFactory.cs index ce326e4..d286488 100644 --- a/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerFactory.cs +++ b/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerFactory.cs @@ -35,5 +35,8 @@ namespace Code.Gameplay.Player { Addressables.ReleaseInstance(characterProvider.gameObject); } + + public async UniTask CreateArms(Transform papochka) => (await Addressables.InstantiateAsync(_playerConfig.armsMeshPrefab, papochka).ToUniTask()).GetComponent(); + public void ReleaseArms(ArmsMeshProvider arms) => Addressables.ReleaseInstance(arms.gameObject); } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Scenes/SceneEnvironments/GameplaySceneEnvironment.cs b/Game/CourierOld/Assets/Code/Scenes/SceneEnvironments/GameplaySceneEnvironment.cs index 250cb4d..40c86ed 100644 --- a/Game/CourierOld/Assets/Code/Scenes/SceneEnvironments/GameplaySceneEnvironment.cs +++ b/Game/CourierOld/Assets/Code/Scenes/SceneEnvironments/GameplaySceneEnvironment.cs @@ -1,3 +1,4 @@ +using Code.Gameplay.Orders.Order; using UnityEngine; using UnityEngine.Serialization; @@ -8,11 +9,13 @@ namespace Code.Scenes.SceneEnvironments { [FormerlySerializedAs("sfxTarget")] public Transform debugSfxTarget; public Transform playerSpawnPoint; + public OrderDispenser debugTube; public void TransitVariables(GameplaySceneEnvironment env) { debugSfxTarget = env.debugSfxTarget; playerSpawnPoint = env.playerSpawnPoint; + debugTube = env.debugTube; } } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Scenes/SceneLoaderService.cs b/Game/CourierOld/Assets/Code/Scenes/SceneLoaderService.cs index ef85739..f03468b 100644 --- a/Game/CourierOld/Assets/Code/Scenes/SceneLoaderService.cs +++ b/Game/CourierOld/Assets/Code/Scenes/SceneLoaderService.cs @@ -30,7 +30,7 @@ namespace Code.Scenes callBack?.Invoke(); } - public async UniTask LoadSceneAsyncAwaitable(int sceneId, float waitFor = 0) + public async UniTask LoadSceneAsyncAwaitable(int sceneId, float waitFor = 0f) { await UniTask.WhenAll( UniTask.Delay(TimeSpan.FromSeconds(waitFor)), diff --git a/Game/CourierOld/Assets/Code/StaticData/IStaticDataService.cs b/Game/CourierOld/Assets/Code/StaticData/IStaticDataService.cs index 0344471..9243134 100644 --- a/Game/CourierOld/Assets/Code/StaticData/IStaticDataService.cs +++ b/Game/CourierOld/Assets/Code/StaticData/IStaticDataService.cs @@ -21,6 +21,8 @@ namespace Code.StaticData SFXListConfig SFXListConfig { get; } DispatcherSoundListConfig DispatcherSoundListConfig { get; } EnemiesSoundListConfig EnemiesSoundListConfig { get; } + OrderServiceConfig OrderServiceConfig { get; } + OrderBoxConfig OrderBoxConfig { get; } void Load(); Task InstantiateAsset(AssetReference assetReference) where T : Behaviour; } diff --git a/Game/CourierOld/Assets/Code/StaticData/StaticDataService.cs b/Game/CourierOld/Assets/Code/StaticData/StaticDataService.cs index e7b98ea..a5d1c48 100644 --- a/Game/CourierOld/Assets/Code/StaticData/StaticDataService.cs +++ b/Game/CourierOld/Assets/Code/StaticData/StaticDataService.cs @@ -20,6 +20,8 @@ namespace Code.StaticData public SFXListConfig SFXListConfig { get; private set; } public DispatcherSoundListConfig DispatcherSoundListConfig { get; private set; } public EnemiesSoundListConfig EnemiesSoundListConfig { get; private set; } + public OrderServiceConfig OrderServiceConfig { get; private set; } + public OrderBoxConfig OrderBoxConfig { get; private set; } public void Load() { @@ -29,6 +31,8 @@ namespace Code.StaticData CharacterConfig = Resources.Load(string.Format(StringPaths.ConfigSingle, "App", "CharacterConfig")); UIConfig = Resources.Load(string.Format(StringPaths.ConfigSingle, "App", "UIConfig")); PlayerConfig = Resources.Load(string.Format(StringPaths.ConfigSingle, "App", "PlayerConfig")); + OrderServiceConfig = Resources.Load(string.Format(StringPaths.ConfigSingle, "Gameplay", "OrderServiceConfig")); + OrderBoxConfig = Resources.Load(string.Format(StringPaths.ConfigSingle, "Gameplay", "OrderBoxConfig")); LoadAudioConfigs(); } diff --git a/Game/CourierOld/Assets/Code/UI/Panels/GameplayPanel.cs b/Game/CourierOld/Assets/Code/UI/Panels/GameplayPanel.cs index 5a9f828..6a7f0d6 100644 --- a/Game/CourierOld/Assets/Code/UI/Panels/GameplayPanel.cs +++ b/Game/CourierOld/Assets/Code/UI/Panels/GameplayPanel.cs @@ -2,10 +2,9 @@ using Code.Gameplay.Player; using DG.Tweening; using TMPro; using UnityEngine; -using UnityEngine.Serialization; using UnityEngine.UI; -namespace Code.UI +namespace Code.UI.Panels { public class GameplayPanel : UIElement { @@ -16,6 +15,7 @@ namespace Code.UI [SerializeField] private float dispatcherTransitionTime = 0.5f; [Header("Timer")] [SerializeField] private TMP_Text timer; + public TMP_Text Timer => timer; [Header("HealthBar")] [SerializeField] private Image healthBar; [Header("MoneyBar")] @@ -41,11 +41,6 @@ namespace Code.UI health.OnDamage += HealthUpdate; HealthUpdate(0,health); } - private void Update() - { - timer.text = Time.deltaTime.ToString(); - } - public void SummonDispatcher() { // TODO diff --git a/Game/CourierOld/Assets/Resources/Audio/MainMixer.mixer b/Game/CourierOld/Assets/Resources/Audio/MainMixer.mixer index a058f23..d439824 100644 --- a/Game/CourierOld/Assets/Resources/Audio/MainMixer.mixer +++ b/Game/CourierOld/Assets/Resources/Audio/MainMixer.mixer @@ -154,6 +154,7 @@ AudioMixerSnapshotController: m_SnapshotID: 6d6b0cfa14637d5f0a34277934971c34 m_FloatValues: b9fc0df121fe7134e9cbd35aa5a65755: -80 + 4c469b14481ac855fb9fb2989e6e6b94: -14.221897 ddab7e07de3c686e296ff10b1cd77a47: -80 m_TransitionOverrides: {} --- !u!241 &24100000 @@ -189,7 +190,7 @@ AudioMixerController: - af6d3dead2e9e4848a2ca2fa55634108 name: View m_CurrentViewIndex: 0 - m_TargetSnapshot: {fileID: -5566153147845745614} + m_TargetSnapshot: {fileID: -1214924791136564940} --- !u!243 &24300002 AudioMixerGroupController: m_ObjectHideFlags: 0 diff --git a/Game/CourierOld/Assets/Resources/Configs/App/PlayerConfig.asset b/Game/CourierOld/Assets/Resources/Configs/App/PlayerConfig.asset index 59e9f70..37a6a7e 100644 --- a/Game/CourierOld/Assets/Resources/Configs/App/PlayerConfig.asset +++ b/Game/CourierOld/Assets/Resources/Configs/App/PlayerConfig.asset @@ -19,3 +19,9 @@ MonoBehaviour: m_SubObjectType: m_SubObjectGUID: m_EditorAssetChanged: 0 + armsMeshPrefab: + m_AssetGUID: 1d4767c722c05b5d6b96bb226d378c65 + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 diff --git a/Game/CourierOld/Assets/Resources/Configs/Audio/SoundtrackListConfig.asset b/Game/CourierOld/Assets/Resources/Configs/Audio/SoundtrackListConfig.asset index 5249c7f..c8a9076 100644 --- a/Game/CourierOld/Assets/Resources/Configs/Audio/SoundtrackListConfig.asset +++ b/Game/CourierOld/Assets/Resources/Configs/Audio/SoundtrackListConfig.asset @@ -13,12 +13,32 @@ MonoBehaviour: m_Name: SoundtrackListConfig m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.SoundtrackListConfig peacefulSoundtrack: + - m_AssetGUID: 803e40b883c823b89a91aa8b9d9fc483 + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 + - m_AssetGUID: ebe18293a5ef86704b23dad3a1786476 + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 - m_AssetGUID: 803e40b883c823b89a91aa8b9d9fc483 m_SubObjectName: m_SubObjectType: m_SubObjectGUID: m_EditorAssetChanged: 0 actionSoundtrack: + - m_AssetGUID: ebe18293a5ef86704b23dad3a1786476 + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 + - m_AssetGUID: f4b6fa54ecac6cc418f98824491aa17a + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 - m_AssetGUID: ebe18293a5ef86704b23dad3a1786476 m_SubObjectName: m_SubObjectType: @@ -35,3 +55,8 @@ MonoBehaviour: m_SubObjectType: m_SubObjectGUID: m_EditorAssetChanged: 0 + - m_AssetGUID: ebe18293a5ef86704b23dad3a1786476 + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 diff --git a/Game/CourierOld/Assets/Resources/Configs/Gameplay.meta b/Game/CourierOld/Assets/Resources/Configs/Gameplay.meta new file mode 100644 index 0000000..3eb488a --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Configs/Gameplay.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09d8a07b00c1aa2f883b2aeb975d70e6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderBoxConfig.asset b/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderBoxConfig.asset new file mode 100644 index 0000000..533bf82 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderBoxConfig.asset @@ -0,0 +1,49 @@ +%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: 6af4f53d425a41c78ef889fd7e5c3197, type: 3} + m_Name: OrderBoxConfig + m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.OrderBoxConfig + activationTime: 2 + floatingCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1.4374113 + outSlope: 1.4374113 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.48992503 + value: 0.70422375 + inSlope: 0.028391719 + outSlope: 0.028391719 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1.3806279 + outSlope: -1.3806279 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + curveLength: 1 diff --git a/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderBoxConfig.asset.meta b/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderBoxConfig.asset.meta new file mode 100644 index 0000000..a5534e8 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderBoxConfig.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15fc4dd72b7b0ac0c9210a07f70b4007 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderFactoryConfig.asset b/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderFactoryConfig.asset new file mode 100644 index 0000000..6ddd9a4 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderFactoryConfig.asset @@ -0,0 +1,20 @@ +%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: 95639b2744d24b66842ac3d71d056129, type: 3} + m_Name: OrderFactoryConfig + m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.OrderFactoryConfig + orderDispenserPrefab: + m_AssetGUID: 751890caa1647ec6689f24933fbcb770 + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 diff --git a/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderFactoryConfig.asset.meta b/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderFactoryConfig.asset.meta new file mode 100644 index 0000000..c1efc7f --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderFactoryConfig.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 38984bc3c0ffd57a0a88f0da6f96e470 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderServiceConfig.asset b/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderServiceConfig.asset new file mode 100644 index 0000000..5a71987 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderServiceConfig.asset @@ -0,0 +1,17 @@ +%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: ee2550c3e4874575ac3aecadfcc42475, type: 3} + m_Name: OrderServiceConfig + m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.OrderServiceConfig + timeBounds: {x: 35, y: 120} + koefRooms: 2 + koefOvertime: 4 diff --git a/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderServiceConfig.asset.meta b/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderServiceConfig.asset.meta new file mode 100644 index 0000000..c0f39b3 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Configs/Gameplay/OrderServiceConfig.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a35867b942225319bb9c26db15511aaf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_attack.fbx b/Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_attack.fbx new file mode 100644 index 0000000..2c4a127 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_attack.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d4f062dd786af82f489dc1e13d372990c7f532ca293b5faf4ace249aae3d69b +size 416012 diff --git a/Game/CourierOld/Assets/Resources/Models/Player/test2_running1.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_attack.fbx.meta similarity index 97% rename from Game/CourierOld/Assets/Resources/Models/Player/test2_running1.fbx.meta rename to Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_attack.fbx.meta index f771dbe..0a66e95 100644 --- a/Game/CourierOld/Assets/Resources/Models/Player/test2_running1.fbx.meta +++ b/Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_attack.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b85158e4bf04f7c4b88db54b3d980351 +guid: 7df3c003de36ea5608ec08e077590a09 ModelImporter: serializedVersion: 24200 internalIDToNameTable: [] @@ -92,7 +92,7 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 globalScale: 1 - rootMotionBoneName: root + rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 @@ -100,7 +100,7 @@ ModelImporter: autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 humanoidOversampling: 1 - avatarSetup: 1 + avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 importBlendShapeDeformPercent: 1 remapMaterialsIfMaterialImportModeIsNone: 0 diff --git a/Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_walk.fbx b/Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_walk.fbx new file mode 100644 index 0000000..44d47ff --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_walk.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b27213bce62af16cdeb92dedb2265f0f277b96832deb41af3fa7459b7668a773 +size 270108 diff --git a/Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_walk.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_walk.fbx.meta new file mode 100644 index 0000000..2a936a9 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Enemies/cockroach_walk.fbx.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 332f301c5f054a7df80785fdefd47cb4 +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: 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: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx b/Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx new file mode 100644 index 0000000..b40a832 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d37f7a7154a3eed683bd4f49362f98a00ea5361aaf05e4842bd4753fef97c78b +size 15660 diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx.meta new file mode 100644 index 0000000..53db09b --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Furniture/лестница.fbx.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 6ba8e76344dabbf13af813f7bea7f6e6 +ModelImporter: + serializedVersion: 24200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/труба.fbx b/Game/CourierOld/Assets/Resources/Models/Furniture/труба.fbx new file mode 100644 index 0000000..da4994e --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Furniture/труба.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85614019e90dd07c666b8983e2db67e6866fc938ab90912f6a8daf1db7ca0ea5 +size 22092 diff --git a/Game/CourierOld/Assets/Resources/Models/Furniture/труба.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Furniture/труба.fbx.meta new file mode 100644 index 0000000..c6a53d0 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Furniture/труба.fbx.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 8c44268c921316e02b33de5f8fbaefbd +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: 0 + importLights: 0 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 1 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/Player/PlayerAnimator.controller b/Game/CourierOld/Assets/Resources/Models/Player/PlayerAnimator.controller index 6351d9f..a491b95 100644 --- a/Game/CourierOld/Assets/Resources/Models/Player/PlayerAnimator.controller +++ b/Game/CourierOld/Assets/Resources/Models/Player/PlayerAnimator.controller @@ -1,5 +1,57 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7043403378478565280 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: mp_clapping + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 3547499754263378043, guid: fdcbb8593657d506fabab9c7ff1b24d0, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-2520237455980583399 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: mp_gun_volley_2 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 5024885288434809407, guid: fae7e38c4cf16670996b82c8355e269a, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -37,7 +89,7 @@ BlendTree: m_Name: MovementBlendTree m_Childs: - serializedVersion: 2 - m_Motion: {fileID: -8439424969872400937, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} + m_Motion: {fileID: 9017035348754885801, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} m_Threshold: 0 m_Position: {x: 0, y: 0} m_TimeScale: 1 @@ -45,8 +97,8 @@ BlendTree: m_DirectBlendParameter: Blend m_Mirror: 0 - serializedVersion: 2 - m_Motion: {fileID: 1770808807073381973, guid: 6ed541dfed802de44928541e1857e4c0, type: 3} - m_Threshold: 1 + m_Motion: {fileID: -4320063115943924929, guid: 02296f680a0e6ed48a92d690d2d82b6e, type: 3} + m_Threshold: 10 m_Position: {x: 0, y: 0} m_TimeScale: 1 m_CycleOffset: 0 @@ -55,10 +107,36 @@ BlendTree: m_BlendParameter: Velocity m_BlendParameterY: Blend m_MinThreshold: 0 - m_MaxThreshold: 1 + m_MaxThreshold: 10 m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 0 +--- !u!1102 &4001842930699683769 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: mp_getriddy_2 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -7308155286946282308, guid: 8c55cfe0387fb209d9487e7b2ed30842, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &4749464319161710948 AnimatorStateMachine: serializedVersion: 6 @@ -71,6 +149,15 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 8889563492703692874} m_Position: {x: 250, y: 90, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2520237455980583399} + m_Position: {x: 250, y: 330, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4001842930699683769} + m_Position: {x: 250, y: 400, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7043403378478565280} + m_Position: {x: 250, y: 260, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Game/CourierOld/Assets/Resources/Models/Player/mp_anim_idle1.fbx b/Game/CourierOld/Assets/Resources/Models/Player/mp_anim_idle1.fbx deleted file mode 100644 index 2c9b2b4..0000000 --- a/Game/CourierOld/Assets/Resources/Models/Player/mp_anim_idle1.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:466c350150cc3374b4cdd515d752743112978a8bd183d4fbb0fdc82fb752f660 -size 1036652 diff --git a/Game/CourierOld/Assets/Resources/Models/Player/mp_anim_running1.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Player/mp_anim_running1.fbx.meta index 38c34c7..cd577f4 100644 --- a/Game/CourierOld/Assets/Resources/Models/Player/mp_anim_running1.fbx.meta +++ b/Game/CourierOld/Assets/Resources/Models/Player/mp_anim_running1.fbx.meta @@ -31,7 +31,7 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: running + name: Running takeName: root|root|root|Armature.002|mixamo.com|Layer0_remap internalID: -4320063115943924929 firstFrame: 0 @@ -39,11 +39,11 @@ ModelImporter: wrapMode: 0 orientationOffsetY: 0 level: 0 - cycleOffset: 0 + cycleOffset: 0.567 loop: 0 hasAdditiveReferencePose: 0 loopTime: 1 - loopBlend: 1 + loopBlend: 0 loopBlendOrientation: 0 loopBlendPositionY: 0 loopBlendPositionXZ: 0 @@ -125,11 +125,11 @@ ModelImporter: hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 humanoidOversampling: 1 - avatarSetup: 1 + avatarSetup: 2 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 importBlendShapeDeformPercent: 1 remapMaterialsIfMaterialImportModeIsNone: 0 diff --git a/Game/CourierOld/Assets/Resources/Models/Player/mp_clapping.fbx b/Game/CourierOld/Assets/Resources/Models/Player/mp_clapping.fbx new file mode 100644 index 0000000..5195731 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Player/mp_clapping.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:415f5df96cda33c832e12ec900cd04c1a6140f0382db3cdef23c8ee1087d6c10 +size 1162336 diff --git a/Game/CourierOld/Assets/Resources/Models/Player/mp_anim_idle1.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Player/mp_clapping.fbx.meta similarity index 58% rename from Game/CourierOld/Assets/Resources/Models/Player/mp_anim_idle1.fbx.meta rename to Game/CourierOld/Assets/Resources/Models/Player/mp_clapping.fbx.meta index 50729db..b20c392 100644 --- a/Game/CourierOld/Assets/Resources/Models/Player/mp_anim_idle1.fbx.meta +++ b/Game/CourierOld/Assets/Resources/Models/Player/mp_clapping.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a7e412e490909bf47af7fe22cd5bd0bf +guid: fdcbb8593657d506fabab9c7ff1b24d0 ModelImporter: serializedVersion: 24200 internalIDToNameTable: [] @@ -29,65 +29,7 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: - - serializedVersion: 16 - name: idle - takeName: root|root|root|Armature.001|mixamo.com|Layer0.001_IN_PLACE_remap - internalID: -8439424969872400937 - firstFrame: 0 - lastFrame: 36 - wrapMode: 0 - orientationOffsetY: 0 - level: 0 - cycleOffset: 0 - loop: 0 - hasAdditiveReferencePose: 0 - loopTime: 1 - loopBlend: 1 - loopBlendOrientation: 0 - loopBlendPositionY: 0 - loopBlendPositionXZ: 0 - keepOriginalOrientation: 0 - keepOriginalPositionY: 1 - keepOriginalPositionXZ: 0 - heightFromFeet: 0 - mirror: 0 - bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 - curves: [] - events: [] - transformMask: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 - - serializedVersion: 16 - name: root|root|root|Armature.002|mixamo.com|Layer0_remap - takeName: root|root|root|Armature.002|mixamo.com|Layer0_remap - internalID: -4320063115943924929 - firstFrame: 0 - lastFrame: 17 - wrapMode: 0 - orientationOffsetY: 0 - level: 0 - cycleOffset: 0 - loop: 0 - hasAdditiveReferencePose: 0 - loopTime: 0 - loopBlend: 0 - loopBlendOrientation: 0 - loopBlendPositionY: 0 - loopBlendPositionXZ: 0 - keepOriginalOrientation: 0 - keepOriginalPositionY: 1 - keepOriginalPositionXZ: 0 - heightFromFeet: 0 - mirror: 0 - bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 - curves: [] - events: [] - transformMask: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 + clipAnimations: [] isReadable: 0 meshes: lODScreenPercentages: [] @@ -154,7 +96,7 @@ ModelImporter: hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 02296f680a0e6ed48a92d690d2d82b6e, type: 3} + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 humanoidOversampling: 1 diff --git a/Game/CourierOld/Assets/Resources/Models/Player/mp_default_idle.fbx b/Game/CourierOld/Assets/Resources/Models/Player/mp_default_idle.fbx new file mode 100644 index 0000000..a026cd5 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Player/mp_default_idle.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8f083ff00cad538e141ecec6e387fca2ddc578283a0b85409563c7119ae348d +size 1248736 diff --git a/Game/CourierOld/Assets/Resources/Models/Player/mp_default_idle.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Player/mp_default_idle.fbx.meta new file mode 100644 index 0000000..822409b --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Player/mp_default_idle.fbx.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: cc997e5ce7a1a9e419209ffe81b9c27f +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: 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: root + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 2 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/Player/mp_getriddy_2.fbx b/Game/CourierOld/Assets/Resources/Models/Player/mp_getriddy_2.fbx new file mode 100644 index 0000000..73378d8 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Player/mp_getriddy_2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:286c4fb7b24c30a78c24428f5b19eae02f9a9233c4aa6493cbb4359a0c221f41 +size 1579744 diff --git a/Game/CourierOld/Assets/Resources/Models/Player/mp_getriddy_2.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Player/mp_getriddy_2.fbx.meta new file mode 100644 index 0000000..79cc4f0 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Player/mp_getriddy_2.fbx.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 8c55cfe0387fb209d9487e7b2ed30842 +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: 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: root + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 2 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/Player/mp_gun_volley_2.fbx b/Game/CourierOld/Assets/Resources/Models/Player/mp_gun_volley_2.fbx new file mode 100644 index 0000000..d2656de --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Player/mp_gun_volley_2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c100d2aaadfad8e12588b56204056ffd60800eef6aa666ea88bba5b491ba5f4b +size 2408768 diff --git a/Game/CourierOld/Assets/Resources/Models/Player/mp_gun_volley_2.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Player/mp_gun_volley_2.fbx.meta new file mode 100644 index 0000000..67c7351 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Player/mp_gun_volley_2.fbx.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: fae7e38c4cf16670996b82c8355e269a +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: 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: root + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 2 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/Player/mp_idle.fbx b/Game/CourierOld/Assets/Resources/Models/Player/mp_idle.fbx new file mode 100644 index 0000000..a803a03 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Player/mp_idle.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20faac3ff6b6c8f9c4da18fc4ff3ff5763e32b5cc749b491cfc0cf1b63552edb +size 1179584 diff --git a/Game/CourierOld/Assets/Resources/Models/Player/test2_running2.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Player/mp_idle.fbx.meta similarity index 91% rename from Game/CourierOld/Assets/Resources/Models/Player/test2_running2.fbx.meta rename to Game/CourierOld/Assets/Resources/Models/Player/mp_idle.fbx.meta index 2be96f1..fd02cf9 100644 --- a/Game/CourierOld/Assets/Resources/Models/Player/test2_running2.fbx.meta +++ b/Game/CourierOld/Assets/Resources/Models/Player/mp_idle.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6ed541dfed802de44928541e1857e4c0 +guid: 6dd32929f788d35afba7c6c6c124a92d ModelImporter: serializedVersion: 24200 internalIDToNameTable: [] @@ -31,15 +31,15 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: root|root|untitled|Anima_Layer - takeName: root|root|untitled|Anima_Layer - internalID: 1770808807073381973 + name: mp_idle + takeName: mp_idle + internalID: 9017035348754885801 firstFrame: 0 - lastFrame: 17 + lastFrame: 52 wrapMode: 0 orientationOffsetY: 0 level: 0 - cycleOffset: 0 + cycleOffset: 1.733 loop: 0 hasAdditiveReferencePose: 0 loopTime: 1 @@ -125,11 +125,11 @@ ModelImporter: hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 02296f680a0e6ed48a92d690d2d82b6e, type: 3} + lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 humanoidOversampling: 1 - avatarSetup: 2 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 importBlendShapeDeformPercent: 1 remapMaterialsIfMaterialImportModeIsNone: 0 diff --git a/Game/CourierOld/Assets/Resources/Models/Player/mp_stretching.fbx b/Game/CourierOld/Assets/Resources/Models/Player/mp_stretching.fbx new file mode 100644 index 0000000..81a1df8 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Player/mp_stretching.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ff8b7626a00f4081ef676dd6b9ccbcfdeee0d3706c15b5b37c71322c3640a33 +size 1594336 diff --git a/Game/CourierOld/Assets/Resources/Models/Player/mp_stretching.fbx.meta b/Game/CourierOld/Assets/Resources/Models/Player/mp_stretching.fbx.meta new file mode 100644 index 0000000..9653224 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Models/Player/mp_stretching.fbx.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 419a5e1d72db2d890859467925faee79 +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: 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: root + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 2 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Models/Player/test2_running1.fbx b/Game/CourierOld/Assets/Resources/Models/Player/test2_running1.fbx deleted file mode 100644 index 399f206..0000000 --- a/Game/CourierOld/Assets/Resources/Models/Player/test2_running1.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e51e1fa2113c2b0a99486970c5b8498c08d0c2c97ccdd92615d79106313e003e -size 2200908 diff --git a/Game/CourierOld/Assets/Resources/Models/Player/test2_running2.fbx b/Game/CourierOld/Assets/Resources/Models/Player/test2_running2.fbx deleted file mode 100644 index b871003..0000000 --- a/Game/CourierOld/Assets/Resources/Models/Player/test2_running2.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d6b801e17b947af7d9b0e4bfaf5e82c9aa0238c9abd8d29f852b69fe008cbf8 -size 675692 diff --git a/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab b/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab index 38d55af..78421fc 100644 --- a/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab +++ b/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab @@ -106,8 +106,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6099115053225634464} serializedVersion: 2 - m_LocalRotation: {x: 0.19427353, y: 0.44825727, z: -0.100474596, w: 0.8667341} - m_LocalPosition: {x: -223.01709, y: 389.89224, z: -363.3137} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Game/CourierOld/Assets/Resources/Prefabs/Furniture/Order.prefab b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/Order.prefab new file mode 100644 index 0000000..fd10600 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/Order.prefab @@ -0,0 +1,178 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5003489554572672819 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3367215396344724721} + - component: {fileID: 6415961798554262282} + - component: {fileID: 2429626066440465031} + - component: {fileID: 293730761507338093} + - component: {fileID: 5208808394032653931} + - component: {fileID: 4338034009071700718} + - component: {fileID: 2620079347338917434} + m_Layer: 9 + m_Name: Order + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3367215396344724721 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5003489554572672819} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6415961798554262282 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5003489554572672819} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2429626066440465031 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5003489554572672819} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &293730761507338093 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5003489554572672819} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 256 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 695 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &5208808394032653931 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5003489554572672819} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &4338034009071700718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5003489554572672819} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 067bc72af86a4fb8ac44d0c1fcfd25d5, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Orders.Tube.OrderBox + rigidbody: {fileID: 5208808394032653931} + _pickupMode: 0 +--- !u!65 &2620079347338917434 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5003489554572672819} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 128 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 823 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3, y: 3, z: 3} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Game/CourierOld/Assets/Resources/Prefabs/Furniture/Order.prefab.meta b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/Order.prefab.meta new file mode 100644 index 0000000..62f6a53 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/Order.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 74379870bb29712edb9b15c87344be8d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx new file mode 100644 index 0000000..3c9902a --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efac23fd405635e2324650f1e88c1099f606453c43df07e23941e3d5d8a81389 +size 24332 diff --git a/Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx.meta b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx.meta new file mode 100644 index 0000000..b68f5c4 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Prefabs/Furniture/testroom.fbx.meta @@ -0,0 +1,115 @@ +fileFormatVersion: 2 +guid: 6a32cf8d6aa3dfe90bbcc79809d1d40d +ModelImporter: + serializedVersion: 24200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: plasterwall01b.001 + second: {fileID: 2100000, guid: 826e07efb851b074080835cf3caee1fa, type: 2} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Prefabs/Player/CharacterControllerFullMono.prefab b/Game/CourierOld/Assets/Resources/Prefabs/Player/CharacterControllerFullMono.prefab index aab7a56..74fd3aa 100644 --- a/Game/CourierOld/Assets/Resources/Prefabs/Player/CharacterControllerFullMono.prefab +++ b/Game/CourierOld/Assets/Resources/Prefabs/Player/CharacterControllerFullMono.prefab @@ -257,7 +257,7 @@ GameObject: - component: {fileID: 1150185452844372375} m_Layer: 0 m_Name: CharacterControllerFullMono - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Game/CourierOld/Assets/Resources/Scenes/Gameplay.unity b/Game/CourierOld/Assets/Resources/Scenes/Gameplay.unity index c12e628..a44fa53 100644 --- a/Game/CourierOld/Assets/Resources/Scenes/Gameplay.unity +++ b/Game/CourierOld/Assets/Resources/Scenes/Gameplay.unity @@ -119,6 +119,90 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &26125191 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_LocalPosition.x + value: -5.27 + objectReference: {fileID: 0} + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_LocalPosition.y + value: 0.98 + objectReference: {fileID: 0} + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_LocalPosition.z + value: -91.2 + objectReference: {fileID: 0} + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2604837964834288015, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3417650473070914357, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + propertyPath: m_Name + value: "\u0442\u0440\u0443\u0431\u0430" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 751890caa1647ec6689f24933fbcb770, type: 3} +--- !u!114 &26125192 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3955530786522667816, guid: 751890caa1647ec6689f24933fbcb770, type: 3} + m_PrefabInstance: {fileID: 26125191} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e50e3c42f5ee45e0b1087e0dbf7dd0f4, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Orders.Tube.TubeYourself --- !u!1 &26949268 GameObject: m_ObjectHideFlags: 0 @@ -131,7 +215,7 @@ GameObject: - component: {fileID: 26949271} - component: {fileID: 26949270} - component: {fileID: 26949269} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -223,12 +307,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 26949268} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7.62457, y: 3.04, z: 26.4} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.3999996, y: 0, z: -61} m_LocalScale: {x: 3, y: 7, z: 3} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 371614076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &72152317 GameObject: @@ -242,7 +326,7 @@ GameObject: - component: {fileID: 72152320} - component: {fileID: 72152319} - component: {fileID: 72152318} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -334,13 +418,108 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 72152317} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7.32457, y: 3.04, z: -99} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.1000004, y: 0, z: -186.4} m_LocalScale: {x: 3, y: 7, z: 3} m_ConstrainProportionsScale: 0 m_Children: [] + m_Father: {fileID: 371614076} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &137019059 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 137019061} + - component: {fileID: 137019060} + - component: {fileID: 137019062} + - component: {fileID: 137019063} + m_Layer: 9 + m_Name: DeliveryTrigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &137019060 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137019059} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 128 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 823 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 21.795864, y: 4.032048, z: 9.925346} + m_Center: {x: 2.9106407, y: 1.5160241, z: -4.462673} +--- !u!4 &137019061 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137019059} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.17869, y: -0.18, z: -70.79761} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &137019062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137019059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 47fbefab729047e5a11d8761e26f75a6, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Orders.Order.OrderDeliveryZone + _playerEntered: 0 +--- !u!54 &137019063 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137019059} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &348281800 GameObject: m_ObjectHideFlags: 0 @@ -353,7 +532,7 @@ GameObject: - component: {fileID: 348281803} - component: {fileID: 348281802} - component: {fileID: 348281801} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -445,11 +624,53 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 348281800} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7.62457, y: 3.04, z: -13.6} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.3999996, y: 0, z: -101} m_LocalScale: {x: 3, y: 7, z: 3} m_ConstrainProportionsScale: 0 m_Children: [] + m_Father: {fileID: 371614076} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &371614075 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 371614076} + m_Layer: 0 + m_Name: Level + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &371614076 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371614075} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.22457, y: 3.04, z: 87.4} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1907014361} + - {fileID: 1305409470} + - {fileID: 348281804} + - {fileID: 2009772756} + - {fileID: 1790626894} + - {fileID: 852325141} + - {fileID: 72152321} + - {fileID: 1709114967} + - {fileID: 26949272} + - {fileID: 980519113} + - {fileID: 1398162589} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &545729161 @@ -464,7 +685,7 @@ GameObject: - component: {fileID: 545729164} - component: {fileID: 545729163} - component: {fileID: 545729162} - m_Layer: 0 + m_Layer: 8 m_Name: Platform m_TagString: Untagged m_Icon: {fileID: 0} @@ -575,7 +796,7 @@ GameObject: - component: {fileID: 852325140} - component: {fileID: 852325139} - component: {fileID: 852325138} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -667,12 +888,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 852325137} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.47543, y: 3.04, z: -86.5} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6.7, y: 0, z: -173.9} m_LocalScale: {x: 3, y: 7, z: 3} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 371614076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &980519109 GameObject: @@ -686,7 +907,7 @@ GameObject: - component: {fileID: 980519112} - component: {fileID: 980519111} - component: {fileID: 980519110} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (9) m_TagString: Untagged m_Icon: {fileID: 0} @@ -778,12 +999,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 980519109} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.42457, y: 3.04, z: 63.7} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.8, y: 0, z: -23.7} m_LocalScale: {x: 3, y: 7, z: 3} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 371614076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1253837927 GameObject: @@ -845,6 +1066,7 @@ MonoBehaviour: _gameplaySceneEnvironment: debugSfxTarget: {fileID: 1420420439} playerSpawnPoint: {fileID: 1645301970} + debugTube: {fileID: 26125192} --- !u!1 &1305409466 GameObject: m_ObjectHideFlags: 0 @@ -857,7 +1079,7 @@ GameObject: - component: {fileID: 1305409469} - component: {fileID: 1305409468} - component: {fileID: 1305409467} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -949,12 +1171,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1305409466} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.97543, y: 3.04, z: -31.1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6.2, y: 0, z: -118.5} m_LocalScale: {x: 3, y: 7, z: 3} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 371614076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1398162585 GameObject: @@ -968,7 +1190,7 @@ GameObject: - component: {fileID: 1398162588} - component: {fileID: 1398162587} - component: {fileID: 1398162586} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (10) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1060,12 +1282,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1398162585} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.22457, y: 3.04, z: 87.4} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 3, y: 7, z: 3} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 371614076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1420420438 GameObject: @@ -1110,7 +1332,7 @@ GameObject: m_Layer: 0 m_Name: PlayerSpawn m_TagString: Untagged - m_Icon: {fileID: 0} + m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 @@ -1141,7 +1363,7 @@ GameObject: - component: {fileID: 1709114966} - component: {fileID: 1709114965} - component: {fileID: 1709114964} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1233,12 +1455,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1709114963} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.37543002, y: 3.04, z: -115.1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.6000001, y: 0, z: -202.5} m_LocalScale: {x: 3, y: 7, z: 3} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 371614076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1790626890 GameObject: @@ -1252,7 +1474,7 @@ GameObject: - component: {fileID: 1790626893} - component: {fileID: 1790626892} - component: {fileID: 1790626891} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1344,12 +1566,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1790626890} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 12.124571, y: 3.04, z: -64.4} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8.900001, y: 0, z: -151.8} m_LocalScale: {x: 3, y: 7, z: 3} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 371614076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1907014357 GameObject: @@ -1363,7 +1585,7 @@ GameObject: - component: {fileID: 1907014360} - component: {fileID: 1907014359} - component: {fileID: 1907014358} - m_Layer: 0 + m_Layer: 8 m_Name: Cube m_TagString: Untagged m_Icon: {fileID: 0} @@ -1455,12 +1677,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1907014357} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.7, y: 3.04, z: -41.04795} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.4754298, y: 0, z: -128.44795} m_LocalScale: {x: 3, y: 7, z: 3} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 371614076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1948730693 GameObject: @@ -1474,7 +1696,7 @@ GameObject: - component: {fileID: 1948730696} - component: {fileID: 1948730695} - component: {fileID: 1948730694} - m_Layer: 0 + m_Layer: 8 m_Name: Platform (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1585,7 +1807,7 @@ GameObject: - component: {fileID: 2009772755} - component: {fileID: 2009772754} - component: {fileID: 2009772753} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1677,12 +1899,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2009772752} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.024569988, y: 3.04, z: 2.4} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.2, y: 0, z: -85} m_LocalScale: {x: 3, y: 7, z: 3} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 371614076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: @@ -1693,14 +1915,6 @@ SceneRoots: - {fileID: 1948730697} - {fileID: 1420420439} - {fileID: 1645301970} - - {fileID: 1907014361} - - {fileID: 1305409470} - - {fileID: 348281804} - - {fileID: 2009772756} - - {fileID: 1790626894} - - {fileID: 852325141} - - {fileID: 72152321} - - {fileID: 1709114967} - - {fileID: 26949272} - - {fileID: 980519113} - - {fileID: 1398162589} + - {fileID: 371614076} + - {fileID: 26125191} + - {fileID: 137019061} diff --git a/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity b/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity index 29e0bd0..4d6a1e5 100644 --- a/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity +++ b/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity @@ -488,7 +488,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &263844627 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Game/CourierOld/Assets/Resources/Scenes/SoundTest.unity b/Game/CourierOld/Assets/Resources/Scenes/SoundTest.unity index a398459..4911ad8 100644 --- a/Game/CourierOld/Assets/Resources/Scenes/SoundTest.unity +++ b/Game/CourierOld/Assets/Resources/Scenes/SoundTest.unity @@ -119,7 +119,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &133299295 +--- !u!1 &833910211 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -127,2153 +127,301 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 133299296} - - component: {fileID: 133299297} - - component: {fileID: 133299298} + - component: {fileID: 833910215} + - component: {fileID: 833910214} + - component: {fileID: 833910213} + - component: {fileID: 833910212} m_Layer: 0 - m_Name: AudioDebug + m_Name: tr m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &133299296 -Transform: +--- !u!65 &833910212 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133299295} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.39757, y: 0, z: 3.36131} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &133299297 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133299295} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a42cad8f28f54a53bef23d9313014abd, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Code.Audio.AudioServiceDebug - mixer: {fileID: 24100000, guid: ab2634130cfcf5b899bc463c3d060fc4, type: 2} - actionMusic: {fileID: 579872572} - peacefulMusic: {fileID: 1702038598} - prefab: {fileID: 8294310769130454823, guid: 9d14e4d83266834f09a68a06bcdc6ecb, type: 3} - peacefulAudio: - - {fileID: 8300000, guid: 803e40b883c823b89a91aa8b9d9fc483, type: 3} - actionAudio: - - {fileID: 8300000, guid: ebe18293a5ef86704b23dad3a1786476, type: 3} - sfxAudios: - - {fileID: 8300000, guid: 1d7110a045075b22fa27d62bd5f2784e, type: 3} - - {fileID: 8300000, guid: 3831a36e0c8e48f659517a6bb99378b6, type: 3} - enemiesAudios: - - {fileID: 8300000, guid: 82c71411174bfa86ca1f676b9d389f94, type: 3} - - {fileID: 8300000, guid: 2f6134357dc2a5641a846a7478ce4c2c, type: 3} - dispatcherAudios: - - {fileID: 8300000, guid: 03e51c504fa7e0624ba855ec35b60bcc, type: 3} - - {fileID: 8300000, guid: b2c9f83c47783069aabb564f68cb0cbb, type: 3} - - {fileID: 8300000, guid: 111011400ce13ae859c52c757aef859e, type: 3} ---- !u!82 &133299298 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133299295} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 0} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: + m_GameObject: {fileID: 833910211} + m_Material: {fileID: 0} + m_IncludeLayers: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: + m_Bits: 0 + m_ExcludeLayers: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!1 &253799223 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 253799227} - - component: {fileID: 253799226} - - component: {fileID: 253799225} - - component: {fileID: 253799224} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &253799224 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 253799223} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &253799225 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 253799223} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &253799226 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 253799223} + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &833910213 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 833910211} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &253799227 -RectTransform: + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &833910214 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 253799223} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1033449904} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!1 &370198131 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 370198134} - - component: {fileID: 370198133} - - component: {fileID: 370198132} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &370198132 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 370198131} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule - m_SendPointerHoverToParent: 1 - m_MoveRepeatDelay: 0.5 - m_MoveRepeatRate: 0.1 - m_XRTrackingOrigin: {fileID: 0} - m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_DeselectOnBackgroundClick: 1 - m_PointerBehavior: 0 - m_CursorLockBehavior: 0 - m_ScrollDeltaPerTick: 6 ---- !u!114 &370198133 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 370198131} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.EventSystem - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &370198134 + m_GameObject: {fileID: 833910211} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &833910215 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 370198131} + m_GameObject: {fileID: 833910211} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: -0.82198, y: 0, z: -93.65368} + m_LocalScale: {x: 6.6922, y: 0.22422884, z: 6.6922} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &559193742 -GameObject: +--- !u!1001 &1988662661 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 559193745} - - component: {fileID: 559193744} - - component: {fileID: 559193743} - - component: {fileID: 559193746} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &559193743 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 559193742} - m_Enabled: 1 ---- !u!20 &559193744 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 559193742} - m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0.5188679, g: 0.090557136, b: 0.18132588, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &559193745 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 559193742} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &559193746 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 559193742} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_TaaSettings: - m_Quality: 3 - m_FrameInfluence: 0.1 - m_JitterScale: 1 - m_MipBias: 0 - m_VarianceClampScale: 0.9 - m_ContrastAdaptiveSharpening: 0 - m_Version: 2 ---- !u!1 &579872571 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 579872573} - - component: {fileID: 579872572} - m_Layer: 0 - m_Name: AudioSix - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &579872572 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 579872571} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 0 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 2 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.002 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5884347 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalPosition.y + value: 0.44 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalPosition.z + value: -93.55014 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalRotation.w value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1.0000458 - inSlope: -0.003699081 - outSlope: -0.003699081 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.03167778 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalRotation.x value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalRotation.y value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: _pickupMode value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &579872573 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 579872571} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 528.9732, y: 444.03427, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &799741982 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 799741983} - - component: {fileID: 799741985} - - component: {fileID: 799741984} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &799741983 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 799741982} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1611032837} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &799741984 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 799741982} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: MAction - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &799741985 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 799741982} - m_CullTransparentMesh: 1 ---- !u!1 &1033449903 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1033449904} - - component: {fileID: 1033449905} - m_Layer: 5 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1033449904 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1033449903} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1611032837} - - {fileID: 1884709073} - - {fileID: 1637211898} - - {fileID: 2061337935} - - {fileID: 1620938818} - m_Father: {fileID: 253799227} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1033449905 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1033449903} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.VerticalLayoutGroup - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!1 &1611032836 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1611032837} - - component: {fileID: 1611032840} - - component: {fileID: 1611032839} - - component: {fileID: 1611032838} - m_Layer: 5 - m_Name: Test music - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1611032837 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1611032836} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 799741983} - m_Father: {fileID: 1033449904} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1611032838 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1611032836} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1611032839} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 133299297} - m_TargetAssemblyTypeName: Code.Audio.AudioServiceDebug, Assembly-CSharp - m_MethodName: PlayRandomGameplayMusic - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1611032839 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1611032836} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1611032840 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1611032836} - m_CullTransparentMesh: 1 ---- !u!1 &1620938817 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1620938818} - - component: {fileID: 1620938821} - - component: {fileID: 1620938820} - - component: {fileID: 1620938819} - m_Layer: 5 - m_Name: TestDispatcher - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1620938818 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1620938817} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1989949976} - m_Father: {fileID: 1033449904} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1620938819 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1620938817} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1620938820} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 133299297} - m_TargetAssemblyTypeName: Code.Audio.AudioServiceDebug, Assembly-CSharp - m_MethodName: PlayDebugDispatcherSFX - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1620938820 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1620938817} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1620938821 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1620938817} - m_CullTransparentMesh: 1 ---- !u!1 &1637211897 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1637211898} - - component: {fileID: 1637211901} - - component: {fileID: 1637211900} - - component: {fileID: 1637211899} - m_Layer: 5 - m_Name: TestSfx - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1637211898 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637211897} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1829127297} - m_Father: {fileID: 1033449904} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1637211899 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637211897} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1637211900} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 133299297} - m_TargetAssemblyTypeName: Code.Audio.AudioServiceDebug, Assembly-CSharp - m_MethodName: PlayDebugSFX - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1637211900 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637211897} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1637211901 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1637211897} - m_CullTransparentMesh: 1 ---- !u!1 &1702038597 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1702038599} - - component: {fileID: 1702038598} - m_Layer: 0 - m_Name: AudioSeven - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &1702038598 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1702038597} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 0 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 2 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.002 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.size + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[1].time + value: 0.19898753 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[2].time + value: 0.4019116 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[3].time + value: 0.6047269 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[4].time value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1.0000458 - inSlope: -0.003699081 - outSlope: -0.003699081 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.03167778 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[0].value value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &1702038599 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1702038597} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 528.9732, y: 444.03427, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1714908845 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1714908846} - - component: {fileID: 1714908848} - - component: {fileID: 1714908847} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1714908846 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1714908845} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1884709073} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1714908847 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1714908845} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: MPeaceful - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1714908848 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1714908845} - m_CullTransparentMesh: 1 ---- !u!1 &1829127296 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1829127297} - - component: {fileID: 1829127299} - - component: {fileID: 1829127298} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1829127297 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829127296} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1637211898} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1829127298 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829127296} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: SFX - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1829127299 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829127296} - m_CullTransparentMesh: 1 ---- !u!1 &1884709072 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1884709073} - - component: {fileID: 1884709076} - - component: {fileID: 1884709075} - - component: {fileID: 1884709074} - m_Layer: 5 - m_Name: Test music (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1884709073 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1884709072} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1714908846} - m_Father: {fileID: 1033449904} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1884709074 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1884709072} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1884709075} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 133299297} - m_TargetAssemblyTypeName: Code.Audio.AudioServiceDebug, Assembly-CSharp - m_MethodName: PlayRandomGameplayMusic - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1884709075 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1884709072} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1884709076 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1884709072} - m_CullTransparentMesh: 1 ---- !u!1 &1890509183 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1890509184} - - component: {fileID: 1890509186} - - component: {fileID: 1890509185} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1890509184 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890509183} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2061337935} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1890509185 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890509183} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Enemy - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1890509186 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890509183} - m_CullTransparentMesh: 1 ---- !u!1 &1989949975 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1989949976} - - component: {fileID: 1989949978} - - component: {fileID: 1989949977} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1989949976 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1989949975} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1620938818} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1989949977 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1989949975} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Dispatcher - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1989949978 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1989949975} - m_CullTransparentMesh: 1 ---- !u!1 &2061337934 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2061337935} - - component: {fileID: 2061337938} - - component: {fileID: 2061337937} - - component: {fileID: 2061337936} - m_Layer: 5 - m_Name: TestEnemy - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2061337935 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2061337934} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1890509184} - m_Father: {fileID: 1033449904} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2061337936 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2061337934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 2061337937} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 133299297} - m_TargetAssemblyTypeName: Code.Audio.AudioServiceDebug, Assembly-CSharp - m_MethodName: PlayDebugEnemySFX - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &2061337937 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2061337934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2061337938 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2061337934} - m_CullTransparentMesh: 1 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[1].value + value: 0.30317923 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[2].value + value: -0.0020296276 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[3].value + value: 0.29578984 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[0].inSlope + value: 1.5236093 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[1].inSlope + value: 0.009777367 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[2].inSlope + value: -0.017813861 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[3].inSlope + value: 0.36005458 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[4].inSlope + value: -0.74831766 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[0].outSlope + value: 1.5236093 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[1].inWeight + value: 0.33333334 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[1].outSlope + value: 0.009777367 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[2].inWeight + value: 0.33333334 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[2].outSlope + value: -0.017813861 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[3].inWeight + value: 0.33333334 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[3].outSlope + value: 0.36005458 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[4].inWeight + value: 0.33333334 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[4].outSlope + value: -0.74831766 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[0].outWeight + value: 0.33333334 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[1].outWeight + value: 0.33333334 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[2].outWeight + value: 0.33333334 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[3].outWeight + value: 0.33333334 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[0].tangentMode + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[1].tangentMode + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[2].tangentMode + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[3].tangentMode + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: debugCurve.m_Curve.Array.data[4].tangentMode + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 5003489554572672819, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_Name + value: Order + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 74379870bb29712edb9b15c87344be8d, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 559193745} - - {fileID: 133299296} - - {fileID: 253799227} - - {fileID: 579872573} - - {fileID: 370198134} - - {fileID: 1702038599} + - {fileID: 833910215} + - {fileID: 1988662661} diff --git a/Game/CourierOld/Assets/Resources_moved/Prefabs/Furniture.meta b/Game/CourierOld/Assets/Resources_moved/Prefabs/Furniture.meta new file mode 100644 index 0000000..7258bd5 --- /dev/null +++ b/Game/CourierOld/Assets/Resources_moved/Prefabs/Furniture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c7160d745f618dbdb8163f29d1bd3fcb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources_moved/Prefabs/Furniture/труба.prefab b/Game/CourierOld/Assets/Resources_moved/Prefabs/Furniture/труба.prefab new file mode 100644 index 0000000..fcdf5ac --- /dev/null +++ b/Game/CourierOld/Assets/Resources_moved/Prefabs/Furniture/труба.prefab @@ -0,0 +1,428 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1231079979359426660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9193591371474947157} + - component: {fileID: 7625978170505768481} + - component: {fileID: 4638457563665064123} + - component: {fileID: 678767563459554035} + m_Layer: 8 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9193591371474947157 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1231079979359426660} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000013767878, y: 0.7071068, z: -0.7071067, w: 0.00000013767877} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 100, z: 100} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2604837964834288015} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7625978170505768481 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1231079979359426660} + m_Mesh: {fileID: 2534964839176971238, guid: 8c44268c921316e02b33de5f8fbaefbd, type: 3} +--- !u!23 &4638457563665064123 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1231079979359426660} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &678767563459554035 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1231079979359426660} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.0047686645, y: 0.0064064013, z: 0.04999999} + m_Center: {x: -2.3283064e-10, y: 0.00086505705, z: -5.156143e-11} +--- !u!1 &3417650473070914357 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2604837964834288015} + - component: {fileID: 3955530786522667816} + - component: {fileID: 3619333982702189546} + - component: {fileID: 1241824075605248047} + m_Layer: 8 + m_Name: "\u0442\u0440\u0443\u0431\u0430" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2604837964834288015 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3417650473070914357} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9193591371474947157} + - {fileID: 1477814355629630319} + - {fileID: 3306500706244594812} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3955530786522667816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3417650473070914357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e50e3c42f5ee45e0b1087e0dbf7dd0f4, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Orders.Tube.TubeYourself + hatch: {fileID: 1477814355629630319} + order: {fileID: 4569472181382920803} +--- !u!65 &3619333982702189546 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3417650473070914357} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 128 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 823 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 3, y: 3, z: 3} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &1241824075605248047 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3417650473070914357} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!1 &6164243699255949143 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9092572324010853557} + - component: {fileID: 1921635605781284469} + - component: {fileID: 4723542012780461790} + m_Layer: 8 + m_Name: Cylinder.001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9092572324010853557 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6164243699255949143} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000015566039, y: 0.7994588, z: -0.60072106, w: 0.00000011696471} + m_LocalPosition: {x: 0, y: 0.096, z: 0.326} + m_LocalScale: {x: 100, y: 100, z: 100} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1477814355629630319} + m_LocalEulerAnglesHint: {x: 106.157, y: 0, z: -180} +--- !u!33 &1921635605781284469 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6164243699255949143} + m_Mesh: {fileID: -7387706064836869012, guid: 8c44268c921316e02b33de5f8fbaefbd, type: 3} +--- !u!23 &4723542012780461790 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6164243699255949143} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6293357023988395545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1477814355629630319} + - component: {fileID: 6184600277289066505} + m_Layer: 8 + m_Name: Luk + m_TagString: Untagged + m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1477814355629630319 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6293357023988395545} + serializedVersion: 2 + m_LocalRotation: {x: -0.14416067, y: -0, z: -0, w: 0.98955435} + m_LocalPosition: {x: 0, y: -0.182, z: -0.275} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9092572324010853557} + m_Father: {fileID: 2604837964834288015} + m_LocalEulerAnglesHint: {x: -16.577, y: 0, z: 0} +--- !u!65 &6184600277289066505 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6293357023988395545} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 3 + m_Size: {x: 0.44125134, y: 0.46257216, z: 0.021700652} + m_Center: {x: 0.0008098185, y: 0.23078078, z: 0.011359558} +--- !u!1001 &241448697401176205 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2604837964834288015} + m_Modifications: + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalPosition.y + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalPosition.z + value: -0.084 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5003489554572672819, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + propertyPath: m_Name + value: Order + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 74379870bb29712edb9b15c87344be8d, type: 3} +--- !u!4 &3306500706244594812 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3367215396344724721, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + m_PrefabInstance: {fileID: 241448697401176205} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4569472181382920803 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4338034009071700718, guid: 74379870bb29712edb9b15c87344be8d, type: 3} + m_PrefabInstance: {fileID: 241448697401176205} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 067bc72af86a4fb8ac44d0c1fcfd25d5, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Orders.Tube.OrderBox diff --git a/Game/CourierOld/Assets/Resources_moved/Prefabs/Furniture/труба.prefab.meta b/Game/CourierOld/Assets/Resources_moved/Prefabs/Furniture/труба.prefab.meta new file mode 100644 index 0000000..d921c8c --- /dev/null +++ b/Game/CourierOld/Assets/Resources_moved/Prefabs/Furniture/труба.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 751890caa1647ec6689f24933fbcb770 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab b/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab new file mode 100644 index 0000000..fd5be70 --- /dev/null +++ b/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab @@ -0,0 +1,1107 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &419842412316083924 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2018950426276364536} + m_Layer: 0 + m_Name: DamnPivot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2018950426276364536 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419842412316083924} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1.498, z: -0.046} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4362085140021186758} + m_Father: {fileID: 2819992717264078936} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6837216913684905458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2819992717264078936} + - component: {fileID: 6653251591202573669} + m_Layer: 0 + m_Name: ArmsMesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2819992717264078936 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6837216913684905458} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2018950426276364536} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6653251591202573669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6837216913684905458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cfe65f613bc54b4098acdba0d3fdd2a2, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Player.ArmsMeshProvider + ArmsAnimator: {fileID: 7667679109266590396} +--- !u!1001 &4252387813456377645 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2018950426276364536} + m_Modifications: + - target: {fileID: -9058694271497657701, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -4.891649 + objectReference: {fileID: 0} + - target: {fileID: -9058694271497657701, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 2.4856582 + objectReference: {fileID: 0} + - target: {fileID: -9058694271497657701, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -28.833551 + objectReference: {fileID: 0} + - target: {fileID: -8841008927280559727, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.93046415 + objectReference: {fileID: 0} + - target: {fileID: -8841008927280559727, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.002246103 + objectReference: {fileID: 0} + - target: {fileID: -8841008927280559727, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.08013582 + objectReference: {fileID: 0} + - target: {fileID: -8786205882645896856, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 2.0438485 + objectReference: {fileID: 0} + - target: {fileID: -8786205882645896856, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.0000041019557 + objectReference: {fileID: 0} + - target: {fileID: -8786205882645896856, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -33.03226 + objectReference: {fileID: 0} + - target: {fileID: -8708151371071085946, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 2.6583865 + objectReference: {fileID: 0} + - target: {fileID: -8708151371071085946, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.000111769135 + objectReference: {fileID: 0} + - target: {fileID: -8708151371071085946, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -36.853764 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8056890861941402616, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 1.752577 + objectReference: {fileID: 0} + - target: {fileID: -8056890861941402616, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.23242857 + objectReference: {fileID: 0} + - target: {fileID: -8056890861941402616, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90.03967 + objectReference: {fileID: 0} + - target: {fileID: -7213201706971986373, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 1.6332144 + objectReference: {fileID: 0} + - target: {fileID: -7213201706971986373, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.020350398 + objectReference: {fileID: 0} + - target: {fileID: -7213201706971986373, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.7121581 + objectReference: {fileID: 0} + - target: {fileID: -6931553793431501532, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 15.0545845 + objectReference: {fileID: 0} + - target: {fileID: -6931553793431501532, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 176.87701 + objectReference: {fileID: 0} + - target: {fileID: -6931553793431501532, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -17.566847 + objectReference: {fileID: 0} + - target: {fileID: -6738459475709616398, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -74.80456 + objectReference: {fileID: 0} + - target: {fileID: -6738459475709616398, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -47.109432 + objectReference: {fileID: 0} + - target: {fileID: -6738459475709616398, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 146.95097 + objectReference: {fileID: 0} + - target: {fileID: -6677381884866629139, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 71.641846 + objectReference: {fileID: 0} + - target: {fileID: -6677381884866629139, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 113.55109 + objectReference: {fileID: 0} + - target: {fileID: -6677381884866629139, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 2.7036104 + objectReference: {fileID: 0} + - target: {fileID: -6624100046254573618, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 1.1277509 + objectReference: {fileID: 0} + - target: {fileID: -6624100046254573618, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.0001575045 + objectReference: {fileID: 0} + - target: {fileID: -6624100046254573618, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 15.18576 + objectReference: {fileID: 0} + - target: {fileID: -6604205332161538727, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.0000037862014 + objectReference: {fileID: 0} + - target: {fileID: -6604205332161538727, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.00001224649 + objectReference: {fileID: 0} + - target: {fileID: -6604205332161538727, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.00000049344015 + objectReference: {fileID: 0} + - target: {fileID: -6139659133514860707, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 14.576595 + objectReference: {fileID: 0} + - target: {fileID: -6139659133514860707, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -176.79628 + objectReference: {fileID: 0} + - target: {fileID: -6139659133514860707, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 16.979855 + objectReference: {fileID: 0} + - target: {fileID: -6087704899470712271, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -4.0188003 + objectReference: {fileID: 0} + - target: {fileID: -6087704899470712271, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.0071745114 + objectReference: {fileID: 0} + - target: {fileID: -6087704899470712271, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.09067293 + objectReference: {fileID: 0} + - target: {fileID: -5665499909661423445, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 18.363958 + objectReference: {fileID: 0} + - target: {fileID: -5665499909661423445, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -157.29926 + objectReference: {fileID: 0} + - target: {fileID: -5665499909661423445, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 55.56157 + objectReference: {fileID: 0} + - target: {fileID: -5610780211712759928, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 4.9911658e-15 + objectReference: {fileID: 0} + - target: {fileID: -5610780211712759928, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.000061035153 + objectReference: {fileID: 0} + - target: {fileID: -5610780211712759928, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 4.9911607e-15 + objectReference: {fileID: 0} + - target: {fileID: -5564348827286369812, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 14.891575 + objectReference: {fileID: 0} + - target: {fileID: -5564348827286369812, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 12.35957 + objectReference: {fileID: 0} + - target: {fileID: -5564348827286369812, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 41.164646 + objectReference: {fileID: 0} + - target: {fileID: -5482761652540059802, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 1.4841528 + objectReference: {fileID: 0} + - target: {fileID: -5482761652540059802, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -118.40519 + objectReference: {fileID: 0} + - target: {fileID: -5482761652540059802, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -178.36777 + objectReference: {fileID: 0} + - target: {fileID: -4749764285787729081, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.000015258788 + objectReference: {fileID: 0} + - target: {fileID: -4749764285787729081, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.000015258788 + objectReference: {fileID: 0} + - target: {fileID: -4749764285787729081, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 4.9911344e-15 + objectReference: {fileID: 0} + - target: {fileID: -4709284767940454107, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -9.817476 + objectReference: {fileID: 0} + - target: {fileID: -4709284767940454107, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.032961067 + objectReference: {fileID: 0} + - target: {fileID: -4709284767940454107, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.27886564 + objectReference: {fileID: 0} + - target: {fileID: -4533095336189375299, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 15.140753 + objectReference: {fileID: 0} + - target: {fileID: -4533095336189375299, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 176.14648 + objectReference: {fileID: 0} + - target: {fileID: -4533095336189375299, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -14.460499 + objectReference: {fileID: 0} + - target: {fileID: -4201716577760710377, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 2.5900095 + objectReference: {fileID: 0} + - target: {fileID: -4201716577760710377, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.00005576703 + objectReference: {fileID: 0} + - target: {fileID: -4201716577760710377, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 32.66968 + objectReference: {fileID: 0} + - target: {fileID: -4005500216279383799, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -7.444843 + objectReference: {fileID: 0} + - target: {fileID: -4005500216279383799, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.03784058 + objectReference: {fileID: 0} + - target: {fileID: -4005500216279383799, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.3807104 + objectReference: {fileID: 0} + - target: {fileID: -3693736308115490249, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.00008694359 + objectReference: {fileID: 0} + - target: {fileID: -3693736308115490249, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -25.128553 + objectReference: {fileID: 0} + - target: {fileID: -3693736308115490249, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.00001423154 + objectReference: {fileID: 0} + - target: {fileID: -3652392405744820579, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -11.140015 + objectReference: {fileID: 0} + - target: {fileID: -3652392405744820579, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -3.585004 + objectReference: {fileID: 0} + - target: {fileID: -3652392405744820579, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 12.630695 + objectReference: {fileID: 0} + - target: {fileID: -3105294276466829409, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.000010311876 + objectReference: {fileID: 0} + - target: {fileID: -3105294276466829409, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.00007799636 + objectReference: {fileID: 0} + - target: {fileID: -3105294276466829409, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.000003207355 + objectReference: {fileID: 0} + - target: {fileID: -3052476751237913372, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -3.4881146 + objectReference: {fileID: 0} + - target: {fileID: -3052476751237913372, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.07693578 + objectReference: {fileID: 0} + - target: {fileID: -3052476751237913372, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.15931301 + objectReference: {fileID: 0} + - target: {fileID: -3001115537955271686, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 2.1663764 + objectReference: {fileID: 0} + - target: {fileID: -3001115537955271686, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.0000025449322 + objectReference: {fileID: 0} + - target: {fileID: -3001115537955271686, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -14.985576 + objectReference: {fileID: 0} + - target: {fileID: -2803097302572641695, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.00015258773 + objectReference: {fileID: 0} + - target: {fileID: -2803097302572641695, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.00021362315 + objectReference: {fileID: 0} + - target: {fileID: -2803097302572641695, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.000061035153 + objectReference: {fileID: 0} + - target: {fileID: -2698785023205546893, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -35.746685 + objectReference: {fileID: 0} + - target: {fileID: -2698785023205546893, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 179.99947 + objectReference: {fileID: 0} + - target: {fileID: -2698785023205546893, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -6.5459266 + objectReference: {fileID: 0} + - target: {fileID: -2525213446790289079, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 83.85361 + objectReference: {fileID: 0} + - target: {fileID: -2525213446790289079, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 70.62712 + objectReference: {fileID: 0} + - target: {fileID: -2525213446790289079, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 71.19578 + objectReference: {fileID: 0} + - target: {fileID: -2444406315379408139, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.07849325 + objectReference: {fileID: 0} + - target: {fileID: -2444406315379408139, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.07310189 + objectReference: {fileID: 0} + - target: {fileID: -2444406315379408139, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.19857313 + objectReference: {fileID: 0} + - target: {fileID: -2421584020088524647, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -27.717348 + objectReference: {fileID: 0} + - target: {fileID: -2421584020088524647, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 40.982243 + objectReference: {fileID: 0} + - target: {fileID: -2421584020088524647, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -100.66724 + objectReference: {fileID: 0} + - target: {fileID: -2386924680017755606, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -6.319644 + objectReference: {fileID: 0} + - target: {fileID: -2386924680017755606, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.013550996 + objectReference: {fileID: 0} + - target: {fileID: -2386924680017755606, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.19992185 + objectReference: {fileID: 0} + - target: {fileID: -2282863000562964204, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.0000004554829 + objectReference: {fileID: 0} + - target: {fileID: -2282863000562964204, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -1.8506498e-12 + objectReference: {fileID: 0} + - target: {fileID: -2282863000562964204, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -1.9773447e-12 + objectReference: {fileID: 0} + - target: {fileID: -1889102022304547840, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 6.0197983 + objectReference: {fileID: 0} + - target: {fileID: -1889102022304547840, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.17592712 + objectReference: {fileID: 0} + - target: {fileID: -1889102022304547840, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.04414938 + objectReference: {fileID: 0} + - target: {fileID: -1257677024105020814, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -23.615015 + objectReference: {fileID: 0} + - target: {fileID: -1257677024105020814, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -35.29161 + objectReference: {fileID: 0} + - target: {fileID: -1257677024105020814, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 94.0275 + objectReference: {fileID: 0} + - target: {fileID: -796595657957826309, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -2.05963 + objectReference: {fileID: 0} + - target: {fileID: -796595657957826309, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.0032241058 + objectReference: {fileID: 0} + - target: {fileID: -796595657957826309, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.08528637 + objectReference: {fileID: 0} + - target: {fileID: -778611468251357502, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 8.902403 + objectReference: {fileID: 0} + - target: {fileID: -778611468251357502, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -3.3818312 + objectReference: {fileID: 0} + - target: {fileID: -778611468251357502, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -23.11198 + objectReference: {fileID: 0} + - target: {fileID: -729007487329059040, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 9.385965 + objectReference: {fileID: 0} + - target: {fileID: -729007487329059040, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 31.67287 + objectReference: {fileID: 0} + - target: {fileID: -729007487329059040, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -19.73233 + objectReference: {fileID: 0} + - target: {fileID: -551070387560303096, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.00014859105 + objectReference: {fileID: 0} + - target: {fileID: -551070387560303096, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.00017043008 + objectReference: {fileID: 0} + - target: {fileID: -551070387560303096, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.00006096627 + objectReference: {fileID: 0} + - target: {fileID: 176919256351892642, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -17.188816 + objectReference: {fileID: 0} + - target: {fileID: 176919256351892642, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -20.235237 + objectReference: {fileID: 0} + - target: {fileID: 176919256351892642, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 35.286606 + objectReference: {fileID: 0} + - target: {fileID: 186721377250667627, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -35.879013 + objectReference: {fileID: 0} + - target: {fileID: 186721377250667627, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -179.9996 + objectReference: {fileID: 0} + - target: {fileID: 186721377250667627, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 6.8405733 + objectReference: {fileID: 0} + - target: {fileID: 781632844167958911, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -9.105606 + objectReference: {fileID: 0} + - target: {fileID: 781632844167958911, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 7.224226 + objectReference: {fileID: 0} + - target: {fileID: 781632844167958911, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -40.28638 + objectReference: {fileID: 0} + - target: {fileID: 814133013216996204, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.45025292 + objectReference: {fileID: 0} + - target: {fileID: 814133013216996204, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.000029454111 + objectReference: {fileID: 0} + - target: {fileID: 814133013216996204, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -13.488062 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_Name + value: mp_idle + objectReference: {fileID: 0} + - target: {fileID: 1139325989675019811, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 73.235954 + objectReference: {fileID: 0} + - target: {fileID: 1139325989675019811, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -114.513565 + objectReference: {fileID: 0} + - target: {fileID: 1139325989675019811, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -3.8345058 + objectReference: {fileID: 0} + - target: {fileID: 1302896479977946763, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -5.111575 + objectReference: {fileID: 0} + - target: {fileID: 1302896479977946763, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.014676116 + objectReference: {fileID: 0} + - target: {fileID: 1302896479977946763, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.28866675 + objectReference: {fileID: 0} + - target: {fileID: 1504068384847439532, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 16.426172 + objectReference: {fileID: 0} + - target: {fileID: 1504068384847439532, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -175.52003 + objectReference: {fileID: 0} + - target: {fileID: 1504068384847439532, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 17.417463 + objectReference: {fileID: 0} + - target: {fileID: 1542398575506050262, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 45.175907 + objectReference: {fileID: 0} + - target: {fileID: 1542398575506050262, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 34.177032 + objectReference: {fileID: 0} + - target: {fileID: 1542398575506050262, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 75.38659 + objectReference: {fileID: 0} + - target: {fileID: 1669725208393378477, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 14.364532 + objectReference: {fileID: 0} + - target: {fileID: 1669725208393378477, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -174.04523 + objectReference: {fileID: 0} + - target: {fileID: 1669725208393378477, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 22.282701 + objectReference: {fileID: 0} + - target: {fileID: 1726344752564138694, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 8.788559 + objectReference: {fileID: 0} + - target: {fileID: 1726344752564138694, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 3.3394818 + objectReference: {fileID: 0} + - target: {fileID: 1726344752564138694, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 22.712715 + objectReference: {fileID: 0} + - target: {fileID: 2119330624120669131, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -8.889874 + objectReference: {fileID: 0} + - target: {fileID: 2119330624120669131, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.021290813 + objectReference: {fileID: 0} + - target: {fileID: 2119330624120669131, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.20321198 + objectReference: {fileID: 0} + - target: {fileID: 2140609463621276777, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -6.4897 + objectReference: {fileID: 0} + - target: {fileID: 2140609463621276777, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.23621851 + objectReference: {fileID: 0} + - target: {fileID: 2140609463621276777, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 5.338456 + objectReference: {fileID: 0} + - target: {fileID: 3438134670489540198, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 21.990545 + objectReference: {fileID: 0} + - target: {fileID: 3438134670489540198, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 174.05699 + objectReference: {fileID: 0} + - target: {fileID: 3438134670489540198, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -18.603544 + objectReference: {fileID: 0} + - target: {fileID: 3670841850873347221, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 12.022047 + objectReference: {fileID: 0} + - target: {fileID: 3670841850873347221, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 165.46898 + objectReference: {fileID: 0} + - target: {fileID: 3670841850873347221, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -55.334763 + objectReference: {fileID: 0} + - target: {fileID: 3917095021154631655, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -6.3182826 + objectReference: {fileID: 0} + - target: {fileID: 3917095021154631655, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.0028652432 + objectReference: {fileID: 0} + - target: {fileID: 3917095021154631655, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.0565284 + objectReference: {fileID: 0} + - target: {fileID: 4020098620284548233, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -3.7524376 + objectReference: {fileID: 0} + - target: {fileID: 4020098620284548233, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -1.8289338 + objectReference: {fileID: 0} + - target: {fileID: 4020098620284548233, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 27.308928 + objectReference: {fileID: 0} + - target: {fileID: 4228691970840306762, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 5.1827855 + objectReference: {fileID: 0} + - target: {fileID: 4228691970840306762, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.0105110835 + objectReference: {fileID: 0} + - target: {fileID: 4228691970840306762, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.106633745 + objectReference: {fileID: 0} + - target: {fileID: 4295559906399074180, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -30.255693 + objectReference: {fileID: 0} + - target: {fileID: 4295559906399074180, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -21.434742 + objectReference: {fileID: 0} + - target: {fileID: 4295559906399074180, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -4.861561 + objectReference: {fileID: 0} + - target: {fileID: 4436805663696350335, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -89.98021 + objectReference: {fileID: 0} + - target: {fileID: 4436805663696350335, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.000056487195 + objectReference: {fileID: 0} + - target: {fileID: 4830432150019182282, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.000034979945 + objectReference: {fileID: 0} + - target: {fileID: 4830432150019182282, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 24.275724 + objectReference: {fileID: 0} + - target: {fileID: 4830432150019182282, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.000014299055 + objectReference: {fileID: 0} + - target: {fileID: 4910347778502631328, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -74.947655 + objectReference: {fileID: 0} + - target: {fileID: 4910347778502631328, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 51.50465 + objectReference: {fileID: 0} + - target: {fileID: 4910347778502631328, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -148.50493 + objectReference: {fileID: 0} + - target: {fileID: 4948926675124957175, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -9.225055 + objectReference: {fileID: 0} + - target: {fileID: 4948926675124957175, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.0155292535 + objectReference: {fileID: 0} + - target: {fileID: 4948926675124957175, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.20555367 + objectReference: {fileID: 0} + - target: {fileID: 5137141950380144012, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 3.0567605 + objectReference: {fileID: 0} + - target: {fileID: 5137141950380144012, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.0030313246 + objectReference: {fileID: 0} + - target: {fileID: 5137141950380144012, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.030696169 + objectReference: {fileID: 0} + - target: {fileID: 5584766959052515123, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.7127826 + objectReference: {fileID: 0} + - target: {fileID: 5584766959052515123, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.0000009584861 + objectReference: {fileID: 0} + - target: {fileID: 5584766959052515123, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 13.385578 + objectReference: {fileID: 0} + - target: {fileID: 5625653893725093531, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -6.386202 + objectReference: {fileID: 0} + - target: {fileID: 5625653893725093531, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -5.861043 + objectReference: {fileID: 0} + - target: {fileID: 5625653893725093531, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 45.470913 + objectReference: {fileID: 0} + - target: {fileID: 5687277551526654976, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -8.409347 + objectReference: {fileID: 0} + - target: {fileID: 5687277551526654976, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 2.8525438 + objectReference: {fileID: 0} + - target: {fileID: 5687277551526654976, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -11.842196 + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: af241b6cdcc834345b675ce177ebac79, type: 2} + - target: {fileID: 6033497119249942473, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 11.714306 + objectReference: {fileID: 0} + - target: {fileID: 6033497119249942473, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -7.8996716 + objectReference: {fileID: 0} + - target: {fileID: 6033497119249942473, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -44.037045 + objectReference: {fileID: 0} + - target: {fileID: 6144966079413338197, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 14.969603 + objectReference: {fileID: 0} + - target: {fileID: 6144966079413338197, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.12647808 + objectReference: {fileID: 0} + - target: {fileID: 6144966079413338197, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.48676687 + objectReference: {fileID: 0} + - target: {fileID: 7122103901011323367, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 2.6936288 + objectReference: {fileID: 0} + - target: {fileID: 7122103901011323367, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.0062663164 + objectReference: {fileID: 0} + - target: {fileID: 7122103901011323367, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.14985493 + objectReference: {fileID: 0} + - target: {fileID: 7381774129094822120, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 10.22343 + objectReference: {fileID: 0} + - target: {fileID: 7381774129094822120, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 1.7659485 + objectReference: {fileID: 0} + - target: {fileID: 7381774129094822120, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 9.84811 + objectReference: {fileID: 0} + - target: {fileID: 7790177421927552515, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 10.065206 + objectReference: {fileID: 0} + - target: {fileID: 7790177421927552515, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 3.066311 + objectReference: {fileID: 0} + - target: {fileID: 7790177421927552515, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 13.019238 + objectReference: {fileID: 0} + - target: {fileID: 7829544821128104084, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -7.9646955 + objectReference: {fileID: 0} + - target: {fileID: 7829544821128104084, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.008177023 + objectReference: {fileID: 0} + - target: {fileID: 7829544821128104084, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.53352654 + objectReference: {fileID: 0} + - target: {fileID: 7966254385995832477, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 5.2249527 + objectReference: {fileID: 0} + - target: {fileID: 7966254385995832477, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.11592309 + objectReference: {fileID: 0} + - target: {fileID: 7966254385995832477, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.048680793 + objectReference: {fileID: 0} + - target: {fileID: 8052196607835650671, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 2.5130749 + objectReference: {fileID: 0} + - target: {fileID: 8052196607835650671, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 118.352325 + objectReference: {fileID: 0} + - target: {fileID: 8052196607835650671, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 177.70116 + objectReference: {fileID: 0} + - target: {fileID: 8298381251576162662, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 2.4851036 + objectReference: {fileID: 0} + - target: {fileID: 8298381251576162662, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.000030617433 + objectReference: {fileID: 0} + - target: {fileID: 8298381251576162662, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 37.476086 + objectReference: {fileID: 0} + - target: {fileID: 8772807434447774749, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 3.191502 + objectReference: {fileID: 0} + - target: {fileID: 8772807434447774749, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 178.56273 + objectReference: {fileID: 0} + - target: {fileID: 8772807434447774749, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -22.614626 + objectReference: {fileID: 0} + - target: {fileID: 8804268453354226405, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 14.431707 + objectReference: {fileID: 0} + - target: {fileID: 8804268453354226405, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -175.91585 + objectReference: {fileID: 0} + - target: {fileID: 8804268453354226405, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 15.987324 + objectReference: {fileID: 0} + - target: {fileID: 9001502431814374689, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -8.971116 + objectReference: {fileID: 0} + - target: {fileID: 9001502431814374689, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.21403864 + objectReference: {fileID: 0} + - target: {fileID: 9001502431814374689, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -2.7685187 + objectReference: {fileID: 0} + - target: {fileID: 9118603901484676259, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -1.301452 + objectReference: {fileID: 0} + - target: {fileID: 9118603901484676259, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.0015764289 + objectReference: {fileID: 0} + - target: {fileID: 9118603901484676259, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.06546136 + objectReference: {fileID: 0} + - target: {fileID: 9179017853419834167, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -76.299904 + objectReference: {fileID: 0} + - target: {fileID: 9179017853419834167, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -179.73582 + objectReference: {fileID: 0} + - target: {fileID: 9179017853419834167, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 179.72812 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} +--- !u!4 &4362085140021186758 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + m_PrefabInstance: {fileID: 4252387813456377645} + m_PrefabAsset: {fileID: 0} +--- !u!95 &7667679109266590396 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: 6dd32929f788d35afba7c6c6c124a92d, type: 3} + m_PrefabInstance: {fileID: 4252387813456377645} + m_PrefabAsset: {fileID: 0} diff --git a/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab.meta b/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab.meta new file mode 100644 index 0000000..8a5148b --- /dev/null +++ b/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/ArmsMesh.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1d4767c722c05b5d6b96bb226d378c65 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/CharacterController.prefab b/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/CharacterController.prefab index 9051f6e..c28488d 100644 --- a/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/CharacterController.prefab +++ b/Game/CourierOld/Assets/Resources_moved/Prefabs/Player/CharacterController.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1047840484662430186} - m_Layer: 0 + m_Layer: 7 m_Name: CameraTarget m_TagString: Untagged m_Icon: {fileID: 0} @@ -42,7 +42,7 @@ GameObject: - component: {fileID: 4497607476133863680} - component: {fileID: 431159069816611448} - component: {fileID: 6173098626481777258} - m_Layer: 0 + m_Layer: 7 m_Name: Capsule m_TagString: Untagged m_Icon: {fileID: 0} @@ -135,9 +135,9 @@ GameObject: - component: {fileID: 3099094249566452406} - component: {fileID: 3283650228831796584} - component: {fileID: 6003242550544221350} - m_Layer: 0 + m_Layer: 7 m_Name: CharacterController - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -157,6 +157,7 @@ Transform: m_Children: - {fileID: 4122797476271397740} - {fileID: 1047840484662430186} + - {fileID: 1463034091404591669} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!136 &3661801025373459518 @@ -203,7 +204,7 @@ MonoBehaviour: MaxStableSlopeAngle: 60 StableGroundLayers: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 256 DiscreteCollisionEvents: 0 StepHandling: 1 MaxStepHeight: 0.5 @@ -252,6 +253,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Character.Core.CharacterProvider customCharacterController: {fileID: 3099094249566452406} cameraFollowPoint: {fileID: 1047840484662430186} + _animator: {fileID: 6003242550544221350} --- !u!114 &6003242550544221350 MonoBehaviour: m_ObjectHideFlags: 0 @@ -264,7 +266,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2f94efbea729423596ee5c6ee2366c98, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Player.PlayerAnimator - playerAnimator: {fileID: 111798061881399239} kinematicCharacterMotor: {fileID: 2338437892164946760} --- !u!1 &5873422912663271407 GameObject: @@ -277,7 +278,7 @@ GameObject: - component: {fileID: 4307738931528151573} - component: {fileID: 6603601364322459808} - component: {fileID: 7838213894568550933} - m_Layer: 0 + m_Layer: 7 m_Name: Cube m_TagString: Untagged m_Icon: {fileID: 0} @@ -355,37 +356,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &6139308014287725242 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6141075408912228788} - m_Layer: 0 - m_Name: CameraTarget - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6141075408912228788 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6139308014287725242} - serializedVersion: 2 - m_LocalRotation: {x: -0.19689888, y: -0.17914915, z: 0.026098415, w: 0.9635639} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8752029570905317134} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6821361459989763406 GameObject: m_ObjectHideFlags: 0 @@ -395,7 +365,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5944670082409334569} - m_Layer: 0 + m_Layer: 7 m_Name: Mesh m_TagString: Untagged m_Icon: {fileID: 0} @@ -427,13 +397,13 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4122797476271397740} - m_Layer: 0 + m_Layer: 7 m_Name: Character m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4122797476271397740 Transform: m_ObjectHideFlags: 0 @@ -448,106 +418,58 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5944670082409334569} - - {fileID: 2372399278530050576} m_Father: {fileID: 2527703521557431680} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2839183039212314107 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 4122797476271397740} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - propertyPath: m_Name - value: mp_anim_idle1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: -2444406315379408139, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - insertIndex: -1 - addedObject: {fileID: 6141075408912228788} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - insertIndex: -1 - addedObject: {fileID: 111798061881399239} - m_SourcePrefab: {fileID: 100100000, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} ---- !u!4 &2372399278530050576 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - m_PrefabInstance: {fileID: 2839183039212314107} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3145663457859035306 stripped +--- !u!1 &8161306573996467593 GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - m_PrefabInstance: {fileID: 2839183039212314107} - m_PrefabAsset: {fileID: 0} ---- !u!95 &111798061881399239 -Animator: - serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3145663457859035306} - m_Enabled: 1 - m_Avatar: {fileID: 9000000, guid: 02296f680a0e6ed48a92d690d2d82b6e, type: 3} - m_Controller: {fileID: 9100000, guid: af241b6cdcc834345b675ce177ebac79, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!4 &8752029570905317134 stripped + serializedVersion: 6 + m_Component: + - component: {fileID: 1463034091404591669} + - component: {fileID: 3128913752302763380} + m_Layer: 7 + m_Name: Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1463034091404591669 Transform: - m_CorrespondingSourceObject: {fileID: -2444406315379408139, guid: a7e412e490909bf47af7fe22cd5bd0bf, type: 3} - m_PrefabInstance: {fileID: 2839183039212314107} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8161306573996467593} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2527703521557431680} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &3128913752302763380 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8161306573996467593} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.2, y: 1.794006, z: 1.0222113} + m_Center: {x: 0, y: 0.9000284, z: 0.3553816} diff --git a/Game/CourierOld/ProjectSettings/Physics2DSettings.asset b/Game/CourierOld/ProjectSettings/Physics2DSettings.asset index 6c5cf8a..5a94269 100644 --- a/Game/CourierOld/ProjectSettings/Physics2DSettings.asset +++ b/Game/CourierOld/ProjectSettings/Physics2DSettings.asset @@ -3,12 +3,12 @@ --- !u!19 &1 Physics2DSettings: m_ObjectHideFlags: 0 - serializedVersion: 4 + serializedVersion: 6 m_Gravity: {x: 0, y: -9.81} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 m_PositionIterations: 3 - m_VelocityThreshold: 1 + m_BounceThreshold: 1 m_MaxLinearCorrection: 0.2 m_MaxAngularCorrection: 8 m_MaxTranslationSpeed: 100 @@ -19,6 +19,7 @@ Physics2DSettings: m_LinearSleepTolerance: 0.01 m_AngularSleepTolerance: 2 m_DefaultContactOffset: 0.01 + m_ContactThreshold: 0 m_JobOptions: serializedVersion: 2 useMultithreading: 0 @@ -38,19 +39,18 @@ Physics2DSettings: m_IslandSolverJointCostScale: 10 m_IslandSolverBodiesPerJob: 50 m_IslandSolverContactsPerJob: 50 - m_AutoSimulation: 1 + m_SimulationMode: 0 + m_SimulationLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_MaxSubStepCount: 4 + m_MinSubStepFPS: 30 + m_UseSubStepping: 0 + m_UseSubStepContacts: 0 m_QueriesHitTriggers: 1 m_QueriesStartInColliders: 1 m_CallbacksOnDisable: 1 m_ReuseCollisionCallbacks: 0 m_AutoSyncTransforms: 0 - m_AlwaysShowColliders: 0 - m_ShowColliderSleep: 1 - m_ShowColliderContacts: 0 - m_ShowColliderAABB: 0 - m_ContactArrowScale: 0.2 - m_ColliderAwakeColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.7529412} - m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432} - m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745} - m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804} - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_GizmoOptions: 10 + m_LayerCollisionMatrix: 0000000000000000000000000000000000000000000000000000000000030000800000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 diff --git a/Game/CourierOld/ProjectSettings/TagManager.asset b/Game/CourierOld/ProjectSettings/TagManager.asset index 1a4a7d0..81fcfdc 100644 --- a/Game/CourierOld/ProjectSettings/TagManager.asset +++ b/Game/CourierOld/ProjectSettings/TagManager.asset @@ -13,9 +13,9 @@ TagManager: - Water - UI - - - - - BakedShit - - RealtimeShit + - Player + - Environment + - Logic - - -