diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index ea5c6bad4..6aefe9ded 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -149,6 +149,108 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &21842981 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 421610955} + m_Modifications: + - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Name + value: TycoonItemSlotUi (2) + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 225 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} +--- !u!224 &21842982 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 21842981} + m_PrefabAsset: {fileID: 0} --- !u!1 &24045680 GameObject: m_ObjectHideFlags: 0 @@ -614,7 +716,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 1678378241, guid: 78925fb45c6c09e42a2b053dacc9c696, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -623,7 +725,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 0.5 --- !u!222 &37297200 CanvasRenderer: m_ObjectHideFlags: 0 @@ -710,11 +812,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -52.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -756,6 +858,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: IsLocked + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: _isLocked value: 1 @@ -774,6 +880,108 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} m_PrefabInstance: {fileID: 64843586} m_PrefabAsset: {fileID: 0} +--- !u!1001 &65862157 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1815544843} + m_Modifications: + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.y + value: -225 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.y + value: -225 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Name + value: IngredientItemSlotUi (8) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} +--- !u!224 &65862158 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + m_PrefabInstance: {fileID: 65862157} + m_PrefabAsset: {fileID: 0} --- !u!1 &79484690 GameObject: m_ObjectHideFlags: 0 @@ -810,8 +1018,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -660} - m_SizeDelta: {x: -80, y: 200} + m_AnchoredPosition: {x: 0, y: -530} + m_SizeDelta: {x: -80, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &79484692 MonoBehaviour: @@ -992,17 +1200,7 @@ MonoBehaviour: SwitchMapsOpened: 2 SwitchMapsClosed: 1 _rectTransform: {fileID: 102499728} - _cookMenuPanel: {fileID: 139042446} - _fryingPanFoodSlotLocation: {fileID: 989840354} - _soupFoodSlotLocation: {fileID: 1173162351} - _skewerFoodSlotLocation: {fileID: 1884162516} - _finishedFoodSlotLocation: {fileID: 1176331394} - _ingredientFoodSlotLocation: {fileID: 1815544843} - _tycoonItemSlotLocation: {fileID: 421610955} - _dailyFoodSlotUi: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} - _finishedFoodSlotUi: {fileID: 6803430367898605830, guid: c1dcd8694a0c4554ab7f60b916d212fc, type: 3} - _ingredientItemSlotUi: {fileID: 6803430367898605830, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - _tycoonItemSlotUi: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + k__BackingField: {fileID: 139042448} --- !u!1 &106186566 GameObject: m_ObjectHideFlags: 0 @@ -1040,7 +1238,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &106186568 MonoBehaviour: @@ -1093,6 +1291,108 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 +--- !u!1001 &138827959 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1815544843} + m_Modifications: + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Name + value: IngredientItemSlotUi (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} +--- !u!224 &138827960 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + m_PrefabInstance: {fileID: 138827959} + m_PrefabAsset: {fileID: 0} --- !u!1 &139042446 GameObject: m_ObjectHideFlags: 0 @@ -1102,8 +1402,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 139042447} + - component: {fileID: 139042448} m_Layer: 5 - m_Name: CookMenuPanel + m_Name: CookMenuUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1133,6 +1434,21 @@ RectTransform: m_AnchoredPosition: {x: -62.499756, y: -25} m_SizeDelta: {x: -95, y: -130} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &139042448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 139042446} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0082f6fc07879948911f80e5ca1e31f, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 1990569297} + k__BackingField: {fileID: 1567220258} + k__BackingField: {fileID: 1453701590} --- !u!4 &141729588 Transform: m_ObjectHideFlags: 0 @@ -1217,7 +1533,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.80392164, g: 0.1137255, b: 0.19215688, a: 1} + m_Color: {r: 1, g: 0.54901963, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1860,107 +2176,151 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &209714888 +--- !u!1 &204218137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 204218138} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &204218138 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204218137} + 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: 607944150} + m_Father: {fileID: 523582525} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 28} + m_Pivot: {x: 0.5, y: 1} +--- !u!1001 &210400510 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1815544843} + m_TransformParent: {fileID: 1378992847} m_Modifications: - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_SizeDelta.x - value: 60 + value: 80 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_SizeDelta.y - value: 60 + value: 80 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_AnchoredPosition.x - value: 95 + value: 220 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_AnchoredPosition.y - value: -290 + value: -40 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: IsLocked + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: _isLocked + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8433118801875043656, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_Name - value: IngredientItemSlotUi (9) + value: DailyFoodSlotUi (2) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} ---- !u!224 &209714889 stripped + m_SourcePrefab: {fileID: 100100000, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} +--- !u!224 &210400511 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - m_PrefabInstance: {fileID: 209714888} + m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 210400510} m_PrefabAsset: {fileID: 0} --- !u!4 &211259727 stripped Transform: @@ -2057,6 +2417,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 215611423} m_CullTransparentMesh: 1 +--- !u!1 &230908402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 230908403} + - component: {fileID: 230908405} + - component: {fileID: 230908404} + m_Layer: 5 + m_Name: ColorImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &230908403 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 230908402} + 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: 1350109859} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 15, y: -2} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &230908404 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 230908402} + 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: 0, g: 0.39215687, b: 0.8039216, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + 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!222 &230908405 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 230908402} + m_CullTransparentMesh: 1 --- !u!1 &272969422 GameObject: m_ObjectHideFlags: 0 @@ -2144,6 +2579,108 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1001 &278514937 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1815544843} + m_Modifications: + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.y + value: -160 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.y + value: -160 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Name + value: IngredientItemSlotUi (7) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} +--- !u!224 &278514938 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + m_PrefabInstance: {fileID: 278514937} + m_PrefabAsset: {fileID: 0} --- !u!1001 &308211526 PrefabInstance: m_ObjectHideFlags: 0 @@ -2394,8 +2931,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -220} - m_SizeDelta: {x: -80, y: 200} + m_AnchoredPosition: {x: 0, y: -190} + m_SizeDelta: {x: -80, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &327744321 MonoBehaviour: @@ -2598,7 +3135,7 @@ MonoBehaviour: m_HorizontalScrollbarVisibility: 0 m_VerticalScrollbarVisibility: 2 m_HorizontalScrollbarSpacing: 0 - m_VerticalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -20 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -2615,7 +3152,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.87058824, g: 0.7529412, b: 0.5686275, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2652,7 +3189,7 @@ GameObject: - component: {fileID: 360820270} - component: {fileID: 360820269} m_Layer: 5 - m_Name: Text (TMP) + m_Name: SelectedFoodText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3149,108 +3686,6 @@ Transform: - {fileID: 1243119378} m_Father: {fileID: 1238956752} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &418644806 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 421610955} - m_Modifications: - - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Name - value: TycoonItemSlotUi (1) - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_SizeDelta.x - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_SizeDelta.y - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchoredPosition.x - value: 135 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchoredPosition.y - value: -40 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} ---- !u!224 &418644807 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - m_PrefabInstance: {fileID: 418644806} - m_PrefabAsset: {fileID: 0} --- !u!1 &421610954 GameObject: m_ObjectHideFlags: 0 @@ -3281,18 +3716,22 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1737029128} - - {fileID: 418644807} - - {fileID: 1855906564} - - {fileID: 1605168862} - - {fileID: 1497877215} - - {fileID: 1750325752} + - {fileID: 1664171139} + - {fileID: 1737090064} + - {fileID: 21842982} + - {fileID: 639093259} + - {fileID: 1660733461} + - {fileID: 1957839370} + - {fileID: 738295683} + - {fileID: 1159737841} + - {fileID: 1106965576} + - {fileID: 1962247113} m_Father: {fileID: 215611424} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0.00054763805} - m_SizeDelta: {x: 0, y: 170} + m_SizeDelta: {x: 0, y: 260} m_Pivot: {x: 0, y: 1} --- !u!114 &421610956 MonoBehaviour: @@ -3374,11 +3813,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -142.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -3420,6 +3859,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: IsLocked + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8433118801875043656, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_Name value: DailyFoodSlotUi @@ -3478,7 +3921,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 440736213} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -3551,11 +3994,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -52.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -3597,6 +4040,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: IsLocked + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: _isLocked value: 1 @@ -3690,6 +4137,198 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 444009244} m_CullTransparentMesh: 1 +--- !u!1001 &515003792 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1815544843} + m_Modifications: + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.y + value: -160 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.y + value: -160 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Name + value: IngredientItemSlotUi (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} +--- !u!224 &515003793 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + m_PrefabInstance: {fileID: 515003792} + m_PrefabAsset: {fileID: 0} +--- !u!1 &523582524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 523582525} + - component: {fileID: 523582528} + - component: {fileID: 523582527} + - component: {fileID: 523582526} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &523582525 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523582524} + 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: 204218138} + m_Father: {fileID: 1617241975} + 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, y: 1} +--- !u!114 &523582526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523582524} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10917, 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!222 &523582527 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523582524} + m_CullTransparentMesh: 1 +--- !u!114 &523582528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523582524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1 &526767279 GameObject: m_ObjectHideFlags: 0 @@ -3720,8 +4359,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1278147493} - {fileID: 1925779218} + - {fileID: 1278147493} m_Father: {fileID: 1567220255} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -3796,7 +4435,7 @@ Transform: m_GameObject: {fileID: 545850347} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -2, y: 25.711502, z: -32.08078} + m_LocalPosition: {x: 13.01, y: 25.711504, z: -21.75178} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3994,11 +4633,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -4040,6 +4679,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: IsLocked + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: _isLocked value: 1 @@ -4058,6 +4701,112 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} m_PrefabInstance: {fileID: 566176540} m_PrefabAsset: {fileID: 0} +--- !u!1001 &567774568 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1378992847} + m_Modifications: + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalPosition.x + value: -142.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalPosition.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_AnchoredPosition.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_AnchoredPosition.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: IsLocked + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8433118801875043656, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_Name + value: DailyFoodSlotUi + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} +--- !u!224 &567774569 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 567774568} + m_PrefabAsset: {fileID: 0} --- !u!1 &571612559 GameObject: m_ObjectHideFlags: 0 @@ -4177,7 +4926,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 578755295} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -4372,7 +5121,7 @@ GameObject: - component: {fileID: 597588667} - component: {fileID: 597588666} m_Layer: 5 - m_Name: Text (TMP) + m_Name: CookText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4496,6 +5245,195 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 597588664} m_CullTransparentMesh: 1 +--- !u!1001 &604714257 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1815544843} + m_Modifications: + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.y + value: -95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.y + value: -95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Name + value: IngredientItemSlotUi (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} +--- !u!224 &604714258 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + m_PrefabInstance: {fileID: 604714257} + m_PrefabAsset: {fileID: 0} +--- !u!1 &607944149 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 607944150} + - component: {fileID: 607944151} + m_Layer: 5 + m_Name: Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &607944150 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 607944149} + 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: 1154969372} + - {fileID: 1078622233} + - {fileID: 1795712518} + m_Father: {fileID: 204218138} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &607944151 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 607944149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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: 1154969373} + toggleTransition: 1 + graphic: {fileID: 1078622234} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 1 --- !u!1 &626632725 GameObject: m_ObjectHideFlags: 0 @@ -4622,6 +5560,285 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 626632725} m_CullTransparentMesh: 1 +--- !u!1001 &639093258 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 421610955} + m_Modifications: + - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Name + value: TycoonItemSlotUi (3) + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 315 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} +--- !u!224 &639093259 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 639093258} + m_PrefabAsset: {fileID: 0} +--- !u!1 &670055546 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 670055547} + - component: {fileID: 670055549} + - component: {fileID: 670055548} + m_Layer: 5 + m_Name: Arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &670055547 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670055546} + 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: 2108304084} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -15, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &670055548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670055546} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10915, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + 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!222 &670055549 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670055546} + m_CullTransparentMesh: 1 +--- !u!1001 &738295682 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 421610955} + m_Modifications: + - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Name + value: TycoonItemSlotUi (6) + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 225 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -130 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} +--- !u!224 &738295683 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 738295682} + m_PrefabAsset: {fileID: 0} --- !u!1 &751009896 GameObject: m_ObjectHideFlags: 0 @@ -4739,11 +5956,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -4835,6 +6052,210 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -40} m_SizeDelta: {x: 140, y: 40} m_Pivot: {x: 1, y: 1} +--- !u!1001 &810401071 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1815544843} + m_Modifications: + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.y + value: -290 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.y + value: -290 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Name + value: IngredientItemSlotUi (9) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} +--- !u!224 &810401072 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + m_PrefabInstance: {fileID: 810401071} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &842924126 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1815544843} + m_Modifications: + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.y + value: -225 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.y + value: -225 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Name + value: IngredientItemSlotUi (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} +--- !u!224 &842924127 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + m_PrefabInstance: {fileID: 842924126} + m_PrefabAsset: {fileID: 0} --- !u!1 &850434286 GameObject: m_ObjectHideFlags: 0 @@ -5402,7 +6823,7 @@ Transform: m_GameObject: {fileID: 873223985} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -2, y: 25.711502, z: -32.08078} + m_LocalPosition: {x: 13.01, y: 25.711504, z: -21.75178} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5580,108 +7001,6 @@ MonoBehaviour: m_Spacing: {x: 10, y: 10} m_Constraint: 0 m_ConstraintCount: 2 ---- !u!1001 &966919357 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1815544843} - m_Modifications: - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.x - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.x - value: 95 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.y - value: -160 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Name - value: IngredientItemSlotUi (5) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} ---- !u!224 &966919358 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - m_PrefabInstance: {fileID: 966919357} - m_PrefabAsset: {fileID: 0} --- !u!1 &977582642 GameObject: m_ObjectHideFlags: 0 @@ -5968,6 +7287,116 @@ MonoBehaviour: m_Spacing: {x: 10, y: 10} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!1001 &1011627381 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1378992847} + m_Modifications: + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalPosition.x + value: -52.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalPosition.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_AnchoredPosition.x + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_AnchoredPosition.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: IsLocked + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: _isLocked + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8433118801875043656, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: m_Name + value: DailyFoodSlotUi (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} +--- !u!224 &1011627382 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + m_PrefabInstance: {fileID: 1011627381} + m_PrefabAsset: {fileID: 0} --- !u!1 &1016107600 GameObject: m_ObjectHideFlags: 0 @@ -6004,108 +7433,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &1017181534 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1815544843} - m_Modifications: - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.x - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.x - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.y - value: -160 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Name - value: IngredientItemSlotUi (4) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} ---- !u!224 &1017181535 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - m_PrefabInstance: {fileID: 1017181534} - m_PrefabAsset: {fileID: 0} --- !u!4 &1038321203 stripped Transform: m_CorrespondingSourceObject: {fileID: 6190127373159935981, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} @@ -6153,11 +7480,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -6199,6 +7526,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: IsLocked + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: _isLocked value: 1 @@ -6475,6 +7806,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070845212} m_CullTransparentMesh: 1 +--- !u!1 &1078622232 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1078622233} + - component: {fileID: 1078622235} + - component: {fileID: 1078622234} + m_Layer: 5 + m_Name: Item Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1078622233 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1078622232} + 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: 607944150} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1078622234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1078622232} + m_Enabled: 0 + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + 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!222 &1078622235 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1078622232} + m_CullTransparentMesh: 1 --- !u!1 &1078862805 GameObject: m_ObjectHideFlags: 0 @@ -6644,7 +8050,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1101945425 RectTransform: m_ObjectHideFlags: 0 @@ -6702,6 +8108,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1101945424} m_CullTransparentMesh: 1 +--- !u!1001 &1106965575 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 421610955} + m_Modifications: + - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Name + value: TycoonItemSlotUi (8) + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -220 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} +--- !u!224 &1106965576 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 1106965575} + m_PrefabAsset: {fileID: 0} --- !u!1 &1108764854 GameObject: m_ObjectHideFlags: 0 @@ -6838,6 +8346,258 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1108764854} m_CullTransparentMesh: 1 +--- !u!1 &1154969371 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1154969372} + - component: {fileID: 1154969374} + - component: {fileID: 1154969373} + m_Layer: 5 + m_Name: Item Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1154969372 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154969371} + 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: 607944150} + 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!114 &1154969373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154969371} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + 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!222 &1154969374 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1154969371} + m_CullTransparentMesh: 1 +--- !u!1001 &1159737840 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 421610955} + m_Modifications: + - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Name + value: TycoonItemSlotUi (7) + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 315 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -130 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} +--- !u!224 &1159737841 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 1159737840} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1170066054 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1170066055} + - component: {fileID: 1170066057} + - component: {fileID: 1170066056} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1170066055 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170066054} + 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: 1269429789} + 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: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1170066056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170066054} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 1678378241, guid: 78925fb45c6c09e42a2b053dacc9c696, type: 3} + 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: 0.5 +--- !u!222 &1170066057 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170066054} + m_CullTransparentMesh: 1 --- !u!1 &1173162350 GameObject: m_ObjectHideFlags: 0 @@ -6874,8 +8634,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -440} - m_SizeDelta: {x: -80, y: 200} + m_AnchoredPosition: {x: 0, y: -360} + m_SizeDelta: {x: -80, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1173162352 MonoBehaviour: @@ -7506,108 +9266,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ccb8b4cf4e054704a8bfa9e1334764a7, type: 3} ---- !u!1001 &1255684752 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1815544843} - m_Modifications: - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.x - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.x - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.y - value: -225 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Name - value: IngredientItemSlotUi (6) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} ---- !u!224 &1255684753 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - m_PrefabInstance: {fileID: 1255684752} - m_PrefabAsset: {fileID: 0} --- !u!1 &1256380695 GameObject: m_ObjectHideFlags: 0 @@ -7639,6 +9297,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 360820268} + - {fileID: 1869202012} m_Father: {fileID: 1567220255} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -7684,6 +9343,178 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1256380695} m_CullTransparentMesh: 1 +--- !u!1 &1269429788 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1269429789} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1269429789 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1269429788} + 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: 1170066055} + m_Father: {fileID: 1774270790} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1271409482 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1271409483} + - component: {fileID: 1271409485} + - component: {fileID: 1271409484} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1271409483 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271409482} + 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: 2108304084} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -7.5, y: -0.5} + m_SizeDelta: {x: -35, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1271409484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271409482} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uD544\uD130" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18.6 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1271409485 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271409482} + m_CullTransparentMesh: 1 --- !u!1 &1278147492 GameObject: m_ObjectHideFlags: 0 @@ -7697,7 +9528,7 @@ GameObject: - component: {fileID: 1278147495} - component: {fileID: 1278147494} m_Layer: 5 - m_Name: SortDropdown + m_Name: FinishedFoodSortDropdown m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7779,15 +9610,45 @@ MonoBehaviour: - m_Text: "\uC815\uB82C" m_Image: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - - m_Text: Option B + - m_Text: "\uAC00\uACA9\u2191" m_Image: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - - m_Text: Option C + - m_Text: "\uAC00\uACA9\u2193" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uC694\uB9AC\uC885\uB958\u2191" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uC694\uB9AC\uC885\uB958\u2193" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uB9DB\uC885\uB958\u2191" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uB9DB\uC885\uB958\u2193" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uC774\uB984\u2191" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uC774\uB984\u2193" m_Image: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_OnValueChanged: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1567220258} + m_TargetAssemblyTypeName: BlueWater.Uis.CookUi, Assembly-CSharp + m_MethodName: SortButton + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_AlphaFadeSpeed: 0.15 --- !u!114 &1278147495 MonoBehaviour: @@ -7827,6 +9688,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1278147492} m_CullTransparentMesh: 1 +--- !u!1 &1297637640 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1297637641} + - component: {fileID: 1297637643} + - component: {fileID: 1297637642} + m_Layer: 5 + m_Name: DessertMenuPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1297637641 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297637640} + 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: 1350109859} + - {fileID: 1378992847} + m_Father: {fileID: 1453701587} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -700} + m_SizeDelta: {x: -80, y: 140} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1297637642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297637640} + m_Enabled: 0 + 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: 0.29803923} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + 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!222 &1297637643 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297637640} + m_CullTransparentMesh: 1 --- !u!1 &1306764367 GameObject: m_ObjectHideFlags: 0 @@ -8000,7 +9938,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1337634205 MonoBehaviour: @@ -8053,108 +9991,158 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 ---- !u!1001 &1349113119 -PrefabInstance: +--- !u!1 &1350109858 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1815544843} - m_Modifications: - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.x - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.x - value: 95 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.y - value: -95 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Name - value: IngredientItemSlotUi (3) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} ---- !u!224 &1349113120 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - m_PrefabInstance: {fileID: 1349113119} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1350109859} + - component: {fileID: 1350109862} + - component: {fileID: 1350109861} + - component: {fileID: 1350109860} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1350109859 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350109858} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000048048674} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 230908403} + m_Father: {fileID: 1297637641} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -24.999954} + m_SizeDelta: {x: -295.39, y: 50} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1350109860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350109858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &1350109861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350109858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uB514\uC800\uD2B8" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 24 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1350109862 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1350109858} + m_CullTransparentMesh: 1 --- !u!1 &1356312470 GameObject: m_ObjectHideFlags: 0 @@ -8189,8 +10177,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5, y: -0.5} - m_SizeDelta: {x: -30, y: -3} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1356312472 MonoBehaviour: @@ -8221,8 +10209,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -8239,13 +10227,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 + m_fontSize: 13.8 m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 20 + m_fontStyle: 1 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -8291,6 +10279,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1356312470} m_CullTransparentMesh: 1 +--- !u!1 &1378992846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1378992847} + - component: {fileID: 1378992848} + m_Layer: 5 + m_Name: DessertFoodSlotUiList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1378992847 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1378992846} + 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: 567774569} + - {fileID: 1011627382} + - {fileID: 210400511} + m_Father: {fileID: 1297637641} + 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: -25} + m_SizeDelta: {x: 0, y: -50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1378992848 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1378992846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 80, y: 80} + m_Spacing: {x: 10, y: 10} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1001 &1381452131 PrefabInstance: m_ObjectHideFlags: 0 @@ -8333,11 +10384,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -142.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -8723,7 +10774,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.14901961, g: 0.34117648, b: 0.6509804, a: 1} + m_Color: {r: 1, g: 0.84313726, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -8838,6 +10889,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1418585147} m_CullTransparentMesh: 1 +--- !u!1001 &1438594026 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1815544843} + m_Modifications: + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.y + value: -95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.x + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.y + value: -95 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Name + value: IngredientItemSlotUi (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} +--- !u!224 &1438594027 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + m_PrefabInstance: {fileID: 1438594026} + m_PrefabAsset: {fileID: 0} --- !u!1 &1445223406 GameObject: m_ObjectHideFlags: 0 @@ -8882,7 +11035,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1445223406} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -8924,8 +11077,9 @@ GameObject: - component: {fileID: 1453701587} - component: {fileID: 1453701589} - component: {fileID: 1453701588} + - component: {fileID: 1453701590} m_Layer: 5 - m_Name: DailyFoodMenuPanel + m_Name: DailyFoodMenuUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8947,6 +11101,7 @@ RectTransform: - {fileID: 327744320} - {fileID: 1173162351} - {fileID: 79484691} + - {fileID: 1297637641} m_Father: {fileID: 139042447} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -8992,6 +11147,23 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1453701586} m_CullTransparentMesh: 1 +--- !u!114 &1453701590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1453701586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29ee900ba52849b49bfc33631b1e74a0, type: 3} + m_Name: + m_EditorClassIdentifier: + _fryingPanFoodSlotLocation: {fileID: 989840354} + _soupFoodSlotLocation: {fileID: 908699584} + _skewerFoodSlotLocation: {fileID: 1884162516} + _dessertFoodSlotLocation: {fileID: 1378992847} + _dailyFoodSlotUi: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} --- !u!1 &1471090205 GameObject: m_ObjectHideFlags: 0 @@ -9005,7 +11177,7 @@ GameObject: - component: {fileID: 1471090208} - component: {fileID: 1471090207} m_Layer: 5 - m_Name: SortDropdown + m_Name: InventoryDropdown m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9019,7 +11191,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1471090205} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -9087,15 +11259,45 @@ MonoBehaviour: - m_Text: "\uC815\uB82C" m_Image: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - - m_Text: Option B + - m_Text: "\uAC00\uACA9\u2191" m_Image: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - - m_Text: Option C + - m_Text: "\uAC00\uACA9\u2193" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uC544\uC774\uD15C\uC885\uB958\u2191" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uC544\uC774\uD15C\uC885\uB958\u2193" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uC7AC\uB8CC\uC885\uB958\u2191" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uC7AC\uB8CC\uC885\uB958\u2193" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uC774\uB984\u2191" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uC774\uB984\u2193" m_Image: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_OnValueChanged: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1990569297} + m_TargetAssemblyTypeName: BlueWater.Uis.InventoryUi, Assembly-CSharp + m_MethodName: InventorySortButton + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_AlphaFadeSpeed: 0.15 --- !u!114 &1471090208 MonoBehaviour: @@ -9450,108 +11652,6 @@ MonoBehaviour: m_EditorClassIdentifier: SwitchMapsOpened: 2 SwitchMapsClosed: 1 ---- !u!1001 &1497877214 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 421610955} - m_Modifications: - - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Name - value: TycoonItemSlotUi (4) - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_SizeDelta.x - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_SizeDelta.y - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchoredPosition.x - value: 45 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchoredPosition.y - value: -130 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} ---- !u!224 &1497877215 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - m_PrefabInstance: {fileID: 1497877214} - m_PrefabAsset: {fileID: 0} --- !u!1 &1508199804 GameObject: m_ObjectHideFlags: 0 @@ -9586,8 +11686,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5, y: -0.5} - m_SizeDelta: {x: -30, y: -3} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1508199806 MonoBehaviour: @@ -9609,7 +11709,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Option A + m_text: "\uAC00\uACA9\u2191" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} @@ -9618,8 +11718,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -9636,13 +11736,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 + m_fontSize: 13.8 m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 20 + m_fontStyle: 1 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -9688,108 +11788,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1508199804} m_CullTransparentMesh: 1 ---- !u!1001 &1542351160 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1815544843} - m_Modifications: - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.x - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.x - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.y - value: -95 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Name - value: IngredientItemSlotUi (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} ---- !u!224 &1542351161 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - m_PrefabInstance: {fileID: 1542351160} - m_PrefabAsset: {fileID: 0} --- !u!1 &1552262093 GameObject: m_ObjectHideFlags: 0 @@ -9876,8 +11874,9 @@ GameObject: - component: {fileID: 1567220255} - component: {fileID: 1567220257} - component: {fileID: 1567220256} + - component: {fileID: 1567220258} m_Layer: 5 - m_Name: CookPanel + m_Name: CookUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9947,6 +11946,28 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1567220254} m_CullTransparentMesh: 1 +--- !u!114 &1567220258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1567220254} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9218f5903e52fa446af3c1b35c5ba207, type: 3} + m_Name: + m_EditorClassIdentifier: + _selectedFoodImage: {fileID: 1256380697} + _selectedFoodName: {fileID: 360820269} + _selectedFoodTasteText: {fileID: 1869202013} + _finishedFoodSortDropdown: {fileID: 1278147494} + _cookButton: {fileID: 1786369331} + _cookText: {fileID: 597588666} + _finishedFoodSlotLocation: {fileID: 1176331394} + _ingredientFoodSlotLocation: {fileID: 1815544843} + _finishedFoodSlotUi: {fileID: 6803430367898605830, guid: c1dcd8694a0c4554ab7f60b916d212fc, type: 3} + _ingredientItemSlotUi: {fileID: 5759877438722640172, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} --- !u!1 &1572330888 GameObject: m_ObjectHideFlags: 0 @@ -10143,108 +12164,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604407184} m_CullTransparentMesh: 1 ---- !u!1001 &1605168861 -PrefabInstance: +--- !u!1 &1617241974 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 421610955} - m_Modifications: - - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Name - value: TycoonItemSlotUi (3) - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_SizeDelta.x - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_SizeDelta.y - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchoredPosition.x - value: 315 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchoredPosition.y - value: -40 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} ---- !u!224 &1605168862 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - m_PrefabInstance: {fileID: 1605168861} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1617241975} + - component: {fileID: 1617241978} + - component: {fileID: 1617241977} + - component: {fileID: 1617241976} + m_Layer: 5 + m_Name: Template + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1617241975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617241974} + 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: 523582525} + - {fileID: 1774270790} + m_Father: {fileID: 2108304084} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 0, y: 150} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1617241976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617241974} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 204218138} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 523582525} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1774270791} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: -20 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1617241977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617241974} + 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: 0.87058824, g: 0.7529412, b: 0.5686275, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + 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!222 &1617241978 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617241974} + m_CullTransparentMesh: 1 --- !u!1 &1619849087 GameObject: m_ObjectHideFlags: 0 @@ -10454,11 +12481,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -10500,6 +12527,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: IsLocked + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: _isLocked value: 1 @@ -10654,6 +12685,210 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1658965175} m_CullTransparentMesh: 1 +--- !u!1001 &1660733460 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 421610955} + m_Modifications: + - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Name + value: TycoonItemSlotUi (4) + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -130 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} +--- !u!224 &1660733461 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 1660733460} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1664171138 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 421610955} + m_Modifications: + - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Name + value: TycoonItemSlotUi + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} +--- !u!224 &1664171139 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 1664171138} + m_PrefabAsset: {fileID: 0} --- !u!1 &1665075867 GameObject: m_ObjectHideFlags: 0 @@ -10841,7 +13076,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 1, y: 1} --- !u!114 &1676572569 @@ -10887,7 +13122,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1978509265} m_HandleRect: {fileID: 1978509264} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -10913,7 +13148,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: -253798138, guid: 9c75448aaba29644fb4aabe6a37bcec6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -10922,7 +13157,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 0.5 --- !u!222 &1676572571 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11159,11 +13394,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -52.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -11205,6 +13440,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: IsLocked + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: _isLocked value: 1 @@ -11359,10 +13598,107 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1723000583} m_CullTransparentMesh: 1 ---- !u!224 &1737029128 stripped +--- !u!1001 &1737090063 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 421610955} + m_Modifications: + - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Name + value: TycoonItemSlotUi (1) + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 135 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} +--- !u!224 &1737090064 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - m_PrefabInstance: {fileID: 816956612472257166} + m_PrefabInstance: {fileID: 1737090063} m_PrefabAsset: {fileID: 0} --- !u!1 &1742012843 GameObject: @@ -11618,108 +13954,6 @@ MonoBehaviour: pivotPointRoot: {fileID: 0} spreadOutCount: 1 showGraphs: 1 ---- !u!1001 &1750325751 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 421610955} - m_Modifications: - - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Name - value: TycoonItemSlotUi (5) - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_SizeDelta.x - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_SizeDelta.y - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchoredPosition.x - value: 135 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchoredPosition.y - value: -130 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} ---- !u!224 &1750325752 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - m_PrefabInstance: {fileID: 1750325751} - m_PrefabAsset: {fileID: 0} --- !u!1 &1759838089 GameObject: m_ObjectHideFlags: 0 @@ -11992,6 +14226,132 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1769137578} m_CullTransparentMesh: 1 +--- !u!1 &1774270789 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1774270790} + - component: {fileID: 1774270793} + - component: {fileID: 1774270792} + - component: {fileID: 1774270791} + m_Layer: 5 + m_Name: Scrollbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1774270790 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1774270789} + 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: 1269429789} + m_Father: {fileID: 1617241975} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 20, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1774270791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1774270789} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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: 1170066056} + m_HandleRect: {fileID: 1170066055} + m_Direction: 2 + m_Value: 1 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1774270792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1774270789} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -253798138, guid: 9c75448aaba29644fb4aabe6a37bcec6, type: 3} + 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: 0.5 +--- !u!222 &1774270793 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1774270789} + m_CullTransparentMesh: 1 --- !u!1 &1786369329 GameObject: m_ObjectHideFlags: 0 @@ -12074,7 +14434,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1786369332} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1567220258} + m_TargetAssemblyTypeName: BlueWater.Uis.CookUi, Assembly-CSharp + m_MethodName: Cook + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1786369332 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12113,6 +14485,244 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1786369329} m_CullTransparentMesh: 1 +--- !u!1 &1795712517 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1795712518} + - component: {fileID: 1795712520} + - component: {fileID: 1795712519} + m_Layer: 5 + m_Name: Item Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1795712518 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795712517} + 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: 607944150} + 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: -10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1795712519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795712517} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Option A + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 13.8 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 8 + m_fontSizeMax: 20 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1795712520 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795712517} + m_CullTransparentMesh: 1 +--- !u!1001 &1813968672 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1815544843} + m_Modifications: + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.y + value: -290 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_AnchoredPosition.y + value: -290 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + propertyPath: m_Name + value: IngredientItemSlotUi (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} +--- !u!224 &1813968673 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} + m_PrefabInstance: {fileID: 1813968672} + m_PrefabAsset: {fileID: 0} --- !u!1 &1815544842 GameObject: m_ObjectHideFlags: 0 @@ -12146,15 +14756,15 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 762644069} - - {fileID: 1925191957} - - {fileID: 1542351161} - - {fileID: 1349113120} - - {fileID: 1017181535} - - {fileID: 966919358} - - {fileID: 1255684753} - - {fileID: 1970481864} - - {fileID: 2005815607} - - {fileID: 209714889} + - {fileID: 604714258} + - {fileID: 515003793} + - {fileID: 842924127} + - {fileID: 1813968673} + - {fileID: 138827960} + - {fileID: 1438594027} + - {fileID: 278514938} + - {fileID: 65862158} + - {fileID: 810401072} m_Father: {fileID: 1567220255} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -12181,7 +14791,7 @@ MonoBehaviour: m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 - m_StartAxis: 0 + m_StartAxis: 1 m_CellSize: {x: 60, y: 60} m_Spacing: {x: 5, y: 5} m_Constraint: 2 @@ -12313,108 +14923,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1849823319} m_CullTransparentMesh: 1 ---- !u!1001 &1855906563 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 421610955} - m_Modifications: - - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Name - value: TycoonItemSlotUi (2) - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_SizeDelta.x - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_SizeDelta.y - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchoredPosition.x - value: 225 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchoredPosition.y - value: -40 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} ---- !u!224 &1855906564 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - m_PrefabInstance: {fileID: 1855906563} - m_PrefabAsset: {fileID: 0} --- !u!1 &1858836598 GameObject: m_ObjectHideFlags: 0 @@ -12451,7 +14959,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 1, y: 1} --- !u!114 &1858836600 @@ -12497,7 +15005,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 37297199} m_HandleRect: {fileID: 37297198} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -12523,7 +15031,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: -253798138, guid: 9c75448aaba29644fb4aabe6a37bcec6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -12532,7 +15040,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 0.5 --- !u!222 &1858836602 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12788,6 +15296,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868299319} m_CullTransparentMesh: 1 +--- !u!1 &1869202011 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1869202012} + - component: {fileID: 1869202014} + - component: {fileID: 1869202013} + m_Layer: 5 + m_Name: SelectedFoodTasteText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1869202012 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1869202011} + 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: 1256380696} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -80} + m_SizeDelta: {x: 300, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1869202013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1869202011} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uACE0\uC18C\uD55C \uB9DB" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 24 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1869202014 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1869202011} + m_CullTransparentMesh: 1 --- !u!1 &1884162515 GameObject: m_ObjectHideFlags: 0 @@ -12948,7 +15592,7 @@ MonoBehaviour: m_HorizontalScrollbarVisibility: 0 m_VerticalScrollbarVisibility: 2 m_HorizontalScrollbarSpacing: 0 - m_VerticalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -20 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -12965,7 +15609,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.87058824, g: 0.7529412, b: 0.5686275, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -13032,11 +15676,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -142.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -13078,6 +15722,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} + propertyPath: IsLocked + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8433118801875043656, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_Name value: DailyFoodSlotUi @@ -13092,108 +15740,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} m_PrefabInstance: {fileID: 1924794515} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1925191956 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1815544843} - m_Modifications: - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.x - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.x - value: 95 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.y - value: -30 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Name - value: IngredientItemSlotUi (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} ---- !u!224 &1925191957 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - m_PrefabInstance: {fileID: 1925191956} - m_PrefabAsset: {fileID: 0} --- !u!1 &1925779217 GameObject: m_ObjectHideFlags: 0 @@ -13302,6 +15848,210 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1925779217} m_CullTransparentMesh: 1 +--- !u!1001 &1957839369 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 421610955} + m_Modifications: + - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Name + value: TycoonItemSlotUi (5) + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 135 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -130 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} +--- !u!224 &1957839370 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 1957839369} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1962247112 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 421610955} + m_Modifications: + - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Name + value: TycoonItemSlotUi (9) + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 135 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -220 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} +--- !u!224 &1962247113 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 1962247112} + m_PrefabAsset: {fileID: 0} --- !u!1 &1966407669 GameObject: m_ObjectHideFlags: 0 @@ -13352,7 +16102,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.28235295, g: 0.7019608, b: 0.36078432, a: 1} + m_Color: {r: 0.19607843, g: 0.8039216, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -13377,108 +16127,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1966407669} m_CullTransparentMesh: 1 ---- !u!1001 &1970481863 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1815544843} - m_Modifications: - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.x - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.x - value: 95 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.y - value: -225 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Name - value: IngredientItemSlotUi (7) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} ---- !u!224 &1970481864 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - m_PrefabInstance: {fileID: 1970481863} - m_PrefabAsset: {fileID: 0} --- !u!1 &1978509263 GameObject: m_ObjectHideFlags: 0 @@ -13536,7 +16184,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 1678378241, guid: 78925fb45c6c09e42a2b053dacc9c696, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -13545,7 +16193,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 0.5 --- !u!222 &1978509266 CanvasRenderer: m_ObjectHideFlags: 0 @@ -13602,8 +16250,9 @@ GameObject: - component: {fileID: 1990569294} - component: {fileID: 1990569296} - component: {fileID: 1990569295} + - component: {fileID: 1990569297} m_Layer: 5 - m_Name: InventoryPanel + m_Name: InventoryUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -13622,8 +16271,9 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2048187806} - - {fileID: 1471090206} - {fileID: 1228578001} + - {fileID: 2108304084} + - {fileID: 1471090206} m_Father: {fileID: 139042447} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -13669,6 +16319,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1990569293} m_CullTransparentMesh: 1 +--- !u!114 &1990569297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1990569293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0aa6c5437b8592a47a158038ecd836ae, type: 3} + m_Name: + m_EditorClassIdentifier: + _inventoryFilterSortDropdown: {fileID: 2108304085} + _inventorySortDropdown: {fileID: 1471090207} + _tycoonItemSlotLocation: {fileID: 421610955} + _tycoonItemSlotUi: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} --- !u!1 &1993214433 GameObject: m_ObjectHideFlags: 0 @@ -13790,108 +16456,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1993214433} m_CullTransparentMesh: 1 ---- !u!1001 &2005815606 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1815544843} - m_Modifications: - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.x - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_SizeDelta.y - value: 60 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.x - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_AnchoredPosition.y - value: -290 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8433118801875043656, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - propertyPath: m_Name - value: IngredientItemSlotUi (8) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} ---- !u!224 &2005815607 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} - m_PrefabInstance: {fileID: 2005815606} - m_PrefabAsset: {fileID: 0} --- !u!1 &2017406340 GameObject: m_ObjectHideFlags: 0 @@ -14221,103 +16785,161 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} ---- !u!1001 &816956612472257166 -PrefabInstance: +--- !u!1 &2108304083 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 421610955} - m_Modifications: - - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Name - value: TycoonItemSlotUi - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_SizeDelta.x - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_SizeDelta.y - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchoredPosition.x - value: 45 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_AnchoredPosition.y - value: -40 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2108304084} + - component: {fileID: 2108304087} + - component: {fileID: 2108304086} + - component: {fileID: 2108304085} + m_Layer: 5 + m_Name: InventoryFilterDropdown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2108304084 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2108304083} + 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: 1271409483} + - {fileID: 670055547} + - {fileID: 1617241975} + m_Father: {fileID: 1990569294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -160, y: -130} + m_SizeDelta: {x: 80, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2108304085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2108304083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b743370ac3e4ec2a1668f5455a8ef8a, 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: 2108304086} + m_Template: {fileID: 1617241975} + m_CaptionText: {fileID: 1271409484} + m_CaptionImage: {fileID: 0} + m_Placeholder: {fileID: 0} + m_ItemText: {fileID: 1795712519} + m_ItemImage: {fileID: 0} + m_Value: 0 + m_MultiSelect: 0 + m_Options: + m_Options: + - m_Text: "\uD544\uD130" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uC804\uCCB4" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + - m_Text: "\uC7AC\uB8CC" + m_Image: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1990569297} + m_TargetAssemblyTypeName: BlueWater.Uis.InventoryUi, Assembly-CSharp + m_MethodName: InventoryFilterSortButton + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_AlphaFadeSpeed: 0.15 +--- !u!114 &2108304086 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2108304083} + 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: 0.79215693, g: 0.6117647, b: 0.4431373, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -738154133, guid: 8549b299e8d6b894e9a11c4becb528a3, type: 3} + 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: 2 +--- !u!222 &2108304087 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2108304083} + m_CullTransparentMesh: 1 --- !u!1001 &5626406452199475265 PrefabInstance: m_ObjectHideFlags: 0 @@ -14728,7 +17350,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x - value: -2 + value: 13.01 objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.y @@ -14736,7 +17358,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.z - value: -1.439 + value: 8.89 objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatInventory.cs b/Assets/02.Scripts/Character/Inventory.cs similarity index 76% rename from Assets/02.Scripts/Character/Player/Combat/CombatInventory.cs rename to Assets/02.Scripts/Character/Inventory.cs index 0cc28ddea..a5af81245 100644 --- a/Assets/02.Scripts/Character/Player/Combat/CombatInventory.cs +++ b/Assets/02.Scripts/Character/Inventory.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using BlueWater.Items; using UnityEngine; -namespace BlueWater.Players.Combat +namespace BlueWater { - public enum InventorySortingType + public enum CombatInventorySortingType { None = 0, Recent, @@ -15,7 +15,7 @@ namespace BlueWater.Players.Combat } [Serializable] - public class CombatInventory + public class Inventory { [field: SerializeField] public List ItemSlotList { get; private set; } = new(); @@ -45,18 +45,17 @@ namespace BlueWater.Players.Combat // 같은 idx가 없으면, 리스트에 아이템 새로 추가 if (existingItemIdx != null) { - existingItemIdx.AddItemCount(newItemSlot.Count); + existingItemIdx.AddItemQuantity(newItemSlot.Quantity); + OnChangeItemSlot?.Invoke(existingItemIdx, true); } else { ItemSlotList.Add(newItemSlot); + OnChangeItemSlot?.Invoke(newItemSlot, true); } // 추가된 아이템에 맞게 인벤토리 내의 무게 계산 CalculateInventoryWeight(); - - // 인벤토리 UI에 업데이트 - OnChangeItemSlot?.Invoke(newItemSlot, true); } public void RemoveItem(ItemSlot removeItemSlot, int removeCount) @@ -65,8 +64,8 @@ namespace BlueWater.Players.Combat if (existingItem != null) { - existingItem.RemoveItemCount(removeCount); - if (existingItem.Count <= 0) + existingItem.RemoveItemQuantity(removeCount); + if (existingItem.Quantity <= 0) { ItemSlotList.Remove(existingItem); } @@ -87,32 +86,32 @@ namespace BlueWater.Players.Combat foreach (var element in ItemSlotList) { var elementWeight = ItemManager.Instance.GetItemDataByIdx(element.Idx).Weight; - CurrentTotalWeight += elementWeight * element.Count; + CurrentTotalWeight += elementWeight * element.Quantity; } IsOverWeight = CurrentTotalWeight >= WeightLimit; } - public void SortItem(InventorySortingType sortingType) + public void SortItem(CombatInventorySortingType sortingType) { switch (sortingType) { - case InventorySortingType.None: + case CombatInventorySortingType.None: return; - case InventorySortingType.Recent: + case CombatInventorySortingType.Recent: ItemSlotList.Sort((x, y) => y.AcquisitionTime.CompareTo(x.AcquisitionTime)); break; - case InventorySortingType.Name: + case CombatInventorySortingType.Name: ItemSlotList.Sort((x, y) => string.Compare(ItemManager.Instance.GetItemDataByIdx(x.Idx).Name, ItemManager.Instance.GetItemDataByIdx(y.Idx).Name, StringComparison.Ordinal)); break; - case InventorySortingType.Category: + case CombatInventorySortingType.Category: ItemSlotList.Sort((x, y) => - ItemManager.Instance.GetItemDataByIdx(x.Idx).Category.CompareTo(ItemManager.Instance.GetItemDataByIdx(y.Idx).Category)); + ItemManager.Instance.GetItemDataByIdx(x.Idx).Type.CompareTo(ItemManager.Instance.GetItemDataByIdx(y.Idx).Type)); break; - case InventorySortingType.Count: - ItemSlotList.Sort((x, y) => y.Count.CompareTo(x.Count)); + case CombatInventorySortingType.Count: + ItemSlotList.Sort((x, y) => y.Quantity.CompareTo(x.Quantity)); break; default: throw new ArgumentOutOfRangeException(); diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatInventory.cs.meta b/Assets/02.Scripts/Character/Inventory.cs.meta similarity index 100% rename from Assets/02.Scripts/Character/Player/Combat/CombatInventory.cs.meta rename to Assets/02.Scripts/Character/Inventory.cs.meta diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs index 70c82c3d9..4e54cafa9 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs @@ -99,11 +99,11 @@ namespace BlueWater.Players.Tycoons } } - public void OnBuildingSystem(InputAction.CallbackContext context) + public void OnDevelopKey01(InputAction.CallbackContext context) { if (context.performed) { - + DataManager.Instance.TestData(); } } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs index 6721879d3..d5e98e814 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs @@ -140,8 +140,11 @@ namespace BlueWater.Players.Tycoons CurrentDirection = _inputDirection; IsMoving = _inputDirection != Vector3.zero; - var finalVelocity = _inputDirection * (MoveSpeed * Time.deltaTime); - Rigidbody.MovePosition(transform.position + finalVelocity); + var finalVelocity = _inputDirection * MoveSpeed; + if (!Rigidbody.isKinematic) + { + Rigidbody.linearVelocity = finalVelocity; + } } #endregion diff --git a/Assets/02.Scripts/DataManager.cs b/Assets/02.Scripts/DataManager.cs index 7be464307..ddbb58a7a 100644 --- a/Assets/02.Scripts/DataManager.cs +++ b/Assets/02.Scripts/DataManager.cs @@ -1,4 +1,6 @@ -using BlueWater.Players.Combat; +using System; +using System.Collections.Generic; +using BlueWater.Items; using BlueWater.Tycoons; using Sirenix.OdinInspector; using UnityEngine; @@ -18,46 +20,53 @@ namespace BlueWater { public SaveStage CurrentSaveStage { get; set; } - [field: Title("Inventory")] - [field: SerializeField] public CombatInventory CombatInventory { get; private set; } = new(); + [field: Title("아이템 데이터")] + [field: SerializeField] public Inventory Inventory { get; private set; } = new(); + + [field: Title("아이템 데이터")] + [field: SerializeField] public List FoodRecipes { get; private set; } = new(); public int Gold { get; set; } = 0; [field: Title("타이쿤 데이터")] [field: SerializeField] public TycoonData TycoonData { get; private set; } + + public event Action OnChangeFoodRecipe; + public void TestData() + { + Inventory.AddItem(new ItemSlot(10107, 2)); + Inventory.AddItem(new ItemSlot(10108, 1)); + Inventory.AddItem(new ItemSlot(10109, 2)); + Inventory.AddItem(new ItemSlot(10201, 1)); + Inventory.AddItem(new ItemSlot(10404, 9)); + Inventory.AddItem(new ItemSlot(10503, 4)); + Inventory.AddItem(new ItemSlot(10507, 15)); + Inventory.AddItem(new ItemSlot(10508, 100)); + Inventory.AddItem(new ItemSlot(10603, 3)); + Inventory.AddItem(new ItemSlot(10701, 999)); + Inventory.AddItem(new ItemSlot(10704, 5396)); + Inventory.AddItem(new ItemSlot(10705, 66)); + Inventory.AddItem(new ItemSlot(10706, 35)); + Inventory.AddItem(new ItemSlot(60001, 2)); + + AddFoodRecipe(30001); + AddFoodRecipe(30002); + AddFoodRecipe(30004); + AddFoodRecipe(30005); + AddFoodRecipe(30006); + } -// /// -// /// Dictionary 초기화 함수 -// /// -// private Dictionary CreateDictionaryFromList(List list, int capacity) where T : IIdx -// { -// var newDictionary = new Dictionary(capacity); -// -// foreach (var item in list) -// { -// newDictionary.Add(item.Idx, item); -// } -// -// return newDictionary; -// } -// -// [ContextMenu("Json To So")] -// public void MakeDataSoFromJson() -// { -// NpcDataSo.npcDataList = GetJsonData>("JSON/customer_table.json"); -// -// #if UNITY_EDITOR_OSX || UNITY_EDITOR_WIN -// EditorUtility.SetDirty(NpcDataSo); -// #endif -// } -// -// private static T GetJsonData(string path) -// { -// var jsonString = File.ReadAllText(SystemPath.GetPath(path)); -// var data = JsonConvert.DeserializeObject(jsonString); -// return data; -// } + public void AddFoodRecipe(int idx) + { + if (FoodRecipes.Contains(idx)) return; + + var foodData = ItemManager.Instance.GetFoodDataByIdx(idx); + if (foodData == null) return; + + FoodRecipes.Add(idx); + OnChangeFoodRecipe?.Invoke(foodData); + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Editor/JsonHelperEditor.cs b/Assets/02.Scripts/Editor/JsonHelperEditor.cs index 608e8eb9a..708e511f2 100644 --- a/Assets/02.Scripts/Editor/JsonHelperEditor.cs +++ b/Assets/02.Scripts/Editor/JsonHelperEditor.cs @@ -105,6 +105,8 @@ namespace BlueWater.Editors Debug.LogError("Json 파일 데이터가 비어있거나, 불러올 수 없습니다.\n" + fullJsonFilePath); return; } + + newData.Sort((x, y) => x.Idx.CompareTo(y.Idx)); var assetFileName = Path.GetFileNameWithoutExtension(_jsonFilePath) + ".asset"; var assetPath = Path.Combine(_assetFilePath, assetFileName); @@ -126,6 +128,7 @@ namespace BlueWater.Editors { var existingData = container.GetData(); MergeData(existingData, newData); + existingData.Sort((x, y) => x.Idx.CompareTo(y.Idx)); container.SetData(existingData); } EditorUtility.DisplayDialog("알림 메세지", "기존 ScriptableObject가 업데이트되었습니다.", "확인"); @@ -146,7 +149,18 @@ namespace BlueWater.Editors private void MergeData(List existingData, List newData) where T : class, IIdx { existingData ??= new List(); - + + var newDataIdxSet = new HashSet(); + foreach (var newDataItem in newData) + { + if (newDataItem != null) + { + newDataIdxSet.Add(newDataItem.Idx); + } + } + + existingData.RemoveAll(item => item == null || !newDataIdxSet.Contains(item.Idx)); + var existingDataDict = new Dictionary(); foreach (var data in existingData) { diff --git a/Assets/02.Scripts/Item/Food/FoodData.cs b/Assets/02.Scripts/Item/Food/FoodData.cs index a072bd886..0e1ed03c9 100644 --- a/Assets/02.Scripts/Item/Food/FoodData.cs +++ b/Assets/02.Scripts/Item/Food/FoodData.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using BlueWater.Interfaces; using Sirenix.OdinInspector; using UnityEngine; @@ -46,33 +47,65 @@ namespace BlueWater.Items public int Plate { get; set; } [field: SerializeField, Tooltip("1번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] - public string IngredientIdx1 { get; set; } + public int IngredientIdx1 { get; set; } [field: SerializeField, Tooltip("1번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] - public string IngredientQuantity1 { get; set; } + public int IngredientQuantity1 { get; set; } [field: SerializeField, Tooltip("2번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] - public string IngredientIdx2 { get; set; } + public int IngredientIdx2 { get; set; } [field: SerializeField, Tooltip("2번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] - public string IngredientQuantity2 { get; set; } + public int IngredientQuantity2 { get; set; } [field: SerializeField, Tooltip("3번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] - public string IngredientIdx3 { get; set; } + public int IngredientIdx3 { get; set; } [field: SerializeField, Tooltip("3번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] - public string IngredientQuantity3 { get; set; } + public int IngredientQuantity3 { get; set; } [field: SerializeField, Tooltip("4번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] - public string IngredientIdx4 { get; set; } + public int IngredientIdx4 { get; set; } [field: SerializeField, Tooltip("4번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] - public string IngredientQuantity4 { get; set; } + public int IngredientQuantity4 { get; set; } [field: SerializeField, Tooltip("5번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] - public string IngredientIdx5 { get; set; } + public int IngredientIdx5 { get; set; } [field: SerializeField, Tooltip("5번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] - public string IngredientQuantity5 { get; set; } + public int IngredientQuantity5 { get; set; } + + public List GetValidIngredients() + { + var ingredients = new List(5); + + if (IngredientIdx1 != 0) ingredients.Add(new Ingredient(IngredientIdx1, IngredientQuantity1)); + if (IngredientIdx2 != 0) ingredients.Add(new Ingredient(IngredientIdx2, IngredientQuantity2)); + if (IngredientIdx3 != 0) ingredients.Add(new Ingredient(IngredientIdx3, IngredientQuantity3)); + if (IngredientIdx4 != 0) ingredients.Add(new Ingredient(IngredientIdx4, IngredientQuantity4)); + if (IngredientIdx5 != 0) ingredients.Add(new Ingredient(IngredientIdx5, IngredientQuantity5)); + + return ingredients; + } + + public string TasteToString() + { + switch (Taste) + { + case FoodTaste.None: + return null; + case FoodTaste.Savory: + return "고소한 맛"; + case FoodTaste.Spicy: + return "매운맛"; + case FoodTaste.Salty: + return "짠맛"; + case FoodTaste.Sweet: + return "단맛"; + default: + throw new ArgumentOutOfRangeException(); + } + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Food/Ingredient.cs b/Assets/02.Scripts/Item/Food/Ingredient.cs new file mode 100644 index 000000000..b55d1cdae --- /dev/null +++ b/Assets/02.Scripts/Item/Food/Ingredient.cs @@ -0,0 +1,17 @@ +using System; + +namespace BlueWater.Items +{ + [Serializable] + public class Ingredient + { + public int Idx { get; set; } + public int Quantity { get; set; } + + public Ingredient(int idx, int quantity) + { + Idx = idx; + Quantity = quantity; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Food/Ingredient.cs.meta b/Assets/02.Scripts/Item/Food/Ingredient.cs.meta new file mode 100644 index 000000000..c84f91af7 --- /dev/null +++ b/Assets/02.Scripts/Item/Food/Ingredient.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b1ee14937a7070d438897a37c609a7fc diff --git a/Assets/02.Scripts/Item/Item.cs b/Assets/02.Scripts/Item/Item.cs index 99a320031..78b554b87 100644 --- a/Assets/02.Scripts/Item/Item.cs +++ b/Assets/02.Scripts/Item/Item.cs @@ -140,8 +140,8 @@ namespace BlueWater.Items { Destroy(gameObject); AudioManager.Instance.PlaySfx(AcquiredSfxName); - DataManager.Instance.CombatInventory.AddItem(ItemSlot); - CombatUiManager.Instance.ItemLootUi.ShowLootInfoUi(ItemData, ItemSlot.Count); + DataManager.Instance.Inventory.AddItem(ItemSlot); + CombatUiManager.Instance.ItemLootUi.ShowLootInfoUi(ItemData, ItemSlot.Quantity); } private IEnumerator LootCoroutine() diff --git a/Assets/02.Scripts/Item/ItemData.cs b/Assets/02.Scripts/Item/ItemData.cs index 852c84243..e3a2ac5ed 100644 --- a/Assets/02.Scripts/Item/ItemData.cs +++ b/Assets/02.Scripts/Item/ItemData.cs @@ -6,7 +6,7 @@ using UnityEngine; namespace BlueWater.Items { - public enum ItemCategory + public enum ItemType { None = 0, FoodIngredient, @@ -16,7 +16,7 @@ namespace BlueWater.Items Quest = 9 } - public enum ItemType + public enum IngredientType { None = 0, Meat, @@ -45,10 +45,10 @@ namespace BlueWater.Items public string Name { get; set; } [field: SerializeField, Tooltip("아이템 종류"), BoxGroup("Json 데이터 영역")] - public ItemCategory Category { get; set; } + public ItemType Type { get; set; } [field: SerializeField, Tooltip("재료 종류"), BoxGroup("Json 데이터 영역")] - public ItemType Type { get; set; } + public IngredientType IngredientType { get; set; } [field: SerializeField, Tooltip("아이템 품질"), BoxGroup("Json 데이터 영역")] public ItemQuality Quality { get; set; } @@ -70,13 +70,13 @@ namespace BlueWater.Items public Item ItemPrefab { get; set; } [JsonConstructor] - public ItemData(int idx, string name, ItemCategory category, ItemType type, ItemQuality quality, int price, + public ItemData(int idx, string name, ItemType type, IngredientType ingredientType, ItemQuality quality, int price, int weight, string description, Sprite sprite, Item itemPrefab) { Idx = idx; Name = name; - Category = category; Type = type; + IngredientType = ingredientType; Quality = quality; Price = price; Weight = weight; @@ -89,8 +89,8 @@ namespace BlueWater.Items { Idx = itemData.Idx; Name = itemData.Name; - Category = itemData.Category; Type = itemData.Type; + IngredientType = itemData.IngredientType; Quality = itemData.Quality; Price = itemData.Price; Weight = itemData.Weight; diff --git a/Assets/02.Scripts/Item/ItemManager.cs b/Assets/02.Scripts/Item/ItemManager.cs index 3dd8bf7b8..2aea6c2e8 100644 --- a/Assets/02.Scripts/Item/ItemManager.cs +++ b/Assets/02.Scripts/Item/ItemManager.cs @@ -12,12 +12,16 @@ namespace BlueWater.Items [SerializeField, Required] private ItemDataSo _itemDataSo; - private Dictionary _itemDictionary; + private Dictionary _itemDataDictionary; [SerializeField, Required] private ItemDropTableSo _itemDropTableSo; private Dictionary _itemDropTableDictionary; + [SerializeField, Required] + private FoodDataSo _foodDataSo; + private Dictionary _foodDataDictionary; + [field: SerializeField, Required] public ItemSlotDataSo ItemSlotDataSo { get; private set; } @@ -39,10 +43,10 @@ namespace BlueWater.Items private void Initialize() { - _itemDictionary = new Dictionary(_itemDataSo.ItemDataList.Count); + _itemDataDictionary = new Dictionary(_itemDataSo.ItemDataList.Count); foreach (var element in _itemDataSo.ItemDataList) { - _itemDictionary.TryAdd(element.Idx, element); + _itemDataDictionary.TryAdd(element.Idx, element); } _itemDropTableDictionary = new Dictionary(_itemDropTableSo.ItemDropTables.Count); @@ -50,6 +54,12 @@ namespace BlueWater.Items { _itemDropTableDictionary.TryAdd(element.CharacterData.CharacterIdx, element); } + + _foodDataDictionary = new Dictionary(_foodDataSo.FoodDatas.Count); + foreach (var element in _foodDataSo.FoodDatas) + { + _foodDataDictionary.TryAdd(element.Idx, element); + } } public void ItemDropRandomPosition(int idx, Vector3 dropPosition, float randomDropRadius = float.PositiveInfinity) @@ -74,7 +84,7 @@ namespace BlueWater.Items droppedPositions.Add(newDropPosition); - var itemPrefab = _itemDictionary[element.Idx].ItemPrefab; + var itemPrefab = _itemDataDictionary[element.Idx].ItemPrefab; if (!itemPrefab) { itemPrefab = _defaultItemPrefab; @@ -95,7 +105,7 @@ namespace BlueWater.Items public ItemData GetItemDataByIdx(int idx) { - if (_itemDictionary.TryGetValue(idx, out var itemData)) return itemData; + if (_itemDataDictionary.TryGetValue(idx, out var itemData)) return itemData; Debug.LogError($"{idx}와 일치하는 아이템이 없습니다."); return null; @@ -114,5 +124,13 @@ namespace BlueWater.Items Debug.LogError($"{idx}와 일치하는 아이템이 없습니다."); return null; } + + public FoodData GetFoodDataByIdx(int idx) + { + if (_foodDataDictionary.TryGetValue(idx, out var foodData)) return foodData; + + Debug.LogError($"{idx}와 일치하는 아이템이 없습니다."); + return null; + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Item/ItemSlot.cs b/Assets/02.Scripts/Item/ItemSlot.cs index 591a45681..d9dc18654 100644 --- a/Assets/02.Scripts/Item/ItemSlot.cs +++ b/Assets/02.Scripts/Item/ItemSlot.cs @@ -10,30 +10,30 @@ namespace BlueWater.Items public int Idx { get; private set; } [field: SerializeField, Tooltip("아이템 수량")] - public int Count { get; set; } + public int Quantity { get; set; } [field: SerializeField, Tooltip("아이템 획득 시간")] public long AcquisitionTime { get; set; } - public ItemSlot(int idx, int count) + public ItemSlot(int idx, int quantity) { Idx = idx; - Count = count; + Quantity = quantity; AcquisitionTime = FormatDateTimeAsNumeric(DateTime.UtcNow); } - public void AddItemCount(int count) + public void AddItemQuantity(int quantity) { - Count += count; + Quantity += quantity; AcquisitionTime = FormatDateTimeAsNumeric(DateTime.UtcNow); } - public void RemoveItemCount(int count) + public void RemoveItemQuantity(int quantity) { - Count -= count; - if (Count < 0) + Quantity -= quantity; + if (Quantity < 0) { - Count = 0; + Quantity = 0; } } diff --git a/Assets/02.Scripts/Item/ItemSlotDataSo.cs b/Assets/02.Scripts/Item/ItemSlotDataSo.cs index d93177bc5..5b4250264 100644 --- a/Assets/02.Scripts/Item/ItemSlotDataSo.cs +++ b/Assets/02.Scripts/Item/ItemSlotDataSo.cs @@ -14,6 +14,9 @@ namespace BlueWater [field: SerializeField] public Color SkewerPanFood { get; private set; } + [field: SerializeField] + public Color DessertFood { get; private set; } + [field: SerializeField] public Color NormalItemBox { get; private set; } diff --git a/Assets/02.Scripts/NewBlueWater.inputactions b/Assets/02.Scripts/NewBlueWater.inputactions index 328c263c6..1414bfa9b 100644 --- a/Assets/02.Scripts/NewBlueWater.inputactions +++ b/Assets/02.Scripts/NewBlueWater.inputactions @@ -540,7 +540,7 @@ "initialStateCheck": false }, { - "name": "BuildingSystem", + "name": "DevelopKey01", "type": "Button", "id": "a0f02877-2c29-4c32-8898-f0074336c625", "expectedControlType": "", @@ -619,11 +619,11 @@ { "name": "", "id": "dd5f3d27-d927-487a-b704-1612e36734cd", - "path": "/b", + "path": "/f1", "interactions": "", "processors": "", "groups": "", - "action": "BuildingSystem", + "action": "DevelopKey01", "isComposite": false, "isPartOfComposite": false } diff --git a/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset index 93135be52..ea7872f13 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset @@ -15,8 +15,8 @@ MonoBehaviour: k__BackingField: - k__BackingField: 10101 k__BackingField: "\uD0B9\uD06C\uB7A9" - k__BackingField: 1 k__BackingField: 1 + k__BackingField: 1 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -25,8 +25,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10102 k__BackingField: "\uACF5\uB8E1 \uACE0\uAE30" - k__BackingField: 1 k__BackingField: 1 + k__BackingField: 1 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -35,8 +35,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10103 k__BackingField: "\uB7A8\uACE0\uAE30" - k__BackingField: 1 k__BackingField: 1 + k__BackingField: 1 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -45,8 +45,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10104 k__BackingField: "\uB2ED\uACE0\uAE30" - k__BackingField: 1 k__BackingField: 1 + k__BackingField: 1 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -55,8 +55,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10105 k__BackingField: "\uBC40\uACE0\uAE30" - k__BackingField: 1 k__BackingField: 1 + k__BackingField: 1 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -65,8 +65,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10106 k__BackingField: "\uCF54\uBFD4\uC18C \uBFD4" - k__BackingField: 1 k__BackingField: 1 + k__BackingField: 1 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -75,28 +75,48 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10107 k__BackingField: "\uCF54\uBFD4\uC18C \uB2E4\uB9AC\uC0B4" - k__BackingField: 1 k__BackingField: 1 + k__BackingField: 1 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: -249642080, guid: 551ef1d8906c85f43bed28c7a5a67e9c, type: 3} + k__BackingField: {fileID: 0} + - k__BackingField: 10108 + k__BackingField: "\uC2AC\uB77C\uC784 \uCC0C\uAC70\uAE30" + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 21300000, guid: 517031ef7cb81d848a246b47006cc498, type: 3} + k__BackingField: {fileID: 0} + - k__BackingField: 10109 + k__BackingField: "\uC5BC\uC74C \uAC00\uC2DC" + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 21300000, guid: cd0b57bb346bc2f45a42fdc2fdf9e398, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10201 k__BackingField: "\uBC31\uC0C1\uC5B4" - k__BackingField: 1 - k__BackingField: 2 + k__BackingField: 1 + k__BackingField: 2 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 83ba6a22503f6834ab2cd6e9e881a9fd, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10202 k__BackingField: "\uB2C8\uBAA8" - k__BackingField: 1 - k__BackingField: 2 + k__BackingField: 1 + k__BackingField: 2 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -105,8 +125,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10203 k__BackingField: "\uD574\uD30C\uB9AC" - k__BackingField: 1 - k__BackingField: 2 + k__BackingField: 1 + k__BackingField: 2 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -115,8 +135,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10204 k__BackingField: "\uAC00\uC624\uB9AC" - k__BackingField: 1 - k__BackingField: 2 + k__BackingField: 1 + k__BackingField: 2 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -125,8 +145,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10205 k__BackingField: "\uC6B0\uB7ED" - k__BackingField: 1 - k__BackingField: 2 + k__BackingField: 1 + k__BackingField: 2 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -135,8 +155,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10301 k__BackingField: "\uB370\uC2A4\uB3C4\uC5B4\uC758 \uC54C" - k__BackingField: 1 - k__BackingField: 3 + k__BackingField: 1 + k__BackingField: 3 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -145,8 +165,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10302 k__BackingField: "\uACF5\uB8E1\uC54C" - k__BackingField: 1 - k__BackingField: 3 + k__BackingField: 1 + k__BackingField: 3 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -155,8 +175,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10401 k__BackingField: "\uBA54\uB860" - k__BackingField: 1 - k__BackingField: 4 + k__BackingField: 1 + k__BackingField: 4 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -165,48 +185,38 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10402 k__BackingField: "\uD1A0\uB9C8\uD1A0" - k__BackingField: 1 - k__BackingField: 4 + k__BackingField: 1 + k__BackingField: 4 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 472129669, guid: 551ef1d8906c85f43bed28c7a5a67e9c, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10403 k__BackingField: "\uC0AC\uACFC" - k__BackingField: 1 - k__BackingField: 4 + k__BackingField: 1 + k__BackingField: 4 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: -55580973, guid: 551ef1d8906c85f43bed28c7a5a67e9c, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10404 k__BackingField: "\uB808\uBAAC" - k__BackingField: 1 - k__BackingField: 4 + k__BackingField: 1 + k__BackingField: 4 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10405 - k__BackingField: "\uD1A0\uB9C8\uD1A0" - k__BackingField: 1 - k__BackingField: 4 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: -1272800058, guid: 551ef1d8906c85f43bed28c7a5a67e9c, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10501 k__BackingField: "\uB9C8\uB298" - k__BackingField: 1 - k__BackingField: 5 + k__BackingField: 1 + k__BackingField: 5 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -215,28 +225,28 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10502 k__BackingField: "\uC591\uD30C" - k__BackingField: 1 - k__BackingField: 5 + k__BackingField: 1 + k__BackingField: 5 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 1687559360, guid: 551ef1d8906c85f43bed28c7a5a67e9c, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10503 k__BackingField: "\uB300\uD30C" - k__BackingField: 1 - k__BackingField: 5 + k__BackingField: 1 + k__BackingField: 5 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: c99299b384d0fb147ba287c14bca05f7, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10504 k__BackingField: "\uD30C\uC2AC\uB9AC" - k__BackingField: 1 - k__BackingField: 5 + k__BackingField: 1 + k__BackingField: 5 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -245,8 +255,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10505 k__BackingField: "\uB2E4\uC2DC\uB9C8" - k__BackingField: 1 - k__BackingField: 5 + k__BackingField: 1 + k__BackingField: 5 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -255,38 +265,38 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10506 k__BackingField: "\uD30C\uD504\uB9AC\uCE74" - k__BackingField: 1 - k__BackingField: 5 + k__BackingField: 1 + k__BackingField: 5 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 8630b1c884d84ad4db92660bd1fbff25, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10507 k__BackingField: "\uBC30\uCD94" - k__BackingField: 1 - k__BackingField: 5 + k__BackingField: 1 + k__BackingField: 5 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: -224896251, guid: 551ef1d8906c85f43bed28c7a5a67e9c, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10508 k__BackingField: "\uBE0C\uB85C\uCF5C\uB9AC" - k__BackingField: 1 - k__BackingField: 5 + k__BackingField: 1 + k__BackingField: 5 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: daecfc8f8ea7e3f4c93ba7d71c566bf9, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10509 k__BackingField: "\uAE7B\uC78E" - k__BackingField: 1 - k__BackingField: 5 + k__BackingField: 1 + k__BackingField: 5 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -295,8 +305,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10601 k__BackingField: "\uC9C4\uC8FC \uC870\uAC1C" - k__BackingField: 1 - k__BackingField: 6 + k__BackingField: 1 + k__BackingField: 6 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -305,8 +315,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10602 k__BackingField: "\uBC14\uB2E4 \uC870\uAC1C" - k__BackingField: 1 - k__BackingField: 6 + k__BackingField: 1 + k__BackingField: 6 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -315,28 +325,28 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10603 k__BackingField: "\uAC70\uB300 \uC870\uAC1C" - k__BackingField: 1 - k__BackingField: 6 + k__BackingField: 1 + k__BackingField: 6 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: d9bedb12956adb14283ae6bc1287fd9e, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10701 k__BackingField: "\uC18C\uAE08" - k__BackingField: 1 - k__BackingField: 7 + k__BackingField: 1 + k__BackingField: 7 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 1089943196, guid: 551ef1d8906c85f43bed28c7a5a67e9c, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10702 k__BackingField: "\uACE0\uCDA7\uAC00\uB8E8" - k__BackingField: 1 - k__BackingField: 7 + k__BackingField: 1 + k__BackingField: 7 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 @@ -345,48 +355,48 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 10703 k__BackingField: "\uD6C4\uCD94" - k__BackingField: 1 - k__BackingField: 7 + k__BackingField: 1 + k__BackingField: 7 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 910fd09388091a24abfc27d2ca0806bb, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10704 k__BackingField: "\uAC04\uC7A5" - k__BackingField: 1 - k__BackingField: 7 + k__BackingField: 1 + k__BackingField: 7 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 24e97b05d9cfdb548adb59f5fe266289, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10705 k__BackingField: "\uBC84\uD130" - k__BackingField: 1 - k__BackingField: 7 + k__BackingField: 1 + k__BackingField: 7 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 96e97973084d87e4bbeef865b3040c34, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 10706 k__BackingField: "\uC124\uD0D5" - k__BackingField: 1 - k__BackingField: 7 + k__BackingField: 1 + k__BackingField: 7 k__BackingField: 0 k__BackingField: 100 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: e841bb6ae64327c43a6b26d5d8ca0a90, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 20001 k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uB3D9)" - k__BackingField: 2 - k__BackingField: 0 + k__BackingField: 2 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 500 k__BackingField: 100 @@ -395,8 +405,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 20002 k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uC740)" - k__BackingField: 2 - k__BackingField: 0 + k__BackingField: 2 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 1000 k__BackingField: 100 @@ -405,8 +415,8 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 20003 k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uAE08)" - k__BackingField: 2 - k__BackingField: 0 + k__BackingField: 2 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 2000 k__BackingField: 100 @@ -415,118 +425,38 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 20004 k__BackingField: "\uBBF8\uBBF9" - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 30201 - k__BackingField: "\uCF54\uCF54\uB11B\uAC8C\uC0B4\uC2A4\uD29C" - k__BackingField: 3 k__BackingField: 2 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 40001 - k__BackingField: "\uB9E5\uC8FC" - k__BackingField: 4 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - k__BackingField: {fileID: 1098625912, guid: 551ef1d8906c85f43bed28c7a5a67e9c, type: 3} - k__BackingField: {fileID: 0} - - k__BackingField: 50001 - k__BackingField: "\uD558\uD2B8 \uBC18 \uAC1C" - k__BackingField: 5 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - k__BackingField: {fileID: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, type: 3} - k__BackingField: {fileID: 8962896418303621511, guid: 66d94bc59db241a4895f8e4fff7ea201, type: 3} - - k__BackingField: 50002 - k__BackingField: "\uD558\uD2B8 \uD55C \uAC1C" - k__BackingField: 5 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - k__BackingField: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3} - k__BackingField: {fileID: 8962896418303621511, guid: 0dc7ed0facf2fca4b80244d0d95e2557, type: 3} - - k__BackingField: 60001 - k__BackingField: "\uC82C\uC2A4\uD1A4" - k__BackingField: 6 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 1000 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 21300000, guid: 1ddf647b8857bff45a83e009dbb9ec8c, type: 3} - k__BackingField: {fileID: 0} - - k__BackingField: 60002 - k__BackingField: "\uD480\uC78E" - k__BackingField: 6 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 10 - k__BackingField: 1 - k__BackingField: - k__BackingField: {fileID: 21300000, guid: ff92fed29107bb94e8011820502e8cb8, type: 3} - k__BackingField: {fileID: 1370112280380943697, guid: 6dee5e24767665b48aa614edcd6f71a2, type: 3} - - k__BackingField: 10108 - k__BackingField: "\uC2AC\uB77C\uC784 \uCC0C\uAC70\uAE30" - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10109 - k__BackingField: "\uC5BC\uC74C \uAC00\uC2DC" - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 100 k__BackingField: 100 k__BackingField: k__BackingField: {fileID: 0} k__BackingField: {fileID: 0} - k__BackingField: 30001 k__BackingField: "\uC2AC\uB77C\uC784 \uD478\uB529" - k__BackingField: 3 - k__BackingField: 0 + k__BackingField: 3 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 500 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 21300000, guid: 017d2be51bb271e499f8facd2e2aaeae, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 30002 k__BackingField: "\uC5BC\uC74C\uB3C4\uCE58 \uD325\uBE59\uC218" - k__BackingField: 3 - k__BackingField: 0 + k__BackingField: 3 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 500 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 103910208, guid: 551ef1d8906c85f43bed28c7a5a67e9c, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 30003 k__BackingField: "\uCF54\uBFD4\uC18C \uBFD4 \uD280\uAE40" - k__BackingField: 3 - k__BackingField: 0 + k__BackingField: 3 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 150 k__BackingField: 100 @@ -535,38 +465,88 @@ MonoBehaviour: k__BackingField: {fileID: 0} - k__BackingField: 30004 k__BackingField: "\uCF54\uBFD4\uC18C \uB4B7\uB2E4\uB9AC \uACE0\uAE30" - k__BackingField: 3 - k__BackingField: 0 + k__BackingField: 3 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 500 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 1681919652, guid: 551ef1d8906c85f43bed28c7a5a67e9c, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 30005 k__BackingField: "\uBC31\uC0C1\uC5B4 \uD1B5\uAD6C\uC774" - k__BackingField: 3 - k__BackingField: 0 + k__BackingField: 3 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 150 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 1040357770, guid: 551ef1d8906c85f43bed28c7a5a67e9c, type: 3} k__BackingField: {fileID: 0} - k__BackingField: 30006 k__BackingField: "\uBC84\uD130 \uC870\uAC1C \uAD6C\uC774" - k__BackingField: 3 - k__BackingField: 0 + k__BackingField: 3 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 140 k__BackingField: 100 k__BackingField: - k__BackingField: {fileID: 0} + k__BackingField: {fileID: -1313039003, guid: 551ef1d8906c85f43bed28c7a5a67e9c, type: 3} k__BackingField: {fileID: 0} + - k__BackingField: 40001 + k__BackingField: "\uB9E5\uC8FC" + k__BackingField: 4 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: {fileID: 1098625912, guid: 551ef1d8906c85f43bed28c7a5a67e9c, type: 3} + k__BackingField: {fileID: 0} + - k__BackingField: 50001 + k__BackingField: "\uD558\uD2B8 \uBC18 \uAC1C" + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: {fileID: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, type: 3} + k__BackingField: {fileID: 8962896418303621511, guid: 66d94bc59db241a4895f8e4fff7ea201, type: 3} + - k__BackingField: 50002 + k__BackingField: "\uD558\uD2B8 \uD55C \uAC1C" + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3} + k__BackingField: {fileID: 8962896418303621511, guid: 0dc7ed0facf2fca4b80244d0d95e2557, type: 3} + - k__BackingField: 60001 + k__BackingField: "\uC82C\uC2A4\uD1A4" + k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 1000 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 21300000, guid: 1ddf647b8857bff45a83e009dbb9ec8c, type: 3} + k__BackingField: {fileID: 0} + - k__BackingField: 60002 + k__BackingField: "\uD480\uC78E" + k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 10 + k__BackingField: 1 + k__BackingField: + k__BackingField: {fileID: 21300000, guid: ff92fed29107bb94e8011820502e8cb8, type: 3} + k__BackingField: {fileID: 1370112280380943697, guid: 6dee5e24767665b48aa614edcd6f71a2, type: 3} - k__BackingField: 70001 k__BackingField: "\uC7A5\uC791" - k__BackingField: 7 - k__BackingField: 0 + k__BackingField: 7 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 diff --git a/Assets/02.Scripts/ScriptableObject/Item/ItemSlotData.asset b/Assets/02.Scripts/ScriptableObject/Item/ItemSlotData.asset index 8f7a0af46..6b006e201 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/ItemSlotData.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/ItemSlotData.asset @@ -12,9 +12,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 44b4a96e2c7bdd54fada7ad0fda0d360, type: 3} m_Name: ItemSlotData m_EditorClassIdentifier: - k__BackingField: {r: 0.8039216, g: 0.11372549, b: 0.19215687, a: 1} - k__BackingField: {r: 0.14901961, g: 0.34117648, b: 0.6509804, a: 1} - k__BackingField: {r: 0.28235295, g: 0.7019608, b: 0.36078432, a: 1} + k__BackingField: {r: 1, g: 0.54901963, b: 0, a: 1} + k__BackingField: {r: 1, g: 0.84313726, b: 0, a: 1} + k__BackingField: {r: 0.19607843, g: 0.8039216, b: 0.19607843, a: 1} + k__BackingField: {r: 0, g: 0.39215687, b: 0.8039216, a: 1} k__BackingField: {r: 0.87058824, g: 0.7529412, b: 0.5686275, a: 1} k__BackingField: {r: 0.8117647, g: 0.62352943, b: 0.44705883, a: 1} k__BackingField: {fileID: -1656092153, guid: 8549b299e8d6b894e9a11c4becb528a3, type: 3} diff --git a/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs b/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs index 8cfd83702..cc10d2e05 100644 --- a/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs +++ b/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using BlueWater.Items; -using BlueWater.Players.Combat; using Sirenix.OdinInspector; using TMPro; using UnityEngine; @@ -34,7 +33,7 @@ namespace BlueWater.Uis private List _itemSlotUiList = new(); private List _selectedList = new(); - private CombatInventory _combatInventory; + private Inventory _inventory; #endregion @@ -55,12 +54,12 @@ namespace BlueWater.Uis private void Start() { - _combatInventory.OnChangeItemSlot += ChangedData; + _inventory.OnChangeItemSlot += ChangedData; } private void OnDestroy() { - _combatInventory.OnChangeItemSlot -= ChangedData; + _inventory.OnChangeItemSlot -= ChangedData; } #endregion @@ -81,7 +80,7 @@ namespace BlueWater.Uis { if (DataManager.Instance) { - _combatInventory = DataManager.Instance.CombatInventory; + _inventory = DataManager.Instance.Inventory; } _itemSlotUiList.Clear(); @@ -94,7 +93,7 @@ namespace BlueWater.Uis private void InventorySynchronization() { - foreach (var element in _combatInventory.ItemSlotList) + foreach (var element in _inventory.ItemSlotList) { var newItemContent = Instantiate(ItemSlotUiPrefab, InstantiateLocation).GetComponent(); newItemContent.InitializeData(element); @@ -119,16 +118,16 @@ namespace BlueWater.Uis private void CalculateWeight() { - if (float.IsPositiveInfinity(_combatInventory.WeightLimit)) + if (float.IsPositiveInfinity(_inventory.WeightLimit)) { - CurrentWeight.text = _combatInventory.CurrentTotalWeight + " / ∞Kg"; + CurrentWeight.text = _inventory.CurrentTotalWeight + " / ∞Kg"; } else { - CurrentWeight.text = _combatInventory.CurrentTotalWeight + " / " + _combatInventory.WeightLimit + "Kg"; + CurrentWeight.text = _inventory.CurrentTotalWeight + " / " + _inventory.WeightLimit + "Kg"; } - CurrentWeight.color = _combatInventory.IsOverWeight ? Color.red : Color.white; + CurrentWeight.color = _inventory.IsOverWeight ? Color.red : Color.white; } public void ChangedData(ItemSlot changedItemSlot, bool added) @@ -165,7 +164,7 @@ namespace BlueWater.Uis if (existingItemSlotUi != null) { existingItemSlotUi.UpdateData(removeItemSlot); - if (existingItemSlotUi.ItemSlot.Count <= 0) + if (existingItemSlotUi.ItemSlot.Quantity <= 0) { _itemSlotUiList.Remove(existingItemSlotUi); Destroy(existingItemSlotUi.gameObject); @@ -213,32 +212,32 @@ namespace BlueWater.Uis { if (SortingDropdown.value == 0) return; - _combatInventory.SortItem((InventorySortingType)SortingDropdown.value); - SortItemSlotUi((InventorySortingType)SortingDropdown.value); + _inventory.SortItem((CombatInventorySortingType)SortingDropdown.value); + SortItemSlotUi((CombatInventorySortingType)SortingDropdown.value); SortingDropdown.value = 0; } - private void SortItemSlotUi(InventorySortingType sortingType) + private void SortItemSlotUi(CombatInventorySortingType sortingType) { switch (sortingType) { - case InventorySortingType.None: + case CombatInventorySortingType.None: return; - case InventorySortingType.Recent: + case CombatInventorySortingType.Recent: _itemSlotUiList.Sort((x, y) => y.ItemSlot.AcquisitionTime.CompareTo(x.ItemSlot.AcquisitionTime)); break; - case InventorySortingType.Name: + case CombatInventorySortingType.Name: _itemSlotUiList.Sort((x, y) => string.Compare(ItemManager.Instance.GetItemDataByIdx(x.ItemSlot.Idx).Name, ItemManager.Instance.GetItemDataByIdx(y.ItemSlot.Idx).Name, StringComparison.Ordinal)); break; - case InventorySortingType.Category: + case CombatInventorySortingType.Category: _itemSlotUiList.Sort((x, y) => - ItemManager.Instance.GetItemDataByIdx(x.ItemSlot.Idx).Category.CompareTo(ItemManager.Instance.GetItemDataByIdx(y.ItemSlot.Idx).Category)); + ItemManager.Instance.GetItemDataByIdx(x.ItemSlot.Idx).Type.CompareTo(ItemManager.Instance.GetItemDataByIdx(y.ItemSlot.Idx).Type)); break; - case InventorySortingType.Count: - _itemSlotUiList.Sort((x, y) => y.ItemSlot.Count.CompareTo(x.ItemSlot.Count)); + case CombatInventorySortingType.Count: + _itemSlotUiList.Sort((x, y) => y.ItemSlot.Quantity.CompareTo(x.ItemSlot.Quantity)); break; default: throw new ArgumentOutOfRangeException(); diff --git a/Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs b/Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs index ca30159f9..495e14348 100644 --- a/Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs +++ b/Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs @@ -71,14 +71,14 @@ namespace BlueWater.Uis public void CountDownButton() { _currentCount--; - _currentCount = Mathf.Clamp(_currentCount, 1, _selectedList[0].ItemSlot.Count); + _currentCount = Mathf.Clamp(_currentCount, 1, _selectedList[0].ItemSlot.Quantity); _countText.text = _currentCount.ToString(); } public void CountUpButton() { _currentCount++; - _currentCount = Mathf.Clamp(_currentCount , 1, _selectedList[0].ItemSlot.Count); + _currentCount = Mathf.Clamp(_currentCount , 1, _selectedList[0].ItemSlot.Quantity); _countText.text = _currentCount.ToString(); } @@ -86,13 +86,13 @@ namespace BlueWater.Uis { if (_removeType == RemoveType.Single) { - DataManager.Instance.CombatInventory.RemoveItem(_selectedList[0].ItemSlot, _currentCount); + DataManager.Instance.Inventory.RemoveItem(_selectedList[0].ItemSlot, _currentCount); } else if (_removeType == RemoveType.Multi) { foreach (var element in _selectedList) { - DataManager.Instance.CombatInventory.RemoveItem(element.ItemSlot, element.ItemSlot.Count); + DataManager.Instance.Inventory.RemoveItem(element.ItemSlot, element.ItemSlot.Quantity); } } diff --git a/Assets/02.Scripts/Ui/Combat/ItemLootUi.cs b/Assets/02.Scripts/Ui/Combat/ItemLootUi.cs index a1d0d59e2..a7e36c8a1 100644 --- a/Assets/02.Scripts/Ui/Combat/ItemLootUi.cs +++ b/Assets/02.Scripts/Ui/Combat/ItemLootUi.cs @@ -29,7 +29,7 @@ namespace BlueWater.Uis public void ShowLootInfoUi(ItemData itemData, int count) { - var totalItemCount = DataManager.Instance.CombatInventory.GetItemByIdx(itemData.Idx).Count; + var totalItemCount = DataManager.Instance.Inventory.GetItemByIdx(itemData.Idx).Quantity; if (_waitingLootInfoUis.Count > 0) { diff --git a/Assets/02.Scripts/Ui/Combat/ItemSlotUi.cs b/Assets/02.Scripts/Ui/Combat/ItemSlotUi.cs index cf8061196..86e929ce8 100644 --- a/Assets/02.Scripts/Ui/Combat/ItemSlotUi.cs +++ b/Assets/02.Scripts/Ui/Combat/ItemSlotUi.cs @@ -50,8 +50,8 @@ namespace BlueWater.Uis var item = ItemManager.Instance.GetItemDataByIdx(itemSlot.Idx); _image.sprite = item.Sprite; _nameText.text = item.Name; - _weightText.text = item.Weight * ItemSlot.Count + "kg"; - _countText.text = "x" + ItemSlot.Count; + _weightText.text = item.Weight * ItemSlot.Quantity + "kg"; + _countText.text = "x" + ItemSlot.Quantity; } public void ToggleOn() => _itemSelectToggle.isOn = true; diff --git a/Assets/02.Scripts/Ui/Tycoon/CookMenuUi.cs b/Assets/02.Scripts/Ui/Tycoon/CookMenuUi.cs new file mode 100644 index 000000000..7ad98d6f6 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/CookMenuUi.cs @@ -0,0 +1,21 @@ +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Uis +{ + public class CookMenuUi : MonoBehaviour + { + [field: Title("컴포넌트")] + [field: SerializeField, Required] + public InventoryUi InventoryUi { get; private set; } + + [field: SerializeField, Required] + public CookUi CookUi { get; private set; } + + [field: SerializeField, Required] + public DailyFoodMenuUi DailyFoodMenuUi { get; private set; } + + public void ShowUi() => gameObject.SetActive(true); + public void HideUi() => gameObject.SetActive(false); + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/CookMenuUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/CookMenuUi.cs.meta new file mode 100644 index 000000000..d016363d4 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/CookMenuUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d0082f6fc07879948911f80e5ca1e31f diff --git a/Assets/02.Scripts/Ui/Tycoon/CookUi.cs b/Assets/02.Scripts/Ui/Tycoon/CookUi.cs new file mode 100644 index 000000000..c24c7092a --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/CookUi.cs @@ -0,0 +1,289 @@ +using System; +using System.Collections.Generic; +using BlueWater.Items; +using Sirenix.OdinInspector; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace BlueWater.Uis +{ + public class CookUi : MonoBehaviour + { + [Title("컴포넌트")] + [SerializeField, Required] + private Image _selectedFoodImage; + + [SerializeField, Required] + private TMP_Text _selectedFoodName; + + [SerializeField, Required] + private TMP_Text _selectedFoodTasteText; + + [SerializeField, Required] + private TMP_Dropdown _finishedFoodSortDropdown; + + [SerializeField, Required] + private Button _cookButton; + + [SerializeField, Required] + private TMP_Text _cookText; + + [Title("프리팹 생성 위치")] + [SerializeField, Required] + private Transform _finishedFoodSlotLocation; + + [SerializeField, Required] + private Transform _ingredientFoodSlotLocation; + + [Title("프리팹")] + [SerializeField, Required] + private TycoonItemSlotUi _finishedFoodSlotUi; + + [SerializeField, Required] + private IngredientItemSlotUi _ingredientItemSlotUi; + + private List _finishedFoodSlotUis; + private List _highIngredientSlotUis; + private List _normalIngredientSlotUis; + + private DataManager _dataManager; + private ItemManager _itemManager; + private DailyFoodMenuUi _dailyFoodMenuUi; + private FoodData _selectedFoodData; + private bool _isEnoughIngredient; + + private void Awake() + { + Initialize(); + InventorySynchronization(); + SelectFinishedFood(null); + } + + private void Start() + { + _dataManager.OnChangeFoodRecipe += AddFoodRecipe; + _dataManager.Inventory.OnChangeItemSlot += OnInventoryChange; + } + + private void OnDestroy() + { + _dataManager.OnChangeFoodRecipe -= AddFoodRecipe; + _dataManager.Inventory.OnChangeItemSlot -= OnInventoryChange; + } + + private void Initialize() + { + _dataManager = DataManager.Instance; + _itemManager = ItemManager.Instance; + _dailyFoodMenuUi = TycoonUiManager.Instance.TycoonManagementUi.CookMenuUi.DailyFoodMenuUi; + + _finishedFoodSlotUis = new List(); + foreach (Transform element in _finishedFoodSlotLocation) + { + Destroy(element.gameObject); + } + + _highIngredientSlotUis = new List(5); + _normalIngredientSlotUis = new List(5); + foreach (Transform element in _ingredientFoodSlotLocation) + { + Destroy(element.gameObject); + } + + for (var i = 0; i < 10; i++) + { + var newItemSlot = Instantiate(_ingredientItemSlotUi, _ingredientFoodSlotLocation).GetComponent(); + + if (i < 5) + { + _highIngredientSlotUis.Add(newItemSlot); + _highIngredientSlotUis[i].SetIsLocked(true); + } + else + { + _normalIngredientSlotUis.Add(newItemSlot); + } + newItemSlot.SetItemSlot(null); + } + + CheckCookable(); + } + + private void InventorySynchronization() + { + foreach (var element in _dataManager.FoodRecipes) + { + var newItemSlot = Instantiate(_finishedFoodSlotUi, _finishedFoodSlotLocation).GetComponent(); + var foodData = _itemManager.GetFoodDataByIdx(element); + newItemSlot.SetFoodData(foodData); + _finishedFoodSlotUis.Add(newItemSlot); + newItemSlot.AddButtonClickListener(() => SelectFinishedFood(foodData)); + } + } + + private void AddFoodRecipe(FoodData foodData) + { + var newItemSlot = Instantiate(_finishedFoodSlotUi, _finishedFoodSlotLocation).GetComponent(); + newItemSlot.SetFoodData(foodData); + _finishedFoodSlotUis.Add(newItemSlot); + newItemSlot.AddButtonClickListener(() => SelectFinishedFood(foodData)); + } + + private void OnInventoryChange(ItemSlot itemSlot, bool isAdded) + { + UpdateIngredientSlots(); + } + + private void UpdateIngredientSlots() + { + if (_selectedFoodData == null) return; + + SetIngredient(_selectedFoodData); + } + + private void SelectFinishedFood(FoodData foodData) + { + if (foodData == null) + { + _selectedFoodImage.enabled = false; + _selectedFoodImage.sprite = null; + _selectedFoodName.text = null; + _selectedFoodTasteText.text = null; + } + else + { + _selectedFoodData = foodData; + _selectedFoodImage.sprite = _itemManager.GetItemDataByIdx(_selectedFoodData.Idx).Sprite; + _selectedFoodName.text = _selectedFoodData.Name; + _selectedFoodTasteText.text = _selectedFoodData.TasteToString(); + _selectedFoodImage.enabled = true; + SetIngredient(_selectedFoodData); + } + } + + private void SetIngredient(FoodData foodData) + { + var ingredients = foodData.GetValidIngredients(); + var ingredientCount = ingredients.Count; + for (var i = 0; i < 5; i++) + { + if (i < ingredientCount) + { + _normalIngredientSlotUis[i].SetItemSlot(new ItemSlot(ingredients[i].Idx, ingredients[i].Quantity)); + } + else + { + _normalIngredientSlotUis[i].SetItemSlot(null); + } + } + + CheckCookable(); + } + + public void CheckCookable() + { + if (_selectedFoodData == null) + { + _cookButton.interactable = false; + _cookText.color = _cookButton.colors.disabledColor; + return; + } + + if (!_dailyFoodMenuUi.IsEmptyDailyFoodMenu(_selectedFoodData)) + { + _cookButton.interactable = false; + _cookText.color = _cookButton.colors.disabledColor; + return; + } + + var ingredientCount = _selectedFoodData.GetValidIngredients().Count; + for (var i = 0; i < ingredientCount; i++) + { + if (_normalIngredientSlotUis[i].IsEnoughIngredient) continue; + + _cookButton.interactable = false; + _cookText.color = _cookButton.colors.disabledColor; + return; + } + + _cookButton.interactable = true; + _cookText.color = Color.black; + } + + public void Cook() + { + foreach (var element in _selectedFoodData.GetValidIngredients()) + { + var itemSlot = _dataManager.Inventory.GetItemByIdx(element.Idx); + _dataManager.Inventory.RemoveItem(itemSlot, element.Quantity); + } + + _dailyFoodMenuUi.AddDailyFoodMenu(_selectedFoodData); + CheckCookable(); + } + + public void SortButton() + { + if (_finishedFoodSortDropdown.value == 0) return; + + SortItemSlotUi((FoodSortingType)_finishedFoodSortDropdown.value); + + _finishedFoodSortDropdown.value = 0; + } + + private void SortItemSlotUi(FoodSortingType sortingType) + { + switch (sortingType) + { + case FoodSortingType.None: + return; + case FoodSortingType.PriceUp: + _finishedFoodSlotUis.Sort((x, y) => + _itemManager.GetItemDataByIdx(x.FoodData.Idx).Price. + CompareTo(_itemManager.GetItemDataByIdx(y.FoodData.Idx).Price)); + break; + case FoodSortingType.PriceDown: + _finishedFoodSlotUis.Sort((x, y) => + _itemManager.GetItemDataByIdx(y.FoodData.Idx).Price. + CompareTo(_itemManager.GetItemDataByIdx(x.FoodData.Idx).Price)); + break; + case FoodSortingType.CookwareTypeUp: + _finishedFoodSlotUis.Sort((x, y) => + x.FoodData.Type. + CompareTo(y.FoodData.Type)); + break; + case FoodSortingType.CookwareTypeDown: + _finishedFoodSlotUis.Sort((x, y) => + y.FoodData.Type. + CompareTo(x.FoodData.Type)); + break; + case FoodSortingType.TasteUp: + _finishedFoodSlotUis.Sort((x, y) => + x.FoodData.Taste. + CompareTo(y.FoodData.Taste)); + break; + case FoodSortingType.TasteDown: + _finishedFoodSlotUis.Sort((x, y) => + y.FoodData.Taste. + CompareTo(x.FoodData.Taste)); + break; + case FoodSortingType.NameUp: + _finishedFoodSlotUis.Sort((x, y) => + string.Compare(x.FoodData.Name, y.FoodData.Name, StringComparison.Ordinal)); + break; + case FoodSortingType.NameDown: + _finishedFoodSlotUis.Sort((x, y) => + string.Compare(y.FoodData.Name, x.FoodData.Name, StringComparison.Ordinal)); + break; + default: + throw new ArgumentOutOfRangeException(); + } + + for (var i = 0; i < _finishedFoodSlotUis.Count; i++) + { + _finishedFoodSlotUis[i].transform.SetSiblingIndex(i); + } + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/CookUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/CookUi.cs.meta new file mode 100644 index 000000000..2e60a4c05 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/CookUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9218f5903e52fa446af3c1b35c5ba207 diff --git a/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs b/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs new file mode 100644 index 000000000..401b44aa5 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs @@ -0,0 +1,126 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BlueWater.Items; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Uis +{ + public class DailyFoodMenuUi : MonoBehaviour + { + [Title("프리팹 생성 위치")] + [SerializeField, Required] + private Transform _fryingPanFoodSlotLocation; + + [SerializeField, Required] + private Transform _soupFoodSlotLocation; + + [SerializeField, Required] + private Transform _skewerFoodSlotLocation; + + [SerializeField, Required] + private Transform _dessertFoodSlotLocation; + + [Title("프리팹")] + [SerializeField, Required] + private TycoonItemSlotUi _dailyFoodSlotUi; + + private List _fryingPanFoodSlotUis = new(3); + private List _soupFoodSlotUis = new(3); + private List _skewerFoodSlotUis = new(3); + private List _dessertPanFoodSlotUis = new(3); + private CookUi _cookUi; + + private void Awake() + { + Initialize(); + } + + private void Initialize() + { + _cookUi = TycoonUiManager.Instance.TycoonManagementUi.CookMenuUi.CookUi; + + _fryingPanFoodSlotUis = _fryingPanFoodSlotLocation.GetComponentsInChildren().ToList(); + foreach (var element in _fryingPanFoodSlotUis) + { + element.SetFoodData(null); + element.AddButtonClickListener(() => SelectDailyFood(element)); + } + + _soupFoodSlotUis = _soupFoodSlotLocation.GetComponentsInChildren().ToList(); + foreach (var element in _soupFoodSlotUis) + { + element.SetFoodData(null); + element.AddButtonClickListener(() => SelectDailyFood(element)); + } + + _skewerFoodSlotUis = _skewerFoodSlotLocation.GetComponentsInChildren().ToList(); + foreach (var element in _skewerFoodSlotUis) + { + element.SetFoodData(null); + element.AddButtonClickListener(() => SelectDailyFood(element)); + } + + _dessertPanFoodSlotUis = _dessertFoodSlotLocation.GetComponentsInChildren().ToList(); + foreach (var element in _dessertPanFoodSlotUis) + { + element.SetFoodData(null); + element.AddButtonClickListener(() => SelectDailyFood(element)); + } + } + + private void SelectDailyFood(TycoonItemSlotUi tycoonItemSlotUi) + { + tycoonItemSlotUi.SetFoodData(null); + _cookUi.CheckCookable(); + } + + public bool IsEmptyDailyFoodMenu(FoodData selectedFoodData) + { + var selectedTypeItemSlotUis = GetDailyFoodType(selectedFoodData.Type); + + foreach (var element in selectedTypeItemSlotUis) + { + if (element.GetIsLocked() || element.FoodData != null) continue; + + return true; + } + + return false; + } + + public void AddDailyFoodMenu(FoodData selectedFoodData) + { + var selectedTypeItemSlotUis = GetDailyFoodType(selectedFoodData.Type); + + foreach (var element in selectedTypeItemSlotUis) + { + if (element.GetIsLocked() || element.FoodData != null) continue; + + element.SetFoodData(selectedFoodData); + return; + } + } + + private List GetDailyFoodType(FoodType foodType) + { + switch (foodType) + { + case FoodType.None: + Debug.LogError($"FoodType이 None입니다."); + return null; + case FoodType.Skewer: + return _skewerFoodSlotUis; + case FoodType.Soup: + return _soupFoodSlotUis; + case FoodType.FryingPan: + return _fryingPanFoodSlotUis; + case FoodType.Dessert: + return _dessertPanFoodSlotUis; + default: + throw new ArgumentOutOfRangeException(nameof(foodType), foodType, null); + } + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs.meta new file mode 100644 index 000000000..3b2b36bb5 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/DailyFoodMenuUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 29ee900ba52849b49bfc33631b1e74a0 \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/IngredientItemSlotUi.cs b/Assets/02.Scripts/Ui/Tycoon/IngredientItemSlotUi.cs new file mode 100644 index 000000000..cda1e0d20 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/IngredientItemSlotUi.cs @@ -0,0 +1,39 @@ +using BlueWater.Items; +using UnityEngine; + +namespace BlueWater.Uis +{ + public class IngredientItemSlotUi : TycoonItemSlotUi + { + [field: SerializeField] + public bool IsEnoughIngredient { get; private set; } + + public override void SetItemSlot(ItemSlot itemSlot) + { + ItemSlot = itemSlot; + ItemManager ??= ItemManager.Instance; + + if (IsLocked) + { + SetItemImage(ItemManager.ItemSlotDataSo.LockSprite); + QuantityText.text = null; + return; + } + + if (ItemSlot == null) + { + SetItemImage(null); + QuantityText.text = null; + } + else + { + SetItemImage(ItemManager.GetItemDataByIdx(ItemSlot.Idx).Sprite); + var myIngredientQuantity = DataManager.Instance.Inventory.GetItemByIdx(itemSlot.Idx)?.Quantity ?? 0; + var needQuantity = ItemSlot.Quantity; + QuantityText.text = $"{myIngredientQuantity}/{needQuantity}"; + IsEnoughIngredient = myIngredientQuantity - needQuantity >= 0; + QuantityText.color = IsEnoughIngredient ? Color.white : Color.red; + } + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/IngredientItemSlotUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/IngredientItemSlotUi.cs.meta new file mode 100644 index 000000000..3033d5dae --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/IngredientItemSlotUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 24f3912b25031ab45a327c312819030e diff --git a/Assets/02.Scripts/Ui/Tycoon/InventoryUi.cs b/Assets/02.Scripts/Ui/Tycoon/InventoryUi.cs new file mode 100644 index 000000000..ebbc62c59 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/InventoryUi.cs @@ -0,0 +1,227 @@ +using System; +using System.Collections.Generic; +using BlueWater.Items; +using Sirenix.OdinInspector; +using TMPro; +using UnityEngine; + +namespace BlueWater.Uis +{ + public class InventoryUi : MonoBehaviour + { + [Title("컴포넌트")] + [SerializeField, Required] + private TMP_Dropdown _inventoryFilterSortDropdown; + + [SerializeField, Required] + private TMP_Dropdown _inventorySortDropdown; + + [Title("프리팹 생성 위치")] + [SerializeField, Required] + private Transform _tycoonItemSlotLocation; + + [Title("프리팹")] + [SerializeField, Required] + private TycoonItemSlotUi _tycoonItemSlotUi; + + private List _tycoonItemSlotUis = new(); + + private ItemManager _itemManager; + private DataManager _dataManager; + private Inventory _inventory; + + private void Awake() + { + InitializeInventory(); + InventorySynchronization(); + } + + private void Start() + { + _dataManager.Inventory.OnChangeItemSlot += ChangedData; + } + + private void OnDestroy() + { + _dataManager.Inventory.OnChangeItemSlot -= ChangedData; + } + + private void InitializeInventory() + { + _itemManager = ItemManager.Instance; + _dataManager = DataManager.Instance; + _inventory = _dataManager.Inventory; + + _tycoonItemSlotUis.Clear(); + foreach (Transform element in _tycoonItemSlotLocation) + { + Destroy(element.gameObject); + } + } + + private void InventorySynchronization() + { + foreach (var element in _inventory.ItemSlotList) + { + var newItemContent = Instantiate(_tycoonItemSlotUi, _tycoonItemSlotLocation).GetComponent(); + newItemContent.SetItemSlot(element); + _tycoonItemSlotUis.Add(newItemContent); + } + } + + public void ChangedData(ItemSlot changedItemSlot, bool added) + { + if (added) + { + AddItem(changedItemSlot); + } + else + { + RemoveItem(changedItemSlot); + } + } + + private void AddItem(ItemSlot addItemSlot) + { + var existingItemSlotUi = _tycoonItemSlotUis.Find(i => i.ItemSlot.Idx == addItemSlot.Idx); + if (existingItemSlotUi) + { + existingItemSlotUi.SetItemSlot(addItemSlot); + } + else + { + var newItemSlot = Instantiate(_tycoonItemSlotUi, _tycoonItemSlotLocation).GetComponent(); + newItemSlot.SetItemSlot(addItemSlot); + _tycoonItemSlotUis.Add(newItemSlot); + } + } + + private void RemoveItem(ItemSlot removeItemSlot) + { + var existingItemSlotUi = _tycoonItemSlotUis.Find(i => i.ItemSlot.Idx == removeItemSlot.Idx); + if (existingItemSlotUi) + { + existingItemSlotUi.SetItemSlot(removeItemSlot); + if (existingItemSlotUi.ItemSlot.Quantity <= 0) + { + _tycoonItemSlotUis.Remove(existingItemSlotUi); + Destroy(existingItemSlotUi.gameObject); + } + } + } + + public void InventoryFilterSortButton() + { + if (_inventoryFilterSortDropdown.value == 0) return; + + InventoryFilterSortItemSlotUi((InventoryFilterSortingType)_inventoryFilterSortDropdown.value); + + _inventoryFilterSortDropdown.value = 0; + } + + private void InventoryFilterSortItemSlotUi(InventoryFilterSortingType inventoryFilterSortingType) + { + switch (inventoryFilterSortingType) + { + case InventoryFilterSortingType.None: + break; + case InventoryFilterSortingType.Total: + foreach (var element in _tycoonItemSlotUis) + { + element.ShowUi(); + } + break; + case InventoryFilterSortingType.Ingredient: + foreach (var element in _tycoonItemSlotUis) + { + if (_itemManager.GetItemDataByIdx(element.ItemSlot.Idx).Type == ItemType.FoodIngredient) + { + element.ShowUi(); + } + else + { + element.HideUi(); + } + } + break; + default: + throw new ArgumentOutOfRangeException(nameof(inventoryFilterSortingType), inventoryFilterSortingType, null); + } + } + + public void InventorySortButton() + { + if (_inventorySortDropdown.value == 0) return; + + InventorySortItemSlotUi((InventorySortingType)_inventorySortDropdown.value); + + _inventorySortDropdown.value = 0; + } + + private void InventorySortItemSlotUi(InventorySortingType inventorySortingType) + { + switch (inventorySortingType) + { + case InventorySortingType.None: + break; + case InventorySortingType.PriceUp: + _tycoonItemSlotUis.Sort((x, y) => + _itemManager.GetItemDataByIdx(x.ItemSlot.Idx).Price. + CompareTo(_itemManager.GetItemDataByIdx(y.ItemSlot.Idx).Price)); + break; + case InventorySortingType.PriceDown: + _tycoonItemSlotUis.Sort((x, y) => + _itemManager.GetItemDataByIdx(y.ItemSlot.Idx).Price. + CompareTo(_itemManager.GetItemDataByIdx(x.ItemSlot.Idx).Price)); + break; + case InventorySortingType.TypeUp: + _tycoonItemSlotUis.Sort((x, y) => + _itemManager.GetItemDataByIdx(x.ItemSlot.Idx).Type. + CompareTo(_itemManager.GetItemDataByIdx(y.ItemSlot.Idx).Type)); + break; + case InventorySortingType.TypeDown: + _tycoonItemSlotUis.Sort((x, y) => + _itemManager.GetItemDataByIdx(y.ItemSlot.Idx).Type. + CompareTo(_itemManager.GetItemDataByIdx(x.ItemSlot.Idx).Type)); + break; + case InventorySortingType.IngredientTypeUp: + _tycoonItemSlotUis.Sort((x, y) => + _itemManager.GetItemDataByIdx(x.ItemSlot.Idx).IngredientType. + CompareTo(_itemManager.GetItemDataByIdx(y.ItemSlot.Idx).IngredientType)); + break; + case InventorySortingType.IngredientTypeDown: + _tycoonItemSlotUis.Sort((x, y) => + _itemManager.GetItemDataByIdx(y.ItemSlot.Idx).IngredientType. + CompareTo(_itemManager.GetItemDataByIdx(x.ItemSlot.Idx).IngredientType)); + break; + case InventorySortingType.NameUp: + _tycoonItemSlotUis.Sort((x, y) => + string.Compare(_itemManager.GetItemDataByIdx(x.ItemSlot.Idx).Name, + _itemManager.GetItemDataByIdx(y.ItemSlot.Idx).Name, StringComparison.Ordinal)); + break; + case InventorySortingType.NameDown: + _tycoonItemSlotUis.Sort((x, y) => + string.Compare(_itemManager.GetItemDataByIdx(y.ItemSlot.Idx).Name, + _itemManager.GetItemDataByIdx(x.ItemSlot.Idx).Name, StringComparison.Ordinal)); + break; + case InventorySortingType.AcquisitionTimeUp: + _tycoonItemSlotUis.Sort((x, y) => + x.ItemSlot.AcquisitionTime. + CompareTo(y.ItemSlot.AcquisitionTime)); + break; + case InventorySortingType.AcquisitionTimeDown: + _tycoonItemSlotUis.Sort((x, y) => + y.ItemSlot.AcquisitionTime. + CompareTo(x.ItemSlot.AcquisitionTime)); + break; + default: + throw new ArgumentOutOfRangeException(); + } + + for (var i = 0; i < _tycoonItemSlotUis.Count; i++) + { + _tycoonItemSlotUis[i].transform.SetSiblingIndex(i); + } + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/InventoryUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/InventoryUi.cs.meta new file mode 100644 index 000000000..884936e2a --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/InventoryUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0aa6c5437b8592a47a158038ecd836ae diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonItemSlotUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonItemSlotUi.cs index 1dec4de1e..4ebaf072c 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonItemSlotUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonItemSlotUi.cs @@ -3,54 +3,92 @@ using BlueWater.Items; using Sirenix.OdinInspector; using TMPro; using UnityEngine; -using UnityEngine.EventSystems; +using UnityEngine.Events; using UnityEngine.UI; namespace BlueWater.Uis { - public class TycoonItemSlotUi : MonoBehaviour, IPointerDownHandler, IPointerUpHandler + public enum InventorySortingType + { + None = 0, + PriceUp, + PriceDown, + TypeUp, + TypeDown, + IngredientTypeUp, + IngredientTypeDown, + NameUp, + NameDown, + AcquisitionTimeUp, + AcquisitionTimeDown + } + + public enum InventoryFilterSortingType + { + None = 0, + Total, + Ingredient + } + + public enum FoodSortingType + { + None = 0, + PriceUp, + PriceDown, + CookwareTypeUp, + CookwareTypeDown, + TasteUp, + TasteDown, + NameUp, + NameDown + } + + public class TycoonItemSlotUi : MonoBehaviour { [Title("컴포넌트")] [SerializeField, Required] - private Image _itemBoxImage; + protected Button Button; [SerializeField, Required] - private Image _backgroundImage; + protected Image BackgroundImage; [SerializeField, Required] - private Image _itemImage; + protected Image ItemImage; [SerializeField, Required] - private TMP_Text _quantityText; + protected TMP_Text QuantityText; [Title("옵션")] [SerializeField] - private bool _isUsingBackgroundColor; + protected bool IsUsingBackgroundColor; [SerializeField] - private bool _isUsingQuantityText; + protected bool IsUsingQuantityText; [SerializeField] - private bool _isLocked; + protected bool IsLocked; - [Title("현재 아이템 데이터")] [SerializeField] - private ItemData _itemData; + protected bool IsButtonInteraction; + + [field: Title("현재 아이템 데이터")] + [field: SerializeField] + public ItemSlot ItemSlot { get; protected set; } - [SerializeField] - private FoodData _foodData; + [field: SerializeField] + public FoodData FoodData { get; protected set; } + + protected ItemManager ItemManager; + protected UnityAction ClickAction; private void Awake() { - DisuseBackgroundColor(); - DisuseQuantityText(); - SetItemData(null); - SetItemImage(null); + ItemManager = ItemManager.Instance; } private void OnEnable() { - if (_isUsingBackgroundColor) + if (IsUsingBackgroundColor) { UseBackgroundColor(); } @@ -59,7 +97,7 @@ namespace BlueWater.Uis DisuseBackgroundColor(); } - if (_isUsingQuantityText) + if (IsUsingQuantityText) { UseQuantityText(); } @@ -67,31 +105,28 @@ namespace BlueWater.Uis { DisuseQuantityText(); } + } - if (_isLocked) + private void OnDestroy() + { + if (ClickAction != null) { - SetItemData(null); - SetItemImage(ItemManager.Instance.ItemSlotDataSo.LockSprite); + Button.onClick.RemoveListener(ClickAction); } } - public void OnPointerDown(PointerEventData eventData) + public void AddButtonClickListener(UnityAction action) { - _itemBoxImage.color = ItemManager.Instance.ItemSlotDataSo.HighlightingItemBox; - } - - public void OnPointerUp(PointerEventData eventData) - { - _itemBoxImage.color = ItemManager.Instance.ItemSlotDataSo.NormalItemBox; + Button.onClick.AddListener(action); } // Background Color public void UseBackgroundColor() { - var itemSlotDataSo = ItemManager.Instance.ItemSlotDataSo; + var itemSlotDataSo = ItemManager.ItemSlotDataSo; var newColor = Color.white; - switch (_foodData.Type) + switch (FoodData.Type) { case FoodType.None: break; @@ -105,41 +140,114 @@ namespace BlueWater.Uis newColor = itemSlotDataSo.FryingPanFood; break; case FoodType.Dessert: + newColor = itemSlotDataSo.DessertFood; break; default: throw new ArgumentOutOfRangeException(); } - _backgroundImage.color = newColor; - _backgroundImage.enabled = true; + BackgroundImage.color = newColor; + BackgroundImage.enabled = true; } public void DisuseBackgroundColor() { - _backgroundImage.enabled = false; - _backgroundImage.color = Color.white; + BackgroundImage.enabled = false; + BackgroundImage.color = Color.white; } // Quantity Text public void UseQuantityText() { - _quantityText.enabled = true; + QuantityText.enabled = true; } public void DisuseQuantityText() { - _quantityText.enabled = false; + QuantityText.enabled = false; } - public void SetItemData(ItemData itemData) + public virtual void SetItemSlot(ItemSlot itemSlot) { - _itemData = itemData; + if (IsLocked) + { + SetItemImage(ItemManager.ItemSlotDataSo.LockSprite); + if (IsUsingQuantityText) + { + QuantityText.text = null; + } + return; + } + + ItemSlot = itemSlot; + ItemManager ??= ItemManager.Instance; + + if (ItemSlot == null) + { + SetItemImage(null); + QuantityText.text = null; + } + else + { + SetItemImage(ItemManager.GetItemDataByIdx(ItemSlot.Idx).Sprite); + QuantityText.text = ItemSlot.Quantity.ToString(); + } + } + + public void SetFoodData(FoodData foodData) + { + if (IsLocked) + { + SetItemImage(ItemManager.ItemSlotDataSo.LockSprite); + if (IsUsingQuantityText) + { + QuantityText.text = null; + } + return; + } + + FoodData = foodData; + ItemManager ??= ItemManager.Instance; + + if (FoodData == null) + { + SetItemImage(null); + if (IsUsingBackgroundColor) + { + DisuseBackgroundColor(); + } + } + else + { + SetItemImage(ItemManager.GetItemDataByIdx(FoodData.Idx).Sprite); + if (IsUsingBackgroundColor) + { + UseBackgroundColor(); + } + } } public void SetItemImage(Sprite sprite) { - _itemImage.sprite = sprite; - _itemImage.enabled = _itemImage.sprite; + ItemImage.sprite = sprite; + ItemImage.enabled = ItemImage.sprite; + + if (IsButtonInteraction) + { + if (!IsLocked && ItemImage.sprite) + { + Button.interactable = true; + } + else + { + Button.interactable = false; + } + } } + + public bool GetIsLocked() => IsLocked; + public void SetIsLocked(bool value) => IsLocked = value; + public void ShowUi() => gameObject.SetActive(true); + public void HideUi() => gameObject.SetActive(false); } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonManagementUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonManagementUi.cs index d024f4879..3a3f004dd 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonManagementUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonManagementUi.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using DG.Tweening; using Sirenix.OdinInspector; @@ -12,53 +11,19 @@ namespace BlueWater.Uis [SerializeField, Required] private RectTransform _rectTransform; - [SerializeField, Required] - private GameObject _cookMenuPanel; - - [SerializeField, Required] - private Transform _fryingPanFoodSlotLocation; + [field: SerializeField, Required] + public CookMenuUi CookMenuUi { get; private set; } - [SerializeField, Required] - private Transform _soupFoodSlotLocation; - - [SerializeField, Required] - private Transform _skewerFoodSlotLocation; - - [SerializeField, Required] - private Transform _finishedFoodSlotLocation; - - [SerializeField, Required] - private Transform _ingredientFoodSlotLocation; - - [SerializeField, Required] - private Transform _tycoonItemSlotLocation; - - [Title("프리팹")] - [SerializeField, Required] - private TycoonItemSlotUi _dailyFoodSlotUi; - - [SerializeField, Required] - private TycoonItemSlotUi _finishedFoodSlotUi; - - [SerializeField, Required] - private TycoonItemSlotUi _ingredientItemSlotUi; - - [SerializeField, Required] - private TycoonItemSlotUi _tycoonItemSlotUi; - private Tween _openTween; private Tween _closeTween; - private bool _isQuitting; - private void OnApplicationQuit() + private void Awake() { - _isQuitting = true; + CookMenuUi.ShowUi(); } private void OnDestroy() { - if (_isQuitting) return; - _openTween.Kill(); _closeTween.Kill(); } diff --git a/Assets/03.Images/Items/Foods/Broccoli.png b/Assets/03.Images/Items/Foods/Broccoli.png new file mode 100644 index 000000000..faf2b9e50 Binary files /dev/null and b/Assets/03.Images/Items/Foods/Broccoli.png differ diff --git a/Assets/03.Images/Items/Foods/Broccoli.png.meta b/Assets/03.Images/Items/Foods/Broccoli.png.meta new file mode 100644 index 000000000..7cb91f596 --- /dev/null +++ b/Assets/03.Images/Items/Foods/Broccoli.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: daecfc8f8ea7e3f4c93ba7d71c566bf9 +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/Butter.png b/Assets/03.Images/Items/Foods/Butter.png new file mode 100644 index 000000000..f20f88046 Binary files /dev/null and b/Assets/03.Images/Items/Foods/Butter.png differ diff --git a/Assets/03.Images/Items/Foods/Butter.png.meta b/Assets/03.Images/Items/Foods/Butter.png.meta new file mode 100644 index 000000000..f43278e00 --- /dev/null +++ b/Assets/03.Images/Items/Foods/Butter.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 96e97973084d87e4bbeef865b3040c34 +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/GiantShell.png b/Assets/03.Images/Items/Foods/GiantShell.png new file mode 100644 index 000000000..cc16883bf Binary files /dev/null and b/Assets/03.Images/Items/Foods/GiantShell.png differ diff --git a/Assets/03.Images/Items/Foods/GiantShell.png.meta b/Assets/03.Images/Items/Foods/GiantShell.png.meta new file mode 100644 index 000000000..0abaa3cd8 --- /dev/null +++ b/Assets/03.Images/Items/Foods/GiantShell.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: d9bedb12956adb14283ae6bc1287fd9e +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/IceSpike.png b/Assets/03.Images/Items/Foods/IceSpike.png new file mode 100644 index 000000000..a0d3dedae Binary files /dev/null and b/Assets/03.Images/Items/Foods/IceSpike.png differ diff --git a/Assets/03.Images/Items/Foods/IceSpike.png.meta b/Assets/03.Images/Items/Foods/IceSpike.png.meta new file mode 100644 index 000000000..58d333d58 --- /dev/null +++ b/Assets/03.Images/Items/Foods/IceSpike.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: cd0b57bb346bc2f45a42fdc2fdf9e398 +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/Leek.png b/Assets/03.Images/Items/Foods/Leek.png new file mode 100644 index 000000000..5bfb5b0c3 Binary files /dev/null and b/Assets/03.Images/Items/Foods/Leek.png differ diff --git a/Assets/03.Images/Items/Foods/Leek.png.meta b/Assets/03.Images/Items/Foods/Leek.png.meta new file mode 100644 index 000000000..9d7fe681c --- /dev/null +++ b/Assets/03.Images/Items/Foods/Leek.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: c99299b384d0fb147ba287c14bca05f7 +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/Paprika.png b/Assets/03.Images/Items/Foods/Paprika.png new file mode 100644 index 000000000..0cf1b130e Binary files /dev/null and b/Assets/03.Images/Items/Foods/Paprika.png differ diff --git a/Assets/03.Images/Items/Foods/Paprika.png.meta b/Assets/03.Images/Items/Foods/Paprika.png.meta new file mode 100644 index 000000000..691d874a0 --- /dev/null +++ b/Assets/03.Images/Items/Foods/Paprika.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 8630b1c884d84ad4db92660bd1fbff25 +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/Pepper.png b/Assets/03.Images/Items/Foods/Pepper.png new file mode 100644 index 000000000..56412118a Binary files /dev/null and b/Assets/03.Images/Items/Foods/Pepper.png differ diff --git a/Assets/03.Images/Items/Foods/Pepper.png.meta b/Assets/03.Images/Items/Foods/Pepper.png.meta new file mode 100644 index 000000000..76f4edfdf --- /dev/null +++ b/Assets/03.Images/Items/Foods/Pepper.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 910fd09388091a24abfc27d2ca0806bb +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/Pudding.png b/Assets/03.Images/Items/Foods/Pudding.png new file mode 100644 index 000000000..23480b3ef Binary files /dev/null and b/Assets/03.Images/Items/Foods/Pudding.png differ diff --git a/Assets/03.Images/Items/Foods/Pudding.png.meta b/Assets/03.Images/Items/Foods/Pudding.png.meta new file mode 100644 index 000000000..d275274a4 --- /dev/null +++ b/Assets/03.Images/Items/Foods/Pudding.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 017d2be51bb271e499f8facd2e2aaeae +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/Salt.png b/Assets/03.Images/Items/Foods/Salt.png new file mode 100644 index 000000000..5b7fd7cb3 Binary files /dev/null and b/Assets/03.Images/Items/Foods/Salt.png differ diff --git a/Assets/03.Images/Items/Foods/Salt.png.meta b/Assets/03.Images/Items/Foods/Salt.png.meta new file mode 100644 index 000000000..ca7aa011a --- /dev/null +++ b/Assets/03.Images/Items/Foods/Salt.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: b6f39db37a41d7f4db161e4608dad785 +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/Shark.png b/Assets/03.Images/Items/Foods/Shark.png new file mode 100644 index 000000000..91e672db0 Binary files /dev/null and b/Assets/03.Images/Items/Foods/Shark.png differ diff --git a/Assets/03.Images/Items/Foods/Shark.png.meta b/Assets/03.Images/Items/Foods/Shark.png.meta new file mode 100644 index 000000000..3c958a17b --- /dev/null +++ b/Assets/03.Images/Items/Foods/Shark.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 83ba6a22503f6834ab2cd6e9e881a9fd +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/SlimeResidue.png b/Assets/03.Images/Items/Foods/SlimeResidue.png new file mode 100644 index 000000000..2cd8910ca Binary files /dev/null and b/Assets/03.Images/Items/Foods/SlimeResidue.png differ diff --git a/Assets/03.Images/Items/Foods/SlimeResidue.png.meta b/Assets/03.Images/Items/Foods/SlimeResidue.png.meta new file mode 100644 index 000000000..367909128 --- /dev/null +++ b/Assets/03.Images/Items/Foods/SlimeResidue.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 517031ef7cb81d848a246b47006cc498 +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/SoySauce.png b/Assets/03.Images/Items/Foods/SoySauce.png new file mode 100644 index 000000000..233dd895f Binary files /dev/null and b/Assets/03.Images/Items/Foods/SoySauce.png differ diff --git a/Assets/03.Images/Items/Foods/SoySauce.png.meta b/Assets/03.Images/Items/Foods/SoySauce.png.meta new file mode 100644 index 000000000..b6720feae --- /dev/null +++ b/Assets/03.Images/Items/Foods/SoySauce.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 24e97b05d9cfdb548adb59f5fe266289 +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/Sugar.png b/Assets/03.Images/Items/Foods/Sugar.png new file mode 100644 index 000000000..710cf5251 Binary files /dev/null and b/Assets/03.Images/Items/Foods/Sugar.png differ diff --git a/Assets/03.Images/Items/Foods/Sugar.png.meta b/Assets/03.Images/Items/Foods/Sugar.png.meta new file mode 100644 index 000000000..a697eaa47 --- /dev/null +++ b/Assets/03.Images/Items/Foods/Sugar.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: e841bb6ae64327c43a6b26d5d8ca0a90 +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Items/Foods/fish01.png b/Assets/03.Images/Items/Foods/fish01.png new file mode 100644 index 000000000..709b00b2f Binary files /dev/null and b/Assets/03.Images/Items/Foods/fish01.png differ diff --git a/Assets/03.Images/Items/Foods/fish01.png.meta b/Assets/03.Images/Items/Foods/fish01.png.meta new file mode 100644 index 000000000..f5a8c1cdd --- /dev/null +++ b/Assets/03.Images/Items/Foods/fish01.png.meta @@ -0,0 +1,141 @@ +fileFormatVersion: 2 +guid: 4d8bfd8befe07484cb2af88758e37d17 +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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 2048 + 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: 1 + 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: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab index f03df58aa..364daa4f1 100644 --- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -1605,7 +1605,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1674052485383758547} m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp - m_MethodName: OnBuildingSystem + m_MethodName: OnDevelopKey01 m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1772,7 +1772,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _itemRenderer: {fileID: 5527707380059080408} - _isCarriedFood: 0 + _isCarriedItem: 0 --- !u!1 &2823872900850750388 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Managers/ItemManager.prefab b/Assets/05.Prefabs/Managers/ItemManager.prefab index a264f5523..9d920c9c2 100644 --- a/Assets/05.Prefabs/Managers/ItemManager.prefab +++ b/Assets/05.Prefabs/Managers/ItemManager.prefab @@ -48,6 +48,7 @@ MonoBehaviour: _defaultItemPrefab: {fileID: 1370112280380943697, guid: 28a379482be867746aad889c0f1c3c79, type: 3} _itemDataSo: {fileID: 11400000, guid: d7011c71193e95743aa868ca1bea6010, type: 2} _itemDropTableSo: {fileID: 11400000, guid: 9e1384a77106eb845ad86d6834ba9a52, type: 2} + _foodDataSo: {fileID: 11400000, guid: 7b282dfe68d23cd48a8f437ae2cd7dde, type: 2} k__BackingField: {fileID: 11400000, guid: 1e74e5d3760c6a74c820233d292733c1, type: 2} _randomDropRadius: 3 _minSeparationDistance: 1.5 diff --git a/Assets/05.Prefabs/Uis/Tycoons/DailyFoodSlotUi.prefab b/Assets/05.Prefabs/Uis/Tycoons/DailyFoodSlotUi.prefab index ba232987a..39f86944f 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/DailyFoodSlotUi.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/DailyFoodSlotUi.prefab @@ -8,9 +8,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4888250272685488326, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4888250272685488326, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4888250272685488326, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} propertyPath: m_Name - value: DailyItemSlotUi + value: DailyFoodSlotUi objectReference: {fileID: 0} - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} propertyPath: m_Pivot.x @@ -92,10 +104,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: IsButtonInteraction + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: IsUsingQuantityText + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: _isButtonInteraction + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} propertyPath: _isUsingQuantityText value: 0 objectReference: {fileID: 0} + - target: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: _isButtonHighlighting + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8902695159634601431, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} propertyPath: m_Enabled value: 1 diff --git a/Assets/05.Prefabs/Uis/Tycoons/FinishedFoodSlotUi.prefab b/Assets/05.Prefabs/Uis/Tycoons/FinishedFoodSlotUi.prefab index 0b383b83e..6cd5e79d8 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/FinishedFoodSlotUi.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/FinishedFoodSlotUi.prefab @@ -8,6 +8,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4888250272685488326, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4888250272685488326, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4888250272685488326, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} propertyPath: m_Name value: FinishedFoodSlotUi @@ -92,10 +104,30 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: IsButtonInteraction + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: IsUsingQuantityText + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: _isButtonInteraction + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} propertyPath: _isUsingQuantityText value: 0 objectReference: {fileID: 0} + - target: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: _isButtonHighlighting + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: IsUsingBackgroundColor + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} propertyPath: _isUsingBackgroundColor value: 1 @@ -104,8 +136,59 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 8902695159634601431, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 223540656057325585} + - target: {fileID: 8902695159634601431, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Colors.m_NormalColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8902695159634601431, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Colors.m_NormalColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8902695159634601431, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Colors.m_NormalColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8902695159634601431, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Colors.m_PressedColor.b + value: 0.5882353 + objectReference: {fileID: 0} + - target: {fileID: 8902695159634601431, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Colors.m_PressedColor.g + value: 0.5882353 + objectReference: {fileID: 0} + - target: {fileID: 8902695159634601431, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Colors.m_PressedColor.r + value: 0.5882353 + objectReference: {fileID: 0} + - target: {fileID: 8902695159634601431, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 0.78431374 + objectReference: {fileID: 0} + - target: {fileID: 8902695159634601431, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 0.78431374 + objectReference: {fileID: 0} + - target: {fileID: 8902695159634601431, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 0.78431374 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} +--- !u!114 &223540656057325585 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3230293767881956811, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 3444798637381813722} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/05.Prefabs/Uis/Tycoons/IngredientItemSlotUi.prefab b/Assets/05.Prefabs/Uis/Tycoons/IngredientItemSlotUi.prefab index 544065399..56ec2ce8c 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/IngredientItemSlotUi.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/IngredientItemSlotUi.prefab @@ -8,9 +8,45 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2954143415441238988, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2954143415441238988, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.x + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 2954143415441238988, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2954143415441238988, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.x + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 2954143415441238988, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_AnchoredPosition.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5472621884890045282, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_text + value: 10/1 + objectReference: {fileID: 0} + - target: {fileID: 5472621884890045282, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_fontSize + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5472621884890045282, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_fontSizeMin + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 5472621884890045282, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + propertyPath: m_HorizontalAlignment + value: 4 + objectReference: {fileID: 0} - target: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} propertyPath: m_Name - value: DailyItemSlotUi 1 + value: IngredientItemSlotUi objectReference: {fileID: 0} - target: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} propertyPath: m_Pivot.x @@ -92,8 +128,103 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 8188883071690808540, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + insertIndex: -1 + addedObject: {fileID: 5759877438722640172} m_SourcePrefab: {fileID: 100100000, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} +--- !u!114 &223540656057325585 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3230293767881956811, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 3444798637381813722} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3758087177579996834 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2011150234301735800, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 3444798637381813722} + 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: +--- !u!114 &6071652809713426445 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8902695159634601431, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 3444798637381813722} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8433118801875043656} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7222870553785458360 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5472621884890045282, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 3444798637381813722} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &8433118801875043656 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6540940545668841618, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} + m_PrefabInstance: {fileID: 3444798637381813722} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5759877438722640172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8433118801875043656} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 24f3912b25031ab45a327c312819030e, type: 3} + m_Name: + m_EditorClassIdentifier: + Button: {fileID: 6071652809713426445} + BackgroundImage: {fileID: 223540656057325585} + ItemImage: {fileID: 3758087177579996834} + QuantityText: {fileID: 7222870553785458360} + IsUsingBackgroundColor: 0 + IsUsingQuantityText: 1 + IsLocked: 0 + IsButtonInteraction: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 diff --git a/Assets/05.Prefabs/Uis/Tycoons/TycoonItemSlotUi.prefab b/Assets/05.Prefabs/Uis/Tycoons/TycoonItemSlotUi.prefab index ac882ba79..bfbb194e6 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/TycoonItemSlotUi.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonItemSlotUi.prefab @@ -213,7 +213,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8705883, g: 0.75294125, b: 0.5686275, a: 1} + m_Color: {r: 0.87058824, g: 0.7529412, b: 0.5686275, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -251,9 +251,9 @@ MonoBehaviour: 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_NormalColor: {r: 0.87058824, g: 0.7529412, b: 0.5686275, a: 1} + m_HighlightedColor: {r: 0.8117647, g: 0.62352943, b: 0.44705883, a: 1} + m_PressedColor: {r: 0.8113208, g: 0.5209637, b: 0.24875402, 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 @@ -286,41 +286,35 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} m_Name: m_EditorClassIdentifier: - _itemBoxImage: {fileID: 4888250272685488326} - _backgroundImage: {fileID: 3230293767881956811} - _itemImage: {fileID: 2011150234301735800} - _quantityText: {fileID: 5472621884890045282} - _isUsingBackgroundColor: 0 - _isUsingQuantityText: 1 - _isLocked: 0 - _itemData: + Button: {fileID: 8902695159634601431} + BackgroundImage: {fileID: 3230293767881956811} + ItemImage: {fileID: 2011150234301735800} + QuantityText: {fileID: 5472621884890045282} + IsUsingBackgroundColor: 0 + IsUsingQuantityText: 1 + IsLocked: 0 + IsButtonInteraction: 0 + k__BackingField: k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - _foodData: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: k__BackingField: 0 k__BackingField: k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 - k__BackingField: - k__BackingField: - k__BackingField: - k__BackingField: - k__BackingField: - k__BackingField: - k__BackingField: - k__BackingField: - k__BackingField: - k__BackingField: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 --- !u!1 &7619189173913017875 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Excel/ItemDataTable.xlsx b/Assets/Resources/Excel/ItemDataTable.xlsx index 1c92067dc..6d3774231 100644 Binary files a/Assets/Resources/Excel/ItemDataTable.xlsx and b/Assets/Resources/Excel/ItemDataTable.xlsx differ diff --git a/Assets/Resources/JSON/ItemDataTable.json b/Assets/Resources/JSON/ItemDataTable.json index eb5a93df6..8ee3b7c1c 100644 --- a/Assets/Resources/JSON/ItemDataTable.json +++ b/Assets/Resources/JSON/ItemDataTable.json @@ -2,8 +2,8 @@ { "Idx": 10101, "Name": "킹크랩", - "Category": 1, "Type": 1, + "IngredientType": 1, "Quality": 0, "Price": 100, "Weight": 100, @@ -12,8 +12,8 @@ { "Idx": 10102, "Name": "공룡 고기", - "Category": 1, "Type": 1, + "IngredientType": 1, "Quality": 0, "Price": 100, "Weight": 100, @@ -22,8 +22,8 @@ { "Idx": 10103, "Name": "램고기", - "Category": 1, "Type": 1, + "IngredientType": 1, "Quality": 0, "Price": 100, "Weight": 100, @@ -32,8 +32,8 @@ { "Idx": 10104, "Name": "닭고기", - "Category": 1, "Type": 1, + "IngredientType": 1, "Quality": 0, "Price": 100, "Weight": 100, @@ -42,8 +42,8 @@ { "Idx": 10105, "Name": "뱀고기", - "Category": 1, "Type": 1, + "IngredientType": 1, "Quality": 0, "Price": 100, "Weight": 100, @@ -52,8 +52,8 @@ { "Idx": 10106, "Name": "코뿔소 뿔", - "Category": 1, "Type": 1, + "IngredientType": 1, "Quality": 0, "Price": 100, "Weight": 100, @@ -62,8 +62,8 @@ { "Idx": 10107, "Name": "코뿔소 다리살", - "Category": 1, "Type": 1, + "IngredientType": 1, "Quality": 0, "Price": 100, "Weight": 100, @@ -72,8 +72,8 @@ { "Idx": 10108, "Name": "슬라임 찌거기", - "Category": 1, "Type": 1, + "IngredientType": 1, "Quality": 0, "Price": 100, "Weight": 100, @@ -82,8 +82,8 @@ { "Idx": 10109, "Name": "얼음 가시", - "Category": 1, "Type": 1, + "IngredientType": 1, "Quality": 0, "Price": 100, "Weight": 100, @@ -92,8 +92,8 @@ { "Idx": 10201, "Name": "백상어", - "Category": 1, - "Type": 2, + "Type": 1, + "IngredientType": 2, "Quality": 0, "Price": 100, "Weight": 100, @@ -102,8 +102,8 @@ { "Idx": 10202, "Name": "니모", - "Category": 1, - "Type": 2, + "Type": 1, + "IngredientType": 2, "Quality": 0, "Price": 100, "Weight": 100, @@ -112,8 +112,8 @@ { "Idx": 10203, "Name": "해파리", - "Category": 1, - "Type": 2, + "Type": 1, + "IngredientType": 2, "Quality": 0, "Price": 100, "Weight": 100, @@ -122,8 +122,8 @@ { "Idx": 10204, "Name": "가오리", - "Category": 1, - "Type": 2, + "Type": 1, + "IngredientType": 2, "Quality": 0, "Price": 100, "Weight": 100, @@ -132,8 +132,8 @@ { "Idx": 10205, "Name": "우럭", - "Category": 1, - "Type": 2, + "Type": 1, + "IngredientType": 2, "Quality": 0, "Price": 100, "Weight": 100, @@ -142,8 +142,8 @@ { "Idx": 10301, "Name": "데스도어의 알", - "Category": 1, - "Type": 3, + "Type": 1, + "IngredientType": 3, "Quality": 0, "Price": 100, "Weight": 100, @@ -152,8 +152,8 @@ { "Idx": 10302, "Name": "공룡알", - "Category": 1, - "Type": 3, + "Type": 1, + "IngredientType": 3, "Quality": 0, "Price": 100, "Weight": 100, @@ -162,8 +162,8 @@ { "Idx": 10401, "Name": "메론", - "Category": 1, - "Type": 4, + "Type": 1, + "IngredientType": 4, "Quality": 0, "Price": 100, "Weight": 100, @@ -172,8 +172,8 @@ { "Idx": 10402, "Name": "토마토", - "Category": 1, - "Type": 4, + "Type": 1, + "IngredientType": 4, "Quality": 0, "Price": 100, "Weight": 100, @@ -182,8 +182,8 @@ { "Idx": 10403, "Name": "사과", - "Category": 1, - "Type": 4, + "Type": 1, + "IngredientType": 4, "Quality": 0, "Price": 100, "Weight": 100, @@ -192,18 +192,8 @@ { "Idx": 10404, "Name": "레몬", - "Category": 1, - "Type": 4, - "Quality": 0, - "Price": 100, - "Weight": 100, - "Desciption": "" - }, - { - "Idx": 10405, - "Name": "토마토", - "Category": 1, - "Type": 4, + "Type": 1, + "IngredientType": 4, "Quality": 0, "Price": 100, "Weight": 100, @@ -212,8 +202,8 @@ { "Idx": 10501, "Name": "마늘", - "Category": 1, - "Type": 5, + "Type": 1, + "IngredientType": 5, "Quality": 0, "Price": 100, "Weight": 100, @@ -222,8 +212,8 @@ { "Idx": 10502, "Name": "양파", - "Category": 1, - "Type": 5, + "Type": 1, + "IngredientType": 5, "Quality": 0, "Price": 100, "Weight": 100, @@ -232,8 +222,8 @@ { "Idx": 10503, "Name": "대파", - "Category": 1, - "Type": 5, + "Type": 1, + "IngredientType": 5, "Quality": 0, "Price": 100, "Weight": 100, @@ -242,8 +232,8 @@ { "Idx": 10504, "Name": "파슬리", - "Category": 1, - "Type": 5, + "Type": 1, + "IngredientType": 5, "Quality": 0, "Price": 100, "Weight": 100, @@ -252,8 +242,8 @@ { "Idx": 10505, "Name": "다시마", - "Category": 1, - "Type": 5, + "Type": 1, + "IngredientType": 5, "Quality": 0, "Price": 100, "Weight": 100, @@ -262,8 +252,8 @@ { "Idx": 10506, "Name": "파프리카", - "Category": 1, - "Type": 5, + "Type": 1, + "IngredientType": 5, "Quality": 0, "Price": 100, "Weight": 100, @@ -272,8 +262,8 @@ { "Idx": 10507, "Name": "배추", - "Category": 1, - "Type": 5, + "Type": 1, + "IngredientType": 5, "Quality": 0, "Price": 100, "Weight": 100, @@ -282,8 +272,8 @@ { "Idx": 10508, "Name": "브로콜리", - "Category": 1, - "Type": 5, + "Type": 1, + "IngredientType": 5, "Quality": 0, "Price": 100, "Weight": 100, @@ -292,8 +282,8 @@ { "Idx": 10509, "Name": "깻잎", - "Category": 1, - "Type": 5, + "Type": 1, + "IngredientType": 5, "Quality": 0, "Price": 100, "Weight": 100, @@ -302,8 +292,8 @@ { "Idx": 10601, "Name": "진주 조개", - "Category": 1, - "Type": 6, + "Type": 1, + "IngredientType": 6, "Quality": 0, "Price": 100, "Weight": 100, @@ -312,8 +302,8 @@ { "Idx": 10602, "Name": "바다 조개", - "Category": 1, - "Type": 6, + "Type": 1, + "IngredientType": 6, "Quality": 0, "Price": 100, "Weight": 100, @@ -322,8 +312,8 @@ { "Idx": 10603, "Name": "거대 조개", - "Category": 1, - "Type": 6, + "Type": 1, + "IngredientType": 6, "Quality": 0, "Price": 100, "Weight": 100, @@ -332,8 +322,8 @@ { "Idx": 10701, "Name": "소금", - "Category": 1, - "Type": 7, + "Type": 1, + "IngredientType": 7, "Quality": 0, "Price": 100, "Weight": 100, @@ -342,8 +332,8 @@ { "Idx": 10702, "Name": "고춧가루", - "Category": 1, - "Type": 7, + "Type": 1, + "IngredientType": 7, "Quality": 0, "Price": 100, "Weight": 100, @@ -352,8 +342,8 @@ { "Idx": 10703, "Name": "후추", - "Category": 1, - "Type": 7, + "Type": 1, + "IngredientType": 7, "Quality": 0, "Price": 100, "Weight": 100, @@ -362,8 +352,8 @@ { "Idx": 10704, "Name": "간장", - "Category": 1, - "Type": 7, + "Type": 1, + "IngredientType": 7, "Quality": 0, "Price": 100, "Weight": 100, @@ -372,8 +362,8 @@ { "Idx": 10705, "Name": "버터", - "Category": 1, - "Type": 7, + "Type": 1, + "IngredientType": 7, "Quality": 0, "Price": 100, "Weight": 100, @@ -382,8 +372,8 @@ { "Idx": 10706, "Name": "설탕", - "Category": 1, - "Type": 7, + "Type": 1, + "IngredientType": 7, "Quality": 0, "Price": 100, "Weight": 100, @@ -392,8 +382,8 @@ { "Idx": 20001, "Name": "보물 상자 (동)", - "Category": 2, - "Type": 0, + "Type": 2, + "IngredientType": 0, "Quality": 0, "Price": 500, "Weight": 100, @@ -402,8 +392,8 @@ { "Idx": 20002, "Name": "보물 상자 (은)", - "Category": 2, - "Type": 0, + "Type": 2, + "IngredientType": 0, "Quality": 0, "Price": 1000, "Weight": 100, @@ -412,8 +402,8 @@ { "Idx": 20003, "Name": "보물 상자 (금)", - "Category": 2, - "Type": 0, + "Type": 2, + "IngredientType": 0, "Quality": 0, "Price": 2000, "Weight": 100, @@ -422,8 +412,8 @@ { "Idx": 20004, "Name": "미믹", - "Category": 2, - "Type": 0, + "Type": 2, + "IngredientType": 0, "Quality": 0, "Price": 0, "Weight": 100, @@ -432,8 +422,8 @@ { "Idx": 30001, "Name": "슬라임 푸딩", - "Category": 3, - "Type": 0, + "Type": 3, + "IngredientType": 0, "Quality": 0, "Price": 500, "Weight": 100, @@ -442,8 +432,8 @@ { "Idx": 30002, "Name": "얼음도치 팥빙수", - "Category": 3, - "Type": 0, + "Type": 3, + "IngredientType": 0, "Quality": 0, "Price": 500, "Weight": 100, @@ -452,8 +442,8 @@ { "Idx": 30003, "Name": "코뿔소 뿔 튀김", - "Category": 3, - "Type": 0, + "Type": 3, + "IngredientType": 0, "Quality": 0, "Price": 150, "Weight": 100, @@ -462,8 +452,8 @@ { "Idx": 30004, "Name": "코뿔소 뒷다리 고기", - "Category": 3, - "Type": 0, + "Type": 3, + "IngredientType": 0, "Quality": 0, "Price": 500, "Weight": 100, @@ -472,8 +462,8 @@ { "Idx": 30005, "Name": "백상어 통구이", - "Category": 3, - "Type": 0, + "Type": 3, + "IngredientType": 0, "Quality": 0, "Price": 150, "Weight": 100, @@ -482,8 +472,8 @@ { "Idx": 30006, "Name": "버터 조개 구이", - "Category": 3, - "Type": 0, + "Type": 3, + "IngredientType": 0, "Quality": 0, "Price": 140, "Weight": 100, @@ -492,8 +482,8 @@ { "Idx": 40001, "Name": "맥주", - "Category": 4, - "Type": 0, + "Type": 4, + "IngredientType": 0, "Quality": 0, "Price": 0, "Weight": 0, @@ -502,8 +492,8 @@ { "Idx": 50001, "Name": "하트 반 개", - "Category": 5, - "Type": 0, + "Type": 5, + "IngredientType": 0, "Quality": 0, "Price": 0, "Weight": 0, @@ -512,8 +502,8 @@ { "Idx": 50002, "Name": "하트 한 개", - "Category": 5, - "Type": 0, + "Type": 5, + "IngredientType": 0, "Quality": 0, "Price": 0, "Weight": 0, @@ -522,8 +512,8 @@ { "Idx": 60001, "Name": "젬스톤", - "Category": 6, - "Type": 0, + "Type": 6, + "IngredientType": 0, "Quality": 0, "Price": 1000, "Weight": 100, @@ -532,8 +522,8 @@ { "Idx": 60002, "Name": "풀잎", - "Category": 6, - "Type": 0, + "Type": 6, + "IngredientType": 0, "Quality": 0, "Price": 10, "Weight": 1, @@ -542,8 +532,8 @@ { "Idx": 70001, "Name": "장작", - "Category": 7, - "Type": 0, + "Type": 7, + "IngredientType": 0, "Quality": 0, "Price": 0, "Weight": 0,