diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index 21118192..13f4ded0 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:000a4d3dd41397958e79767980d3c36a56e8bd21e92e6c7be50d285d34c8f989 -size 12440467 +oid sha256:8c6b0a4e3e6fc73a1186bb0c88725a6f0edb976fb98ce99d9e53765abb542f75 +size 12431783 diff --git a/Assets/02_Scripts/Item/ItemData.cs b/Assets/02_Scripts/Item/ItemData.cs index d3fc3941..88a72856 100644 --- a/Assets/02_Scripts/Item/ItemData.cs +++ b/Assets/02_Scripts/Item/ItemData.cs @@ -99,7 +99,10 @@ public enum ProductGroup Potato, Cabbage, Broccoli, - Aubergine + Aubergine, + Tomato, + Cucumber, + Onion } } diff --git a/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabOnion.asset b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabOnion.asset new file mode 100644 index 00000000..8724713f --- /dev/null +++ b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabOnion.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a6f3073daca93dc1fe89c1654b76bc2fb2067399ad3d7f4a79f16e75e7f5a6c +size 5109 diff --git a/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabOnion.asset.meta b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabOnion.asset.meta new file mode 100644 index 00000000..273ea3f5 --- /dev/null +++ b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabOnion.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 13ceb8dc68b87df408db94daa787c947 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTomato.asset b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTomato.asset new file mode 100644 index 00000000..3aac2c66 --- /dev/null +++ b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTomato.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c8cbbdd2e15cd178aed72886be817d5949ca099c8555c1e7f19c1fc7f620789 +size 4978 diff --git a/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTomato.asset.meta b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTomato.asset.meta new file mode 100644 index 00000000..c5d2eed8 --- /dev/null +++ b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTomato.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f1ba810d42d3c2743bc923cd2b6eb7aa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Vegetable/Cucumber.asset b/Assets/08_Data/Items/Vegetable/Cucumber.asset new file mode 100644 index 00000000..62da0841 --- /dev/null +++ b/Assets/08_Data/Items/Vegetable/Cucumber.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c9426b0ca5e6925aff672872c261ec779152ab6a10ed2984667bca5be18d470 +size 695 diff --git a/Assets/08_Data/Items/Vegetable/Cucumber.asset.meta b/Assets/08_Data/Items/Vegetable/Cucumber.asset.meta new file mode 100644 index 00000000..8aee30f1 --- /dev/null +++ b/Assets/08_Data/Items/Vegetable/Cucumber.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a3dca6e0a5adc0843b0494636136c8da +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Vegetable/Onion.asset b/Assets/08_Data/Items/Vegetable/Onion.asset new file mode 100644 index 00000000..808e8562 --- /dev/null +++ b/Assets/08_Data/Items/Vegetable/Onion.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbb29830115f5daa25439d00dd285de1524bc3d35d92c0fcbd6d8165a15e937e +size 692 diff --git a/Assets/08_Data/Items/Vegetable/Onion.asset.meta b/Assets/08_Data/Items/Vegetable/Onion.asset.meta new file mode 100644 index 00000000..b992457a --- /dev/null +++ b/Assets/08_Data/Items/Vegetable/Onion.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 191518547f526944bb82f0d24e9e1349 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Vegetable/Tomato.asset b/Assets/08_Data/Items/Vegetable/Tomato.asset new file mode 100644 index 00000000..063762e6 --- /dev/null +++ b/Assets/08_Data/Items/Vegetable/Tomato.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37f4932800aa69029f1e1d7b382e19bc4ed2f6016a2e517343e1d1c31cbe5191 +size 699 diff --git a/Assets/08_Data/Items/Vegetable/Tomato.asset.meta b/Assets/08_Data/Items/Vegetable/Tomato.asset.meta new file mode 100644 index 00000000..038e8b1b --- /dev/null +++ b/Assets/08_Data/Items/Vegetable/Tomato.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77a9fa5b948ab2a46a098ffd998571cc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Supermarket Store/Vegetables/Prefabs/Cucumber Variant.prefab b/Assets/Supermarket Store/Vegetables/Prefabs/Cucumber Variant.prefab index ca098dae..c16c3e45 100644 --- a/Assets/Supermarket Store/Vegetables/Prefabs/Cucumber Variant.prefab +++ b/Assets/Supermarket Store/Vegetables/Prefabs/Cucumber Variant.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44aef0d68c5a8f681271c9f1a9da7d34865c018cff8a42557dac04aedee872e1 -size 2521 +oid sha256:67d24db5aa16a4566cec95e0785e1e5a86eb4eb698210ae4a6426082f099d504 +size 25264 diff --git a/Assets/Supermarket Store/Vegetables/Prefabs/Onion Variant.prefab b/Assets/Supermarket Store/Vegetables/Prefabs/Onion Variant.prefab index 7091c93b..6b444609 100644 --- a/Assets/Supermarket Store/Vegetables/Prefabs/Onion Variant.prefab +++ b/Assets/Supermarket Store/Vegetables/Prefabs/Onion Variant.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e54c5c8786a01e8bad060f6fdd05e3ed48e0d58b2d850d02306e7f91a3757e9 -size 2518 +oid sha256:941fed8984c4a51eb7ef15490bf3fd2f0dca2de8191aade1bb83d175418d604b +size 25172 diff --git a/Assets/Supermarket Store/Vegetables/Prefabs/Tomato Variant.prefab b/Assets/Supermarket Store/Vegetables/Prefabs/Tomato Variant.prefab index 12585f31..67a89162 100644 --- a/Assets/Supermarket Store/Vegetables/Prefabs/Tomato Variant.prefab +++ b/Assets/Supermarket Store/Vegetables/Prefabs/Tomato Variant.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b447ed07dfd8b76ebbe1c11700f55ce521e0bd4c69f9e3d07e3c3de7d65dbbd0 -size 2519 +oid sha256:a46a3f2e3ea1de21378ec2a9a93ae4edc0b8d51b0b0c7fa372610634947fa9db +size 25209 diff --git a/Assets/vFavorites/vFavorites Data.asset b/Assets/vFavorites/vFavorites Data.asset index 834e3c9c..c7350304 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:ead95116811655ba31fc6fe15fb418b5cde7ced05906662c3c5f367815d3c374 -size 1803 +oid sha256:08c1dbe00c4e0fe407d1019d0b247455d9964ea0dc7c880ec41602e941106b53 +size 979