From cf784889901e7f569a25c1df41afb88260ed5176 Mon Sep 17 00:00:00 2001 From: "DESKTOP-VVOCIJO\\PC" Date: Mon, 4 May 2026 15:34:00 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A59?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/MyProject/GameScene.unity | 4 ++-- Assets/02_Scripts/Item/ItemData.cs | 6 +++++- Assets/08_Data/Items/Bakery/MediumFlour.asset | 3 +++ Assets/08_Data/Items/Bakery/MediumFlour.asset.meta | 8 ++++++++ Assets/08_Data/Items/Bakery/SoftFlour.asset | 3 +++ Assets/08_Data/Items/Bakery/SoftFlour.asset.meta | 8 ++++++++ Assets/08_Data/Items/Bakery/StrongFlour.asset | 3 +++ Assets/08_Data/Items/Bakery/StrongFlour.asset.meta | 8 ++++++++ .../Prefabs/RackAssets/BakeryFreshBreadB.prefab | 4 ++-- .../Prefabs/RackAssets/BakeryFreshBreadC.prefab | 4 ++-- .../Prefabs/RackAssets/BakeryUnleavened.prefab | 4 ++-- Assets/vFavorites/vFavorites Data.asset | 4 ++-- 12 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 Assets/08_Data/Items/Bakery/MediumFlour.asset create mode 100644 Assets/08_Data/Items/Bakery/MediumFlour.asset.meta create mode 100644 Assets/08_Data/Items/Bakery/SoftFlour.asset create mode 100644 Assets/08_Data/Items/Bakery/SoftFlour.asset.meta create mode 100644 Assets/08_Data/Items/Bakery/StrongFlour.asset create mode 100644 Assets/08_Data/Items/Bakery/StrongFlour.asset.meta diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index 74520485..b496484c 100644 --- a/Assets/01_Scenes/MyProject/GameScene.unity +++ b/Assets/01_Scenes/MyProject/GameScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba5f40af72d3d7cf548f613a94c67b699f3c86dd9704277730f1fd46aac2f918 -size 13441108 +oid sha256:da42afedf1c541131be1a460397b78961e661800b4c9267055b247ec9b69b58f +size 13382117 diff --git a/Assets/02_Scripts/Item/ItemData.cs b/Assets/02_Scripts/Item/ItemData.cs index 1f33841c..477d6c08 100644 --- a/Assets/02_Scripts/Item/ItemData.cs +++ b/Assets/02_Scripts/Item/ItemData.cs @@ -85,6 +85,10 @@ public enum ProductGroup Jelly, Soda, Yogurt, - Water + Water, + SoftFlour, + StrongFlour, + MediumFlour + } } diff --git a/Assets/08_Data/Items/Bakery/MediumFlour.asset b/Assets/08_Data/Items/Bakery/MediumFlour.asset new file mode 100644 index 00000000..ed7ef19e --- /dev/null +++ b/Assets/08_Data/Items/Bakery/MediumFlour.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4c6e853795a53a7dd28d83714c812db977d36624ef36097c1d8684b5b955963 +size 695 diff --git a/Assets/08_Data/Items/Bakery/MediumFlour.asset.meta b/Assets/08_Data/Items/Bakery/MediumFlour.asset.meta new file mode 100644 index 00000000..74312f6d --- /dev/null +++ b/Assets/08_Data/Items/Bakery/MediumFlour.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 541317a2fe729fa4cabc2e2b3d7db458 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Bakery/SoftFlour.asset b/Assets/08_Data/Items/Bakery/SoftFlour.asset new file mode 100644 index 00000000..4bb3e5e8 --- /dev/null +++ b/Assets/08_Data/Items/Bakery/SoftFlour.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1fa54f73250ae71728c2181b4189f1dd3394a391f76801a09cde2968f2db28b +size 693 diff --git a/Assets/08_Data/Items/Bakery/SoftFlour.asset.meta b/Assets/08_Data/Items/Bakery/SoftFlour.asset.meta new file mode 100644 index 00000000..34f9a965 --- /dev/null +++ b/Assets/08_Data/Items/Bakery/SoftFlour.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25e6a090dcf0a9e498c3cff6769280d9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Bakery/StrongFlour.asset b/Assets/08_Data/Items/Bakery/StrongFlour.asset new file mode 100644 index 00000000..2c96061b --- /dev/null +++ b/Assets/08_Data/Items/Bakery/StrongFlour.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82aaa8a18c06085a9527bda688f2c356a5099ca88c06ea7b9503ca5a96bd42f0 +size 696 diff --git a/Assets/08_Data/Items/Bakery/StrongFlour.asset.meta b/Assets/08_Data/Items/Bakery/StrongFlour.asset.meta new file mode 100644 index 00000000..96a1863b --- /dev/null +++ b/Assets/08_Data/Items/Bakery/StrongFlour.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a318997e6658dbb42b970913f64fd0a6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/BakeryFreshBreadB.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/BakeryFreshBreadB.prefab index 406cdab1..4e01e9e8 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/BakeryFreshBreadB.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/BakeryFreshBreadB.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:976c388d3149d39857df335f94349a473eba73476f93902d1c3a07b4ac074e76 -size 2549 +oid sha256:74e3cce163f9e3ee1be178fda359ff8ad03869313d5c1bee3de5e6ca245c8389 +size 25573 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/BakeryFreshBreadC.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/BakeryFreshBreadC.prefab index 37522c06..8eefa295 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/BakeryFreshBreadC.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/BakeryFreshBreadC.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fd41a60339a17de145737252d4653ddf644adfc866ce80559027af726a5f5e1 -size 2549 +oid sha256:76dcec1cb433709942b43b6b85b2523c8fd649aa9bd44b0d9bf7027b7a74a62f +size 25545 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/BakeryUnleavened.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/BakeryUnleavened.prefab index 2d573456..ff34b94e 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/BakeryUnleavened.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/BakeryUnleavened.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a96e43d8286d772b3830660a1f330527f9ea756b767ba7057b1536a91cbe8cc2 -size 2548 +oid sha256:9455638466ca09d49dc86a6ae526165f0af03c91126c5764aadfbedcc76536ce +size 25446 diff --git a/Assets/vFavorites/vFavorites Data.asset b/Assets/vFavorites/vFavorites Data.asset index 6874c845..863e526a 100644 --- a/Assets/vFavorites/vFavorites Data.asset +++ b/Assets/vFavorites/vFavorites Data.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e88cf53b345ec76bcab294cd97c1b6ae9b343d464e69371158b1a686452f23d -size 2627 +oid sha256:1ff15a3ca264f4094c93ed613e8c6e5b9577ca05474eaa0d5896eae7955f8700 +size 3451