From bc30316d57c6e24632e2ae00aeec8957e635be25 Mon Sep 17 00:00:00 2001 From: "DESKTOP-VVOCIJO\\PC" Date: Mon, 4 May 2026 13:09:23 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A55?= 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 | 4 +++- Assets/08_Data/Items/Snack/Candy.asset | 3 +++ Assets/08_Data/Items/Snack/Candy.asset.meta | 8 ++++++++ Assets/08_Data/Items/Snack/Jelly1.asset | 3 +++ Assets/08_Data/Items/Snack/Jelly1.asset.meta | 8 ++++++++ Assets/08_Data/Items/Snack/Jelly2.asset | 3 +++ Assets/08_Data/Items/Snack/Jelly2.asset.meta | 8 ++++++++ Assets/08_Data/Items/Snack/Jelly3.asset | 3 +++ Assets/08_Data/Items/Snack/Jelly3.asset.meta | 8 ++++++++ .../Prefabs/RackAssets/JellyCandy.prefab | 4 ++-- .../Prefabs/RackAssets/Jelly_CandyBlue.prefab | 4 ++-- .../Prefabs/RackAssets/Sweet_Candy.prefab | 4 ++-- .../Prefabs/RackAssets/Sweet_CandyGreen.prefab | 4 ++-- Assets/vFavorites/vFavorites Data.asset | 4 ++-- 15 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 Assets/08_Data/Items/Snack/Candy.asset create mode 100644 Assets/08_Data/Items/Snack/Candy.asset.meta create mode 100644 Assets/08_Data/Items/Snack/Jelly1.asset create mode 100644 Assets/08_Data/Items/Snack/Jelly1.asset.meta create mode 100644 Assets/08_Data/Items/Snack/Jelly2.asset create mode 100644 Assets/08_Data/Items/Snack/Jelly2.asset.meta create mode 100644 Assets/08_Data/Items/Snack/Jelly3.asset create mode 100644 Assets/08_Data/Items/Snack/Jelly3.asset.meta diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index a6c76ba0..665696c1 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:d46e3a8d15e611cf0ed9e1d1b9734a10706bfbd822f1a1d48abda2a4658444ed -size 13425577 +oid sha256:4e8e64825a063fd5225ba34725305eb8f29b7c2dca5b61dde80e582bd5fded31 +size 13426272 diff --git a/Assets/02_Scripts/Item/ItemData.cs b/Assets/02_Scripts/Item/ItemData.cs index 4f32575a..c45fecde 100644 --- a/Assets/02_Scripts/Item/ItemData.cs +++ b/Assets/02_Scripts/Item/ItemData.cs @@ -80,6 +80,8 @@ public enum ProductGroup LaundryDetergent, ClothesConditioner, KitchenDetergent, - Cleaner + Cleaner, + Candy, + Jelly } } diff --git a/Assets/08_Data/Items/Snack/Candy.asset b/Assets/08_Data/Items/Snack/Candy.asset new file mode 100644 index 00000000..b04bf085 --- /dev/null +++ b/Assets/08_Data/Items/Snack/Candy.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88c6eb33c566f2da75998716675131a4bb9756486ccb4a809b494ad741718fbf +size 702 diff --git a/Assets/08_Data/Items/Snack/Candy.asset.meta b/Assets/08_Data/Items/Snack/Candy.asset.meta new file mode 100644 index 00000000..7fad8fa2 --- /dev/null +++ b/Assets/08_Data/Items/Snack/Candy.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4a396533a9360ac438006f977ef0517c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Snack/Jelly1.asset b/Assets/08_Data/Items/Snack/Jelly1.asset new file mode 100644 index 00000000..2b3ee0f2 --- /dev/null +++ b/Assets/08_Data/Items/Snack/Jelly1.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff1430ce3a7627fcf679dde66ae10c0a3d4e92f804793c6cfcd741eb273c50ec +size 709 diff --git a/Assets/08_Data/Items/Snack/Jelly1.asset.meta b/Assets/08_Data/Items/Snack/Jelly1.asset.meta new file mode 100644 index 00000000..aa8ecd92 --- /dev/null +++ b/Assets/08_Data/Items/Snack/Jelly1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 586dfc2f1eaac0440a9949d57ac982f2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Snack/Jelly2.asset b/Assets/08_Data/Items/Snack/Jelly2.asset new file mode 100644 index 00000000..4ae9047d --- /dev/null +++ b/Assets/08_Data/Items/Snack/Jelly2.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9111a2e0c8a39955e900c871ab950ae958c3a84003e9dbc772fcac8f48ab0f0c +size 698 diff --git a/Assets/08_Data/Items/Snack/Jelly2.asset.meta b/Assets/08_Data/Items/Snack/Jelly2.asset.meta new file mode 100644 index 00000000..97d8759b --- /dev/null +++ b/Assets/08_Data/Items/Snack/Jelly2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ec30052c6e2706e42a4f56ffd56d70f0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Snack/Jelly3.asset b/Assets/08_Data/Items/Snack/Jelly3.asset new file mode 100644 index 00000000..665bab23 --- /dev/null +++ b/Assets/08_Data/Items/Snack/Jelly3.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf03074813beafd0391fc4f32dfc7f3f5f7b7a8533e25d4ab119cd2e9c4ac8b3 +size 709 diff --git a/Assets/08_Data/Items/Snack/Jelly3.asset.meta b/Assets/08_Data/Items/Snack/Jelly3.asset.meta new file mode 100644 index 00000000..99288b07 --- /dev/null +++ b/Assets/08_Data/Items/Snack/Jelly3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 135e12605e9fb064ea173bf0712bc7bf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/JellyCandy.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/JellyCandy.prefab index 890fb15e..0c4919c6 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/JellyCandy.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/JellyCandy.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c365c40023a3b71f06f8b4914228e2e4ee34ab3791f1050ea519c5ae91069f1 -size 2542 +oid sha256:a3cba75df88fcf6dba780c530ad9474b2f95453367eb0790b4a8853126eecf08 +size 24978 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/Jelly_CandyBlue.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/Jelly_CandyBlue.prefab index dad3207c..f93a7da9 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/Jelly_CandyBlue.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/Jelly_CandyBlue.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:517ec5c3e48da4d576c08d9255b8bd8689918079783794bd6b49e95fbe347fc5 -size 2547 +oid sha256:3688dd061a7dbd51ddc5da39507e7886182ec488ee5976a1dffdbd2e39b14960 +size 24958 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/Sweet_Candy.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/Sweet_Candy.prefab index 43d13183..3a815f92 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/Sweet_Candy.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/Sweet_Candy.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c5cea0f0c0824b79dbd8ef96270a2858d76fd83869c57527dd9a5fa04bf05dd -size 2543 +oid sha256:a491d2449dd8747a4911dd5a66b80aa9665aefa328cf834f5253ac42f632ee6d +size 24968 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/Sweet_CandyGreen.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/Sweet_CandyGreen.prefab index 1170a6be..9e3dca43 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/Sweet_CandyGreen.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/Sweet_CandyGreen.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1490da408a43ddaf09c37c831badcee5d2d346ff3dea20df97897089c24d3afa -size 2548 +oid sha256:bb4853158c38789e0f7055a5388a9177430ab90f572f981ab253b9c82eb6ba35 +size 24948 diff --git a/Assets/vFavorites/vFavorites Data.asset b/Assets/vFavorites/vFavorites Data.asset index 36ba3992..ed4bf150 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:6062f218be9872a158119034eae4e796b45e47563673dd87301df2ed44484bde -size 1799 +oid sha256:12977ad2b3f38f53ff40e910d96d1ce690c912663cc010df20bfff7f5f84b937 +size 3477