diff --git a/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs b/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs index d7472b1..670aabf 100644 --- a/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs +++ b/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs @@ -1,4 +1,3 @@ -using System.Net.Mime; using Code.App.StateMachine; using Code.Input; using Code.Scenes; diff --git a/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs index b6cc559..497c824 100644 --- a/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs +++ b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs @@ -1,5 +1,6 @@ using Code.App.StateMachine; using Code.Configs; +using Code.Gameplay.Character.Camera; using Code.Input; using Code.Scenes; using Code.StaticData; @@ -22,11 +23,21 @@ namespace Code.App containerBuilder.AddSingleton(typeof(InputService), typeof(IInputService)); containerBuilder.AddSingleton(typeof(UIService), typeof(IUIService)); + + InitializeCamera(containerBuilder, staticDataService); + containerBuilder.AddSingleton(typeof(SceneLoaderService), typeof(ISceneLoaderService)); containerBuilder.OnContainerBuilt += Bootstrap; } + private void InitializeCamera(ContainerBuilder containerBuilder, IStaticDataService staticDataService) + { + CameraService cameraService = Instantiate(staticDataService.CameraConfig.cameraPrefab); + containerBuilder.AddSingleton(cameraService); + DontDestroyOnLoad(cameraService); + } + private void InstallInfrastructureUnit(ContainerBuilder containerBuilder, IStaticDataService staticDataService) { GameObject infrastructureUnit = Instantiate(staticDataService.AppConfig.infrastructureUnitPrefab); diff --git a/Game/CourierOld/Assets/Code/Configs/CameraConfig.cs b/Game/CourierOld/Assets/Code/Configs/CameraConfig.cs index 98a5552..92cb987 100644 --- a/Game/CourierOld/Assets/Code/Configs/CameraConfig.cs +++ b/Game/CourierOld/Assets/Code/Configs/CameraConfig.cs @@ -1,3 +1,4 @@ +using Code.Gameplay.Character.Camera; using Code.Gameplay.Character.Core; using UnityEngine; @@ -34,5 +35,7 @@ namespace Code.Configs // Позиция следования по умолчанию (для меню) public Vector3 defaultFollowPosition = Vector3.zero; + + public CameraService cameraPrefab; } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Character/Camera/CameraService.cs b/Game/CourierOld/Assets/Code/Gameplay/Character/Camera/CameraService.cs index c5914e4..ec7f44e 100644 --- a/Game/CourierOld/Assets/Code/Gameplay/Character/Camera/CameraService.cs +++ b/Game/CourierOld/Assets/Code/Gameplay/Character/Camera/CameraService.cs @@ -53,26 +53,24 @@ namespace Code.Gameplay.Character.Camera // Текущий режим работы камеры public CameraMode CurrentMode { get; private set; } - // Конфиг из DI - [Inject] private CameraConfig _config; - // Загрузка конфига для камеры - private void LoadConfig() + [Inject] + private void LoadConfig(CameraConfig config) { // Загрузка значений из конфига - _defaultDistance = _config.defaultDistance; - _minDistance = _config.minDistance; - _maxDistance = _config.maxDistance; - _distanceMovementSpeed = _config.distanceMovementSpeed; - _rotationSpeed = _config.rotationSpeed; - _rotationSharpness = _config.rotationSharpness; - _followSharpness = _config.followSharpness; - _minVerticalAngle = _config.minVerticalAngle; - _maxVerticalAngle = _config.maxVerticalAngle; - _defaultVerticalAngle = _config.defaultVerticalAngle; - CurrentMode = _config.defaultCameraMode; - _defaultFollowPosition = _config.defaultFollowPosition; + _defaultDistance = config.defaultDistance; + _minDistance = config.minDistance; + _maxDistance = config.maxDistance; + _distanceMovementSpeed = config.distanceMovementSpeed; + _rotationSpeed = config.rotationSpeed; + _rotationSharpness = config.rotationSharpness; + _followSharpness = config.followSharpness; + _minVerticalAngle = config.minVerticalAngle; + _maxVerticalAngle = config.maxVerticalAngle; + _defaultVerticalAngle = config.defaultVerticalAngle; + CurrentMode = config.defaultCameraMode; + _defaultFollowPosition = config.defaultFollowPosition; // Валидация значений (на случай ручного редактирования конфига) _defaultDistance = Mathf.Clamp(_defaultDistance, _minDistance, _maxDistance); @@ -91,11 +89,6 @@ namespace Code.Gameplay.Character.Camera _currentFollowPosition = _defaultFollowPosition; } - // Инициализация камеры при создании - private void Awake() - { - LoadConfig(); - } // Установка цели для следования камеры public void SetFollowTransform(Transform t) diff --git a/Game/CourierOld/Assets/Code/Gameplay/Character/Core/Character.cs b/Game/CourierOld/Assets/Code/Gameplay/Character/Core/Character.cs index 525396a..aaadfb7 100644 --- a/Game/CourierOld/Assets/Code/Gameplay/Character/Core/Character.cs +++ b/Game/CourierOld/Assets/Code/Gameplay/Character/Core/Character.cs @@ -15,7 +15,7 @@ namespace Code.Gameplay.Character.Core */ public class Character : MonoBehaviour { - [FormerlySerializedAs("characterCamera")] [SerializeField] private CameraService cameraService; // Компонент камеры персонажа + [Inject] private CameraService _cameraService; // Компонент камеры персонажа [SerializeField] private CustomCharacterController customCharacterController; // Компонент управления персонажем [SerializeField] private Transform cameraFollowPoint; // Точка следования камеры (уровень глаз для FirstPerson) @@ -28,8 +28,8 @@ namespace Code.Gameplay.Character.Core private void Start() { // Настройка камеры для следования за точкой камеры - cameraService.SetFollowTransform(cameraFollowPoint); - cameraService.SetCameraMode(CameraMode.FirstPerson); + _cameraService.SetFollowTransform(cameraFollowPoint); + _cameraService.SetCameraMode(CameraMode.FirstPerson); // Включение Gameplay мапа ввода _inputService.EnableMap(ActionMappings.Gameplay); @@ -43,7 +43,7 @@ namespace Code.Gameplay.Character.Core var scrollInput = _inputService.ZoomInput; // Передаем данные в камеру - cameraService.UpdateWithInput(Time.deltaTime, scrollInput, + _cameraService.UpdateWithInput(Time.deltaTime, scrollInput, new Vector3(lookInput.x, lookInput.y, 0)); } @@ -62,9 +62,9 @@ namespace Code.Gameplay.Character.Core inputs.SlidePressed = _inputService.SlidePressed; // Слайд (Ctrl) // Передаем информацию о камере для адаптивного поведения - inputs.CameraRotation = cameraService.transform.rotation; - inputs.CameraMode = cameraService.CurrentMode; - inputs.CameraPlanarDirection = cameraService.PlanarDirection; + inputs.CameraRotation = _cameraService.transform.rotation; + inputs.CameraMode = _cameraService.CurrentMode; + inputs.CameraPlanarDirection = _cameraService.PlanarDirection; // Передаем ввод в контроллер персонажа customCharacterController.SetInputs(ref inputs); @@ -93,10 +93,10 @@ namespace Code.Gameplay.Character.Core // Метод для переключения режимов камеры private void ToggleCameraMode() { - var currentMode = cameraService.CurrentMode; + var currentMode = _cameraService.CurrentMode; var newMode = currentMode == CameraMode.FirstPerson ? CameraMode.ThirdPerson : CameraMode.FirstPerson; - cameraService.SetCameraMode(newMode); + _cameraService.SetCameraMode(newMode); } // Обновление логики каждый кадр diff --git a/Game/CourierOld/Assets/Code/UI/UIService.cs b/Game/CourierOld/Assets/Code/UI/UIService.cs index 661f090..2d45e60 100644 --- a/Game/CourierOld/Assets/Code/UI/UIService.cs +++ b/Game/CourierOld/Assets/Code/UI/UIService.cs @@ -13,19 +13,20 @@ namespace Code.UI { _canvas = Object.Instantiate(canvas); Object.DontDestroyOnLoad(_canvas); - + _uiPanelsPrefabs = uiPanelsPrefabs; - - LoadingScreen = (LoadingPanel) Object.Instantiate(_uiPanelsPrefabs[(int)UIPanel.Loading], _canvas.transform); + + LoadingScreen = (LoadingPanel)Object.Instantiate(_uiPanelsPrefabs[(int)UIPanel.Loading], _canvas.transform); } - + public void EnablePanel() => CurrentPanel.gameObject.SetActive(true); public void DisablePanel() => CurrentPanel.gameObject.SetActive(false); - + public void SwitchPanelTo(UIPanel uiPanel) { - Object.Destroy(CurrentPanel); - + if (CurrentPanel.gameObject != null) + Object.Destroy(CurrentPanel.gameObject); + CurrentPanel = Object.Instantiate(_uiPanelsPrefabs[(int)uiPanel], _canvas.transform); } } diff --git a/Game/CourierOld/Assets/Resources/Configs/App/CharacterCameraConfig.asset b/Game/CourierOld/Assets/Resources/Configs/App/CharacterCameraConfig.asset index c85fd84..1e805ea 100644 --- a/Game/CourierOld/Assets/Resources/Configs/App/CharacterCameraConfig.asset +++ b/Game/CourierOld/Assets/Resources/Configs/App/CharacterCameraConfig.asset @@ -23,3 +23,5 @@ MonoBehaviour: maxVerticalAngle: 70 defaultVerticalAngle: 10 defaultCameraMode: 0 + defaultFollowPosition: {x: 0, y: 0, z: 0} + cameraPrefab: {fileID: 4646144043143727929, guid: 8b8bf5712dc5a42c7bd8e22cddb884c3, type: 3} diff --git a/Game/CourierOld/Assets/Resources/Prefabs/App.meta b/Game/CourierOld/Assets/Resources/Prefabs/App.meta new file mode 100644 index 0000000..0a40fe2 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Prefabs/App.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32ef2c05fcde7cfff8a0f3cb8aef19dd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab b/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab new file mode 100644 index 0000000..77b9a47 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab @@ -0,0 +1,232 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4020116641700429774 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8446312744501130134} + - component: {fileID: 2909726676418717939} + - component: {fileID: 2501524445164724345} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8446312744501130134 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4020116641700429774} + 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: 8978384765604412142} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2909726676418717939 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4020116641700429774} + 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!114 &2501524445164724345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4020116641700429774} + 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!1 &6099115053225634464 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8978384765604412142} + - component: {fileID: 374984699890489845} + - component: {fileID: 4075496901397588323} + - component: {fileID: 7468744325105696788} + - component: {fileID: 4646144043143727929} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8978384765604412142 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8446312744501130134} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &374984699890489845 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6099115053225634464} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, 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: 0 + 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!81 &4075496901397588323 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6099115053225634464} + m_Enabled: 1 +--- !u!114 &7468744325105696788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6099115053225634464} + 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!114 &4646144043143727929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6099115053225634464} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1d98e6c5419411098391c07861e627e, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Character.Camera.CameraService diff --git a/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab.meta b/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab.meta new file mode 100644 index 0000000..e3ff1b1 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8b8bf5712dc5a42c7bd8e22cddb884c3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity b/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity index 286408a..eef873d 100644 --- a/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity +++ b/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity @@ -119,52 +119,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &828922429 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 828922431} - - component: {fileID: 828922430} - m_Layer: 0 - m_Name: SkipToGameplay - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &828922430 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 828922429} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: affd42e82c2547a5af4604b574a24f59, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Code.App.Debug.GoToState - gotoState: 4 - allowedState: -1 ---- !u!4 &828922431 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 828922429} - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1253837927 GameObject: m_ObjectHideFlags: 0 @@ -214,4 +168,3 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1253837929} - - {fileID: 828922431} diff --git a/Game/CourierOld/Assets/_Recovery.meta b/Game/CourierOld/Assets/_Recovery.meta new file mode 100644 index 0000000..edfcc81 --- /dev/null +++ b/Game/CourierOld/Assets/_Recovery.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75793e520683ea032ace153b3040cf4e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/_Recovery/0.unity b/Game/CourierOld/Assets/_Recovery/0.unity new file mode 100644 index 0000000..eef873d --- /dev/null +++ b/Game/CourierOld/Assets/_Recovery/0.unity @@ -0,0 +1,170 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &1253837927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1253837929} + - component: {fileID: 1253837928} + m_Layer: 0 + m_Name: SceneScope + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1253837928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253837927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fd1482e4a9dee141aecc5bcd0a4f0f3, type: 3} + m_Name: + m_EditorClassIdentifier: Reflex::Reflex.Core.SceneScope +--- !u!4 &1253837929 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253837927} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1253837929} diff --git a/Game/CourierOld/Assets/_Recovery/0.unity.meta b/Game/CourierOld/Assets/_Recovery/0.unity.meta new file mode 100644 index 0000000..c0cc24e --- /dev/null +++ b/Game/CourierOld/Assets/_Recovery/0.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4ee6c9ddf0020bc978ffcb0af4b2464a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: