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

Комнаты, вся хуйня

Browse Source
This commit is contained in:
ThomasCharester committed 2025-11-27 23:39:57 +03:00
1 parent 000985ee9b
commit b7e9a26462
19 files changed
+2083 -50
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs
+5 -14
View File
@@ -53,10 +53,9 @@ namespace Code.App.AppStates
Context.InputService.EnableMap(ActionMappings.Gameplay);
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, InstaKillDEBUG);
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG);
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, Tube);
Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG);
Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.Gameplay);
Context.SceneLoaderService.LoadSceneAsyncAwaitable((int)SceneIds.DevGen);
Context.LoadingManager.OnLoadingEnded += AfterSceneLoaded;
#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
@@ -162,13 +161,7 @@ namespace Code.App.AppStates
private void RoomPassedDEBUG(InputAction.CallbackContext context)
{
_orderService.RoomPassed();
}
private OrderDispenser _debugTube;
private void Tube(InputAction.CallbackContext context)
{
_debugTube.ThrowOrder();
}
}
// DEBUG
private bool _tickEnabled;
public override void Tick()
@@ -206,8 +199,7 @@ namespace Code.App.AppStates
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug1, InstaKillDEBUG);
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG);
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug5, Tube);
Context.InputService.DebugUnbindAction((int)ActionMappings.Debug, (int)DebugActions.Debug4, RoomPassedDEBUG);
base.ExitState();
}
@@ -255,8 +247,7 @@ namespace Code.App.AppStates
private GameplaySceneEnvironment SceneEnvironmentVariables(Container sceneContainer)
{
var sceneEnvironment = (GameplaySceneEnvironment)sceneContainer.Resolve<CurrentSceneEnvironment>();
_debugTube = sceneEnvironment.debugTube;
return sceneEnvironment;
}
}
Game/CourierOld/Assets/Code/Generator/RoomGenerator.cs
+6 -2
View File
@@ -8,7 +8,7 @@ namespace Code.Generator
{
public class RoomGenerator : MonoBehaviour
{
[Inject] private IOrderService _orderService;
private IOrderService _orderService;
[SerializeField] private GeneratorConfig generatorConfig;
@@ -19,8 +19,12 @@ namespace Code.Generator
private int _nextRoomStackIndex;
private async void Awake()
[Inject]
private async void Construct(IOrderService orderService)
{
_orderService = orderService;
_orderService.OrderGive();
_factory = new RoomGeneratorFactory(generatorConfig);
_spawnedRooms = new List<Room>();
_roomIndexesStack = new List<int>();