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

Compare commits

merge into: ThomasCharester/Infratest:RacerAIWillBeUsed
ThomasCharester/Infratest:main ThomasCharester/Infratest:NotLiminalPCG ThomasCharester/Infratest:RacerAIWillBeUsed ThomasCharester/Infratest:NotLiminalOne ThomasCharester/Infratest:AR
...
pull from: ThomasCharester/Infratest:main
ThomasCharester/Infratest:NotLiminalPCG ThomasCharester/Infratest:RacerAIWillBeUsed ThomasCharester/Infratest:NotLiminalOne ThomasCharester/Infratest:AR ThomasCharester/Infratest:main
1 Commits
RacerAIWillBeUsed ... main
Author SHA1 Message Date
ThomasCharester bffc9bd263 Новый рефлекс 2026-01-12 20:59:54 +03:00
9 changed files with 96 additions and 185 deletions
Expand all files Collapse all files

No files matched your search

.idea/.idea.Infratest/.idea/workspace.xml
Generated
+39 -129
View File
@@ -5,130 +5,17 @@
</component>
<component name="ChangeListManager">
<list default="true" id="ed1a3c4f-83ac-4211-ae32-004a26afd5d8" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/Assets/Code/Example.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Liminal.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Liminal/Character.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Liminal/Character/LiminalCharacterController.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Liminal/Character/LiminalCharacterController.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Liminal/Player.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Liminal/Player/PlayerAnimator.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Liminal/Player/PlayerAnimator.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Liminal/Player/PlayerFactory.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Liminal/Player/PlayerFactory.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Liminal/Player/PlayerMovementController.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Example/Liminal/Player/PlayerMovementController.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/AppStateMachine.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/AppStateMachine.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/PapaInstaller.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/PapaInstaller.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/SceneInstallers.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/SceneInstallers/GameplaySceneInstaller.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/SceneInstallers/GameplaySceneInstaller.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/SceneInstallers/MainMenuSceneInstaller.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/SceneInstallers/MainMenuSceneInstaller.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/States.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/BootstrapState.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/BootstrapState.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/GameplayState.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/GameplayState.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/MainMenuState.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/MainMenuState.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraFactory.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraFactory.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraSettings.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraSettings.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraStateMachine.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraStateMachine.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraStateMachineRunner.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraStateMachineRunner.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraStates.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraStates/BaseCameraState.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraStates/BaseCameraState.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraStates/FirstPersonCameraState.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraStates/FirstPersonCameraState.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraStates/NoneCameraState.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraStates/NoneCameraState.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Configs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Configs/ConfigLocator.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Configs/ConfigLocator.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Configs/SystemConfigsReferences.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Configs/SystemConfigsReferences.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Generators/ConfigGenerator.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Generators/ConfigGenerator.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Generators/SceneLoaderGenerator.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Generators/SceneLoaderGenerator.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Input.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Input/ActionMappings.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Input/ActionMappings.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Input/IInputService.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Input/IInputService.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Input/InputService.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Input/InputService.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Loadings.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Loadings/Loading.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Loadings/Loading.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/SceneLoader.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/SceneLoader/SceneId.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/SceneLoader/SceneId.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/SceneLoader/SceneLoader.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/SceneLoader/SceneLoader.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/SceneLoader/ScenesAssetReferences.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/SceneLoader/ScenesAssetReferences.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/StateMachine/AbstractStateMachine.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/StateMachine/BaseState.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Infrastructure.Camera.CameraStateMachine.Generated.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Infrastructure.Camera.CameraStateMachine.Generated.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/DebugClassConfig.Generated.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/DebugClassConfig.Generated.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/IConfigLocator.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/IConfigLocator.cs.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/SceneInfoConfig.Generated.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/SceneInfoConfig.Generated.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.Infratest/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Infratest/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Debug.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Debug/DebugInstaller.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Debug/DebugInstaller.cs.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Debug/DebugStateMachine.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Debug/DebugStateMachine.cs.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Debug/States.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Debug/States/FirstState.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Debug/States/FirstState.cs.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Generators.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Generators.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Generators/Attributes.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Generators/Attributes.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Generators/Attributes.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Generators/Attributes.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Generators/StateMachineGenerator.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Generators/StateMachineGenerator.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Generators/StateMachineGenerator.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/Generators/StateMachineGenerator.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/StateMachine.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/StateMachine.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/StateMachine/AbstractStateMachine.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/StateMachine/AbstractStateMachine.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/StateMachine/AbstractStateMachine.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/StateMachine/BaseState.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/StateMachine/BaseState.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/StateMachine/BaseState.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/InputSystem_Actions.inputactions" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/InputSystem_Actions.inputactions" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Readme.asset" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Readme.asset.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/SampleScene.unity" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/SampleScene.unity.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Settings/Mobile_RPAsset.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Settings/Mobile_RPAsset.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TutorialInfo.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TutorialInfo/Icons.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TutorialInfo/Icons/URP.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TutorialInfo/Icons/URP.png.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TutorialInfo/Layout.wlt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TutorialInfo/Layout.wlt.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TutorialInfo/Scripts.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TutorialInfo/Scripts/Editor.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TutorialInfo/Scripts/Readme.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/TutorialInfo/Scripts/Readme.cs.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Debug.DebugStateMachine.Generated.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/UnityCodeGen.Generated/Code.Debug.DebugStateMachine.Generated.cs.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/PapaInstaller.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/App/PapaInstaller.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Code/Infrastructure/EventBus/EventBus.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Code/Infrastructure/EventBus/EventBus.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources/ProjectScope.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/ProjectScope.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources/ReflexSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/ReflexSettings.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Resources/ReflexSettings.asset.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Resources/ReflexSettings.asset.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Bootstrap.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Bootstrap.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Gameplay.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Gameplay.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Packages/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/manifest.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/ShaderGraphSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ShaderGraphSettings.asset" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -145,17 +32,13 @@
<setting file="file://$PROJECT_DIR$/Assets/Code/Infrastructure/Loadings/Loading.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.cysharp.unitask@a85b92a8e443/Runtime/External/Addressables/AddressablesAsyncExtensions.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.cysharp.unitask@a85b92a8e443/Runtime/UniTaskScheduler.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.gustavopsantos.reflex@b77d36a82a21/Core/Container.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.gustavopsantos.reflex@b77d36a82a21/Core/SceneScope.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.gustavopsantos.reflex@b77d36a82a21/Extensions/SceneExtensions.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.gustavopsantos.reflex@b77d36a82a21/Injectors/MethodInjector.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.addressables@45e9abf44299/Runtime/ResourceManager/AsyncOperations/AsyncOperationBase.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.addressables@45e9abf44299/Runtime/ResourceManager/AsyncOperations/AsyncOperationHandle.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.addressables@45e9abf44299/Runtime/ResourceManager/AsyncOperations/ChainOperation.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.addressables@45e9abf44299/Runtime/ResourceManager/Util/DelegateList.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.unity.addressables@45e9abf44299/Runtime/ResourceManager/Util/MonoBehaviourCallbackHooks.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/1eb9db207454431c84a47bcd81e79c3746ae00/50/ee0759d6/Dictionary`2.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/493b407efcb64dddad59f28bb0b831d3212400/1d/b6f4672d/Vector2.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/493b407efcb64dddad59f28bb0b831d3212400/1d/b6f4672d/Vector2.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/493b407efcb64dddad59f28bb0b831d3212400/e6/06b4bbec/Component.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/6faa6124236442759eb396cfbfdad50810fc00/3f/3a201145/Enumerable.cs" root0="FORCE_HIGHLIGHTING" />
</component>
@@ -173,7 +56,7 @@
"Attach to Unity Editor.Attach to Unity Editor.executor": "Debug",
"RunOnceActivity.ShowReadmeOnStart": "true",
"XThreadsFramesViewSplitterKey": "0.31173185",
"git-widget-placeholder": "main",
"git-widget-placeholder": "NotLiminalOne",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@@ -209,10 +92,10 @@
</option>
<method v="2" />
</configuration>
<configuration name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost" ignored-value-for-modified-check="3060">
<configuration name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost" ignored-value-for-modified-check="2180">
<option name="allowRunningInParallel" value="false" />
<option name="listenPortForConnections" value="false" />
<option name="pid" value="3060" />
<option name="pid" value="2180" />
<option name="projectPathOnTarget" />
<option name="selectedOptions">
<list />
@@ -262,6 +145,7 @@
<workItem from="1767345100869" duration="2686000" />
<workItem from="1768124782138" duration="5579000" />
<workItem from="1768228201670" duration="4137000" />
<workItem from="1768237217087" duration="2844000" />
</task>
<servers />
</component>
@@ -307,6 +191,32 @@
</properties>
<option name="timeStamp" value="58" />
</line-breakpoint>
<line-breakpoint enabled="true" type="DotNet Breakpoints">
<url>file://$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraFactory.cs</url>
<line>50</line>
<properties documentPath="A:\Projects\Infratest\Assets\Code\Infrastructure\Camera\CameraFactory.cs" containingFunctionPresentation="Method 'CreateCameraStateMachine'">
<startOffsets>
<option value="2190" />
</startOffsets>
<endOffsets>
<option value="2295" />
</endOffsets>
</properties>
<option name="timeStamp" value="60" />
</line-breakpoint>
<line-breakpoint enabled="true" type="DotNet Breakpoints">
<url>file://$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraFactory.cs</url>
<line>35</line>
<properties documentPath="A:\Projects\Infratest\Assets\Code\Infrastructure\Camera\CameraFactory.cs" containingFunctionPresentation="Method 'CreateCameraStateMachine'">
<startOffsets>
<option value="1345" />
</startOffsets>
<endOffsets>
<option value="1495" />
</endOffsets>
</properties>
<option name="timeStamp" value="61" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
Assets/Code/Infrastructure/App/PapaInstaller.cs
+13 -11
View File
@@ -4,7 +4,9 @@ using Code.Infrastructure.Input;
using Code.Infrastructure.Loadings;
using Code.Infrastructure.SceneLoader;
using Reflex.Core;
using Reflex.Enums;
using UnityEngine;
using Resolution = Reflex.Enums.Resolution;
namespace Code.Infrastructure.App
{
@@ -12,19 +14,19 @@ namespace Code.Infrastructure.App
{
public void InstallBindings(ContainerBuilder containerBuilder)
{
containerBuilder.AddSingleton(typeof(EventBus.EventBus));
containerBuilder.AddSingleton(typeof(ConfigLocator), typeof(IConfigLocator));
containerBuilder.AddSingleton(typeof(SceneLoader.SceneLoader));
containerBuilder.AddSingleton(typeof(InputService),typeof(IInputService));
containerBuilder.RegisterType(typeof(EventBus.EventBus), Lifetime.Singleton, Resolution.Eager);
containerBuilder.RegisterType(typeof(ConfigLocator), new[] { typeof(IConfigLocator) }, Lifetime.Singleton, Resolution.Eager);
containerBuilder.RegisterType(typeof(SceneLoader.SceneLoader), Lifetime.Singleton, Resolution.Eager);
containerBuilder.RegisterType(typeof(InputService),new[] { typeof(IInputService) }, Lifetime.Singleton, Resolution.Eager);
containerBuilder.OnContainerBuilt += Bootstrap;
containerBuilder.AddSingleton(typeof(AppStateMachine));
containerBuilder.AddSingleton(typeof(AppStateMachineContext));
containerBuilder.RegisterType(typeof(AppStateMachine), Lifetime.Singleton, Resolution.Lazy);
containerBuilder.RegisterType(typeof(AppStateMachineContext), Lifetime.Singleton, Resolution.Lazy);
containerBuilder.AddSingleton(typeof(CameraFactory));
containerBuilder.AddSingleton(typeof(CameraStateMachine));
containerBuilder.AddSingleton(typeof(CameraStateMachineContext));
containerBuilder.RegisterType(typeof(CameraFactory), Lifetime.Singleton, Resolution.Lazy);
containerBuilder.RegisterType(typeof(CameraStateMachine), Lifetime.Singleton, Resolution.Lazy);
containerBuilder.RegisterType(typeof(CameraStateMachineContext), Lifetime.Singleton, Resolution.Lazy);
}
@@ -35,8 +37,8 @@ namespace Code.Infrastructure.App
_thatRightContainer = container;
container.Resolve<EventBus.EventBus>().Subscribe(this);
container.Resolve<SceneLoader.SceneLoader>();
container.Resolve<IInputService>();
// container.Resolve<SceneLoader.SceneLoader>();
// container.Resolve<IInputService>();
container.Resolve<CameraFactory>().CreateCameraStateMachine(container.Resolve<CameraStateMachine>()).Forget();
initialLoading = new Loading(3, () => EssentialLoadEnded(container));
Assets/Code/Infrastructure/EventBus/EventBus.cs
-1
View File
@@ -53,7 +53,6 @@ namespace Code.Infrastructure.EventBus
{
for ( int i = 0; i < subscribers.List.Count; i++)
{
Debug.Log("Invoking " + typeof(TSubscriber).Name);
IGlobalSubscriber subscriber = subscribers.List[i];
try
{
Assets/Resources/ProjectScope.prefab
+13 -13
View File
@@ -9,8 +9,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8739486317792213346}
- component: {fileID: 5606446440374662551}
- component: {fileID: 82607719754315564}
- component: {fileID: -2867823150533533373}
m_Layer: 0
m_Name: ProjectScope
m_TagString: Untagged
@@ -33,18 +33,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5606446440374662551
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6025525265571595293}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 238ee66aa2bafad47bf60938e98aebca, type: 3}
m_Name:
m_EditorClassIdentifier: Reflex::Reflex.Core.ProjectScope
--- !u!114 &82607719754315564
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -57,3 +45,15 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e62d9c9e01334727887a684e008440a6, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.App.PapaInstaller
--- !u!114 &-2867823150533533373
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6025525265571595293}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5312032623c34414a54ea00e35a7eb8e, type: 3}
m_Name:
m_EditorClassIdentifier: Reflex::Reflex.Core.ContainerScope
Assets/Resources/ReflexSettings.asset
+2 -2
View File
@@ -13,5 +13,5 @@ MonoBehaviour:
m_Name: ReflexSettings
m_EditorClassIdentifier: Reflex::Reflex.Configuration.ReflexSettings
<LogLevel>k__BackingField: 0
<ProjectScopes>k__BackingField:
- {fileID: 5606446440374662551, guid: ec0f7695b6246ec4e859d78a70c50a8f, type: 3}
<RootScopes>k__BackingField:
- {fileID: -2867823150533533373, guid: ec0f7695b6246ec4e859d78a70c50a8f, type: 3}
Assets/Scenes/Bootstrap.unity
+13 -13
View File
@@ -128,8 +128,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 60958143}
- component: {fileID: 60958142}
- component: {fileID: 60958144}
- component: {fileID: 60958145}
m_Layer: 0
m_Name: SceneScope
m_TagString: Untagged
@@ -137,18 +137,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &60958142
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 60958141}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3fd1482e4a9dee141aecc5bcd0a4f0f3, type: 3}
m_Name:
m_EditorClassIdentifier: Reflex::Reflex.Core.SceneScope
--- !u!4 &60958143
Transform:
m_ObjectHideFlags: 0
@@ -176,6 +164,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 067978788f51445ca3af5381eafec386, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.App.SceneInstallers.MainMenuSceneInstaller
--- !u!114 &60958145
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 60958141}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5312032623c34414a54ea00e35a7eb8e, type: 3}
m_Name:
m_EditorClassIdentifier: Reflex::Reflex.Core.ContainerScope
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
Assets/Scenes/Gameplay.unity
+13 -13
View File
@@ -185,8 +185,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 871625794}
- component: {fileID: 871625793}
- component: {fileID: 871625795}
- component: {fileID: 871625796}
m_Layer: 0
m_Name: SceneScope
m_TagString: Untagged
@@ -194,18 +194,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &871625793
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 871625792}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3fd1482e4a9dee141aecc5bcd0a4f0f3, type: 3}
m_Name:
m_EditorClassIdentifier: Reflex::Reflex.Core.SceneScope
--- !u!4 &871625794
Transform:
m_ObjectHideFlags: 0
@@ -233,6 +221,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab7d8da1f0cc44bf99ae978a6b75847a, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.App.SceneInstallers.GameplaySceneInstaller
--- !u!114 &871625796
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 871625792}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5312032623c34414a54ea00e35a7eb8e, type: 3}
m_Name:
m_EditorClassIdentifier: Reflex::Reflex.Core.ContainerScope
--- !u!1 &892968103 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6371182735212572944, guid: 24906af39c56b6841a50573dc0da37ef, type: 3}
Packages/manifest.json
+1 -1
View File
@@ -2,7 +2,7 @@
"dependencies": {
"com.annulusgames.unity-codegen": "https://github.com/AnnulusGames/UnityCodeGen.git?path=/Assets/UnityCodeGen",
"com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
"com.gustavopsantos.reflex": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#13.0.3",
"com.gustavopsantos.reflex": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#14.0.0",
"com.unity.2d.sprite": "1.0.0",
"com.unity.addressables": "2.7.6",
"com.unity.ai.navigation": "2.0.9",
Packages/packages-lock.json
+2 -2
View File
@@ -15,11 +15,11 @@
"hash": "73a63b7f672b88f7e9992f6917eb458a8cbb6fa9"
},
"com.gustavopsantos.reflex": {
"version": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#13.0.3",
"version": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#14.0.0",
"depth": 0,
"source": "git",
"dependencies": {},
"hash": "3d382e6e1d479380685887ef0c7a7a5492911b99"
"hash": "7860febed99b82ca2dc273ca621c13965dc497a2"
},
"com.unity.2d.sprite": {
"version": "1.0.0",