diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/CookUi.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/CookUi.prefab index cc6f1ce17..d9c365bd0 100644 --- a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/CookUi.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/CookUi.prefab @@ -1520,7 +1520,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -1528,15 +1528,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 131 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -1568,11 +1568,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 78.5 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -219 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1626,7 +1626,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -1634,15 +1634,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 131 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -1674,11 +1674,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 723.5 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -83 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1716,19 +1716,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 36.4 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 33.2 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchoredPosition.y @@ -2072,7 +2072,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.x @@ -2080,15 +2080,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130.5 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalPosition.x @@ -2120,11 +2120,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 71.25 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -89 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2193,7 +2193,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -2201,15 +2201,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 131 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -2241,11 +2241,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 336.5 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -83 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2404,7 +2404,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.x @@ -2412,15 +2412,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130.5 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalPosition.x @@ -2452,11 +2452,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 332.25 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -89 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2647,7 +2647,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -2655,15 +2655,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 131 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -2695,11 +2695,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 336.5 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -219 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2745,7 +2745,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.x @@ -2753,15 +2753,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130.5 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalPosition.x @@ -2793,11 +2793,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 462.75 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -89 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2866,7 +2866,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -2874,15 +2874,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 131 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -2914,11 +2914,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 723.5 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -219 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3081,19 +3081,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 54.6 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 42.3 objectReference: {fileID: 0} - target: {fileID: 8857436002959004668, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_Pivot.x @@ -3215,27 +3215,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2418783700055957396, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2418783700055957396, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2418783700055957396, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 88.56 objectReference: {fileID: 0} - target: {fileID: 2418783700055957396, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 40.69 objectReference: {fileID: 0} - target: {fileID: 2418783700055957396, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 137.65 objectReference: {fileID: 0} - target: {fileID: 2418783700055957396, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -4.1550007 objectReference: {fileID: 0} - target: {fileID: 2451091866420006696, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_IsActive @@ -3275,27 +3275,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3832518280535675901, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3832518280535675901, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3832518280535675901, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 59.37 objectReference: {fileID: 0} - target: {fileID: 3832518280535675901, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 39 objectReference: {fileID: 0} - target: {fileID: 3832518280535675901, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 41.684998 objectReference: {fileID: 0} - target: {fileID: 3832518280535675901, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -5 objectReference: {fileID: 0} - target: {fileID: 5019251911750780373, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_Name @@ -3351,27 +3351,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6042001140281731505, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6042001140281731505, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6042001140281731505, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 21.14 objectReference: {fileID: 0} - target: {fileID: 6042001140281731505, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 39 objectReference: {fileID: 0} - target: {fileID: 6042001140281731505, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 22.57 objectReference: {fileID: 0} - target: {fileID: 6042001140281731505, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -5 objectReference: {fileID: 0} - target: {fileID: 8107209452760937939, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_Pivot.x @@ -3670,7 +3670,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -3678,15 +3678,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 131 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -3718,11 +3718,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 594.5 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -83 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3932,7 +3932,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -3940,15 +3940,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 131 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -3980,11 +3980,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 207.5 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -219 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4030,7 +4030,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.x @@ -4038,15 +4038,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130.5 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalPosition.x @@ -4078,11 +4078,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 723.75 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -89 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4163,7 +4163,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4845916953007548565, guid: fdffdf2f516c10248b94da9029036e36, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: -312 objectReference: {fileID: 0} - target: {fileID: 4845916953007548565, guid: fdffdf2f516c10248b94da9029036e36, type: 3} propertyPath: m_LocalPosition.x @@ -4325,7 +4325,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -4333,15 +4333,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 131 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -4373,11 +4373,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 594.5 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -219 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4423,7 +4423,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.x @@ -4431,15 +4431,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130.5 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalPosition.x @@ -4471,11 +4471,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 593.25 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -89 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4536,7 +4536,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.x @@ -4544,15 +4544,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 130.5 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalPosition.x @@ -4584,11 +4584,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 201.75 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -89 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4774,7 +4774,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -4782,15 +4782,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 131 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -4822,11 +4822,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 465.5 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -219 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5168,7 +5168,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -5176,15 +5176,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 131 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -5216,11 +5216,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 207.5 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -83 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5832,7 +5832,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -5840,15 +5840,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 131 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -5880,11 +5880,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 78.5 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -83 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5938,7 +5938,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -5946,15 +5946,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 131 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 132 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -5986,11 +5986,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 465.5 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -83 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/_DDD/_Scripts/GameEvent/GameEvents.cs b/Assets/_DDD/_Scripts/GameEvent/GameEvents.cs index 175caf04e..f1242308e 100644 --- a/Assets/_DDD/_Scripts/GameEvent/GameEvents.cs +++ b/Assets/_DDD/_Scripts/GameEvent/GameEvents.cs @@ -110,7 +110,7 @@ public class SmartVariablesDirtyEvent : IEvent public class ItemSlotSelectedEvent : IEvent { - public ItemViewModel Model; + public ItemModel Model; } public class TodayMenuAddedEvent : IEvent {} diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookUi.cs index 665e7d7cd..04ff5b83c 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookUi.cs @@ -45,15 +45,27 @@ public override void Open(OpenPopupUiEvent evt) } _viewModel.CreateAddedCookItemSlot(_addedCookContent); + + _addedCookTabGroup.SelectFirstTab(); IsInitialized = true; } + protected override void OnOpenedEvents() + { + base.OnOpenedEvents(); + + _viewModel.OnAddedIngredients += OnAddedIngredients; + } + protected override void OnClosedEvents() { base.OnClosedEvents(); - - + + if (_viewModel) + { + _viewModel.OnAddedIngredients -= OnAddedIngredients; + } } protected override void SetupBindings() @@ -76,13 +88,18 @@ protected override GameObject GetInitialSelected() private void OnAddedCookTabSelected(int index) { _viewModel.SetAddedCook(index); - for (int i = 0; i < _selectedIngredients.Count; i++) - { - _selectedIngredients[i].SetIngredientEntry(_viewModel.SelectedCookSlot.Model.GetIngredients[i]); - } UpdateTasteHashTags(); } + + private void OnAddedIngredients() + { + for (int i = 0; i < _selectedIngredients.Count; i++) + { + var ingredient = _viewModel.SelectedCookSlot.Model.GetIngredients[i]; + _selectedIngredients[i].SetIngredientEntry(ingredient); + } + } private void UpdateTasteHashTags() { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookViewModel.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookViewModel.cs index 92a2fe0fc..bd6fbd48c 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookViewModel.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookViewModel.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Linq; using UnityEngine; @@ -61,12 +62,14 @@ public SelectedCookSnapshot SelectedCookSnapshot private RestaurantManagementData GetRestaurantManagementData() => RestaurantData.Instance.ManagementData; private RestaurantManagementState GetRestaurantManagementState() => RestaurantState.Instance.ManagementState; - private int _currentCookIndex; + private int _currentCookIndex = -1; public int CurrentCookIndex { get => _currentCookIndex; set => SetField(ref _currentCookIndex, value); } + + public event Action OnAddedIngredients; public void SetCookwareType(CookwareType cookwareType) { @@ -86,10 +89,8 @@ public void SetAddedCook(int index) public void CreateAddedCookItemSlot(Transform parent) { - Utils.DestroyAllChildren(parent); // TODO : 추후에 data에서 max값 가져오기 (현재는 8이라 시스템상 지금 가져오면 오류) - var addedCookCount = 6; - _addedCookItemSlots = new List(addedCookCount); + _addedCookItemSlots = new List(parent.GetComponentsInChildren()); // Dictionary 하나로 레시피 ID와 개수를 함께 관리 var matchingRecipes = new Dictionary(); @@ -119,9 +120,9 @@ public void CreateAddedCookItemSlot(Transform parent) } var recipeList = matchingRecipes.ToList(); - for (int i = 0; i < addedCookCount; i++) + for (int i = 0; i < _addedCookItemSlots.Count; i++) { - ItemViewModel model = null; + ItemModel model = null; if (i < recipeList.Count) { @@ -129,13 +130,7 @@ public void CreateAddedCookItemSlot(Transform parent) model = ItemViewModelFactory.CreateByItemId(recipe.Key); model?.SetCount(recipe.Value); } - - var itemSlotUiPrefab = GetRestaurantManagementData().ItemSlotUiPrefab; - var instance = Instantiate(itemSlotUiPrefab, parent); - var slot = instance.GetComponent(); - slot.Initialize(model, new InventorySlotUiStrategy()); - - _addedCookItemSlots.Add(slot); + _addedCookItemSlots[i].Initialize(model, new TodayMenuSlotUiStrategy(RecipeType.FoodRecipe)); } } @@ -156,10 +151,7 @@ private void RecomputeSelectedCook() var cookIcon = selectedItemModel.GetResultIcon; var cookPrice = selectedItemModel.GetPrice.ToGold(); var ingredientEntries = selectedItemModel.GetIngredients; - foreach (var ingredientEntry in ingredientEntries) - { - - } + OnAddedIngredients?.Invoke(); var tastes = selectedItemModel.GetTasteDatas; var tasteMat = selectedItemModel.RecipeType switch { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/SelectedIngredient.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/SelectedIngredient.cs index 19ec020f1..b5c77f988 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/SelectedIngredient.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/SelectedIngredient.cs @@ -16,7 +16,14 @@ public void Initialize() public void SetIngredientEntry(IngredientEntry ingredientEntry) { - IngredientImage.sprite = DataManager.Instance.GetIcon(ingredientEntry.IngredientId); + if (ingredientEntry == null) + { + IngredientImage.sprite = null; + SetActive(false); + return; + } + + IngredientImage.sprite = DataManager.Instance.GetSprite(ingredientEntry.IngredientId); SetActive(IngredientImage.sprite); } } diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs index b455498b2..07e5b052e 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs @@ -4,7 +4,7 @@ namespace DDD { public class InventorySlotUiStrategy : IItemSlotUiStrategy { - public void Setup(ItemSlotUi ui, ItemViewModel model) + public void Setup(ItemSlotUi ui, ItemModel model) { if (InventoryManager.Instance.ContainInventoryItem(model.Id)) { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs index 1fad1502b..8cb6a32b0 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs @@ -4,7 +4,7 @@ namespace DDD { public interface IItemSlotUiStrategy { - void Setup(ItemSlotUi ui, ItemViewModel model); + void Setup(ItemSlotUi ui, ItemModel model); RuntimeAnimatorController GetAnimatorController(); } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModel.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemModel.cs similarity index 95% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModel.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemModel.cs index 8873cd0b0..4db0f3964 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModel.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemModel.cs @@ -5,20 +5,20 @@ namespace DDD { [Serializable] - public class ItemViewModel + public class ItemModel { [field: SerializeField] public string Id { get; private set; } [field: SerializeField] public ItemType ItemType { get; private set; } [field: SerializeField] public int Count { get; private set; } - public ItemViewModel(string id, ItemType itemType, int count) + public ItemModel(string id, ItemType itemType, int count) { Id = id; ItemType = itemType; Count = count; } - public ItemViewModel(string id, ItemType itemType) + public ItemModel(string id, ItemType itemType) { Id = id; ItemType = itemType; @@ -108,7 +108,7 @@ public Sprite GetCookwareIcon } } - public Sprite GetResultIcon => DataManager.Instance.GetIcon(GetRecipeResultKey); + public Sprite GetResultIcon => DataManager.Instance.GetSprite(GetRecipeResultKey); public List GetIngredients { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModel.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModel.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemModel.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs index 7e6201707..a220f5689 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs @@ -16,12 +16,12 @@ public class ItemSlotUi : MonoBehaviour, ISelectHandler, IAutoScrollItem [SerializeField] private Image _markImage; [SerializeField] private Animator _animator; - [field: SerializeField] public ItemViewModel Model { get; private set; } + [field: SerializeField] public ItemModel Model { get; private set; } public IItemSlotUiStrategy Strategy { get; private set; } private CommonButton _commonButton; - public void Initialize(ItemViewModel model, IItemSlotUiStrategy strategy) + public void Initialize(ItemModel model, IItemSlotUiStrategy strategy) { _commonButton = GetComponent(); diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs index 98699ec43..621d8c10a 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs @@ -4,9 +4,9 @@ namespace DDD { public static class ItemViewModelFactory { - public static List CreateRestaurantManagementInventoryItem() + public static List CreateRestaurantManagementInventoryItem() { - var result = new List(); + var result = new List(); var allItemDataLookup = InventoryManager.Instance.AllItemDataLookup; foreach (var keyItemDataPair in allItemDataLookup) { @@ -23,7 +23,7 @@ public static List CreateRestaurantManagementInventoryItem() }; } - var model = new ItemViewModel(id, itemData.ItemType, modelCount); + var model = new ItemModel(id, itemData.ItemType, modelCount); result.Add(model); } @@ -49,14 +49,14 @@ private static int CalculateCraftableCount(string recipeId) }; } - public static ItemViewModel CreateByItemId(string itemId) + public static ItemModel CreateByItemId(string itemId) { var itemSo = DataManager.Instance.GetDataSo(); if (!itemSo.TryGetDataById(itemId, out var itemData)) return null; if (InventoryManager.Instance.GetItemDataByIdOrNull(itemId) == null) return null; - var model = new ItemViewModel(itemId, itemData.ItemType); + var model = new ItemModel(itemId, itemData.ItemType); return model; } diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementViewModel.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementViewModel.cs index ad849615d..2726902e9 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementViewModel.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementViewModel.cs @@ -327,7 +327,7 @@ public void UpdateCategoryViewByCategory(InventoryCategoryType category) _firstSlot = firstValidSlot; } - private bool MatchesCategory(ItemViewModel model, InventoryCategoryType category) + private bool MatchesCategory(ItemModel model, InventoryCategoryType category) { switch (category) { @@ -376,13 +376,13 @@ public ItemDetailSnapshot ItemDetail private set => SetField(ref _itemDetail, value); } - public ItemViewModel SelectedItem { get; private set; } + public ItemModel SelectedItem { get; private set; } private const string CookwareDetailPanel = "CookwareDetailPanel"; private const string IngredientDetailPanel = "IngredientDetailPanel"; private const string RecipeDetailPanel = "RecipeDetailPanel"; - public void SetSelectedItem(ItemViewModel item) + public void SetSelectedItem(ItemModel item) { if (SelectedItem == item) return; diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs index a64002ac3..12f02076d 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs @@ -11,7 +11,7 @@ public TodayMenuSlotUiStrategy(RecipeType recipeType) _recipeType = recipeType; } - public void Setup(ItemSlotUi ui, ItemViewModel model) + public void Setup(ItemSlotUi ui, ItemModel model) { if (model == null) { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs index 73942f770..f181dbc46 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs @@ -4,7 +4,7 @@ namespace DDD { public class TodayCookwareSlotUiStrategy : IItemSlotUiStrategy { - public void Setup(ItemSlotUi ui, ItemViewModel model) + public void Setup(ItemSlotUi ui, ItemModel model) { if (model == null) { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs index 078017323..2252a36ac 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs @@ -4,7 +4,7 @@ namespace DDD { public class TodayWorkerSlotUiStrategy : IItemSlotUiStrategy { - public void Setup(ItemSlotUi ui, ItemViewModel model) + public void Setup(ItemSlotUi ui, ItemModel model) { if (model == null) { diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs index 372a58980..652e99556 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs @@ -2,6 +2,7 @@ using Opsive.BehaviorDesigner.Runtime; using UnityEngine; using UnityEngine.AddressableAssets; +using UnityEngine.ResourceManagement.AsyncOperations; namespace DDD { @@ -9,6 +10,8 @@ public class CustomerCharacter : RestaurantNpcCharacter, ICustomerInitializer { private CustomerData _customerData; + private AsyncOperationHandle _subtreeHandle; + public async void Initialize(CustomerData customerData) { _customerData = customerData; @@ -32,7 +35,7 @@ private async Task InitializeBehaviorTree() try { - var subtree = await subtreeReference.LoadAssetAsync().Task; + var subtree = await AssetManager.LoadAsset(subtreeReference.AssetGUID); if (subtree != null) { _behaviorTree.Subgraph = subtree; diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs b/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs index e8a742c00..d28ce09e6 100644 --- a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs +++ b/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs @@ -21,6 +21,17 @@ public class RestaurantManagementInteractionSubsystem : MonoBehaviour, IInteract [SerializeField] protected RestaurantManagementType _managementType = RestaurantManagementType.OpenRestaurantMenu; [SerializeField] private CookwareType _cookwareType = CookwareType.None; + private ScriptableObject _cachedPayload; + + private void OnDestroy() + { + if (_cachedPayload) + { + DestroyImmediate(_cachedPayload); + _cachedPayload = null; + } + } + public RestaurantManagementType GetInteractionSubsystemType() { return _managementType; @@ -45,9 +56,14 @@ public ScriptableObject GetPayload() { if (_managementType == RestaurantManagementType.OpenCookUi) { - var payloadInstance = ScriptableObject.CreateInstance(typeof(CookwareTypePayload)) as CookwareTypePayload; - payloadInstance.CookwareType = _cookwareType; - return payloadInstance; + if (!_cachedPayload) + { + _cachedPayload = ScriptableObject.CreateInstance(typeof(CookwareTypePayload)); + } + + var payload = _cachedPayload as CookwareTypePayload; + payload.CookwareType = _cookwareType; + return payload; } return null; diff --git a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantManagementState.cs b/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantManagementState.cs index 89039a80b..330546a47 100644 --- a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantManagementState.cs +++ b/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantManagementState.cs @@ -73,7 +73,7 @@ public bool IsOpenable() return isOpenable; } - public bool TryAddTodayMenu(ItemViewModel model) + public bool TryAddTodayMenu(ItemModel model) { string recipeId = model.Id; @@ -123,7 +123,7 @@ public bool TryAddTodayMenu(ItemViewModel model) return added; } - public bool TryRemoveTodayMenu(ItemViewModel model) + public bool TryRemoveTodayMenu(ItemModel model) { string recipeId = model.Id; var removedEvt = RestaurantEvents.TodayMenuRemovedEvent; @@ -179,7 +179,7 @@ public bool TryRemoveTodayMenu(ItemViewModel model) return removed; } - public bool TryAddTodayCookware(ItemViewModel model) + public bool TryAddTodayCookware(ItemModel model) { var cookwareId = model.Id; @@ -208,7 +208,7 @@ public bool TryAddTodayCookware(ItemViewModel model) public bool IsContainTodayMenu(string recipeId) => _todayFoodRecipeIds.ContainsKey(recipeId) || _todayDrinkRecipeIds.ContainsKey(recipeId); - public bool TryRemoveTodayCookware(ItemViewModel model) + public bool TryRemoveTodayCookware(ItemModel model) { var cookwareId = model.Id; diff --git a/Packages/manifest.json b/Packages/manifest.json index 1095fc5d7..5dba9ef29 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -17,6 +17,7 @@ "com.unity.ide.visualstudio": "2.0.23", "com.unity.inputsystem": "1.14.0", "com.unity.localization": "1.5.5", + "com.unity.memoryprofiler": "1.1.8", "com.unity.multiplayer.center": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.render-pipelines.core": "17.1.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 1707723da..734fb2ddd 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -424,6 +424,19 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.memoryprofiler": { + "version": "1.1.8", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.0", + "com.unity.collections": "1.2.3", + "com.unity.mathematics": "1.2.1", + "com.unity.profiling.core": "1.0.0", + "com.unity.editorcoroutines": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.multiplayer.center": { "version": "1.0.0", "depth": 0,