Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/customer_behavior
# Conflicts: # Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Common/Actions/MoveToInteractionTarget.cs
This commit is contained in:
commit
b204a7b1b9
16
.gitattributes
vendored
16
.gitattributes
vendored
@ -72,3 +72,19 @@
|
||||
*.asmdef text
|
||||
*.sbs filter=lfs diff=lfs merge=lfs -text
|
||||
*.bytes filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
# --- Review에서 패치 숨기기(소스코드 외 파일) ---
|
||||
# 아래 규칙은 기존 text/merge/eol 속성은 유지하면서, PR에서 패치(diff) 표시만 숨깁니다.
|
||||
*.meta -diff
|
||||
*.prefab -diff
|
||||
*.unity -diff
|
||||
*.mat -diff
|
||||
*.anim -diff
|
||||
*.controller -diff
|
||||
*.overrideController -diff
|
||||
*.mask -diff
|
||||
*.lighting -diff
|
||||
*.renderTexture -diff
|
||||
*.timeline -diff
|
||||
*.playable -diff
|
||||
*.spriteatlasv2 -diff
|
||||
|
3
Assets/_DDD/_Scripts/Game.meta
Normal file
3
Assets/_DDD/_Scripts/Game.meta
Normal file
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c82c9604b41d4755b70d679f3a0a3947
|
||||
timeCreated: 1756279729
|
@ -18,13 +18,6 @@ public static class GameEvents
|
||||
public static InventoryChangedEvent InventoryChangedEvent = new();
|
||||
public static SmartVariablesDirtyEvent SmartVariablesDirtyEvent = new();
|
||||
}
|
||||
|
||||
public static class RestaurantEvents
|
||||
{
|
||||
public static ItemSlotSelectedEvent ItemSlotSelectedEvent = new();
|
||||
public static TodayMenuAddedEvent TodayMenuAddedEvent = new();
|
||||
public static TodayMenuRemovedEvent TodayMenuRemovedEvent = new();
|
||||
}
|
||||
|
||||
// public static class VoyageEvents
|
||||
// {
|
||||
@ -105,20 +98,4 @@ public class SmartVariablesDirtyEvent : IEvent
|
||||
{
|
||||
public SmartVariablesDomain DomainFlags;
|
||||
}
|
||||
|
||||
#region RestaurantInteractionEvents
|
||||
|
||||
public class ItemSlotSelectedEvent : IEvent
|
||||
{
|
||||
public ItemModel Model;
|
||||
}
|
||||
|
||||
public class TodayMenuAddedEvent : IEvent {}
|
||||
|
||||
public class TodayMenuRemovedEvent : IEvent
|
||||
{
|
||||
public InventoryCategoryType InventoryCategoryType;
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
@ -41,7 +41,7 @@ public interface IInteractable
|
||||
{
|
||||
bool CanInteract();
|
||||
bool IsInteractionHidden();
|
||||
bool OnInteracted(IInteractor interactor, ScriptableObject causerPayload = null);
|
||||
void OnInteracted(IInteractor interactor, ScriptableObject causerPayload = null);
|
||||
InteractionType GetInteractionType();
|
||||
GameObject GetInteractableGameObject();
|
||||
void InitializeInteraction(InteractionType interactionType);
|
@ -39,7 +39,7 @@ public static void Broadcast<T>(T evt) where T : IEvent
|
||||
{
|
||||
foreach (var handler in list.Cast<IEventHandler<T>>())
|
||||
{
|
||||
handler.Invoke(evt);
|
||||
handler.HandleEvent(evt);
|
||||
}
|
||||
}
|
||||
}
|
@ -2,6 +2,6 @@ namespace DDD
|
||||
{
|
||||
public interface IEventHandler<in T> where T : IEvent
|
||||
{
|
||||
void Invoke(T evt);
|
||||
void HandleEvent(T evt);
|
||||
}
|
||||
}
|
@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using DDD.Restaurant;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Localization.SmartFormat.PersistentVariables;
|
||||
|
||||
@ -71,7 +72,7 @@ public void PostInit()
|
||||
EventBus.Register<SmartVariablesDirtyEvent>(this);
|
||||
}
|
||||
|
||||
public void Invoke(SmartVariablesDirtyEvent evt)
|
||||
public void HandleEvent(SmartVariablesDirtyEvent evt)
|
||||
{
|
||||
var flags = evt.DomainFlags;
|
||||
if (flags == SmartVariablesDomain.All)
|
@ -68,7 +68,7 @@ private void UpdateTimeScale()
|
||||
|
||||
public bool IsPaused => Mathf.Approximately(CurrentTimeScale, 0f);
|
||||
|
||||
public void Invoke(TimeScaleChangeEvent evt)
|
||||
public void HandleEvent(TimeScaleChangeEvent evt)
|
||||
{
|
||||
if (evt.NewTimeScale < 1f)
|
||||
{
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user