iwnc2020/ProjectDDD
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
김산 2025-09-01 09:40:48 +09:00
commit b7f9fbb5ab
4 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/_DDD/_Raw/Sprites/Ui/Common/SpeechBubble.png.meta
View File

@ -119,6 +119,19 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 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:
serializedVersion: 2
sprites: []

13
Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_012.png.meta
View File

@ -119,6 +119,19 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 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:
serializedVersion: 2
sprites: []

13
Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_019.png.meta
View File

@ -119,6 +119,19 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 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:
serializedVersion: 2
sprites: []

9
Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInput.cs
View File

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