ThomasCharester/Infratest
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Нашёл причину утечки памяти

Browse Source
This commit is contained in:
ThomasCharester committed 2026-03-24 15:16:17 +03:00
1 parent 60c28f54f2
commit 320847af5b
229 files changed
+3094 -18282
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/AddressableAssetsData/AddressableAssetSettings.asset
+1
View File
@@ -61,6 +61,7 @@ MonoBehaviour:
m_BuildAddressablesWithPlayerBuild: 0
m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
m_GroupAssets:
- {fileID: 11400000, guid: 474eae8d8cac07b49a71a36bddcfea71, type: 2}
- {fileID: 11400000, guid: cd5d8f0bccfc1e5489a5c528087c4feb, type: 2}
m_BuildSettings:
m_LogResourceManagerExceptions: 1
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
-89
View File
@@ -21,11 +21,6 @@ MonoBehaviour:
m_SerializedLabels:
- PlatformerEntity
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 0d2cf1d8a32701f56851c8b734cf7928
m_Address: Assets/Resources_moved/UI/Panels/PlayerCounter.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 0eb645a0c96b1c437bf0712d6b856b7c
m_Address: Assets/Resources_moved/Example/Platformer/Bee.prefab
m_ReadOnly: 0
@@ -47,12 +42,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 14e849600b64a5a498f121440eebefd2
m_Address: Assets/Resources_moved/Configs/UI/PlayerSceneChoose.asset
m_ReadOnly: 0
m_SerializedLabels:
- UIPanelConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 17c5e56eb6c99db40b6093c9d543bb4f
m_Address: Assets/Resources_moved/Configs/UI/CanvasSettingsConfig.asset
m_ReadOnly: 0
@@ -109,12 +98,6 @@ MonoBehaviour:
m_SerializedLabels:
- SceneConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 29779120ceccabb0ab008e48b44a39f4
m_Address: Example/Race/Configs/AIBot
m_ReadOnly: 0
m_SerializedLabels:
- RacerConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2e29259ec1cd556c6a33f0396d8f90e2
m_Address: Assets/Resources_moved/Configs/Audio/Infos/UI/launchUpMenu.asset
m_ReadOnly: 0
@@ -126,12 +109,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2f99b96d93cb35086b74d1b8c4111f90
m_Address: Assets/Resources_moved/Example/Race/SceneChooser.asset
m_ReadOnly: 0
m_SerializedLabels:
- UIPanelConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 30778c5a4d5c3f74bac4e5340344cdad
m_Address: Assets/Resources_moved/Configs/Volumes/MenuRetro.asset
m_ReadOnly: 0
@@ -156,12 +133,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3a4a23e1c0a57dd49b451aa86b9baa3a
m_Address: Assets/Resources_moved/Configs/Scenes/SoundTest.asset
m_ReadOnly: 0
m_SerializedLabels:
- SceneConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3f2b0a19832dd31578147a7bb53cf931
m_Address: Assets/Resources_moved/Example/Platformer/Configs/LayerMasks/GroundLayerMask.asset
m_ReadOnly: 0
@@ -184,12 +155,6 @@ MonoBehaviour:
m_SerializedLabels:
- CameraConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4ad92ea93f2a0664191607510b1b623d
m_Address: Assets/Resources_moved/Configs/Scenes/Gameplay.asset
m_ReadOnly: 0
m_SerializedLabels:
- SceneConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4b5011c8b31164d418f96afe213172ce
m_Address: Example/Platformer/Audio/stare
m_ReadOnly: 0
@@ -229,12 +194,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 55ccf07d7c51c2a409a42ddcda3b3b30
m_Address: Assets/Resources_moved/Configs/UI/WinScreen.asset
m_ReadOnly: 0
m_SerializedLabels:
- UIPanelConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 62388720cc90ef87f9d8ed5328dbc6fe
m_Address: Assets/Resources_moved/Configs/Audio/AudioInfoConfig.asset
m_ReadOnly: 0
@@ -263,11 +222,6 @@ MonoBehaviour:
m_SerializedLabels:
- AudioInfoConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 6c22f498979461d3ea35e12a19f9be78
m_Address: Assets/Resources_moved/Example/Race/PlayerScores.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 6d3fc61919b807d0da6d9625d6c7ccb8
m_Address: Assets/Resources_moved/Example/Platformer/Configs/Audio/GotDamage.asset
m_ReadOnly: 0
@@ -312,12 +266,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7a5ae0cc826b85108aa9f0681d7f85cc
m_Address: Assets/Resources_moved/Example/Race/Configs/AIRed.asset
m_ReadOnly: 0
m_SerializedLabels:
- RacerConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7d8290233b2e82e4e9a8f85ca8b2e26d
m_Address: Assets/Resources_moved/Example/Platformer/Configs/Audio/GameEnd.asset
m_ReadOnly: 0
@@ -367,11 +315,6 @@ MonoBehaviour:
m_SerializedLabels:
- AudioInfoConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9e77251929568a7c0806d17b11af8afb
m_Address: Assets/Resources_moved/Example/Race/PlayerRacist.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9fa1fde1ddb533d4b8f4a758cc83a696
m_Address: Assets/Resources_moved/Example/Platformer/Audio/laugh.wav
m_ReadOnly: 0
@@ -394,12 +337,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: b93ef12d9a22d9b65ba68c45742f73a3
m_Address: Assets/Resources_moved/Configs/Camera/ThirdPersonConfig.asset
m_ReadOnly: 0
m_SerializedLabels:
- CameraConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: becf493a34b841e4d8ea927261a05e9b
m_Address: Camera/Camera
m_ReadOnly: 0
@@ -426,11 +363,6 @@ MonoBehaviour:
m_SerializedLabels:
- SceneConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: cbab6f2c86f23fd48b3ec4b8885b9889
m_Address: Assets/Scenes/SoundTest.unity
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: cc76fd76d78cd364880ebe8330a05834
m_Address: Assets/Resources_moved/Example/Platformer/Configs/LayerMasks/Enemies.asset
m_ReadOnly: 0
@@ -470,11 +402,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: df809fbbdc1f51f43b4d42a7896a0919
m_Address: Assets/Scenes/Gameplay.unity
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e1fbe5b2798657342b569f723d16c9de
m_Address: UI/Canvas
m_ReadOnly: 0
@@ -491,11 +418,6 @@ MonoBehaviour:
m_SerializedLabels:
- UIPanelConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: eb48bfdd161d536498ed1b2810fa476e
m_Address: Example/Race/Racist (1)
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ec0362c4c0d045cccbe89aee2231c3be
m_Address: Assets/Resources_moved/Configs/Audio/Settings/AudioSourceSettingsConfig.asset
m_ReadOnly: 0
@@ -539,11 +461,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f60baf3e133aa2644a106742a1f2c2fb
m_Address: Assets/Resources_moved/Example/Race/WinScreen.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f75fc43e1e6bd3ca5b4c90a98a790033
m_Address: Example/Platformer
m_ReadOnly: 0
@@ -555,12 +472,6 @@ MonoBehaviour:
m_SerializedLabels:
- AudioInfoConfig
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f8c793cd022fab58682fadd51648a3c1
m_Address: Example/Race/Configs/Player
m_ReadOnly: 0
m_SerializedLabels:
- RacerConfig
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: c6c4cec5a69c4d144a5dfabd0405f447, type: 2}
m_SchemaSet:
Assets/AddressableAssetsData/AssetGroups/Duplicate Asset Isolation.asset
+48
View File
@@ -0,0 +1,48 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Duplicate Asset Isolation
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
m_GroupName: Duplicate Asset Isolation
m_GUID: 4d0e6e328b993834280aefa5514ffb63
m_SerializeEntries:
- m_GUID: 13c02b14c4d048fa9653293d54f6e0e1
m_Address: Packages/com.unity.render-pipelines.universal/Shaders/2D/Sprite-Unlit-Default.shader
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 36e335017ad71d54fbb10842863188ae
m_Address: Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/FallbackShader.shader
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 933532a4fcc9baf4fa0491de14d08ed7
m_Address: Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9dfc825aed78fcd4ba02077103263b40
m_Address: Packages/com.unity.render-pipelines.universal/Runtime/Materials/Sprite-Unlit-Default.mat
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: e6e9a19c3678ded42a3bc431ebef7dbd
m_Address: Packages/com.unity.render-pipelines.universal/Shaders/Utils/FallbackError.shader
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: c6c4cec5a69c4d144a5dfabd0405f447, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: b7a101d996c2e9642a8382b9484b7688, type: 2}
- {fileID: 11400000, guid: 81a10561aabdb45419c7e5c285e2552f, type: 2}
Assets/Resources_moved/Example/Race/Configs/AIRed.asset.meta → Assets/AddressableAssetsData/AssetGroups/Duplicate Asset Isolation.asset.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7a5ae0cc826b85108aa9f0681d7f85cc
guid: 474eae8d8cac07b49a71a36bddcfea71
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
Assets/AddressableAssetsData/AssetGroups/Schemas/Duplicate Asset Isolation_BundledAssetGroupSchema.asset
+48
View File
@@ -0,0 +1,48 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: Duplicate Asset Isolation_BundledAssetGroupSchema
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema
m_Group: {fileID: 11400000, guid: 474eae8d8cac07b49a71a36bddcfea71, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_StripDownloadOptions: 0
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: c177911d3f5ed754588b22d7ec9ed060
m_LoadPath:
m_Id: 0625bc81bb6ebfe4badeca8150066832
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_UseDefaultSchemaSettings: 0
m_SelectedPathPairIndex: 0
m_BundleNaming: 0
m_AssetLoadMode: 0
Assets/Resources_moved/Example/Race/Configs/AIGreen.asset.meta → Assets/AddressableAssetsData/AssetGroups/Schemas/Duplicate Asset Isolation_BundledAssetGroupSchema.asset.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 29779120ceccabb0ab008e48b44a39f4
guid: b7a101d996c2e9642a8382b9484b7688
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
Assets/AddressableAssetsData/AssetGroups/Schemas/Duplicate Asset Isolation_ContentUpdateGroupSchema.asset
+16
View File
@@ -0,0 +1,16 @@
%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: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: Duplicate Asset Isolation_ContentUpdateGroupSchema
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.ContentUpdateGroupSchema
m_Group: {fileID: 11400000, guid: 474eae8d8cac07b49a71a36bddcfea71, type: 2}
m_StaticContent: 1
Assets/Resources_moved/Configs/Scenes/Gameplay.asset.meta → Assets/AddressableAssetsData/AssetGroups/Schemas/Duplicate Asset Isolation_ContentUpdateGroupSchema.asset.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4ad92ea93f2a0664191607510b1b623d
guid: 81a10561aabdb45419c7e5c285e2552f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
Assets/Code/Debug/SceneChooser.cs
-4
View File
@@ -22,10 +22,6 @@ namespace Code.Debug
_stateMachine.SwitchState((AppStates)id);
}
public void SwitchGameplay()
{
_stateMachine.SwitchState(AppStates.Gameplay).AllowStateTransition(AppStates.MainMenu);
}
public void SwitchPlatformer()
{
_stateMachine.SwitchState(AppStates.Platformer).AllowStateTransition(AppStates.MainMenu);
Assets/Code/Example/Platformer/Entity/PlatformerPlayerFactory.cs
+2 -2
View File
@@ -88,8 +88,8 @@ namespace Code.Example.Platformer.Entity
public void Dispose()
{
UnityEngine.Debug.LogWarning($"Enemies released");
_playerPrefabHandle.Release();
UnityEngine.Debug.LogWarning($"Player released");
if(_playerPrefabHandle.IsValid()) _playerPrefabHandle.Release();
_playerConfigHandle.Release();
}
Assets/Code/Example/Platformer/Entity/Spawners.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: ab2cbe7f4c0142f980f9640c57d27030
timeCreated: 1774277361
Assets/Code/Example/Platformer/PlatformerState.cs
+31 -1
View File
@@ -76,11 +76,22 @@ namespace Code.Example.Platformer
Context.CameraFactory.ReleaseCinemachineCamera(CameraMode.Platformer);
Context.InputService.DisableMap(ActionMappings.Platformer);
_audioFactory.ReleaseAudios(AudioNames.Platformer);
Context.AudioService.ChangeGroupVolume(
AudioGroupType.Music,
0f,
0.5f,
ReleasePlatformerMusic);
EventBus.Unsubscribe(this);
}
private void ReleasePlatformerMusic()
{
Context.AudioService.CancelMusic(AudioNames.Platformer, 0);
Context.AudioService.CancelMusic(AudioNames.Platformer, 7);
_audioFactory.ReleaseAudios(AudioNames.Platformer);
}
private void StartInitialLoading()
{
@@ -259,6 +270,25 @@ namespace Code.Example.Platformer
}
public void PlayerDied()
{
_loading = new(2, EndGameLoading);
Context.AudioService.ChangeGroupVolume(
AudioGroupType.Music,
0f,
0.5f,
OffTheMusic);
Context.UIService.OpenPanel(UIPanelType.Loading);
}
private void OffTheMusic()
{
ReleasePlatformerMusic();
_loading.DoProgress();
}
private void EndGameLoading()
{
Context.StateMachine.SwitchState(AppStates.MainMenu)
.AllowStateTransition(AppStates.Platformer);
Assets/Code/Example/Race.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 28672941a49242ad95c4a99705410c30
timeCreated: 1769522077
Assets/Code/Example/Race/PlayerPrefsRacePoopshitter.cs
-65
View File
@@ -1,65 +0,0 @@
using System;
using System.Collections.Generic;
using System.IO;
using Newtonsoft.Json;
using UnityEngine;
namespace Code.Example.Race
{
public class PlayerPrefsRacePoopshitter
{
private List<RaceData> _races = new();
public PlayerPrefsRacePoopshitter()
{
GetRaces();
}
public List<RaceData> GetRaces()
{
var path = Path.Combine(Application.persistentDataPath,"raceData.json");
using (StreamReader reader = new(path))
{
var json = reader.ReadToEnd();
_races = JsonConvert.DeserializeObject<List<RaceData>>(json);
}
// for (int i = 0; i < _raceCount; i++)
// races.Add(new(
// PlayerPrefs.GetFloat($"Race{i}"),
// PlayerPrefs.GetInt($"Place{i}")));
return _races;
}
public void AddRace(RaceData race)
{
// PlayerPrefs.SetFloat($"Race{_raceCount}", race.raceTimeSeconds);
// PlayerPrefs.SetInt($"Place{_raceCount}", race.place);
// PlayerPrefs.SetInt("RaceCount", ++_raceCount);
_races.Add(race);
var json = JsonConvert.SerializeObject(_races, Formatting.Indented);
var path = Path.Combine(Application.persistentDataPath,"raceData.json");
using (StreamWriter writer = new(path))
{
writer.Write(json);
}
}
}
[Serializable]
public struct RaceData
{
public float raceTimeSeconds;
public int place;
public RaceData(float raceTimeSeconds, int place)
{
this.raceTimeSeconds = raceTimeSeconds;
this.place = place;
}
}
}
Assets/Code/Example/Race/PlayerPrefsRacePoopshitter.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: e984eddc1697449487c9a790345dfb0b
timeCreated: 1770653240
Assets/Code/Example/Race/RaceGame.cs
-108
View File
@@ -1,108 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Code.Example.Race.Racer;
using Code.Example.Race.Track;
using Code.Infrastructure.EventBus;
using Code.Infrastructure.Loadings;
using UnityEngine;
namespace Code.Example.Race
{
public class RaceGame : IRacerLoadedHandle, IDisposable
{
private RaceScores _scores;
private IRacerFactory _racerFactory;
private RaceTrackData _raceTrackData;
private EventBus _eventBus;
public RaceGame(EventBus eventBus, IRacerFactory racerFactory, RaceTrackData raceTrackData, RaceScores scores)
{
_eventBus = eventBus;
_racerFactory = racerFactory;
_raceTrackData = raceTrackData;
_eventBus.Subscribe(this);
_scores = scores;
RandomizeRacers(raceTrackData.trackData.RacerPoints.Count);
}
private float _timeStart;
public float RaceTime => Time.time - _timeStart;
public void StartRacers()
{
_timeStart = Time.time;
foreach (var racer in PlacedRacers)
{
racer.StartRacer();
}
}
// DEBUG
private List<RacerType> _randomizedTypes = new();
private void RandomizeRacers(int count)
{
_raceGameLoading = new Loading(count, RacersLoadCompleted);
_randomizedTypes.Add(RacerType.Player);
for (var i = 0; i < count - 1; i++)
_randomizedTypes.Add((RacerType)UnityEngine.Random.Range(1, 3));
foreach (var type in _randomizedTypes) _racerFactory.LoadRacer(type);
}
private void RacersLoadCompleted() =>
_eventBus.RaiseEvent<IRaceGameHandle>(x => x.RaceGameReady());
public List<Racer.Racer> PlacedRacers { get; } = new();
public void PlaceRacers()
{
for (var i = 0; i < _raceTrackData.trackData.RacerPoints.Count; i++)
{
PlacedRacers.Add(UnityEngine.Object.Instantiate(
_racerPrefabs[_randomizedTypes[i]],
_raceTrackData.trackData.RacerPoints[i].transform).GetComponent<Racer.Racer>());
PlacedRacers[^1].SetData(_racerPrefabs[_randomizedTypes[i]].Data);
PlacedRacers[^1].Id = i;
_scores.SubscribeRacer(PlacedRacers[^1]);
}
foreach (var racer in PlacedRacers)
{
racer.Initialize(_raceTrackData.trackData.Checkpoints.Select(x=> x.transform).ToList());
}
}
private Dictionary<RacerType, Racer.Racer> _racerPrefabs = new();
private Loading _raceGameLoading;
public void RacerLoaded(RacerType type, Racer.Racer racer)
{
if (racer)
_racerPrefabs.Add(type, racer);
_raceGameLoading.DoProgress();
}
public void Dispose()
{
foreach (var racer in PlacedRacers) _scores.UnsubscribeRacer(racer);
_eventBus.Unsubscribe(this);
_racerPrefabs.Clear();
}
}
public interface IRaceGameHandle : IGlobalSubscriber
{
void RaceGameReady();
void RaceGameEnded(RaceScores scores);
}
}
Assets/Code/Example/Race/RaceGame.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 0ffa5c181be7447cb1c41392018b193f
timeCreated: 1769692114
Assets/Code/Example/Race/RaceScores.cs
-80
View File
@@ -1,80 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Code.Example.Race.Racer.Player;
using Code.Example.Race.Track;
using Code.Infrastructure.EventBus;
using Reflex.Attributes;
namespace Code.Example.Race
{
public class RaceScores : IRacerPassedCheckpointHandler, IDisposable, IPlayerPassedCheckpointHandler
{
private Dictionary<Racer.Racer, ScoreData> _scores = new();
private EventBus _eventBus;
public RaceScores(EventBus eventBus)
{
_eventBus = eventBus;
_eventBus.Subscribe(this);
}
public void SubscribeRacer(Racer.Racer racer)
{
_scores.Add(racer, new ScoreData());
}
public void ChangeScore(Racer.Racer racer, int additionalScore)
{
_scores[racer].checkpointsPassed += additionalScore;
_eventBus.RaiseEvent<IScoreChangedHandle>(x=> x.ScoreChanged(racer,_scores[racer], GetScores()));
}
public void LapPassed(Racer.Racer racer)
{
_scores[racer].lapsPassed++;
_eventBus.RaiseEvent<IScoreChangedHandle>(x=> x.ScoreChanged(racer,_scores[racer], GetScores()));
if (_scores[racer].lapsPassed >= _raceTrackData.trackData.LapCount)
_eventBus.RaiseEvent<IRaceGameHandle>(x=> x.RaceGameEnded(this));
}
public void UnsubscribeRacer(Racer.Racer racer)
{
_scores.Remove(racer);
}
public List<KeyValuePair<Racer.Racer, ScoreData>> GetScores()
{
return _scores.OrderByDescending(x => x.Value.checkpointsPassed).ToList();
}
public void OnRacerPassedCheckpoint(Racer.Racer racer) => ChangeScore(racer,1);
public void Dispose()
{
_eventBus.Unsubscribe(this);
}
[Inject] private RaceTrackData _raceTrackData;
public void OnPlayerPassedCheckpoint(Racer.Racer racer)
{
var player = (PlayerRacer)racer;
_raceTrackData.trackData.Checkpoints[player.CurrentWaypointIndex].Show();
}
public void OnPlayerLapPassed(Racer.Racer racer)
{
}
}
public class ScoreData
{
public int checkpointsPassed;
public int lapsPassed;
}
public interface IScoreChangedHandle : IGlobalSubscriber
{
void ScoreChanged(Racer.Racer racer, ScoreData score, List<KeyValuePair<Racer.Racer, ScoreData>> scores);
}
}
Assets/Code/Example/Race/RaceScores.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: b45fb028abcf43129f5c8100e7215f1f
timeCreated: 1770051193
Assets/Code/Example/Race/Racer.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: db04851257b24d4698e8101ef2d54b2d
timeCreated: 1769522144
Assets/Code/Example/Race/Racer/AI.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 391fdca5d5c94a86bcbd0f7cda609ee7
timeCreated: 1769522152
Assets/Code/Example/Race/Racer/AI/AICarDriver.cs
-36
View File
@@ -1,36 +0,0 @@
using UnityEngine;
namespace Code.Example.Race.Racer.AI
{
public class AICarDriver : CarControllerRB
{
public override void SetSteering(Vector2 steeringLinear)
{
SteeringInput = steeringLinear;
}
protected override void Brake()
{
if (CarRb.linearVelocity.magnitude > 10f && (SteeringInput.y > CarRb.linearVelocity.y || SteeringInput.x > CarRb.linearVelocity.x))
{
foreach (var wheel in wheels)
{
wheel.wheelCollider.brakeTorque = 100 * racer.Data.brakeAcceleration * Time.fixedDeltaTime;
}
// carLights.isBackLightOn = true;
// carLights.OperateBackLights();
}
else
{
foreach (var wheel in wheels)
{
wheel.wheelCollider.brakeTorque = 0;
}
// carLights.isBackLightOn = false;
// carLights.OperateBackLights();
}
}
}
}
Assets/Code/Example/Race/Racer/AI/AICarDriver.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: c82b0db1441e417098bccb9ca1575e3e
timeCreated: 1770639201
Assets/Code/Example/Race/Racer/AI/AIDebugRacer.cs
-45
View File
@@ -1,45 +0,0 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.AI;
namespace Code.Example.Race.Racer.AI
{
public class AIDebugRacer : Racer
{
[SerializeField] private NavMeshAgent navMeshAgent;
[SerializeField] private List<Transform> waypoints;
private int _currentWaypointIndex;
private void Awake()
{
navMeshAgent.destination = waypoints[_currentWaypointIndex].position;
_currentWaypointIndex++;
}
public override void NextWaypoint()
{
if(_currentWaypointIndex >= waypoints.Count) _currentWaypointIndex = 0;
navMeshAgent.destination = waypoints[_currentWaypointIndex++].position;
}
public override void StartRacer()
{
}
public override void StopRacer()
{
}
public override void SetData(RacerData data)
{
}
public override void Initialize(List<Transform> waypoints)
{
}
}
}
Assets/Code/Example/Race/Racer/AI/AIDebugRacer.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 6644b39029d14164961d83a37749e6cc
timeCreated: 1769522190
Assets/Code/Example/Race/Racer/AI/AIRacer.cs
-36
View File
@@ -1,36 +0,0 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.AI;
namespace Code.Example.Race.Racer.AI
{
public class AIRacer : Racer
{
[SerializeField] private NavMeshAgent navMeshAgent;
public override void SetData(RacerData data)
{
Data = data;
navMeshAgent.angularSpeed = data.angularSpeed;
navMeshAgent.speed = data.speed;
}
public override void Initialize(List<Transform> waypoints)
{
navMeshAgent.isStopped = true;
Waypoints = waypoints;
navMeshAgent.destination = Waypoints[CurrentWaypointIndex].position;
CurrentWaypointIndex++;
}
public override void StartRacer() => navMeshAgent.isStopped = false;
public override void StopRacer() => navMeshAgent.isStopped = true;
public override void NextWaypoint()
{
if(CurrentWaypointIndex >= Waypoints.Count) CurrentWaypointIndex = 0;
navMeshAgent.destination = Waypoints[CurrentWaypointIndex++].position;
}
}
}
Assets/Code/Example/Race/Racer/AI/AIRacer.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 05f30660967e40209aa88719fa498c78
timeCreated: 1769694590
Assets/Code/Example/Race/Racer/AI/AIRacerID.cs
-110
View File
@@ -1,110 +0,0 @@
using System.Collections.Generic;
using Code.Example.Race.Racer.AI.ID;
using Code.Example.Race.Track;
using Code.Infrastructure.EventBus;
using Reflex.Attributes;
using UnityEngine;
namespace Code.Example.Race.Racer.AI
{
public class AIRacerID : Racer
{
[Inject] private EventBus _eventBus;
[SerializeField] private CarControllerRB carController;
public override void SetData(RacerData data)
{
Data = data;
_velocity = Vector3.zero;
_steering = new Steering();
}
public override void Initialize(List<Transform> waypoints)
{
Waypoints = waypoints;
}
public override void NextWaypoint()
{
if (++CurrentWaypointIndex < Waypoints.Count) return;
CurrentWaypointIndex = 0;
_eventBus.RaiseEvent<IRacerPassedCheckpointHandler>(x=> x.LapPassed(this));
}
public override void StartRacer()
{
_running = true;
}
public override void StopRacer()
{
_running = false;
}
[SerializeField] private AgentBehaviour agent;
private float _orientation;
private float _rotation;
private Vector3 _velocity;
private Steering _steering;
private bool _running;
private float NormalizeAngle(float angle)
{
switch (angle)
{
case > 360.0f:
{
while (angle > 360.0f) angle -= 360.0f;
break;
}
case < 0.0f:
{
while (angle < 0.0f) angle += 360.0f;
break;
}
}
return angle;
}
public virtual void Update()
{
if (!_running) return;
var steering =
transform.InverseTransformDirection(
agent.GetSteering(Waypoints[CurrentWaypointIndex]).linear);
carController.SetSteering(new Vector2(steering.x, steering.z));
// var displacement = _velocity * Time.deltaTime;
// _orientation += _rotation * Time.deltaTime;
// _orientation = NormalizeAngle(_orientation);
//
// transform.Translate(displacement, Space.World);
// transform.Rotate(Vector3.up, _orientation);
}
public virtual void LateUpdate()
{
if (!_running) return;
//
// _steering = agent.GetSteering(Waypoints[CurrentWaypointIndex]);
//
// _velocity += _steering.linear * Time.deltaTime;
// _rotation += _steering.angular * Time.deltaTime;
// if (_velocity.magnitude > Data.speed)
// {
// _velocity = _velocity.normalized * Data.speed;
// }
// if (_steering.angular == 0.0f)
// {
// _rotation = 0.0f;
// }
// if (_steering.linear.sqrMagnitude == 0.0f)
// {
// _velocity = Vector3.zero;
// }
}
}
}
Assets/Code/Example/Race/Racer/AI/AIRacerID.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: fdcd01ab3c5147e4bfa3619d60fec5fc
timeCreated: 1770394482
Assets/Code/Example/Race/Racer/AI/ID.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 4f9bd0b568944e1f9b11f60f0fb79590
timeCreated: 1770394574
Assets/Code/Example/Race/Racer/AI/ID/Agent.cs
-53
View File
@@ -1,53 +0,0 @@
using UnityEngine;
namespace Code.Example.Race.Racer.AI.ID
{
public class Agent : MonoBehaviour
{
public float maxSpeed;
public float maxAccel;
public float orientation;
public float rotation;
public Vector3 velocity;
protected Steering steering;
private void Start()
{
velocity = Vector3.zero;
steering = new Steering();
}
public virtual void Update ()
{
Vector3 displacement = velocity * Time.deltaTime;
orientation += rotation * Time.deltaTime;
// необходимо ограничить значение переменной orientation
// диапазоном (0-360)
if (orientation < 0.0f)
orientation += 360.0f;
else if (orientation > 360.0f)
orientation -= 360.0f;
transform.Translate(displacement, Space.World);
transform.rotation = new Quaternion();
transform.Rotate(Vector3.up, orientation);
}
public virtual void LateUpdate()
{
velocity += steering.linear * Time.deltaTime;
rotation += steering.angular * Time.deltaTime;
if (velocity.magnitude > maxSpeed)
{
velocity = velocity.normalized * maxSpeed; // Исправлено: корректное нормирование вектора
}
if (steering.angular == 0.0f)
{
rotation = 0.0f;
}
if (steering.linear.sqrMagnitude == 0.0f)
{
velocity = Vector3.zero;
}
// Удалена строка: steering = new Steering();
// (создание нового объекта каждый кадр приведет к утечке памяти и сбросу данных)
}
}
}
Assets/Code/Example/Race/Racer/AI/ID/Agent.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 6d51ddde70f34264954a75923b43dcee
timeCreated: 1770394764
Assets/Code/Example/Race/Racer/AI/ID/AgentBehaviour.cs
-11
View File
@@ -1,11 +0,0 @@
using UnityEngine;
namespace Code.Example.Race.Racer.AI.ID
{
public abstract class AgentBehaviour : MonoBehaviour
{
[SerializeField] protected AIRacerID agent;
public abstract Steering GetSteering(Transform target);
}
}
Assets/Code/Example/Race/Racer/AI/ID/AgentBehaviour.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 5af0fc1b61bd44d9a53fd01f93fe6029
timeCreated: 1770394682
Assets/Code/Example/Race/Racer/AI/ID/Behaviours.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 70ca406222fb4e8e848ccf43db320cc9
timeCreated: 1770395746
Assets/Code/Example/Race/Racer/AI/ID/Behaviours/Flee.cs
-17
View File
@@ -1,17 +0,0 @@
using UnityEngine;
namespace Code.Example.Race.Racer.AI.ID.Behaviours
{
public class Flee : AgentBehaviour
{
public override Steering GetSteering(Transform target)
{
Steering steering = new Steering();
steering.linear = transform.position - target.position;
steering.linear.Normalize();
// steering.linear *= agent.Data.maxAcceleration;
return steering;
}
}
}
Assets/Code/Example/Race/Racer/AI/ID/Behaviours/Flee.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 437d2ae2cd65457a82abc34df278228d
timeCreated: 1770395798
Assets/Code/Example/Race/Racer/AI/ID/Behaviours/Pursue.cs
-42
View File
@@ -1,42 +0,0 @@
using UnityEngine;
using System.Collections;
namespace Code.Example.Race.Racer.AI.ID.Behaviours
{
public class Pursue : Seek
{
public float maxPrediction;
private GameObject _targetAux;
private GameObject _target;
public void Awake()
{
_targetAux = _target;
_target = new GameObject();
}
void OnDestroy()
{
Destroy(_targetAux);
}
public override Steering GetSteering(Transform targetTransform)
{
var direction = _targetAux.transform.position - transform.position;
var distance = direction.magnitude;
var speed = agent.CarRigidbody.linearVelocity.magnitude;
float prediction;
if (speed <= distance / maxPrediction)
prediction = maxPrediction;
else
prediction = distance / speed;
_target.transform.position = _targetAux.transform.position;
// _target.transform.position += targetAgent.velocity * prediction;
return base.GetSteering(_target.transform);
}
}
}
Assets/Code/Example/Race/Racer/AI/ID/Behaviours/Pursue.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: c3a071d2cab443528dd16bdc044bab65
timeCreated: 1770998212
Assets/Code/Example/Race/Racer/AI/ID/Behaviours/Seek.cs
-18
View File
@@ -1,18 +0,0 @@
using UnityEngine;
namespace Code.Example.Race.Racer.AI.ID.Behaviours
{
public class Seek : AgentBehaviour
{
public override Steering GetSteering(Transform target)
{
Steering steering = new Steering();
steering.linear = target.position - transform.position;
UnityEngine.Debug.DrawRay(transform.position, steering.linear, Color.yellow, 5f);
// steering.linear *= agent.Data.maxAcceleration;
steering.linear.Normalize();
return steering;
}
}
}
Assets/Code/Example/Race/Racer/AI/ID/Behaviours/Seek.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: aa69eb79c9ec48b682606dac0c0d4f2d
timeCreated: 1770395751
Assets/Code/Example/Race/Racer/AI/ID/Steering.cs
-16
View File
@@ -1,16 +0,0 @@
using UnityEngine;
namespace Code.Example.Race.Racer.AI.ID
{
public struct Steering
{
public float angular;
public Vector3 linear;
public Steering(float angular, Vector3 linear)
{
this.angular = angular;
this.linear = linear;
}
}
}
Assets/Code/Example/Race/Racer/AI/ID/Steering.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 0395b595869e49b5b177fe54db531823
timeCreated: 1770394582
Assets/Code/Example/Race/Racer/Car.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 2c5dfd92289c4aa38bb9a8bafc07d204
timeCreated: 1769699718
Assets/Code/Example/Race/Racer/Car/CarWheelRotator.cs
-32
View File
@@ -1,32 +0,0 @@
using UnityEngine;
using UnityEngine.AI;
namespace Code.Example.Race.Racer.Car
{
public class CarWheelRotator : MonoBehaviour
{
[SerializeField] private NavMeshAgent agent;
[SerializeField] private Transform[] wheels;
[SerializeField] private bool rotateDebug;
private void Update()
{
Vector3 wheelRotation;
foreach (var wheel in wheels)
{
if (rotateDebug)
{
UnityEngine.Debug.DrawRay(
wheel.position,
Vector3.Project(agent.velocity, agent.gameObject.transform.right),
Color.yellow, 900f);
UnityEngine.Debug.Log(Vector3.Project(agent.velocity, agent.gameObject.transform.right).magnitude);
}
wheelRotation = wheel.localRotation.eulerAngles;
wheelRotation.y = Vector3.Project(agent.velocity, agent.gameObject.transform.right).magnitude * 10f;
wheel.localRotation = Quaternion.Euler(wheelRotation);
}
}
}
}
Assets/Code/Example/Race/Racer/Car/CarWheelRotator.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 3634956b4d55431b8772a8612e2e3a4d
timeCreated: 1769699734
Assets/Code/Example/Race/Racer/Car/CarWheelRotatorPlayer.cs
-23
View File
@@ -1,23 +0,0 @@
using PrimeTween;
using UnityEngine;
namespace Code.Example.Race.Racer.Car
{
public class CarWheelRotatorPlayer : MonoBehaviour
{
[SerializeField] private Transform[] wheels;
[SerializeField] private bool rotateDebug;
public void RotateWheels(float amount)
{
// UnityEngine.Debug.Log("Rotating Wheels: " + amount);
foreach (var wheel in wheels)
{
var wheelRotation = wheel.localRotation.eulerAngles;
wheelRotation.y = amount;
Tween.LocalRotation(wheel,wheelRotation, 1f);
// wheel.localRotation = Quaternion.Euler(wheelRotation);
}
}
}
}
Assets/Code/Example/Race/Racer/Car/CarWheelRotatorPlayer.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: c90fde90552d48f592b955cbf1ec5c77
timeCreated: 1769705011
Assets/Code/Example/Race/Racer/CarControllerRB.cs
-165
View File
@@ -1,165 +0,0 @@
using System;
using System.Collections.Generic;
using UnityEngine;
namespace Code.Example.Race.Racer
{
public abstract class CarControllerRB : MonoBehaviour
{
public enum ControlMode
{
Keyboard,
Buttons
};
public enum Axel
{
Front,
Rear
}
[Serializable]
public struct Wheel
{
public GameObject wheelModel;
public WheelCollider wheelCollider;
public GameObject wheelEffectObj;
public ParticleSystem smokeParticle;
public Axel axel;
}
public ControlMode control;
public Vector3 _centerOfMass;
public List<Wheel> wheels;
protected Rigidbody CarRb;
protected Vector2 SteeringInput = Vector2.zero;
public abstract void SetSteering(Vector2 steeringLinear);
[SerializeField] protected Racer racer;
// private CarLights carLights;
private void Start()
{
CarRb = GetComponent<Rigidbody>();
CarRb.centerOfMass = _centerOfMass;
// carLights = GetComponent<CarLights>();
}
protected virtual void Update()
{
// GetInputs();
AnimateWheels();
// WheelEffects();
}
private void FixedUpdate()
{
Move();
Steer();
Brake();
}
// public void MoveInput(float input)
// {
// moveInput = input;
// }
//
// public void SteerInput(float input)
// {
// steerInput = input;
// }
void GetInputs()
{
// if (control == ControlMode.Keyboard)
// {
// moveInput = Input.GetAxis("Vertical");
// steerInput = Input.GetAxis("Horizontal");
// }
}
private void Move()
{
foreach (var wheel in wheels)
{
wheel.wheelCollider.motorTorque = SteeringInput.y * 600 * racer.Data.maxAcceleration * Time.fixedDeltaTime;
// wheel.wheelCollider.motorTorque = _playerCarInput.MovementInput.y * 600 * _playerRacer.Data.maxAcceleration * Time.fixedDeltaTime;
}
}
private void Steer()
{
foreach (var wheel in wheels)
{
if (wheel.axel != Axel.Front) continue;
var steerAngle = SteeringInput.x * racer.Data.turnSensitivity * racer.Data.maxSteerAngle;
// var _steerAngle = _playerCarInput.MovementInput.x * _playerRacer.Data.turnSensitivity * _playerRacer.Data.maxSteerAngle;
wheel.wheelCollider.steerAngle = steerAngle;
// wheel.wheelCollider.steerAngle = Mathf.Lerp(wheel.wheelCollider.steerAngle, _steerAngle, 0.6f);
}
}
protected virtual void Brake()
{
//|| _playerCarInput.MovementInput.y == 0
// if (_playerCarInput.Brake )
// {
// foreach (var wheel in wheels)
// {
// wheel.wheelCollider.brakeTorque = 300 * _racer.Data.brakeAcceleration * Time.fixedDeltaTime;
// }
//
// // carLights.isBackLightOn = true;
// // carLights.OperateBackLights();
// }
// else
// {
// foreach (var wheel in wheels)
// {
// wheel.wheelCollider.brakeTorque = 0;
// }
//
// // carLights.isBackLightOn = false;
// // carLights.OperateBackLights();
// }
}
private void AnimateWheels()
{
foreach (var wheel in wheels)
{
Quaternion rot;
Vector3 pos;
wheel.wheelCollider.GetWorldPose(out pos, out rot);
wheel.wheelModel.transform.position = pos;
wheel.wheelModel.transform.rotation = rot;
}
}
private void WheelEffects()
{
foreach (var wheel in wheels)
{
//var dirtParticleMainSettings = wheel.smokeParticle.main;
if (wheel.axel == Axel.Rear && wheel.wheelCollider.isGrounded &&
CarRb.linearVelocity.magnitude >= 10.0f)
{
// wheel.wheelEffectObj.GetComponentInChildren<TrailRenderer>().emitting = true;
// wheel.smokeParticle.Emit(1);
}
else
{
// wheel.wheelEffectObj.GetComponentInChildren<TrailRenderer>().emitting = false;
}
}
}
}
}
Assets/Code/Example/Race/Racer/CarControllerRB.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 5f093c913ff54cb99cd22d7e473931e7
timeCreated: 1770299509
Assets/Code/Example/Race/Racer/Player.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 7d9a0a4882314e2f91bb356ea0f82538
timeCreated: 1769705255
Assets/Code/Example/Race/Racer/Player/PlayerCarController.cs
-55
View File
@@ -1,55 +0,0 @@
using Code.Example.Race.Racer.AI;
using Code.Example.Race.Racer.Car;
using UnityEngine;
namespace Code.Example.Race.Racer.Player
{
public class PlayerCarController : MonoBehaviour
{
[SerializeField] private Rigidbody _rigidbody;
[SerializeField] private PlayerCarInput _playerCarInput;
[SerializeField] private PlayerRacer _playerRacer;
[SerializeField] private CarWheelRotatorPlayer _wheels;
private void Update()
{
if (_playerCarInput.MovementInput == Vector2.zero) return;
// var movementForward = transform.forward * (_playerCarInput.MovementInput.y * _playerRacer.Data.speed);
//
// _rigidbody.AddForce(movementForward * Time.fixedDeltaTime, ForceMode.Force);
var force = transform.forward * (_playerCarInput.MovementInput.y * _playerRacer.Data.speed);
_rigidbody.AddForce(force, ForceMode.Force);
// if (Mathf.Abs(_playerCarInput.MovementInput.y) < 0.1f && _rigidbody.linearVelocity.magnitude > 0.3f)
// {
// _rigidbody.AddForce(-_rigidbody.linearVelocity * (_playerRacer.Data.brakeForce * Time.fixedDeltaTime),
// ForceMode.Force);
// }
var steerInput = _playerCarInput.MovementInput.x;
if (_playerCarInput.MovementInput.y < 0)
steerInput = -_playerCarInput.MovementInput.x;
// var steer = steerInput * maxSteerAngle;
//
// if (frontLeftWheel) frontLeftWheel.localRotation = Quaternion.Euler(0, steer, 0);
// if (frontRightWheel) frontRightWheel.localRotation = Quaternion.Euler(0, steer, 0);
if (!(_rigidbody.linearVelocity.magnitude > 0.5f)) return;
// var turn = steerInput * _playerRacer.Data.turnSpeed * Time.fixedDeltaTime;
// _rigidbody.MoveRotation(_rigidbody.rotation * Quaternion.Euler(0, turn, 0));
if (!(_rigidbody.linearVelocity.magnitude is > 1f or < -1f)) return;
var rotateAmount = _playerCarInput.MovementInput.x * _playerRacer.Data.angularSpeed;
_wheels.RotateWheels(rotateAmount * 10 * Time.fixedDeltaTime);
var wheelRotation = transform.rotation.eulerAngles;
wheelRotation.y += rotateAmount;
transform.rotation = Quaternion.Euler(wheelRotation);
}
}
}
Assets/Code/Example/Race/Racer/Player/PlayerCarController.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 4b9e2e4a3ddc437ab250f609ea7fc33e
timeCreated: 1769705285
Assets/Code/Example/Race/Racer/Player/PlayerCarInput.cs
-41
View File
@@ -1,41 +0,0 @@
using Code.Infrastructure.Input;
using Reflex.Attributes;
using UnityEngine;
using UnityEngine.InputSystem;
namespace Code.Example.Race.Racer.Player
{
public class PlayerCarInput : MonoBehaviour
{
private IInputService _inputService;
public Vector2 MovementInput { get; private set; }
public bool Brake { get; private set; }
[Inject]
public void Construct(IInputService inputService)
{
_inputService = inputService;
_inputService.BindActionPerformed((int)ActionMappings.Race, (int)RaceActions.Move, MovementPerformed);
_inputService.BindActionCancelled((int)ActionMappings.Race, (int)RaceActions.Move, MovementEnded);
_inputService.BindActionPerformed((int)ActionMappings.Race, (int)RaceActions.Brake, BrakePerformed);
_inputService.BindActionCancelled((int)ActionMappings.Race, (int)RaceActions.Brake, BrakeEnded);
}
private void MovementPerformed(InputAction.CallbackContext context) => MovementInput = context.ReadValue<Vector2>();
private void MovementEnded(InputAction.CallbackContext context) => MovementInput = Vector2.zero;
private void BrakePerformed(InputAction.CallbackContext context) => Brake = true;
private void BrakeEnded(InputAction.CallbackContext context) => Brake = false;
private void OnDestroy()
{
if (_inputService == null) return;
_inputService.UnbindActionPerformed((int)ActionMappings.Race, (int)RaceActions.Move, MovementPerformed);
_inputService.UnbindActionCancelled((int)ActionMappings.Race, (int)RaceActions.Move, MovementEnded);
_inputService.UnbindActionPerformed((int)ActionMappings.Race, (int)RaceActions.Brake, BrakePerformed);
_inputService.UnbindActionCancelled((int)ActionMappings.Race, (int)RaceActions.Brake, BrakeEnded);
}
}
}
Assets/Code/Example/Race/Racer/Player/PlayerCarInput.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: e52315b65c57499981981e2507aaf7bc
timeCreated: 1769705872
Assets/Code/Example/Race/Racer/Player/PlayerRBCarController.cs
-44
View File
@@ -1,44 +0,0 @@
using UnityEngine;
namespace Code.Example.Race.Racer.Player
{
public class PlayerRBCarController : CarControllerRB
{
[SerializeField] private PlayerCarInput playerCarInput;
public override void SetSteering(Vector2 steeringLinear)
{
}
protected override void Update()
{
SteeringInput = playerCarInput.MovementInput;
base.Update();
}
protected override void Brake()
{
if (playerCarInput.Brake )
{
foreach (var wheel in wheels)
{
wheel.wheelCollider.brakeTorque = 300 * racer.Data.brakeAcceleration * Time.fixedDeltaTime;
}
// carLights.isBackLightOn = true;
// carLights.OperateBackLights();
}
else
{
foreach (var wheel in wheels)
{
wheel.wheelCollider.brakeTorque = 0;
}
// carLights.isBackLightOn = false;
// carLights.OperateBackLights();
}
}
}
}
Assets/Code/Example/Race/Racer/Player/PlayerRBCarController.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: bad2326aa0f24acb9bdfeb5fb7d3d208
timeCreated: 1770640123
Assets/Code/Example/Race/Racer/Player/PlayerRacer.cs
-43
View File
@@ -1,43 +0,0 @@
using System.Collections.Generic;
using Code.Example.Race.Track;
using Code.Infrastructure.EventBus;
using Reflex.Attributes;
using UnityEngine;
namespace Code.Example.Race.Racer.Player
{
public class PlayerRacer : Racer
{
[Inject] private EventBus _eventBus;
public Transform CameraPosition;
public override void SetData(RacerData data)
{
Data = data;
}
public override void Initialize(List<Transform> waypoints)
{
Waypoints = waypoints;
}
public override void NextWaypoint()
{
if (++CurrentWaypointIndex < Waypoints.Count) return;
CurrentWaypointIndex = 0;
_eventBus.RaiseEvent<IPlayerPassedCheckpointHandler>(x=> x.OnPlayerLapPassed(this));
_eventBus.RaiseEvent<IRacerPassedCheckpointHandler>(x=> x.LapPassed(this));
}
public bool RaceStarted { get; set; }
public override void StartRacer()
{
RaceStarted = true;
}
public override void StopRacer()
{
RaceStarted = false;
}
}
}
Assets/Code/Example/Race/Racer/Player/PlayerRacer.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 6d3497d41c87415eab67cfc865262b79
timeCreated: 1769619757
Assets/Code/Example/Race/Racer/Racer.cs
-22
View File
@@ -1,22 +0,0 @@
using System.Collections.Generic;
using UnityEngine;
namespace Code.Example.Race.Racer
{
public abstract class Racer : MonoBehaviour
{
protected List<Transform> Waypoints;
public int CurrentWaypointIndex { get; protected set; }
public RacerData Data { get; protected set; }
public int Id { get; set; }
public abstract void SetData(RacerData data);
public abstract void Initialize(List<Transform> waypoints);
public abstract void NextWaypoint();
public abstract void StartRacer();
public abstract void StopRacer();
[SerializeField] protected Rigidbody carRigidbody;
public Rigidbody CarRigidbody => GetComponent<Rigidbody>();
}
}
Assets/Code/Example/Race/Racer/Racer.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 7f87ed38713d4b779df9e46c83b03fb7
timeCreated: 1769619306
Assets/Code/Example/Race/Racer/RacerFactory.cs
-97
View File
@@ -1,97 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Code.Infrastructure.Configs;
using Code.Infrastructure.EventBus;
using Cysharp.Threading.Tasks;
using UnityEngine;
using UnityEngine.AddressableAssets;
using UnityEngine.ResourceManagement.AsyncOperations;
using EventBus = Code.Infrastructure.EventBus.EventBus;
namespace Code.Example.Race.Racer
{
public interface IRacerFactory
{
RacerSettingsConfig GetConfig(RacerType racerType);
UniTaskVoid LoadRacer(RacerType racerType);
void ReleaseRacer(RacerType racerType);
}
public class RacerFactory : IDisposable, IRacerFactory
{
private Dictionary<RacerType, RacerSettingsConfig> _racerConfigs;
private Dictionary<RacerType, AsyncOperationHandle<GameObject>> _racerPrefabsHandle = new();
private string _racerConfigsLabel;
private AsyncOperationHandle<IList<RacerSettingsConfig>> _racerConfigsHandle;
private EventBus _eventBus;
public RacerFactory(IConfigLocator configLocator, EventBus eventBus)
{
_eventBus = eventBus;
_racerConfigsLabel = configLocator.TryGetManyConfigAssetReferences<RacerSettingsConfig>();
LoadConfigs().Forget();
}
private async UniTaskVoid LoadConfigs()
{
_racerConfigsHandle = Addressables.LoadAssetsAsync<RacerSettingsConfig>(_racerConfigsLabel);
await _racerConfigsHandle.ToUniTask();
_racerConfigs = _racerConfigsHandle.Result.ToDictionary(x => x.racerData.type);
_eventBus.RaiseEvent<IRacerFactoryInitializedHandle>(x => x.RacerFactoryInitialized());
}
public RacerSettingsConfig GetConfig(RacerType racerType) => _racerConfigs[racerType];
public async UniTaskVoid LoadRacer(RacerType racerType)
{
if (_racerPrefabsHandle.ContainsKey(racerType))
{
_eventBus.RaiseEvent<IRacerLoadedHandle>(x => x.RacerLoaded(racerType, null));
return;
}
UnityEngine.Debug.LogWarning($"Racer loaded {racerType}");
_racerPrefabsHandle.Add(racerType,
Addressables.LoadAssetAsync<GameObject>(_racerConfigs[racerType].prefabReference));
await _racerPrefabsHandle[racerType].ToUniTask();
var racer = _racerPrefabsHandle[racerType].Result.GetComponent<Racer>();
racer.SetData(_racerConfigs[racerType].racerData);
_eventBus.RaiseEvent<IRacerLoadedHandle>(x => x.RacerLoaded(racerType, racer));
}
public void ReleaseRacer(RacerType racerType)
{
_racerPrefabsHandle[racerType].Release();
_racerPrefabsHandle.Remove(racerType);
}
public void Dispose()
{
UnityEngine.Debug.LogWarning($"Racers released");
foreach (var prefab in _racerPrefabsHandle)
prefab.Value.Release();
_racerPrefabsHandle.Clear();
_racerConfigsHandle.Release();
}
}
public interface IRacerFactoryInitializedHandle : IGlobalSubscriber
{
public void RacerFactoryInitialized();
}
public interface IRacerLoadedHandle : IGlobalSubscriber
{
public void RacerLoaded(RacerType type, Racer racer);
}
}
Assets/Code/Example/Race/Racer/RacerFactory.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 5ab404f94a89460eae107b9d453fa64d
timeCreated: 1769620039
Assets/Code/Example/Race/Racer/RacerSettings.cs
-27
View File
@@ -1,27 +0,0 @@
using System;
using Code.Infrastructure.Generators;
using UnityEngine.AddressableAssets;
namespace Code.Example.Race.Racer
{
[Config("Configs/Gameplay/RacerSettings", true)]
public class RacerSettings
{
[ToConfig] public RacerData racerData;
[ToConfig] public AssetReference prefabReference;
}
[Serializable]
public struct RacerData
{
public string name;
public float speed;
public float angularSpeed;
public float maxAcceleration;
public float brakeAcceleration;
public float turnSensitivity;
public float maxSteerAngle;
public RacerType type;
}
}
Assets/Code/Example/Race/Racer/RacerSettings.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: f25b32b493144bfc9ca0c5016741d012
timeCreated: 1769619229
Assets/Code/Example/Race/Racer/RacerType.cs
-9
View File
@@ -1,9 +0,0 @@
namespace Code.Example.Race.Racer
{
public enum RacerType
{
Player,
AIGreen,
AIRed
}
}
Assets/Code/Example/Race/Racer/RacerType.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 488f864fcf6f4632b8d50b39038f5472
timeCreated: 1769619126
Assets/Code/Example/Race/Racer/RacistSpawnListDebug.cs
-7
View File
@@ -1,7 +0,0 @@
namespace Code.Example.Race.Racer
{
public class RacistSpawnListDebug
{
}
}
Assets/Code/Example/Race/Racer/RacistSpawnListDebug.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: a9506da417a249929493862133eef179
timeCreated: 1769685790
Assets/Code/Example/Race/Track.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: dbcf0e0163844255817cec8c81839eb1
timeCreated: 1769522093
Assets/Code/Example/Race/Track/CheckPoint.cs
-44
View File
@@ -1,44 +0,0 @@
using Code.Example.Race.Racer;
using Code.Infrastructure.EventBus;
using Reflex.Attributes;
using UnityEngine;
namespace Code.Example.Race.Track
{
public class CheckPoint : MonoBehaviour
{
[Inject] private EventBus _eventBus;
[SerializeField] private GameObject _checkPointMesh;
[SerializeField] private int _id; // Костыль инвалид лестница
private void OnTriggerEnter(Collider other)
{
var racer = other.GetComponent<Racer.Racer>();
if (racer.CurrentWaypointIndex != _id) return;
racer.NextWaypoint();
if (racer.Data.type == RacerType.Player)
{
Hide();
_eventBus.RaiseEvent<IPlayerPassedCheckpointHandler>(h => h.OnPlayerPassedCheckpoint(racer));
}
_eventBus.RaiseEvent<IRacerPassedCheckpointHandler>(h => h.OnRacerPassedCheckpoint(racer));
}
public void Hide() => _checkPointMesh.SetActive(false);
public void Show() => _checkPointMesh.SetActive(true);
}
public interface IRacerPassedCheckpointHandler : IGlobalSubscriber
{
void OnRacerPassedCheckpoint(Racer.Racer racer);
void LapPassed(Racer.Racer racer);
}
public interface IPlayerPassedCheckpointHandler : IGlobalSubscriber
{
void OnPlayerPassedCheckpoint(Racer.Racer racer);
void OnPlayerLapPassed(Racer.Racer racer);
}
}
Assets/Code/Example/Race/Track/CheckPoint.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: e4e29d6d9b0342db9cd6bce229fa358d
timeCreated: 1769522101
Assets/Code/Example/Race/Track/RaceTrackData.cs
-19
View File
@@ -1,19 +0,0 @@
using System.Collections.Generic;
using UnityEngine;
namespace Code.Example.Race.Track
{
public class RaceTrackData : MonoBehaviour
{
public Transform CameraPosition;
public TrackData trackData;
}
[System.Serializable]
public struct TrackData
{
public List<Transform> RacerPoints;
public List<CheckPoint> Checkpoints;
public int LapCount;
}
}
Assets/Code/Example/Race/Track/RaceTrackData.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 1847a22e722c47c48ec0ce7d5a929580
timeCreated: 1769686034
Assets/Code/Example/Race/Track/WellEditor.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: af09293375544928a9b19a6b697f214e
timeCreated: 1770036714
Assets/Code/Example/Race/Track/WellEditor/CheckPointAsset.cs
-39
View File
@@ -1,39 +0,0 @@
namespace Code.Example.Race.Track.WellEditor
{
using UnityEngine;
using UnityEditor;
public static class CheckPointAsset
{
[MenuItem("GameObject/Track/CheckPoint", false, 1)]
private static void CreateCustomPrefab()
{
// Define the path to your prefab in the Project (must be in an "Assets" relative path)
var prefabPath = "Assets/Resources/Example/Misc/Point.prefab"; // Update with your actual path
// Load the prefab asset
var prefab = AssetDatabase.LoadAssetAtPath<GameObject>(prefabPath);
if (!prefab)
{
Debug.LogError("Prefab not found at path: " + prefabPath);
return;
}
// Instantiate the prefab in the scene
var newInstance = (GameObject)PrefabUtility.InstantiatePrefab(prefab);
// Ensure it is placed correctly in the Hierarchy and is undoable
Undo.RegisterCreatedObjectUndo(newInstance, "Create Custom Prefab");
Selection.activeGameObject = newInstance;
// Set parent if an object is selected
if (!Selection.activeTransform)
{
newInstance.transform.parent = Selection.activeTransform;
newInstance.transform.localPosition = Vector3.zero;
}
}
}
}
Assets/Code/Example/Race/Track/WellEditor/CheckPointAsset.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 7d55e4bcf05848eea361440799c21d7e
timeCreated: 1770036738
Assets/Code/Example/Race/UI.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: b875d3daf0cc42e997366fb0b9f0a722
timeCreated: 1770042347
Assets/Code/Example/Race/UI/PlayerScoreCounter.cs
-44
View File
@@ -1,44 +0,0 @@
using System;
using System.Collections.Generic;
using Code.Infrastructure.EventBus;
using Code.Infrastructure.UI;
using Reflex.Attributes;
using TMPro;
using UnityEngine;
namespace Code.Example.Race.UI
{
public partial class PlayerScoreCounter : UIPanel, IScoreChangedHandle
{
[SerializeField] private TMP_Text playerScore;
private EventBus _eventBus;
[Inject]
private void Construct(EventBus eventBus)
{
_eventBus = eventBus;
_eventBus.Subscribe(this);
}
public override void Open()
{
playerScore.gameObject.SetActive(true);
// callback?.Invoke();
// image.DOColor(shownColor, 1f).onComplete = () => callback?.Invoke();
}
public override void Close()
{
playerScore.gameObject.SetActive(false);
// callback?.Invoke();
// image.DOColor(hiddenColor, 1f).onComplete += () => callback?.Invoke();
}
public void ScoreChanged(Racer.Racer racer, ScoreData additionalScore, List<KeyValuePair<Racer.Racer,ScoreData>> scores)
{
// if (racer.Data.type == RacerType.Player)
string output = "";
foreach (var score in scores) output += $@"{score.Key.Data.name}: {score.Value.lapsPassed} \t {score.Value.checkpointsPassed}\n";
playerScore.text = output;
}
}
}
Assets/Code/Example/Race/UI/PlayerScoreCounter.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: cf68a9a9d3a946f086dccd6d11741dcf
timeCreated: 1770042362
Assets/Code/Example/Race/UI/PlayerScores.cs
-40
View File
@@ -1,40 +0,0 @@
using System;
using System.Collections.Generic;
using Code.Infrastructure.UI;
using PrimeTween;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
namespace Code.Example.Race.UI
{
public partial class PlayerScores : UIPanel
{
[SerializeField] private Image image;
[SerializeField] private TMP_Text scoreText;
[SerializeField] private Color shownColor;
[SerializeField] private Color hiddenColor;
public void SetText(List<RaceData> scores)
{
scoreText.text = "";
foreach (var score in scores)
{
var t = TimeSpan.FromSeconds(score.raceTimeSeconds);
scoreText.text += $@"{score.place} место за {t:mm\:ss\:fff}\n";
}
}
public override void Open()
{
Tween.Color(image,shownColor, 1f);
// Tween.Color(scoreText,shownColor, 1f).OnComplete( () => callback?.Invoke());
}
public override void Close()
{
Tween.Color(image,hiddenColor, 1f);
// Tween.Color(scoreText,hiddenColor, 1f).OnComplete( () => callback?.Invoke());
}
}
}
Assets/Code/Example/Race/UI/PlayerScores.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 250fd47281f3493e86590f89511bba17
timeCreated: 1770654299
Assets/Code/Example/Race/UI/WinScreen.cs
-30
View File
@@ -1,30 +0,0 @@
using System;
using Code.Infrastructure.UI;
using PrimeTween;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
namespace Code.Example.Race.UI
{
public partial class WinScreen : UIPanel
{
[SerializeField] private Image image;
[SerializeField] private TMP_Text winText;
[SerializeField] private Color shownColor;
[SerializeField] private Color hiddenColor;
public void SetText(string text) => winText.text = text;
public override void Open()
{
Tween.Color(image,shownColor, 1f);
// Tween.Color(winText,shownColor, 1f).OnComplete( () => callback?.Invoke());
}
public override void Close()
{
Tween.Color(image,hiddenColor, 1f);
// Tween.Color(winText,hiddenColor, 1f).OnComplete( () => callback?.Invoke());
}
}
}
Assets/Code/Example/Race/UI/WinScreen.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 9093110373134c91b06be09705639ddd
timeCreated: 1770455340
Assets/Code/Infrastructure/App/AppStateMachine.cs
-1
View File
@@ -9,7 +9,6 @@ namespace Code.Infrastructure.App
public enum AppStates
{
Bootstrap,
Gameplay,
MainMenu,
Platformer
}
Assets/Code/Infrastructure/App/PapaInstaller.cs
-1
View File
@@ -120,7 +120,6 @@ namespace Code.Infrastructure.App
{
container.Resolve<EventBus.EventBus>().Unsubscribe(this);
container.Resolve<AppStateMachine>().SwitchState(AppStates.Bootstrap)
.AllowStateTransition(AppStates.Gameplay)
.AllowStateTransition(AppStates.Platformer);
container.Resolve<AppStateMachineContext>().StateMachine = container.Resolve<AppStateMachine>();
}
Assets/Code/Infrastructure/App/SceneInstallers/GameplaySceneInstaller.cs
-37
View File
@@ -1,37 +0,0 @@
using Code.Example.Race;
using Code.Example.Race.Racer;
using Code.Example.Race.Track;
using Code.Infrastructure.SceneLoader;
using Reflex.Core;
using Reflex.Enums;
using UnityEngine;
using Resolution = Reflex.Enums.Resolution;
namespace Code.Infrastructure.App.SceneInstallers
{
public class GameplaySceneInstaller : MonoBehaviour, IInstaller
{
[SerializeField] private RaceTrackData raceTrackData;
public void InstallBindings(ContainerBuilder containerBuilder)
{
containerBuilder.RegisterType(typeof(RacerFactory), new[] { typeof(IRacerFactory) }, Lifetime.Scoped,
Resolution.Lazy);
containerBuilder.RegisterType(typeof(RaceScores), Lifetime.Scoped,
Resolution.Eager);
containerBuilder.RegisterValue(raceTrackData);
containerBuilder.RegisterType(typeof(RaceGame), Lifetime.Scoped,
Resolution.Lazy);
containerBuilder.RegisterType(typeof(PlayerPrefsRacePoopshitter), Lifetime.Scoped,
Resolution.Lazy);
containerBuilder.OnContainerBuilt += PostInstall;
}
private void PostInstall(Container container)
{
container.Resolve<EventBus.EventBus>()
.RaiseEvent<IOnGameplaySceneLoadedHandler>(x => x.OnGameplaySceneInitialized(container));
}
}
}
Assets/Code/Infrastructure/App/SceneInstallers/GameplaySceneInstaller.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: ab7d8da1f0cc44bf99ae978a6b75847a
timeCreated: 1768127778
Assets/Code/Infrastructure/App/States/BootstrapState.cs
+5
View File
@@ -24,6 +24,11 @@ namespace Code.Infrastructure.App.States
Context.UIService.TryLoadCreatePanel(UIPanelType.DebugSceneChooser);
Context.AudioFactory.LoadAudioClips(AudioNames.UISounds);
Context.AudioService.ChangeGroupVolume(
AudioGroupType.Music,
1f,
0.5f);
}
protected override void OnExitState()
Assets/Code/Infrastructure/App/States/GameplayState.cs
-188
View File
@@ -1,188 +0,0 @@
using System.Linq;
using Code.Example.Race;
using Code.Example.Race.Racer;
using Code.Example.Race.Racer.AI;
using Code.Example.Race.Racer.Player;
using Code.Example.Race.Track;
using Code.Example.Race.UI;
using Code.Infrastructure.Audio;
using Code.Infrastructure.Camera;
using Code.Infrastructure.Camera.CameraStates;
using Code.Infrastructure.Generators;
using Code.Infrastructure.Input;
using Code.Infrastructure.Loadings;
using Code.Infrastructure.SceneLoader;
using Code.Infrastructure.UI;
using Cysharp.Threading.Tasks;
using Reflex.Core;
using Reflex.Injectors;
using Unity.Cinemachine;
using UnityEngine.SceneManagement;
// Ивенты создания панелей сломаны TODO
namespace Code.Infrastructure.App.States
{
[State(typeof(AppStates), typeof(AppStateMachineContext))]
[StateRaisingEvent]
public partial class GameplayState :
IOnGameplaySceneLoadedHandler,
IRaceGameHandle,
IRacerFactoryInitializedHandle,
ICinematicMachineHandle
{
public GameplayState(AppStateMachineContext context, EventBus.EventBus eventBus) : base(context, eventBus)
{
}
public override AppStates myState => AppStates.Gameplay;
private Loading _gameplayLoading;
protected override void OnEnterState()
{
EventBus.Subscribe(this);
Context.UIService.OpenPanel(UIPanelType.Loading);
// Scene
// RaceGame
// Factory
// PlayerCounter
// WinScreen
// ScoreScreen
// CinemachineCamera
_gameplayLoading = new Loading(7, GameplayLoadingCompleted);
Context.UIService.TryLoadCreatePanel(UIPanelType.PlayerScoreCounter);
Context.UIService.TryLoadCreatePanel(UIPanelType.WinScreen);
Context.UIService.TryLoadCreatePanel(UIPanelType.PlayerScores);
Context.SceneLoader.LoadSceneAsync(SceneId.Gameplay, LoadSceneMode.Single).Forget();
Context.InputService.EnableMap(ActionMappings.Race);
Context.CameraFactory.LoadCinemachineCamera(CameraMode.ThirdPerson).Forget();
}
private void GameplayLoadingCompleted()
{
Context.AudioService.CancelMusic(AudioNames.UISounds, 0);
_raceGame.PlaceRacers();
Context.Camera.SwitchState(CameraMode.ThirdPerson).AllowStateTransition(CameraMode.None);
// ((ThirdPersonState)Context.Camera.CurrentBaseState).SetFollowTarget(_raceGame.PlacedRacers[0].gameObject.transform, _raceGame.PlacedRacers[0].CarRigidbody);
Context.CameraFactory.GetCinematicCamera(CameraMode.ThirdPerson).transform.position = ((PlayerRacer)_raceGame.PlacedRacers[0]).CameraPosition.position;
Context.CameraFactory.GetCinematicCamera(CameraMode.ThirdPerson).transform.rotation = ((PlayerRacer)_raceGame.PlacedRacers[0]).CameraPosition.rotation;
Context.CameraFactory.GetCinematicCamera(CameraMode.ThirdPerson).Follow =
_raceGame.PlacedRacers[0].gameObject.transform;
Context.UIService.ClosePanel(UIPanelType.Loading);
_raceGame.StartRacers();
}
protected override void OnExitState()
{
Context.UIService.TryRemovePanel(UIPanelType.PlayerScoreCounter);
Context.UIService.TryRemovePanel(UIPanelType.WinScreen);
Context.UIService.TryRemovePanel(UIPanelType.PlayerScores);
Context.CameraFactory.ReleaseCinemachineCamera(CameraMode.ThirdPerson);
Context.InputService.DisableMap(ActionMappings.Race);
_raceGame = null;
EventBus.Unsubscribe(this);
}
public void OnGameplaySceneLoaded()
{
}
private RaceTrackData _raceTrackData;
private RaceGame _raceGame;
private Container UNTILTHEYFIXCONTAINERS;
public void OnGameplaySceneInitialized(Container container)
{
UNTILTHEYFIXCONTAINERS = container;
_raceTrackData = container.Resolve<RaceTrackData>();
Context.CameraFactory.GetCinematicCamera(CameraMode.None).transform.position = _raceTrackData.CameraPosition.transform.position;
Context.CameraFactory.GetCinematicCamera(CameraMode.None).transform.rotation = _raceTrackData.CameraPosition.transform.rotation;
_gameplayLoading.DoProgress();
container.Resolve<IRacerFactory>();
}
public void RaceGameReady()
{
_gameplayLoading.DoProgress();
}
public void RaceGameEnded(RaceScores scores)
{
var winScreen = (WinScreen)Context.UIService.TryGetSinglePanel(UIPanelType.WinScreen);
var id = 0;
var cachedScores = scores.GetScores();
for (var i = 0; i < cachedScores.Count; i++)
if (cachedScores[i].Key.Data.type == RacerType.Player) id = i + 1;
UNTILTHEYFIXCONTAINERS.Resolve<PlayerPrefsRacePoopshitter>().AddRace(new(_raceGame.RaceTime, id));
var winText = $@"{id} МЕСТО\n";
winScreen.SetText(winText);
var getPanel = Context.UIService.TryGetSinglePanel(UIPanelType.PlayerScores);
((PlayerScores)getPanel)
.SetText(UNTILTHEYFIXCONTAINERS.Resolve<PlayerPrefsRacePoopshitter>().GetRaces());
Context.UIService.ClosePanel(UIPanelType.PlayerScoreCounter);
Context.UIService.OpenPanel(UIPanelType.WinScreen);
EndTheGame().Forget();
}
private async UniTaskVoid EndTheGame()
{
await UniTask.WaitForSeconds(3f);
Context.UIService.ClosePanel(UIPanelType.WinScreen);
Context.UIService.OpenPanel(UIPanelType.PlayerScores);
await UniTask.WaitForSeconds(5f);
Context.UIService.OpenPanel(UIPanelType.Loading);
Context.StateMachine.SwitchState(AppStates.MainMenu).AllowStateTransition(AppStates.Gameplay);
}
public void RacerFactoryInitialized()
{
_raceGame = UNTILTHEYFIXCONTAINERS.Resolve<RaceGame>();
_gameplayLoading.DoProgress();
}
public void UILoaded(UIPanelType uiPanelType)
{
if(uiPanelType is UIPanelType.WinScreen or UIPanelType.PlayerScores)
{
_gameplayLoading.DoProgress();
return;
}
if (uiPanelType != UIPanelType.PlayerScoreCounter) return;
Context.UIService.OpenPanel(UIPanelType.PlayerScoreCounter);
_gameplayLoading.DoProgress();
}
public void CinemachineLoaded(CinemachineCamera cinemachineCamera) => _gameplayLoading.DoProgress();
public void UISinglePanelLoaded(UIPanelType uiPanelType)
{
}
public void UISinglePanelRemoved(UIPanelType uiPanelType)
{
throw new System.NotImplementedException();
}
}
}
Assets/Code/Infrastructure/App/States/GameplayState.cs.meta
-3
View File
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: e543193800134f7b858502743ab3a43d
timeCreated: 1766436900
Assets/Code/Infrastructure/App/States/MainMenuState.cs
+12 -1
View File
@@ -30,13 +30,24 @@ namespace Code.Infrastructure.App.States
// Context.AudioFactory.LoadAudioClips(AudioNames.UISounds);
Context.SceneLoader.LoadSceneAsync(SceneId.MainMenu, LoadSceneMode.Single).Forget();
Context.AudioService.PlayRepeatedly(AudioNames.UISounds,0, AudioGroupType.Music);
Context.AudioService.ChangeGroupVolume(
AudioGroupType.Music,
1f,
0.5f);
}
protected override void OnExitState()
{
// Context.AudioFactory.ReleaseAudios(AudioNames.UISounds);
Context.UIService.TryRemovePanel(UIPanelType.DebugSceneChooser);
Context.AudioService.CancelMusic(AudioNames.UISounds,0);
Context.AudioService.ChangeGroupVolume(
AudioGroupType.Music,
0,
0.5f,
() => Context.AudioService.CancelMusic(AudioNames.UISounds,0));
EventBus.Unsubscribe(this);
}
Assets/Code/Infrastructure/Audio/AudioFactory.cs
+9 -3
View File
@@ -73,10 +73,15 @@ namespace Code.Infrastructure.Audio
public void ReleaseAudios(AudioNames groupName)
{
UnityEngine.Debug.LogWarning($"Audios unloaded {groupName}");
_eventBus.RaiseEvent<IAudioClipsEventHandle>(x=> x.AudioClipsUnLoaded(groupName));
if (_clipsHandles[groupName].Count == 0) return;
foreach (var handle in _clipsHandles)
foreach (var handle in _clipsHandles[groupName])
Addressables.Release(handle.Value);
_clipsHandles[groupName].Clear();
_eventBus.RaiseEvent<IAudioClipsEventHandle>(x=> x.AudioClipsUnLoaded(groupName));
}
public void Dispose()
{
@@ -87,7 +92,8 @@ namespace Code.Infrastructure.Audio
handle.Value.Release();
}
}
_clipsHandles.Clear();
_configsHandle.Release();
}
}
Assets/Code/Infrastructure/Audio/AudioService.cs
+48 -7
View File
@@ -88,10 +88,24 @@ namespace Code.Infrastructure.Audio
_pool.ReleaseSource(audioSource);
}
private Dictionary<KeyValuePair<AudioNames, int>, CancellationTokenSource> _cancellationTokenSources = new();
public void CancelMusic(AudioNames groupName, int id) => _cancellationTokenSources[new KeyValuePair<AudioNames, int>(groupName, id)].Cancel();
public void ReleaseCancellationSource(AudioNames groupName, int id) => _cancellationTokenSources[new KeyValuePair<AudioNames, int>(groupName, id)] = null;
private Dictionary<AudioNameIdPair, CancellationTokenSource> _cancellationTokenSources = new();
public void CancelMusic(AudioNames groupName, int id)
{
var key = new AudioNameIdPair(groupName, id);
if (!_cancellationTokenSources.ContainsKey(key)) return;
_cancellationTokenSources[key].Cancel();
_cancellationTokenSources.Remove(key);
}
public void ReleaseCancellationSource(AudioNames groupName, int id)
{
// _cancellationTokenSources[new KeyValuePair<AudioNames, int>(groupName, id)] = null; никаких полумер
_cancellationTokenSources.Remove(new AudioNameIdPair(groupName, id));
}
public async UniTaskVoid PlayRepeatedly(AudioNames groupName, int id, AudioGroupType audioGroupType,
AudioSourceType sourceType = AudioSourceType.NoBlend, AudioSource audioSource = null, CancellationTokenSource cancellationTokenSource = null)
{
@@ -100,7 +114,7 @@ namespace Code.Infrastructure.Audio
if(cancellationTokenSource == null)
{
cancellationTokenSource = new CancellationTokenSource();
_cancellationTokenSources[new KeyValuePair<AudioNames, int>(groupName, id)] = cancellationTokenSource;
_cancellationTokenSources[new AudioNameIdPair(groupName, id)] = cancellationTokenSource;
}
if (!audioSource) audioSource = _pool.GetSource(sourceType);
@@ -108,11 +122,10 @@ namespace Code.Infrastructure.Audio
audioSource.outputAudioMixerGroup = _audioMixerGroups[audioGroupType];
audioSource.Play();
await UniTask.NextFrame();
// await UniTask.WaitUntil(audioSource, _ => audioSource.isPlaying);
var (isCanceled, _) = await UniTask.WaitUntilValueChanged(audioSource,
_ => !audioSource.isPlaying,
cancellationToken: cancellationTokenSource.Token).SuppressCancellationThrow();
UnityEngine.Debug.LogError("Music skipping");
if (isCanceled)
{
@@ -129,6 +142,7 @@ namespace Code.Infrastructure.Audio
}
public AudioClip GetClip(AudioNames groupName, int id) => _audioClips[groupName][id];
public bool CheckClip(AudioNames groupName, int id) => _audioClips[groupName].ContainsKey(id);
public void AudioClipsLoaded(AudioNames groupname, Dictionary<int, AudioClip> clips)
@@ -150,10 +164,37 @@ namespace Code.Infrastructure.Audio
_mixer.SetFloat(effectName, newValue);
}).OnComplete(callback);
}
public void ChangeGroupVolume(AudioGroupType groupType, float value, float time, Action callback = null)
{
ApplyParameter(_audioMixerGroups[groupType].name, Mathf.Log10(value == 0f ? 0.001f : value) * 20, time, callback);
}
private struct AudioNameIdPair : IEquatable<AudioNameIdPair>
{
public AudioNames AudioNames;
public int ID;
public AudioNameIdPair(AudioNames audioNames, int id)
{
AudioNames = audioNames;
ID = id;
}
public bool Equals(AudioNameIdPair other)
{
return AudioNames == other.AudioNames && ID == other.ID;
}
public override bool Equals(object obj)
{
return obj is AudioNameIdPair other && Equals(other);
}
public override int GetHashCode()
{
return HashCode.Combine((int)AudioNames, ID);
}
}
}
public interface IReadyToPlayHandle : IGlobalSubscriber
Assets/Code/Infrastructure/Camera/CameraStates/BaseCameraState.cs
-2
View File
@@ -6,8 +6,6 @@ namespace Code.Infrastructure.Camera.CameraStates
// [State(typeof(CameraMode),typeof(CameraStateMachineContext))]
public abstract class BaseCameraState : BaseState<CameraMode, CameraStateMachineContext>
{
protected EventBus.EventBus EventBus;
protected BaseCameraState(CameraStateMachineContext context, EventBus.EventBus eventBus) : base(context, eventBus)
{
EventBus = eventBus;
Assets/Code/Infrastructure/EventBus/EventBus.cs
+1 -1
View File
@@ -55,7 +55,7 @@ namespace Code.Infrastructure.EventBus
{
IGlobalSubscriber subscriber = subscribers.List[i];
try
{
{
action.Invoke(subscriber as TSubscriber);
}
catch (Exception e)
Assets/Code/Infrastructure/Generators/UIPanelEventsGenerator.cs
+2 -3
View File
@@ -47,15 +47,14 @@ namespace Code.Infrastructure.Generators
if(st.HasAttribute(typeof(UIEventOpenClose)))
{
fireStatesCode += $@"
protected override void FireOpenedEvent()
private void FireOpenedEvent()
{{
_eventBus.RaiseEvent<I{st.Name}OpenedHandle>(h => h.{st.Name}Opened(this));
}}
protected override void FireClosedEvent()
private void FireClosedEvent()
{{
_eventBus.RaiseEvent<I{st.Name}ClosedHandle>(h => h.{st.Name}Closed());
base.FireClosedEvent();
}}
";
fireStatesInterfacesCode += $@"
Assets/Code/Infrastructure/SceneLoader/SceneId.cs
+1 -3
View File
@@ -5,9 +5,7 @@ namespace Code.Infrastructure.SceneLoader
[SceneIdEnum]
public enum SceneId
{
MainMenu,
Gameplay,
SoundTest,
MainMenu,
Platformer,
Platformer2,
Platformer3
Assets/Code/Infrastructure/UI/Panels/LoadingPanel.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace Code.Infrastructure.UI.Panels
Tween.Color(image,shownColor, 1f).OnComplete(FireOpenedEvent);
}
public override void Close()
public override void Close(Action callback = null)
{
Tween.Color(image,hiddenColor, 1f).OnComplete(FireClosedEvent);
}
Assets/Code/Infrastructure/UI/Panels/LogoPanel.cs
+4 -5
View File
@@ -1,11 +1,10 @@
using Code.Infrastructure.Generators;
using System;
using PrimeTween;
using UnityEngine;
using UnityEngine.UI;
namespace Code.Infrastructure.UI.Panels
{
[UIEventOpenClose]
public partial class LogoPanel : UIPanel
{
[SerializeField] private Image image;
@@ -13,12 +12,12 @@ namespace Code.Infrastructure.UI.Panels
[SerializeField] private Color hiddenColor;
public override void Open()
{
Tween.Color(image,shownColor, 1f).OnComplete(FireOpenedEvent);
Tween.Color(image,shownColor, 1f);
}
public override void Close()
public override void Close(Action callback = null)
{
Tween.Color(image,hiddenColor, 1f).OnComplete(FireClosedEvent);
Tween.Color(image,hiddenColor, 1f).OnComplete(callback);
}
}
}
Loaded 100 of 229 files, more files were not shown because too many files have changed in this diff. Show more