From 619ed8067531cd2aabf1156aaaee673befe81c67 Mon Sep 17 00:00:00 2001 From: "DESKTOP-VVOCIJO\\PC" Date: Fri, 1 May 2026 15:19:26 +0900 Subject: [PATCH] =?UTF-8?q?2026-05-01=20=EA=B3=A1=EB=AC=BC=20=EB=AF=B9?= =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80?= 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 | 5 ++++- Assets/08_Data/Items/GrainMixTea.asset | 3 +++ Assets/08_Data/Items/GrainMixTea.asset.meta | 8 ++++++++ Assets/08_Data/Items/GrainMixTea2.asset | 3 +++ Assets/08_Data/Items/GrainMixTea2.asset.meta | 8 ++++++++ Assets/Supermarket Store/Prefabs/RackAssets/Pulses.prefab | 4 ++-- .../Supermarket Store/Prefabs/RackAssets/PulsesB.prefab | 4 ++-- Assets/vFavorites/vFavorites Data.asset | 4 ++-- 9 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 Assets/08_Data/Items/GrainMixTea.asset create mode 100644 Assets/08_Data/Items/GrainMixTea.asset.meta create mode 100644 Assets/08_Data/Items/GrainMixTea2.asset create mode 100644 Assets/08_Data/Items/GrainMixTea2.asset.meta diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index b4b4b44f..722ef38a 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:7ef64fb7907306f1b3c36faf95c360652ddacc61bbf007bb68f6b36c123547aa -size 13561217 +oid sha256:1bb8d1104c60786e945f8bddf11b85968d30141d57d95c4576a979b5e49f9a01 +size 13560456 diff --git a/Assets/02_Scripts/Item/ItemData.cs b/Assets/02_Scripts/Item/ItemData.cs index e359a612..57a7481b 100644 --- a/Assets/02_Scripts/Item/ItemData.cs +++ b/Assets/02_Scripts/Item/ItemData.cs @@ -35,6 +35,7 @@ public class ItemData : ScriptableObject public enum ItemCategory { + Etc, Fruit, Vegetable, Grain, @@ -45,7 +46,8 @@ public enum ItemCategory Drink, Snack, Household, - Etc + Tea + } public enum ProductGroup @@ -61,5 +63,6 @@ public enum ProductGroup Cheese, Milk, Diaper, + GrainMixTea, } } diff --git a/Assets/08_Data/Items/GrainMixTea.asset b/Assets/08_Data/Items/GrainMixTea.asset new file mode 100644 index 00000000..df7f2e54 --- /dev/null +++ b/Assets/08_Data/Items/GrainMixTea.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb9d28f28a771d43c5a137725ea329bad297d787b095ad0e012eb6cdd5a744fb +size 705 diff --git a/Assets/08_Data/Items/GrainMixTea.asset.meta b/Assets/08_Data/Items/GrainMixTea.asset.meta new file mode 100644 index 00000000..aacc7640 --- /dev/null +++ b/Assets/08_Data/Items/GrainMixTea.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c8da3383cf694f34ba2ae346863c7cee +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/GrainMixTea2.asset b/Assets/08_Data/Items/GrainMixTea2.asset new file mode 100644 index 00000000..c55b3599 --- /dev/null +++ b/Assets/08_Data/Items/GrainMixTea2.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b72575bbd36e079acbb0965c181ca42893a61099c354a40cc0e58d95c5e49bba +size 717 diff --git a/Assets/08_Data/Items/GrainMixTea2.asset.meta b/Assets/08_Data/Items/GrainMixTea2.asset.meta new file mode 100644 index 00000000..a0723387 --- /dev/null +++ b/Assets/08_Data/Items/GrainMixTea2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c7c19739e6b2839479b47d679ba2dabe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/Pulses.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/Pulses.prefab index 75cb89cb..116b48e2 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/Pulses.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/Pulses.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be11998de18ae0f2b9c0bf2fa2054ba0edd3a34d929d44d1c0c5186314277192 -size 2538 +oid sha256:da90138ecede462671f32f1dc9811768cb0d78eb46fe5adc3e99ae17acbdc0fd +size 25535 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/PulsesB.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/PulsesB.prefab index e21f7965..d45211a8 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/PulsesB.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/PulsesB.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da249e9660c1f38c608b0a47653b6bdfe4b5fa163c5b9fb1c5a5aa60afe91e70 -size 2539 +oid sha256:bd25fdacca09ee21a7221c6f1f9c1e21d2bbc21929a20c25e09935998ec364d7 +size 25519 diff --git a/Assets/vFavorites/vFavorites Data.asset b/Assets/vFavorites/vFavorites Data.asset index 7586b3b1..0310eb50 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:5034be5c0a485ca730382bbfe9df78b2dffd6e2f7428c6198053bffe0f4ad824 -size 1404 +oid sha256:9239990b4523bca5ee1603ed5ac8447b8b6ff489a0c466955ef3d12bcf6b712a +size 1803