Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
김산 2025-09-01 09:40:48 +09:00
commit b7f9fbb5ab
4 changed files with 48 additions and 0 deletions

View File

@ -119,6 +119,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []

View File

@ -119,6 +119,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []

View File

@ -119,6 +119,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []

View File

@ -10,26 +10,35 @@ public class PlayerInput : MonoBehaviour
private void Start() private void Start()
{ {
_playerDataSo = RestaurantData.Instance.PlayerData; _playerDataSo = RestaurantData.Instance.PlayerData;
#if UNITY_EDITOR
_playerDataSo.OpenManagementUiAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.OpenManagementUi)); _playerDataSo.OpenManagementUiAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.OpenManagementUi));
_playerDataSo.OpenManagementUiAction.performed += OnOpenManagementUi; _playerDataSo.OpenManagementUiAction.performed += OnOpenManagementUi;
#endif
} }
private void OnDestroy() private void OnDestroy()
{ {
if (!_playerDataSo) return; if (!_playerDataSo) return;
#if UNITY_EDITOR
_playerDataSo.OpenManagementUiAction.performed -= OnOpenManagementUi; _playerDataSo.OpenManagementUiAction.performed -= OnOpenManagementUi;
#endif
} }
#if UNITY_EDITOR
private void OnOpenManagementUi(InputAction.CallbackContext context) private void OnOpenManagementUi(InputAction.CallbackContext context)
{ {
if (context.performed) if (context.performed)
{ {
if (GameFlowManager.Instance.GameFlowDataSo.CurrentGameState != GameFlowState.ReadyForRestaurant) return;
var evt = GameEvents.OpenPopupUiEvent; var evt = GameEvents.OpenPopupUiEvent;
evt.UiType = typeof(RestaurantManagementUi); evt.UiType = typeof(RestaurantManagementUi);
EventBus.Broadcast(evt); EventBus.Broadcast(evt);
} }
} }
} }
#endif
} }