Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into develop
This commit is contained in:
Jeonghyeon Ha
commit
f07d3f196b
BIN
Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset
(Stored with Git LFS)
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -1,8 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 09f4966f14db79b4f89e830531b01e9e
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
guid: e3aec645efb9e7a49a6b421d9a60f8c2
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 9100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,5 +1,280 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &633131044254461841
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3251801155585931500}
|
||||
m_Layer: 10
|
||||
m_Name: Fill Area
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3251801155585931500
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 633131044254461841}
|
||||
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: 0
|
||||
m_Children:
|
||||
- {fileID: 609795798002784246}
|
||||
m_Father: {fileID: 4124712097831813607}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.25}
|
||||
m_AnchorMax: {x: 1, y: 0.75}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &6108830054777696831
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 609795798002784246}
|
||||
- component: {fileID: 5096550498312619918}
|
||||
- component: {fileID: 6088464776038824938}
|
||||
m_Layer: 10
|
||||
m_Name: Fill
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &609795798002784246
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6108830054777696831}
|
||||
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: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3251801155585931500}
|
||||
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}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5096550498312619918
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6108830054777696831}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &6088464776038824938
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6108830054777696831}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 0, b: 0, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &6934217169991235231
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6896730674754028691}
|
||||
- component: {fileID: 2778170821913614564}
|
||||
- component: {fileID: 5385555677689984514}
|
||||
m_Layer: 10
|
||||
m_Name: Background
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6896730674754028691
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6934217169991235231}
|
||||
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: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4124712097831813607}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.25}
|
||||
m_AnchorMax: {x: 1, y: 0.75}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2778170821913614564
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6934217169991235231}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5385555677689984514
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6934217169991235231}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &7478348093145584255
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4124712097831813607}
|
||||
- component: {fileID: 290174062369355600}
|
||||
m_Layer: 10
|
||||
m_Name: Slider
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4124712097831813607
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7478348093145584255}
|
||||
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: 0
|
||||
m_Children:
|
||||
- {fileID: 6896730674754028691}
|
||||
- {fileID: 3251801155585931500}
|
||||
m_Father: {fileID: 6787772463908443990}
|
||||
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: -122.7}
|
||||
m_SizeDelta: {x: 80, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &290174062369355600
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7478348093145584255}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 0
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 6088464776038824938}
|
||||
m_FillRect: {fileID: 609795798002784246}
|
||||
m_HandleRect: {fileID: 0}
|
||||
m_Direction: 0
|
||||
m_MinValue: 0
|
||||
m_MaxValue: 1
|
||||
m_WholeNumbers: 0
|
||||
m_Value: 1
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1001 &6675463944788402332
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8,6 +283,10 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1177268455256782109, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: m_BlockingMask.m_Bits
|
||||
value: 1023
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2686192822530022837, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: m_IsTrigger
|
||||
value: 1
|
||||
@ -1686,11 +1965,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2}
|
||||
- target: {fileID: 4246001044237372826, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4900607124439125211, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5108021082109611361, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: _availableInteractions
|
||||
@ -1698,7 +1977,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5523461449651244940, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5654854357519457123, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: gravity.x
|
||||
@ -1726,7 +2005,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6312111630636169229, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6336425934484470474, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: m_SortingOrder
|
||||
@ -1754,7 +2033,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2}
|
||||
- target: {fileID: 6558328110360087691, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6558328110360087691, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6826437533270866908, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
propertyPath: externalBehavior
|
||||
@ -1799,7 +2082,10 @@ PrefabInstance:
|
||||
m_RemovedComponents:
|
||||
- {fileID: 133104368464330048, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 186617915120465866, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 4124712097831813607}
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
insertIndex: -1
|
||||
@ -1813,6 +2099,9 @@ PrefabInstance:
|
||||
- targetCorrespondingSourceObject: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 7166420413980924482}
|
||||
- targetCorrespondingSourceObject: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 7529813704779128435}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
--- !u!1 &4266090516809920735 stripped
|
||||
GameObject:
|
||||
@ -1843,6 +2132,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 784c770c13244dc0a0804056065eaf92, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_blackboardSo: {fileID: 0}
|
||||
--- !u!114 &3825874317044733320
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2055,3 +2345,51 @@ MonoBehaviour:
|
||||
hitFxFadeOutDuration: 0.25
|
||||
hitFxColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
hitFxRadius: 0.5
|
||||
--- !u!114 &7529813704779128435
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4266090516809920735}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e509fdc10cff4d3487080f126f32544f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
serializationData:
|
||||
SerializedFormat: 2
|
||||
SerializedBytes:
|
||||
ReferencedUnityObjects: []
|
||||
SerializedBytesString:
|
||||
Prefab: {fileID: 0}
|
||||
PrefabModificationsReferencedUnityObjects: []
|
||||
PrefabModifications: []
|
||||
SerializationNodes:
|
||||
- Name: _targetOrderType
|
||||
Entry: 7
|
||||
Data: 0|System.Collections.Generic.HashSet`1[[DDD.Restaurant.RestaurantOrderType,
|
||||
Assembly-CSharp]], System.Core
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 3
|
||||
Data: 4
|
||||
- Name:
|
||||
Entry: 3
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 13
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
_currentOrderType: 0
|
||||
_prevOrderType: 0
|
||||
_patienceSlider: {fileID: 0}
|
||||
--- !u!224 &6787772463908443990 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 186617915120465866, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3}
|
||||
m_PrefabInstance: {fileID: 6675463944788402332}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@ -1,5 +1,52 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &7850297018468800652
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7183539670929002447}
|
||||
- component: {fileID: 3020200883419247994}
|
||||
m_Layer: 5
|
||||
m_Name: _OutlineColor Override
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7183539670929002447
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7850297018468800652}
|
||||
serializedVersion: 2
|
||||
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: []
|
||||
m_Father: {fileID: 1145774483742868458}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &3020200883419247994
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7850297018468800652}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
propertyName: _OutlineColor
|
||||
propertyValue: {r: 1, g: 1, b: 1, a: 1}
|
||||
isHDR: 0
|
||||
--- !u!1001 &5991135733323538638
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -98,12 +145,20 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 6683994851862995748, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 7183539670929002447}
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 733902947636509683, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 7297891606913519494}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3}
|
||||
--- !u!224 &1145774483742868458 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6683994851862995748, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3}
|
||||
m_PrefabInstance: {fileID: 5991135733323538638}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6416383596375464765 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 733902947636509683, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3}
|
||||
|
||||
@ -2167,6 +2167,188 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: a0323801ed497de44ab53f18c23cc402, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &3477427597930815052
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 7330412726684592059}
|
||||
m_Modifications:
|
||||
- target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 45.14
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 49
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 22.57
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -24.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3643576478450009530, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: CookKeyLayout
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4995302901292615342, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_text
|
||||
value: "\uC694\uB9AC\uD558\uAE30"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5903102430418324167, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_text
|
||||
value: T
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 172.86
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 49
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 232.78
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -6.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7865319533890706095, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7865319533890706095, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7865319533890706095, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7865319533890706095, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7865319533890706095, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7865319533890706095, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8762267192074770118, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8762267192074770118, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8762267192074770118, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8762267192074770118, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8762267192074770118, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8762267192074770118, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
--- !u!224 &7317153595074350300 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3}
|
||||
m_PrefabInstance: {fileID: 3477427597930815052}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &3564175063392541128
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3219,7 +3401,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1837337877009618859, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 237.315
|
||||
value: 440.17502
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1837337877009618859, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
@ -3487,7 +3669,10 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 2550093527582931782, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3}
|
||||
insertIndex: 1
|
||||
addedObject: {fileID: 7317153595074350300}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3}
|
||||
--- !u!224 &3916868401897859374 stripped
|
||||
@ -3495,6 +3680,11 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 8107209452760937939, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3}
|
||||
m_PrefabInstance: {fileID: 5105141356604677373}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &7330412726684592059 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2550093527582931782, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3}
|
||||
m_PrefabInstance: {fileID: 5105141356604677373}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &5209202590184013229
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
BIN
Assets/_DDD/_Addressables/So/RestaurantData/DataObjects/RestaurantManagementData.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_Addressables/So/RestaurantData/DataObjects/RestaurantManagementData.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_Addressables/So/RestaurantData/DataObjects/RestaurantPlayerData.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_Addressables/So/RestaurantData/DataObjects/RestaurantPlayerData.asset
(Stored with Git LFS)
Binary file not shown.
@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0c5930b6ad0c4b449a092f59c48a2559
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -21,7 +21,7 @@ TextureImporter:
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 1
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
@ -46,7 +46,7 @@ TextureImporter:
|
||||
spriteMode: 2
|
||||
spriteExtrude: 2
|
||||
spriteMeshType: 0
|
||||
alignment: 9
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.45117188}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
@ -21,7 +21,7 @@ TextureImporter:
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 1
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
@ -46,7 +46,7 @@ TextureImporter:
|
||||
spriteMode: 2
|
||||
spriteExtrude: 2
|
||||
spriteMeshType: 0
|
||||
alignment: 9
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.22851562}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
@ -21,7 +21,7 @@ TextureImporter:
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 1
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
@ -46,7 +46,7 @@ TextureImporter:
|
||||
spriteMode: 2
|
||||
spriteExtrude: 2
|
||||
spriteMeshType: 0
|
||||
alignment: 9
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.22851562}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
@ -21,7 +21,7 @@ TextureImporter:
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 1
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
@ -46,7 +46,7 @@ TextureImporter:
|
||||
spriteMode: 2
|
||||
spriteExtrude: 2
|
||||
spriteMeshType: 0
|
||||
alignment: 9
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.22851562}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
BIN
Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message Shared Data.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message Shared Data.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_en.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_en.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ja.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ja.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ko.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ko.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name Shared Data.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name Shared Data.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste Shared Data.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste Shared Data.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_en.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_en.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ja.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ja.asset
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ko.asset
(Stored with Git LFS)
BIN
Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ko.asset
(Stored with Git LFS)
Binary file not shown.
@ -421,7 +421,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1008003955756573696, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 83.369995
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1008003955756573696, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
@ -717,7 +717,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4130017465905115418, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 116.35
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4130017465905115418, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -737,7 +737,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4223787967856646522, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 84.6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4223787967856646522, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -933,7 +933,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6783010733222258758, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 66.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6783010733222258758, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -961,7 +961,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6892356896533285718, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 181.93
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6892356896533285718, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1009,7 +1009,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7713383399699078732, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 45.14
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7713383399699078732, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
@ -1033,7 +1033,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7974438497134857488, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 66.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7974438497134857488, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
@ -1153,10 +1153,58 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2895631047819282398, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2895631047819282398, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2895631047819282398, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2895631047819282398, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2895631047819282398, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2895631047819282398, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3080325846008693413, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RestaurantHud
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3494828945181302518, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3494828945181302518, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3494828945181302518, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3494828945181302518, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3494828945181302518, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3494828945181302518, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4664972416674662382, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
@ -1237,6 +1285,78 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5310309091478669842, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5310309091478669842, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5310309091478669842, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5310309091478669842, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5310309091478669842, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5310309091478669842, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5531837051647323018, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5531837051647323018, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5531837051647323018, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5531837051647323018, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5531837051647323018, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5531837051647323018, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5763713121236530573, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5763713121236530573, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5763713121236530573, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5763713121236530573, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5763713121236530573, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5763713121236530573, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7495439814947728977, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
@ -1261,6 +1381,30 @@ PrefabInstance:
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8315279841667679794, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8315279841667679794, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8315279841667679794, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8315279841667679794, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8315279841667679794, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8315279841667679794, guid: 86a58b93c36851e4787861c23023b094, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
@ -3054,7 +3198,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1561416421336272141, guid: 67b28d928cd16794eba49dade35d395d, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 140
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1561416421336272141, guid: 67b28d928cd16794eba49dade35d395d, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
@ -3078,7 +3222,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1574507451341098674, guid: 67b28d928cd16794eba49dade35d395d, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 45.14
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1574507451341098674, guid: 67b28d928cd16794eba49dade35d395d, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
|
||||
@ -9,16 +9,13 @@ public class AssetPostProcessors : AssetPostprocessor
|
||||
private void OnPreprocessTexture()
|
||||
{
|
||||
var importer = assetImporter as TextureImporter;
|
||||
if (!importer) return;
|
||||
|
||||
var upperPath = importer.assetPath.ToUpper();
|
||||
|
||||
if (upperPath.Contains(PathConstants.RawSpritesPathUpper))
|
||||
{
|
||||
if (upperPath.Contains(PathConstants.RawOnlyAtlasPathUpper))
|
||||
{
|
||||
AssetPostprocessorSprite.OnPreprocessTextureOnlyAtlas(importer);
|
||||
}
|
||||
else if (upperPath.Contains(PathConstants.RawUiPathUpper))
|
||||
if (upperPath.Contains(PathConstants.RawUiPathUpper))
|
||||
{
|
||||
AssetPostprocessorSprite.OnPreprocessTextureForUi(importer);
|
||||
}
|
||||
|
||||
@ -16,7 +16,6 @@ public static class AssetPostprocessorSprite
|
||||
public static void OnPreprocessTexture(TextureImporter importer)
|
||||
{
|
||||
importer.textureType = TextureImporterType.Sprite;
|
||||
importer.spriteImportMode = SpriteImportMode.Single;
|
||||
|
||||
importer.GetSourceTextureWidthAndHeight(out var width, out var height);
|
||||
importer.spritePixelsPerUnit = width <= height ? width : height;
|
||||
@ -25,7 +24,6 @@ public static void OnPreprocessTexture(TextureImporter importer)
|
||||
importer.isReadable = true;
|
||||
importer.mipmapEnabled = false;
|
||||
importer.streamingMipmaps = false;
|
||||
importer.wrapMode = TextureWrapMode.Clamp;
|
||||
importer.filterMode = FilterMode.Bilinear;
|
||||
|
||||
importer.textureCompression = TextureImporterCompression.Uncompressed;
|
||||
@ -44,16 +42,11 @@ public static void OnPreprocessTexture(TextureImporter importer)
|
||||
public static void OnPreprocessTextureForUi(TextureImporter importer)
|
||||
{
|
||||
importer.textureType = TextureImporterType.Sprite;
|
||||
importer.spriteImportMode = SpriteImportMode.Single;
|
||||
|
||||
// 기본 PPU (UI는 100 또는 1 고정 추천)
|
||||
// importer.spritePixelsPerUnit = 100f;
|
||||
|
||||
importer.sRGBTexture = true;
|
||||
importer.isReadable = false;
|
||||
importer.mipmapEnabled = false;
|
||||
importer.streamingMipmaps = false;
|
||||
importer.wrapMode = TextureWrapMode.Clamp;
|
||||
importer.filterMode = FilterMode.Bilinear;
|
||||
|
||||
importer.textureCompression = TextureImporterCompression.Uncompressed;
|
||||
@ -68,17 +61,6 @@ public static void OnPreprocessTextureForUi(TextureImporter importer)
|
||||
|
||||
importer.SetTextureSettings(textureSettings);
|
||||
}
|
||||
|
||||
public static void OnPreprocessTextureOnlyAtlas(TextureImporter importer)
|
||||
{
|
||||
if (importer.textureType == TextureImporterType.Sprite)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
importer.textureType = TextureImporterType.Sprite;
|
||||
importer.spriteImportMode = SpriteImportMode.Single;
|
||||
}
|
||||
|
||||
private static void TryApplyPivotAfterImport(string path)
|
||||
{
|
||||
|
||||
@ -13,6 +13,7 @@ public class DataManager : Singleton<DataManager>, IManager
|
||||
|
||||
private const string AssetLabel = "GoogleSheetSo";
|
||||
private const string Icon = "_icon";
|
||||
private const string AtlasLabel = "Atlas";
|
||||
|
||||
public void PreInit()
|
||||
{
|
||||
@ -21,7 +22,7 @@ public void PreInit()
|
||||
|
||||
public async Task Init()
|
||||
{
|
||||
await LoadAllGameDataSo();
|
||||
await LoadAllGameDataAssets();
|
||||
await LoadSpriteAtlas();
|
||||
}
|
||||
|
||||
@ -30,7 +31,7 @@ public void PostInit()
|
||||
|
||||
}
|
||||
|
||||
private async Task LoadAllGameDataSo()
|
||||
private async Task LoadAllGameDataAssets()
|
||||
{
|
||||
var assets = await AssetManager.Instance.LoadAssetsByLabel<ScriptableObject>(AssetLabel);
|
||||
_dataAssetTable = new Dictionary<Type, ScriptableObject>(assets.Count);
|
||||
@ -45,7 +46,7 @@ private async Task LoadAllGameDataSo()
|
||||
|
||||
private async Task LoadSpriteAtlas()
|
||||
{
|
||||
List<SpriteAtlas> spriteAtlases = await AssetManager.Instance.LoadAssetsByLabel<SpriteAtlas>(DataConstants.AtlasLabel);
|
||||
List<SpriteAtlas> spriteAtlases = await AssetManager.Instance.LoadAssetsByLabel<SpriteAtlas>(AtlasLabel);
|
||||
_spriteAtlas = new Dictionary<string, Sprite>(spriteAtlases.Count);
|
||||
|
||||
foreach (var atlas in spriteAtlases)
|
||||
|
||||
@ -269,6 +269,13 @@ public void OnSubmit(BaseEventData eventData)
|
||||
public void SetInteractable(bool interactable)
|
||||
{
|
||||
_button.interactable = interactable;
|
||||
if (interactable == false)
|
||||
{
|
||||
_isHighlighted = false;
|
||||
_isPressed = false;
|
||||
_isSelected = false;
|
||||
_isToggled = false;
|
||||
}
|
||||
UpdateVisualState();
|
||||
}
|
||||
|
||||
|
||||
@ -248,7 +248,8 @@ public class SharedTimeLimiter<T> : DecoratorNode
|
||||
|
||||
[Tooltip("하단 블랙보드 키에 현재 시간을 저장할 지")]
|
||||
[SerializeField] protected bool _isBlackboardWriteEnabled = false;
|
||||
[SerializeField] protected T _blackboardKey;
|
||||
[SerializeField] protected T _remainTimeblackboardKey;
|
||||
[SerializeField] protected T _maxTimeblackboardKey;
|
||||
|
||||
public SharedVariable<float> TimeLimit
|
||||
{
|
||||
@ -267,7 +268,6 @@ public TaskStatus TimeoutStatus
|
||||
|
||||
public override void OnStart()
|
||||
{
|
||||
base.OnStart();
|
||||
_startTime = Time.time;
|
||||
}
|
||||
|
||||
|
||||
@ -14,13 +14,15 @@ public override void OnStart()
|
||||
{
|
||||
Debug.LogError($"[{GetType().Name}] 블랙보드를 찾을 수 없습니다. 게임오브젝트 해시코드: {gameObject.GetHashCode()}");
|
||||
}
|
||||
_blackboard.SetBlackboardValue(_maxTimeblackboardKey, TimeLimit.Value);
|
||||
_blackboard.SetBlackboardValue(_remainTimeblackboardKey, TimeLimit.Value);
|
||||
}
|
||||
|
||||
public override TaskStatus OnUpdate()
|
||||
{
|
||||
if (_isBlackboardWriteEnabled && _blackboard != null)
|
||||
{
|
||||
_blackboard.SetBlackboardValue(_blackboardKey, Time.time - _startTime);
|
||||
_blackboard.SetBlackboardValue(_remainTimeblackboardKey, TimeLimit.Value - (Time.time - _startTime));
|
||||
}
|
||||
|
||||
return base.OnUpdate();
|
||||
|
||||
@ -13,7 +13,8 @@ public enum RestaurantCustomerBlackboardKey
|
||||
CurrentTargetGameObject,
|
||||
SatisfactionLevel,
|
||||
CumulativeOrderCount,
|
||||
Remaining
|
||||
MaxPatienceTime,
|
||||
RemainingPatienceTime
|
||||
}
|
||||
|
||||
public interface ICustomerBlackboard
|
||||
|
||||
@ -30,5 +30,6 @@ public class RestaurantManagementData : ScriptableObject
|
||||
|
||||
public RuntimeAnimatorController TodayMenuSlotUiAnimatorController;
|
||||
public RuntimeAnimatorController InventorySlotUiAnimatorController;
|
||||
public RuntimeAnimatorController CookingTabUiAnimatorController;
|
||||
}
|
||||
}
|
||||
@ -43,7 +43,7 @@ public void Setup(ItemSlotUi ui, ItemModel model)
|
||||
|
||||
public RuntimeAnimatorController GetAnimatorController()
|
||||
{
|
||||
return RestaurantData.Instance.ManagementData.InventorySlotUiAnimatorController;
|
||||
return RestaurantData.Instance.ManagementData.CookingTabUiAnimatorController;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,26 +1,94 @@
|
||||
using System.Collections.Generic;
|
||||
using Sirenix.OdinInspector;
|
||||
using Sirenix.Serialization;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace DDD.Restaurant
|
||||
{
|
||||
public class CustomerPatienceUiComponent : MonoBehaviour
|
||||
public class CustomerPatienceUiComponent : SerializedMonoBehaviour
|
||||
{
|
||||
private IAISharedBlackboard<RestaurantCustomerBlackboardKey> _blackboard;
|
||||
[SerializeField] HashSet<RestaurantOrderType> _targetOrderType;
|
||||
[SerializeField] RestaurantOrderType _currentOrderType;
|
||||
[OdinSerialize] private HashSet<RestaurantOrderType> _targetOrderType = new();
|
||||
[SerializeField] private RestaurantOrderType _currentOrderType;
|
||||
[SerializeField] private RestaurantOrderType _prevOrderType;
|
||||
private bool _initialized;
|
||||
private IInteractionSubsystemObject<RestaurantOrderType> _subsystem;
|
||||
|
||||
[SerializeField] private Slider _patienceSlider;
|
||||
private void Start()
|
||||
{
|
||||
if (!TryGetComponent(out _blackboard))
|
||||
var canvas = GetComponentInChildren<Canvas>();
|
||||
canvas.worldCamera = Camera.main;
|
||||
|
||||
_patienceSlider = GetComponentInChildren<Slider>();
|
||||
if (_patienceSlider == null)
|
||||
{
|
||||
Debug.LogWarning($"[{GetType().Name}] 블랙보드가 존재하지 않음 오브젝트 해시코드 {gameObject.GetHashCode()}");
|
||||
Debug.LogWarning($"[{GetType().Name}] 슬라이더가 존재하지 않음 오브젝트 해시코드: {gameObject.GetHashCode()}");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!TryGetComponent(out _blackboard))
|
||||
{
|
||||
Debug.LogWarning($"[{GetType().Name}] 블랙보드가 존재하지 않음 오브젝트 해시코드: {gameObject.GetHashCode()}");
|
||||
return;
|
||||
}
|
||||
|
||||
var targetObject = _blackboard.GetBlackboardValue<GameObject>(RestaurantCustomerBlackboardKey.CurrentTargetGameObject);
|
||||
if (targetObject == null)
|
||||
{
|
||||
Debug.LogWarning($"[{GetType().Name}] 타겟 오브젝트가 존재하지 않음 오브젝트 해시코드: {gameObject.GetHashCode()}");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!targetObject.TryGetComponent<IInteractionSubsystemOwner>(out var subsystemOwner))
|
||||
{
|
||||
Debug.LogWarning($"[{GetType().Name}] 서브시스템 오너가 존재하지 않음 오브젝트 해시코드: {gameObject.GetHashCode()}");
|
||||
return;
|
||||
}
|
||||
subsystemOwner.TryGetSubsystemObject(out _subsystem);
|
||||
|
||||
if (_subsystem == null)
|
||||
{
|
||||
Debug.LogWarning($"[{GetType().Name}] RestaurantOrderType 서브시스템이 존재하지 않음 오브젝트 해시코드: {gameObject.GetHashCode()}");
|
||||
return;
|
||||
}
|
||||
|
||||
_currentOrderType = _subsystem.GetInteractionSubsystemType();
|
||||
|
||||
_initialized = true;
|
||||
_patienceSlider.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (!_initialized) return;
|
||||
_currentOrderType = _subsystem.GetInteractionSubsystemType();
|
||||
if (!_targetOrderType.Contains(_currentOrderType))
|
||||
{
|
||||
_patienceSlider.gameObject.SetActive(false);
|
||||
return;
|
||||
}
|
||||
|
||||
if (_currentOrderType != _prevOrderType)
|
||||
{
|
||||
SetPatience();
|
||||
}
|
||||
_patienceSlider.maxValue = _blackboard.GetBlackboardValue<float>(RestaurantCustomerBlackboardKey.MaxPatienceTime);
|
||||
_patienceSlider.value = _blackboard.GetBlackboardValue<float>(RestaurantCustomerBlackboardKey.RemainingPatienceTime);
|
||||
|
||||
if (_patienceSlider.value <= 0)
|
||||
{
|
||||
_patienceSlider.gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
private void SetPatience()
|
||||
{
|
||||
_prevOrderType = _currentOrderType;
|
||||
_patienceSlider.maxValue = _blackboard.GetBlackboardValue<float>(RestaurantCustomerBlackboardKey.MaxPatienceTime);
|
||||
_patienceSlider.value = _patienceSlider.maxValue;
|
||||
_patienceSlider.gameObject.SetActive(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -65,7 +65,6 @@ protected override void OnCreatedInitializePopup()
|
||||
{
|
||||
InitializeViews();
|
||||
InitializeTabGroups();
|
||||
SetupCategoryTabs();
|
||||
SetupBindings();
|
||||
}
|
||||
|
||||
@ -173,12 +172,6 @@ private void InitializeViews()
|
||||
}
|
||||
}
|
||||
|
||||
private void SetupCategoryTabs()
|
||||
{
|
||||
_menuCategoryTabs.UseDefaultAllowedValues();
|
||||
_cookwareCategoryTabs.UseDefaultAllowedValues();
|
||||
}
|
||||
|
||||
private void InitializeTabGroups()
|
||||
{
|
||||
_sectionTabs.Initialize(OnSectionTabSelected);
|
||||
@ -189,7 +182,7 @@ private void InitializeTabGroups()
|
||||
private void UpdateSectionTabs()
|
||||
{
|
||||
if (_viewModel == null) return;
|
||||
_sectionTabs.SelectTab((int)_viewModel.CurrentSection);
|
||||
_sectionTabs.TrySelectTab((int)_viewModel.CurrentSection);
|
||||
}
|
||||
|
||||
private void UpdateCategoryTabs()
|
||||
@ -199,10 +192,10 @@ private void UpdateCategoryTabs()
|
||||
switch (_viewModel.CurrentSection)
|
||||
{
|
||||
case SectionButtonType.Menu:
|
||||
_menuCategoryTabs.SelectTab((int)_viewModel.CurrentCategory);
|
||||
_menuCategoryTabs.TrySelectTab((int)_viewModel.CurrentCategory);
|
||||
break;
|
||||
case SectionButtonType.Cookware:
|
||||
_cookwareCategoryTabs.SelectTab((int)_viewModel.CurrentCategory);
|
||||
_cookwareCategoryTabs.TrySelectTab((int)_viewModel.CurrentCategory);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -264,7 +257,8 @@ private void HandleCloseRequested()
|
||||
|
||||
private void HandleMenuCategorySelected(InventoryCategoryType category)
|
||||
{
|
||||
_menuCategoryTabs.SelectTab((int)category);
|
||||
if (_menuCategoryTabs.TrySelectTab((int)category)) return;
|
||||
if (_cookwareCategoryTabs.TrySelectTab((int)category)) return;
|
||||
}
|
||||
|
||||
private void OnSectionTabSelected(int sectionValue)
|
||||
|
||||
@ -76,22 +76,6 @@ public void Initialize(Action<int> onTabSelected)
|
||||
InitializeTabs();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 기본 허용 값들을 사용하여 탭을 초기화합니다.
|
||||
/// </summary>
|
||||
public void UseDefaultAllowedValues()
|
||||
{
|
||||
if (TabButtonConfig.TryGetValue(_tabButtonType, out List<int> defaultValues))
|
||||
{
|
||||
// 기본값을 바로 사용하여 탭 초기화
|
||||
InitializeTabsWithValues(defaultValues);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogWarning($"TabButtonType {_tabButtonType}에 대한 설정이 정의되지 않았습니다.", this);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 지정된 값들로 탭들을 초기화합니다.
|
||||
/// </summary>
|
||||
@ -144,24 +128,23 @@ private void InitializeTabs()
|
||||
/// </summary>
|
||||
private void HandleTabButtonClicked(int tabValue)
|
||||
{
|
||||
SelectTab(tabValue);
|
||||
TrySelectTab(tabValue);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 지정된 값을 가진 탭을 선택합니다.
|
||||
/// </summary>
|
||||
public void SelectTab(int tabValue)
|
||||
public bool TrySelectTab(int tabValue)
|
||||
{
|
||||
if (_tabLookup == null || _tabLookup.Count == 0)
|
||||
{
|
||||
Debug.LogWarning("탭 룩업이 초기화되지 않았습니다.", this);
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_tabLookup.ContainsKey(tabValue))
|
||||
if (_tabLookup.ContainsKey(tabValue) == false)
|
||||
{
|
||||
Debug.LogWarning($"탭 값 {tabValue}에 해당하는 탭을 찾을 수 없습니다.", this);
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
|
||||
CurrentTabValue = tabValue;
|
||||
@ -174,6 +157,7 @@ public void SelectTab(int tabValue)
|
||||
|
||||
// 이벤트 호출
|
||||
OnTabSelected?.Invoke(tabValue);
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -185,7 +169,7 @@ public void SelectFirstTab()
|
||||
if (_tabButtons[0] != null)
|
||||
{
|
||||
var firstTabValue = _tabButtons[0].TabValue;
|
||||
SelectTab(firstTabValue);
|
||||
TrySelectTab(firstTabValue);
|
||||
}
|
||||
}
|
||||
|
||||
@ -223,7 +207,7 @@ public void Move(int direction)
|
||||
// 상호작용 가능한 탭을 찾았으면 이동
|
||||
if (IsTabInteractable(tabValues[newIndex]))
|
||||
{
|
||||
SelectTab(tabValues[newIndex]);
|
||||
TrySelectTab(tabValues[newIndex]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -10,28 +10,6 @@ public static class CommonConstants
|
||||
public const string BlockImage = "BlockImage";
|
||||
}
|
||||
|
||||
public static class DataConstants
|
||||
{
|
||||
public const string GameStateSo = "GameStateSo";
|
||||
public const string InventoryTestDataSo = "InventoryTestDataSo";
|
||||
public const string ItemDataSo = "ItemDataAsset";
|
||||
public const string RecipeDataSo = "RecipeDataAsset";
|
||||
public const string FoodDataSo = "FoodDataAsset";
|
||||
public const string DrinkDataSo = "DrinkDataAsset";
|
||||
public const string IngredientDataSo = "IngredientDataAsset";
|
||||
public const string CookwareDataSo = "CookwareDataAsset";
|
||||
public const string TasteDataSo = "TasteDataAsset";
|
||||
public const string EnvironmentDataSo = "EnvironmentDataAsset";
|
||||
public const string LevelDataSo = "LevelDataAsset";
|
||||
public const string CustomerPoolDataSo = "CustomerPoolDataAsset";
|
||||
public const string UiInputBindingSo = "UiInputBindingSo";
|
||||
|
||||
public const string RestaurantDataSo = "RestaurantDataSo";
|
||||
|
||||
public const string AtlasLabel = "Atlas";
|
||||
public const string BasePropSpriteMaterial = "BasePropSpriteMaterial";
|
||||
}
|
||||
|
||||
public static class RestaurantPlayerAnimationType
|
||||
{
|
||||
public const string Idle = "Idle";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user