Merge branch 'feature/cook_system' into develop
This commit is contained in:
NTG
commit
de70e83859
@ -48,6 +48,7 @@ GameObject:
|
||||
- component: {fileID: 127430239903465757}
|
||||
- component: {fileID: 3095965496140440094}
|
||||
- component: {fileID: 7606279200344222219}
|
||||
- component: {fileID: 3805557225565208309}
|
||||
- component: {fileID: 500600556154722887}
|
||||
m_Layer: 0
|
||||
m_Name: BaseRestaurantCharacter
|
||||
@ -70,6 +71,7 @@ Transform:
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 4993183601549197863}
|
||||
- {fileID: 3313163606729068704}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!54 &5176902543201676162
|
||||
@ -132,7 +134,6 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 061fa444069fcd74c884c1b3379c41b8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_interactionType: 0
|
||||
--- !u!114 &8736963048629680089
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -181,6 +182,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: c9a5f5b2cb6745238a931b4d52f5d57a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_availableInteractions: 0
|
||||
_nearColliders:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
@ -192,6 +194,18 @@ MonoBehaviour:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
--- !u!114 &3805557225565208309
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5259510642736920361}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f92b168407b75f14aa1941f878c9a4d5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &500600556154722887
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -342,3 +356,151 @@ MonoBehaviour:
|
||||
_animationName:
|
||||
loop: 1
|
||||
timeScale: 1
|
||||
--- !u!1 &7741631174553725873
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3313163606729068704}
|
||||
- component: {fileID: 56326982755876444}
|
||||
- component: {fileID: 6821147414592445835}
|
||||
- component: {fileID: 4556455154625696375}
|
||||
m_Layer: 0
|
||||
m_Name: WorldCanvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3313163606729068704
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7741631174553725873}
|
||||
m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0.6427876}
|
||||
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 310131800585410204}
|
||||
m_Father: {fileID: 1761643478070701343}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0.7660445}
|
||||
m_SizeDelta: {x: 200, y: 200}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!223 &56326982755876444
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7741631174553725873}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 2
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_VertexColorAlwaysGammaSpace: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_UpdateRectTransformForStandalone: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!114 &6821147414592445835
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7741631174553725873}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 1
|
||||
--- !u!114 &4556455154625696375
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7741631174553725873}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 66559
|
||||
--- !u!1001 &1813118635642626351
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3313163606729068704}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2118014469881509811, guid: 54fa77f2833129c468d3c7db11686eb4, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2118014469881509811, guid: 54fa77f2833129c468d3c7db11686eb4, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2118014469881509811, guid: 54fa77f2833129c468d3c7db11686eb4, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2118014469881509811, guid: 54fa77f2833129c468d3c7db11686eb4, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2118014469881509811, guid: 54fa77f2833129c468d3c7db11686eb4, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7052044798137253448, guid: 54fa77f2833129c468d3c7db11686eb4, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SpeechBubble
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7874290921494956750, guid: 54fa77f2833129c468d3c7db11686eb4, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 54fa77f2833129c468d3c7db11686eb4, type: 3}
|
||||
--- !u!224 &310131800585410204 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2118014469881509811, guid: 54fa77f2833129c468d3c7db11686eb4, type: 3}
|
||||
m_PrefabInstance: {fileID: 1813118635642626351}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@ -6748,7 +6748,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 45
|
||||
value: 45.14
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
@ -6756,7 +6756,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 22.5
|
||||
value: 22.57
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
@ -6768,7 +6768,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5903102430418324167, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_text
|
||||
value: F
|
||||
value: T
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
|
||||
313
Assets/_DDD/_Addressables/Prefabs/Uis/SpeechBubble.prefab
Normal file
313
Assets/_DDD/_Addressables/Prefabs/Uis/SpeechBubble.prefab
Normal file
@ -0,0 +1,313 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &7052044798137253448
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2118014469881509811}
|
||||
- component: {fileID: 3930455930557330324}
|
||||
m_Layer: 0
|
||||
m_Name: SpeechBubble
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2118014469881509811
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7052044798137253448}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 7495322353241985613}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 30}
|
||||
m_SizeDelta: {x: 80, y: 80}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &3930455930557330324
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7052044798137253448}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9e3f3626b80543078f6df1b04dd3e5f0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_panel: {fileID: 7874290921494956750}
|
||||
_itemImage: {fileID: 2176096409418682862}
|
||||
--- !u!1 &7874290921494956750
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7495322353241985613}
|
||||
m_Layer: 0
|
||||
m_Name: Panel
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7495322353241985613
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7874290921494956750}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 7326607633246044141}
|
||||
- {fileID: 1434048260887657979}
|
||||
m_Father: {fileID: 2118014469881509811}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1001 &2988963434515109243
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 7495322353241985613}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4684438329468569219, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: 7b7add64dc2936e4f82bb63695aa5a6c, type: 3}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6023966856263752882, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Background
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
--- !u!224 &7326607633246044141 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
m_PrefabInstance: {fileID: 2988963434515109243}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &6859399981411178349
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 7495322353241985613}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4684438329468569219, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: 7b0669364db4d5945b2764f2a5203be5, type: 3}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: -30
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: -30
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6023966856263752882, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ItemImage
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
--- !u!224 &1434048260887657979 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 5537097381728496278, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
m_PrefabInstance: {fileID: 6859399981411178349}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2176096409418682862 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 4684438329468569219, guid: ecdd9e5f95150a64788ab21d61a154b9, type: 3}
|
||||
m_PrefabInstance: {fileID: 6859399981411178349}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 54fa77f2833129c468d3c7db11686eb4
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/_DDD/_Addressables/So/UiActionInputBinding/CookUi_UiActionsInputBinding.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_Addressables/So/UiActionInputBinding/CookUi_UiActionsInputBinding.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_Raw/Sprites/Ui/Common/SpeechBubble.png
(Stored with Git LFS)
Normal file
BIN
Assets/_DDD/_Raw/Sprites/Ui/Common/SpeechBubble.png
(Stored with Git LFS)
Normal file
Binary file not shown.
143
Assets/_DDD/_Raw/Sprites/Ui/Common/SpeechBubble.png.meta
Normal file
143
Assets/_DDD/_Raw/Sprites/Ui/Common/SpeechBubble.png.meta
Normal file
@ -0,0 +1,143 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7b7add64dc2936e4f82bb63695aa5a6c
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 2
|
||||
spriteMeshType: 0
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 4
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 0
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 4
|
||||
buildTarget: WindowsStoreApps
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
customData:
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spriteCustomMetadata:
|
||||
entries: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -894,6 +894,17 @@
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"id": "484c1a63-a617-4149-9242-251a337c8cc8",
|
||||
"path": "<Keyboard>/f",
|
||||
"interactions": "",
|
||||
"processors": "",
|
||||
"groups": ";Keyboard&Mouse",
|
||||
"action": "Cancel",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"id": "19e1fbbb-bff6-4e7b-a4df-79a390e38386",
|
||||
@ -908,7 +919,7 @@
|
||||
{
|
||||
"name": "",
|
||||
"id": "cfbf9b29-3d54-45fc-b740-699c18628211",
|
||||
"path": "<Keyboard>/f",
|
||||
"path": "<Keyboard>/t",
|
||||
"interactions": "",
|
||||
"processors": "",
|
||||
"groups": ";Keyboard&Mouse",
|
||||
|
||||
3
Assets/_DDD/_Scripts/Game/GameObject.meta
Normal file
3
Assets/_DDD/_Scripts/Game/GameObject.meta
Normal file
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e9bb6d801f134399b78da0f0cc842713
|
||||
timeCreated: 1756456534
|
||||
28
Assets/_DDD/_Scripts/Game/GameObject/VirtualItem.cs
Normal file
28
Assets/_DDD/_Scripts/Game/GameObject/VirtualItem.cs
Normal file
@ -0,0 +1,28 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace DDD
|
||||
{
|
||||
public class VirtualItem : ICarriable
|
||||
{
|
||||
private readonly string _itemId;
|
||||
|
||||
public VirtualItem(string itemId)
|
||||
{
|
||||
_itemId = itemId;
|
||||
}
|
||||
|
||||
public string GetCarrierId() => _itemId;
|
||||
public CarriableType GetCarriableType() => CarriableType.VirtualItem;
|
||||
public GameObject GetGameObject() => null;
|
||||
|
||||
public bool CanCarry()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public void OnCarried(ICarrier carrier)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
3
Assets/_DDD/_Scripts/Game/GameObject/VirtualItem.cs.meta
Normal file
3
Assets/_DDD/_Scripts/Game/GameObject/VirtualItem.cs.meta
Normal file
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 58df8ac36f774d3293a0eee9226914f2
|
||||
timeCreated: 1756455026
|
||||
3
Assets/_DDD/_Scripts/Game/GameUi/BaseUi/WorldUis.meta
Normal file
3
Assets/_DDD/_Scripts/Game/GameUi/BaseUi/WorldUis.meta
Normal file
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2abcf465835f4bc6ac505c1df0988753
|
||||
timeCreated: 1756460193
|
||||
@ -0,0 +1,45 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace DDD
|
||||
{
|
||||
public interface ISpeechBubble
|
||||
{
|
||||
void Show(Sprite sprite);
|
||||
void Show(string key);
|
||||
void Hide();
|
||||
}
|
||||
|
||||
public class SpeechBubble : MonoBehaviour, ISpeechBubble
|
||||
{
|
||||
[SerializeField] private GameObject _panel;
|
||||
[SerializeField] private Image _itemImage;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
HidePanel();
|
||||
}
|
||||
|
||||
private void ShowPanel() => _panel.SetActive(true);
|
||||
private void HidePanel() => _panel.SetActive(false);
|
||||
public void SetImage(Sprite sprite) => _itemImage.sprite = sprite;
|
||||
public void SetImage(string key) => DataManager.Instance.GetSprite(key);
|
||||
|
||||
public void Show(Sprite sprite)
|
||||
{
|
||||
SetImage(sprite);
|
||||
ShowPanel();
|
||||
}
|
||||
|
||||
public void Show(string key)
|
||||
{
|
||||
SetImage(key);
|
||||
ShowPanel();
|
||||
}
|
||||
|
||||
public void Hide()
|
||||
{
|
||||
HidePanel();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9e3f3626b80543078f6df1b04dd3e5f0
|
||||
timeCreated: 1756460205
|
||||
@ -0,0 +1,78 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace DDD
|
||||
{
|
||||
public enum CarriableType
|
||||
{
|
||||
None = 0,
|
||||
GameObjectItem, // 실제 GameObject
|
||||
VirtualItem // ID만 존재하는 가상 아이템
|
||||
}
|
||||
|
||||
public interface ICarrier
|
||||
{
|
||||
GameObject GetCarrierGameObject();
|
||||
string GetCarrierId();
|
||||
ICarriable GetCurrentCarriable();
|
||||
bool CanCarryTo(ICarriable carriable);
|
||||
void Carry(ICarriable carriable);
|
||||
void Use(ICarriable carriable);
|
||||
}
|
||||
|
||||
public interface ICarriable
|
||||
{
|
||||
string GetCarrierId();
|
||||
CarriableType GetCarriableType();
|
||||
void OnCarried(ICarrier carrier);
|
||||
bool CanCarry();
|
||||
|
||||
// 실제 오브젝트인 경우에만 유효
|
||||
GameObject GetGameObject();
|
||||
}
|
||||
|
||||
public class CharacterCarrier : MonoBehaviour, ICarrier
|
||||
{
|
||||
private ICarriable _currentCarriable;
|
||||
private ISpeechBubble _speechBubble;
|
||||
|
||||
public GameObject GetCarrierGameObject()
|
||||
{
|
||||
return gameObject;
|
||||
}
|
||||
|
||||
public string GetCarrierId()
|
||||
{
|
||||
return _currentCarriable.GetCarrierId();
|
||||
}
|
||||
|
||||
public ICarriable GetCurrentCarriable()
|
||||
{
|
||||
return _currentCarriable;
|
||||
}
|
||||
|
||||
public bool CanCarryTo(ICarriable carriable)
|
||||
{
|
||||
if (_currentCarriable != null) return false;
|
||||
if (carriable == null) return false;
|
||||
if (carriable.CanCarry() == false) return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public void Carry(ICarriable carriable)
|
||||
{
|
||||
_currentCarriable = carriable;
|
||||
_currentCarriable.OnCarried(this);
|
||||
|
||||
_speechBubble ??= GetComponentInChildren<ISpeechBubble>();
|
||||
_speechBubble?.Show(_currentCarriable.GetCarrierId());
|
||||
}
|
||||
|
||||
public void Use(ICarriable carriable)
|
||||
{
|
||||
_currentCarriable = null;
|
||||
|
||||
_speechBubble.Hide();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f92b168407b75f14aa1941f878c9a4d5
|
||||
@ -17,15 +17,13 @@ protected override void Start()
|
||||
{
|
||||
base.Start();
|
||||
|
||||
_ = Initialize();
|
||||
Initialize();
|
||||
}
|
||||
|
||||
private Task Initialize()
|
||||
private void Initialize()
|
||||
{
|
||||
_restaurantPlayerDataSo = RestaurantData.Instance.PlayerData;
|
||||
Debug.Assert(_restaurantPlayerDataSo != null, "_restaurantPlayerDataSo is null");
|
||||
|
||||
_restaurantPlayerDataSo!.InteractAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Interact));
|
||||
_restaurantPlayerDataSo.InteractAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Interact));
|
||||
_restaurantPlayerDataSo.InteractAction.performed += OnInteractPerformed;
|
||||
_restaurantPlayerDataSo.InteractAction.canceled += OnInteractCanceled;
|
||||
|
||||
@ -33,8 +31,6 @@ private Task Initialize()
|
||||
_interactionLayerMask = _restaurantPlayerDataSo.InteractionLayerMask;
|
||||
|
||||
EventBus.Register<RestaurantInteractionEvent>(this);
|
||||
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public override void InitializeSolvers()
|
||||
|
||||
@ -269,5 +269,22 @@ public bool HasAddedCookByCookwareKey(string cookwareKey)
|
||||
{
|
||||
return _cookwareToRecipeMapping.ContainsKey(cookwareKey) && _cookwareToRecipeMapping[cookwareKey].Count > 0;;
|
||||
}
|
||||
|
||||
public bool TryCookingById(string recipeId)
|
||||
{
|
||||
if (_todayFoodRecipeIds.TryGetValue(recipeId, out var foodCount) && foodCount > 0)
|
||||
{
|
||||
_todayFoodRecipeIds[recipeId] -= 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (_todayDrinkRecipeIds.TryGetValue(recipeId, out var drinkCount) && drinkCount > 0)
|
||||
{
|
||||
_todayDrinkRecipeIds[recipeId] -= 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -262,11 +262,34 @@ private void UpdateSelectedCook()
|
||||
|
||||
private void StartCooking()
|
||||
{
|
||||
// TODO : 플레이어가 선택된 요리 들기
|
||||
|
||||
|
||||
// TODO : 미니 게임 메세지로 대체 (임시)
|
||||
var evt = GameEvents.ShowGlobalMessageEvent;
|
||||
var cookingModel = SelectedCookSlot.Model;
|
||||
var recipeId = cookingModel.Id;
|
||||
if (GetRestaurantManagementState().TryCookingById(recipeId) == false)
|
||||
{
|
||||
// TODO : 메세지 (임시)
|
||||
evt.Set("cooking_failed_dummy_message", newTextColor: Color.red);
|
||||
EventBus.Broadcast(evt);
|
||||
return;
|
||||
}
|
||||
|
||||
var carrier = PlayerManager.Instance.GetPlayer().GetComponent<ICarrier>();
|
||||
if (carrier == null)
|
||||
{
|
||||
Debug.LogError("플레이어 오브젝트에 ICarrier 인터페이스를 찾을 수 없습니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
var newVirtualCarriable = new VirtualItem(cookingModel.GetRecipeResultKey);
|
||||
if (carrier.CanCarryTo(newVirtualCarriable) == false)
|
||||
{
|
||||
Debug.Log("플레이어가 해당 오브젝트를 들 수 없는 상태입니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
carrier.Carry(newVirtualCarriable);
|
||||
|
||||
// TODO : 미니 게임 메세지로 대체 (임시)
|
||||
evt.Set("cooking_minigame_dummy_message", 2f, newTextColor: Color.green);
|
||||
EventBus.Broadcast(evt);
|
||||
}
|
||||
|
||||
BIN
ProjectSettings/EditorBuildSettings.asset
(Stored with Git LFS)
BIN
ProjectSettings/EditorBuildSettings.asset
(Stored with Git LFS)
Binary file not shown.
Loading…
Reference in New Issue
Block a user