Tetramino/CourierOld
5
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

Переполох в камере, насрано

Browse Source
This commit is contained in:
ThomasCharester committed 2025-10-28 14:07:50 +03:00
1 parent 623b152690
commit 724161c455
15 files changed
+48 -75
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs
+1 -1
View File
@@ -10,7 +10,7 @@ namespace Code.App.AppStates
{
public class GameplayState : BaseState<AppStateMachineContext>
{
private PlayerHealthPoints _playerHealthPoints;
private PlayerHealth _playerHealthPoints;
public GameplayState(AppStateMachineContext context) : base(context)
{
Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs
+2
View File
@@ -1,4 +1,5 @@
using Code.App.StateMachine;
using Code.Configs;
using Code.Input;
using Code.Scenes;
using Code.StaticData;
@@ -45,6 +46,7 @@ namespace Code.App
containerBuilder.AddSingleton(staticDataService, typeof(IStaticDataService));
containerBuilder.AddSingleton(staticDataService.InputConfig.inputActionAsset, typeof(InputActionAsset));
containerBuilder.AddSingleton(staticDataService.UIConfig.canvasPrefab, typeof(Canvas));
containerBuilder.AddSingleton(staticDataService.CameraConfig, typeof(CameraConfig));
containerBuilder.AddSingleton(staticDataService.UIConfig.uiElementsPrefabs, typeof(UIElement[]));
}
Game/CourierOld/Assets/Code/Configs/AppConfig.cs
-6
View File
@@ -7,10 +7,4 @@ namespace Code.Configs
{
public GameObject infrastructureUnitPrefab;
}
[CreateAssetMenu(menuName = "Config/Player", fileName = "PlayerConfig")]
public class PlayerConfig : ScriptableObject
{
public Player playerPrefab;
public int maxHealth;
}
}
Game/CourierOld/Assets/Code/Configs/CharacterCameraConfig.cs → Game/CourierOld/Assets/Code/Configs/CameraConfig.cs
+2 -2
View File
@@ -4,7 +4,7 @@ using UnityEngine;
namespace Code.Configs
{
[CreateAssetMenu(fileName = "CharacterCameraConfig", menuName = "Config/CharacterCameraConfig")]
public class CharacterCameraConfig : ScriptableObject
public class CameraConfig : ScriptableObject
{
public float
// Расстояния от персонажа до камеры
@@ -30,7 +30,7 @@ namespace Code.Configs
defaultVerticalAngle = 10f; // Стандартный угол наклона камеры
// Текущий режим камеры
public CameraMode defaultCameraMode = CameraMode.MainMenu;
public CameraMode defaultCameraMode = CameraMode.Bogdan;
// Позиция следования по умолчанию (для меню)
public Vector3 defaultFollowPosition = Vector3.zero;
Game/CourierOld/Assets/Code/Configs/CharacterCameraConfig.cs.meta → Game/CourierOld/Assets/Code/Configs/CameraConfig.cs.meta
View File
File renamed without changes.
Game/CourierOld/Assets/Code/Gameplay/Character/Camera/CharacterCamera.cs → Game/CourierOld/Assets/Code/Gameplay/Character/Camera/CameraService.cs
+26 -20
View File
@@ -1,4 +1,5 @@
using System;
using Code.Configs;
using Code.Gameplay.Character.Core;
using Code.StaticData;
using Reflex.Attributes;
@@ -13,9 +14,9 @@ namespace Code.Gameplay.Character.Camera
*
* Источник: Tvtig, https://www.youtube.com/watch?v=9ibpY64wBYM
*/
public class CharacterCamera : MonoBehaviour
public class CameraService : MonoBehaviour
{
// Параметры загружаются из CharacterCameraConfig
// Параметры загружаются из CameraConfig
private float
_defaultDistance,
_minDistance,
@@ -52,27 +53,26 @@ namespace Code.Gameplay.Character.Camera
// Текущий режим работы камеры
public CameraMode CurrentMode { get; private set; }
// DI для загрузки конфига
[Inject] private IStaticDataService _staticDataService;
// Конфиг из DI
[Inject] private CameraConfig _config;
// Загрузка конфига для камеры
private void LoadConfig()
{
// Загрузка значений из конфигов
var config = _staticDataService.CharacterCameraConfig;
// Загрузка значений из конфига
_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);
@@ -166,7 +166,7 @@ namespace Code.Gameplay.Character.Camera
public void UpdateWithInput(float deltaTime, float zoomInput, Vector3 rotationInput)
{
// Проверка наличия цели для следования и проверка на режим главного меню
if (!_followTransform || CurrentMode == CameraMode.MainMenu) return;
if (!_followTransform || CurrentMode == CameraMode.Bogdan) return;
// Обработка ввода и позиционирования
HandleRotationInput(deltaTime, rotationInput, out var targetRotation);
@@ -204,7 +204,13 @@ namespace Code.Gameplay.Character.Camera
_targetDistance = _defaultDistance;
break;
// Заготовка на будущее (если понадобится)
case CameraMode.MainMenu:
case CameraMode.Bogdan:
_minDistance = 0f;
_maxDistance = 0f;
_defaultDistance = 0f;
_targetDistance = 0f;
_currentDistance = 0f;
break;
case CameraMode.Static:
case CameraMode.Cinematic:
default:
Game/CourierOld/Assets/Code/Gameplay/Character/Camera/CharacterCamera.cs.meta → Game/CourierOld/Assets/Code/Gameplay/Character/Camera/CameraService.cs.meta
View File
File renamed without changes.
Game/CourierOld/Assets/Code/Gameplay/Character/Controller/CustomCharacterController.cs
+1 -1
View File
@@ -127,7 +127,7 @@ namespace Code.Gameplay.Character.Controller
// Заготовка на будущее (если понадобится)
case CameraMode.Static:
case CameraMode.Cinematic:
case CameraMode.MainMenu: // Скорее всего юзлес, но пускай будет
case CameraMode.Bogdan: // Скорее всего юзлес, но пускай будет
default:
break;
}
Game/CourierOld/Assets/Code/Gameplay/Character/Core/CameraMode.cs
+1 -1
View File
@@ -10,7 +10,7 @@ namespace Code.Gameplay.Character.Core
*/
public enum CameraMode
{
MainMenu,
Bogdan,
Static,
FirstPerson,
ThirdPerson,
Game/CourierOld/Assets/Code/Gameplay/Character/Core/Character.cs
+10 -9
View File
@@ -3,6 +3,7 @@ using Code.Gameplay.Character.Controller;
using Code.Input;
using Reflex.Attributes;
using UnityEngine;
using UnityEngine.Serialization;
namespace Code.Gameplay.Character.Core
{
@@ -14,7 +15,7 @@ namespace Code.Gameplay.Character.Core
*/
public class Character : MonoBehaviour
{
[SerializeField] private CharacterCamera characterCamera; // Компонент камеры персонажа
[FormerlySerializedAs("characterCamera")] [SerializeField] private CameraService cameraService; // Компонент камеры персонажа
[SerializeField] private CustomCharacterController customCharacterController; // Компонент управления персонажем
[SerializeField] private Transform cameraFollowPoint; // Точка следования камеры (уровень глаз для FirstPerson)
@@ -27,8 +28,8 @@ namespace Code.Gameplay.Character.Core
private void Start()
{
// Настройка камеры для следования за точкой камеры
characterCamera.SetFollowTransform(cameraFollowPoint);
characterCamera.SetCameraMode(CameraMode.FirstPerson);
cameraService.SetFollowTransform(cameraFollowPoint);
cameraService.SetCameraMode(CameraMode.FirstPerson);
// Включение Gameplay мапа ввода
_inputService.EnableMap(ActionMappings.Gameplay);
@@ -42,7 +43,7 @@ namespace Code.Gameplay.Character.Core
var scrollInput = _inputService.ZoomInput;
// Передаем данные в камеру
characterCamera.UpdateWithInput(Time.deltaTime, scrollInput,
cameraService.UpdateWithInput(Time.deltaTime, scrollInput,
new Vector3(lookInput.x, lookInput.y, 0));
}
@@ -61,9 +62,9 @@ namespace Code.Gameplay.Character.Core
inputs.SlidePressed = _inputService.SlidePressed; // Слайд (Ctrl)
// Передаем информацию о камере для адаптивного поведения
inputs.CameraRotation = characterCamera.transform.rotation;
inputs.CameraMode = characterCamera.CurrentMode;
inputs.CameraPlanarDirection = characterCamera.PlanarDirection;
inputs.CameraRotation = cameraService.transform.rotation;
inputs.CameraMode = cameraService.CurrentMode;
inputs.CameraPlanarDirection = cameraService.PlanarDirection;
// Передаем ввод в контроллер персонажа
customCharacterController.SetInputs(ref inputs);
@@ -92,10 +93,10 @@ namespace Code.Gameplay.Character.Core
// Метод для переключения режимов камеры
private void ToggleCameraMode()
{
var currentMode = characterCamera.CurrentMode;
var currentMode = cameraService.CurrentMode;
var newMode = currentMode == CameraMode.FirstPerson ? CameraMode.ThirdPerson : CameraMode.FirstPerson;
characterCamera.SetCameraMode(newMode);
cameraService.SetCameraMode(newMode);
}
// Обновление логики каждый кадр
Game/CourierOld/Assets/Code/Gameplay/Player/PlayerFactory.cs
+2 -2
View File
@@ -8,11 +8,11 @@ namespace Code.Gameplay.Player
{
[Inject] PlayerConfig _playerConfig;
public PlayerHealthPoints CreatePlayerHP(int count = -1)
public PlayerHealth CreatePlayerHP(int count = -1)
{
if (count < 0) count = _playerConfig.maxHealth;
return new PlayerHealthPoints(count);
return new PlayerHealth(count);
}
}
}
Game/CourierOld/Assets/Code/Gameplay/Player/PlayerHP.cs
-27
View File
@@ -1,27 +0,0 @@
namespace Code.Gameplay.Player
{
public class PlayerHealthPoints
{
public delegate void OnDeathDelegate();
public event OnDeathDelegate OnDeath;
public delegate void OnDamageDelegate(int damage);
public event OnDamageDelegate OnDamage;
private int _healthPoints;
public int HealthPoints => _healthPoints;
public void GetDamage(int count)
{
_healthPoints -= count;
OnDamage?.Invoke(count);
if (_healthPoints <= 0) OnDeath?.Invoke();
}
public PlayerHealthPoints(int healthPoints = 1) => _healthPoints = healthPoints;
}
}
Game/CourierOld/Assets/Code/Gameplay/Player/PlayerHP.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 105512e4d3af4b36932a0d569b87c68e
timeCreated: 1761059874
Game/CourierOld/Assets/Code/StaticData/IStaticDataService.cs
+1 -1
View File
@@ -9,6 +9,6 @@ namespace Code.StaticData
InputConfig InputConfig { get; }
AppConfig AppConfig { get; }
UIConfig UIConfig { get; }
CharacterCameraConfig CharacterCameraConfig { get; }
CameraConfig CameraConfig { get; }
}
}
Game/CourierOld/Assets/Code/StaticData/StaticDataService.cs
+2 -2
View File
@@ -9,13 +9,13 @@ namespace Code.StaticData
public AppConfig AppConfig { get; private set; }
public InputConfig InputConfig { get; private set; }
public UIConfig UIConfig { get; private set; }
public CharacterCameraConfig CharacterCameraConfig { get; private set; }
public CameraConfig CameraConfig { get; private set; }
public void Load()
{
InputConfig = Resources.Load<InputConfig>(string.Format(StringPaths.ConfigSingle, "App", "InputConfig"));
AppConfig = Resources.Load<AppConfig>(string.Format(StringPaths.ConfigSingle, "App", "AppConfig"));
CharacterCameraConfig = Resources.Load<CharacterCameraConfig>(string.Format(StringPaths.ConfigSingle, "App", "CharacterCameraConfig"));
CameraConfig = Resources.Load<CameraConfig>(string.Format(StringPaths.ConfigSingle, "App", "CharacterCameraConfig"));
UIConfig = Resources.Load<UIConfig>(string.Format(StringPaths.ConfigSingle, "App", "UIConfig"));
}
}