RestaurantRunController 오류 수정
This commit is contained in:
parent
cb2970b897
commit
96aa756769
BIN
Assets/_DDD/_Addressables/So/PopupUiState.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_Addressables/So/PopupUiState.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_Addressables/So/RestaurantCustomerStateSo.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_Addressables/So/RestaurantCustomerStateSo.asset
(Stored with Git LFS)
Binary file not shown.
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 6a8ae0a4b68a9b94889b9889b63ebacd
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 11400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
BIN
Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset
(Stored with Git LFS)
Binary file not shown.
@ -28,30 +28,30 @@ public void PreInit()
|
|||||||
|
|
||||||
public Task Init()
|
public Task Init()
|
||||||
{
|
{
|
||||||
return Task.CompletedTask;;
|
return Task.CompletedTask; ;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PostInit()
|
public async void PostInit()
|
||||||
{
|
{
|
||||||
if (IsGameStarted() == false)
|
if (IsGameStarted() == false)
|
||||||
{
|
{
|
||||||
ChangeFlow(GameFlowState.ReadyForRestaurant);
|
await ChangeFlow(GameFlowState.ReadyForRestaurant);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IsGameStarted() => GameFlowDataSo.CurrentGameState != GameFlowState.None;
|
private bool IsGameStarted() => GameFlowDataSo.CurrentGameState != GameFlowState.None;
|
||||||
|
|
||||||
public void ChangeFlow(GameFlowState newFlowState)
|
public async Task ChangeFlow(GameFlowState newFlowState)
|
||||||
{
|
{
|
||||||
if (!CanChangeFlow(newFlowState))
|
if (CanChangeFlow(newFlowState) == false)
|
||||||
{
|
{
|
||||||
Debug.LogError("Can't change flow");
|
Debug.LogError("Can't change flow");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_ = EndCurrentFlow();
|
await EndCurrentFlow();
|
||||||
|
|
||||||
_ = ReadyNewFlow(newFlowState);
|
await ReadyNewFlow(newFlowState);
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool CanChangeFlow(GameFlowState newFlowState)
|
private bool CanChangeFlow(GameFlowState newFlowState)
|
||||||
@ -73,13 +73,13 @@ private async Task ReadyNewFlow(GameFlowState newFlowState)
|
|||||||
{
|
{
|
||||||
GameFlowDataSo.CurrentGameState = newFlowState;
|
GameFlowDataSo.CurrentGameState = newFlowState;
|
||||||
|
|
||||||
|
await OpenFlowScene(newFlowState);
|
||||||
|
|
||||||
foreach (var handler in FlowHandlers)
|
foreach (var handler in FlowHandlers)
|
||||||
{
|
{
|
||||||
await handler.OnReadyNewFlow(newFlowState);
|
await handler.OnReadyNewFlow(newFlowState);
|
||||||
}
|
}
|
||||||
|
|
||||||
await OpenFlowScene(newFlowState);
|
|
||||||
|
|
||||||
StartFlow();
|
StartFlow();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,8 +8,8 @@ public class RestaurantRunController : FlowController
|
|||||||
RestaurantCustomerStateSo _restaurantCustomerStateSo;
|
RestaurantCustomerStateSo _restaurantCustomerStateSo;
|
||||||
public override Task InitializeController()
|
public override Task InitializeController()
|
||||||
{
|
{
|
||||||
|
_restaurantCustomerStateSo = RestaurantState.instance.CustomerState;
|
||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override Task InitializeState()
|
public override Task InitializeState()
|
||||||
|
@ -9,6 +9,7 @@ public class RestaurantState : ScriptableSingleton<RestaurantState>
|
|||||||
public RestaurantRunStateSo RunState { get; private set; }
|
public RestaurantRunStateSo RunState { get; private set; }
|
||||||
public RestaurantEnvironmentStateSo EnvironmentState { get; private set; }
|
public RestaurantEnvironmentStateSo EnvironmentState { get; private set; }
|
||||||
public RestaurantPlayerStateSo PlayerState { get; private set; }
|
public RestaurantPlayerStateSo PlayerState { get; private set; }
|
||||||
|
public RestaurantCustomerStateSo CustomerState { get; private set; }
|
||||||
|
|
||||||
// TODO : Load from disk(SaveData)
|
// TODO : Load from disk(SaveData)
|
||||||
private void OnEnable()
|
private void OnEnable()
|
||||||
@ -17,6 +18,7 @@ private void OnEnable()
|
|||||||
RunState = CreateInstance<RestaurantRunStateSo>();
|
RunState = CreateInstance<RestaurantRunStateSo>();
|
||||||
EnvironmentState = CreateInstance<RestaurantEnvironmentStateSo>();
|
EnvironmentState = CreateInstance<RestaurantEnvironmentStateSo>();
|
||||||
PlayerState = CreateInstance<RestaurantPlayerStateSo>();
|
PlayerState = CreateInstance<RestaurantPlayerStateSo>();
|
||||||
|
CustomerState = CreateInstance<RestaurantCustomerStateSo>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user