diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index f2758920..74520485 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:f185a4f2b988ed8e15efa2016f1ecbedc861e8d269f7065217f1fd5c021222ac -size 13426437 +oid sha256:ba5f40af72d3d7cf548f613a94c67b699f3c86dd9704277730f1fd46aac2f918 +size 13441108 diff --git a/Assets/02_Scripts/Item/ItemData.cs b/Assets/02_Scripts/Item/ItemData.cs index 527c1621..1f33841c 100644 --- a/Assets/02_Scripts/Item/ItemData.cs +++ b/Assets/02_Scripts/Item/ItemData.cs @@ -83,6 +83,8 @@ public enum ProductGroup Cleaner, Candy, Jelly, - Soda + Soda, + Yogurt, + Water } } diff --git a/Assets/08_Data/Items/Drink/MangeJuice.asset b/Assets/08_Data/Items/Drink/MangeJuice.asset new file mode 100644 index 00000000..e4e5cb03 --- /dev/null +++ b/Assets/08_Data/Items/Drink/MangeJuice.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d79734c9ff374c8dcdf1b8b2624d11a87badfeb5ecdb3eefe5163aa1dba0b5f6 +size 723 diff --git a/Assets/08_Data/Items/Drink/MangeJuice.asset.meta b/Assets/08_Data/Items/Drink/MangeJuice.asset.meta new file mode 100644 index 00000000..cb9b224d --- /dev/null +++ b/Assets/08_Data/Items/Drink/MangeJuice.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e5fb5a83ab4abc46b696a3c75c77015 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Drink/MineralWater.asset b/Assets/08_Data/Items/Drink/MineralWater.asset new file mode 100644 index 00000000..ff5d6e8f --- /dev/null +++ b/Assets/08_Data/Items/Drink/MineralWater.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38ab603a9fb52873a22f6f4535cb376d49ae02f7af8d15fa94a4abe513078569 +size 706 diff --git a/Assets/08_Data/Items/Drink/MineralWater.asset.meta b/Assets/08_Data/Items/Drink/MineralWater.asset.meta new file mode 100644 index 00000000..5ff02de5 --- /dev/null +++ b/Assets/08_Data/Items/Drink/MineralWater.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 37b25d20ea3c26946bff1ad60234c373 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Drink/Soda2.asset b/Assets/08_Data/Items/Drink/Soda2.asset new file mode 100644 index 00000000..1e06d95c --- /dev/null +++ b/Assets/08_Data/Items/Drink/Soda2.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a80d745827c73380886ab6f18e547c908abe0bf02f8fdd16299294d0ac2dcecb +size 692 diff --git a/Assets/08_Data/Items/Drink/Soda2.asset.meta b/Assets/08_Data/Items/Drink/Soda2.asset.meta new file mode 100644 index 00000000..3afc837a --- /dev/null +++ b/Assets/08_Data/Items/Drink/Soda2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 94c5c2377bc7d794c899059abca7416b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Drink/Soda3.asset b/Assets/08_Data/Items/Drink/Soda3.asset new file mode 100644 index 00000000..f9b017f0 --- /dev/null +++ b/Assets/08_Data/Items/Drink/Soda3.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8153901a3806389639cadf7b0dff8bb5b425c062f62d66ef9d079e98f4a9f3b +size 686 diff --git a/Assets/08_Data/Items/Drink/Soda3.asset.meta b/Assets/08_Data/Items/Drink/Soda3.asset.meta new file mode 100644 index 00000000..ddbd57e6 --- /dev/null +++ b/Assets/08_Data/Items/Drink/Soda3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 206b7bfd8501d19418883856c4eeb925 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Drink/Soda4.asset b/Assets/08_Data/Items/Drink/Soda4.asset new file mode 100644 index 00000000..d9b0403e --- /dev/null +++ b/Assets/08_Data/Items/Drink/Soda4.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d10ee8d24d512450366c81277e43544aed8d236bb030a4c967c5e296ae356294 +size 688 diff --git a/Assets/08_Data/Items/Drink/Soda4.asset.meta b/Assets/08_Data/Items/Drink/Soda4.asset.meta new file mode 100644 index 00000000..373bdb91 --- /dev/null +++ b/Assets/08_Data/Items/Drink/Soda4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 335db5e93a1e5784c919c1e4b426967e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Drink/Yogurt.asset b/Assets/08_Data/Items/Drink/Yogurt.asset new file mode 100644 index 00000000..8fefe5a6 --- /dev/null +++ b/Assets/08_Data/Items/Drink/Yogurt.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68e9d282b706c6de239d786a39e63982068cb69aa2fa9dfaab8054e6ad5e22bf +size 721 diff --git a/Assets/08_Data/Items/Drink/Yogurt.asset.meta b/Assets/08_Data/Items/Drink/Yogurt.asset.meta new file mode 100644 index 00000000..2a1a0ec1 --- /dev/null +++ b/Assets/08_Data/Items/Drink/Yogurt.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf4034212c50d2e43b41105a568faadb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/FreshMango.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/FreshMango.prefab index 6c9dd159..4b79dd3d 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/FreshMango.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/FreshMango.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:814c9679081a3fa464796d2e8a9eeb6e7ccdac9b4c1fe24efe3a42c34576e507 -size 2542 +oid sha256:8208c747a111e1a9d174be66e4499efd294a9c7657a6ae6f56db1d7a191fa5da +size 25224 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/Milk_Product.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/Milk_Product.prefab index 382ae31a..03909c24 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/Milk_Product.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/Milk_Product.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7328df94932cccab07b249a6b18ee135a00ec879719095ac15e65dcdd6e041c -size 25426 +oid sha256:e5163d7afa7d209ba3df02f4724e93880c1c3e88709f97864571e014117926f2 +size 25442 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/SodaGreen.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/SodaGreen.prefab index d93fbbdc..1419206a 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/SodaGreen.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/SodaGreen.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39c4275c989161a09b46d9d9008d732908bb5b0e9ad1ac92c927d9f84458aff4 -size 2541 +oid sha256:23260007d3343b3f18284aa53b7522a567f7f3c6ac2f997dc16f9e23d780ffc6 +size 24958 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/SoftDrinkBerry.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/SoftDrinkBerry.prefab index e9c1653e..8f09e478 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/SoftDrinkBerry.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/SoftDrinkBerry.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cc2f9ecbfe6c86c4e1612effcb2e3471f035db435c7021ca73c2c4e15f1db6d -size 2546 +oid sha256:9a27925a64bb95f79d2e476113cc51b6cd7ce0cd296652bb679cee66b5dd8d11 +size 24971 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/SoftDrinkOrange.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/SoftDrinkOrange.prefab index c40cc852..61417593 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/SoftDrinkOrange.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/SoftDrinkOrange.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f8e956f7144192875643d3f10d3f1f8ce5f32a788d56318fd475a3bf4784bdb -size 2547 +oid sha256:33a9148212954a5ba8c3022b6b5f836fc78646ddd2d7f43bd0abcee47720515b +size 24944 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/WaterCan.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/WaterCan.prefab index 5a3b0b06..98592a02 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/WaterCan.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/WaterCan.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a2013a574e73ca63358a79088189a825858889656068992647c4acb639f291e -size 2540 +oid sha256:568488b51b444eae3abb86a8ebc2c90531f0a6be120481c213ad3eac5f088097 +size 24966 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/Yogurt.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/Yogurt.prefab index db65082b..98d88a67 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/Yogurt.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/Yogurt.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c379c79068f1b33e98a1959d51ccd478db15277179ff40296c307196a4953a3d -size 2538 +oid sha256:599a1b4d84cb7d1afdcd3c1ceec74724c9bff2be40064fe8fd7281a2cde17cad +size 25005 diff --git a/Assets/vFavorites/vFavorites Data.asset b/Assets/vFavorites/vFavorites Data.asset index acc963c0..6874c845 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:b1b560ef0cf36ec259aaab1b7ca4ec2ceb96945a1734e4f33133bbf2b543fe41 -size 1800 +oid sha256:8e88cf53b345ec76bcab294cd97c1b6ae9b343d464e69371158b1a686452f23d +size 2627