diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index 2c7d7439..9cf95944 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:973c425a38008ff163a3b5a7dfc63f842aa8e3b27d7b38a2b218fdd3aa0831c2 -size 13285378 +oid sha256:f5dfccca7a1de727757636e935c0c0826603c0a616007204013a0cffd290f22a +size 12636271 diff --git a/Assets/02_Scripts/Item/ItemData.cs b/Assets/02_Scripts/Item/ItemData.cs index 9e9626c3..049b0d4e 100644 --- a/Assets/02_Scripts/Item/ItemData.cs +++ b/Assets/02_Scripts/Item/ItemData.cs @@ -90,7 +90,10 @@ public enum ProductGroup SoftFlour, StrongFlour, MediumFlour, - Icecream + Icecream, + Watermelon, + Orange, + Apple } } diff --git a/Assets/08_Data/Items/Fruit.meta b/Assets/08_Data/Items/Fruit.meta new file mode 100644 index 00000000..339f1b03 --- /dev/null +++ b/Assets/08_Data/Items/Fruit.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce1024a3748594a4aab845afb1ea7673 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Fruit/Apple.asset b/Assets/08_Data/Items/Fruit/Apple.asset new file mode 100644 index 00000000..5fb5a307 --- /dev/null +++ b/Assets/08_Data/Items/Fruit/Apple.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79f642a295de7059636abedc8f02f424d36e6d859bd89536378386be0f07d62a +size 688 diff --git a/Assets/08_Data/Items/Fruit/Apple.asset.meta b/Assets/08_Data/Items/Fruit/Apple.asset.meta new file mode 100644 index 00000000..00d99216 --- /dev/null +++ b/Assets/08_Data/Items/Fruit/Apple.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bbc7f40b0a1b1f5498ebc08215b74f9d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Fruit/Orange.asset b/Assets/08_Data/Items/Fruit/Orange.asset new file mode 100644 index 00000000..cf6237c0 --- /dev/null +++ b/Assets/08_Data/Items/Fruit/Orange.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7fd64888f33efbc801f3f7b2c7cfbf54f6268f1d3978593c9d44028d75a3c5a +size 707 diff --git a/Assets/08_Data/Items/Fruit/Orange.asset.meta b/Assets/08_Data/Items/Fruit/Orange.asset.meta new file mode 100644 index 00000000..49eda840 --- /dev/null +++ b/Assets/08_Data/Items/Fruit/Orange.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e75d8ae75d880f74b8212c4557a3c62e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Fruit/Watermelon.asset b/Assets/08_Data/Items/Fruit/Watermelon.asset new file mode 100644 index 00000000..809c3933 --- /dev/null +++ b/Assets/08_Data/Items/Fruit/Watermelon.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c675375bd2efcd7d470b21462676fa53190809c2744268a4ae0c8298f2bb9839 +size 688 diff --git a/Assets/08_Data/Items/Fruit/Watermelon.asset.meta b/Assets/08_Data/Items/Fruit/Watermelon.asset.meta new file mode 100644 index 00000000..17a79aa4 --- /dev/null +++ b/Assets/08_Data/Items/Fruit/Watermelon.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b1d4c7ab8628534f91bf36aa9b8a6cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Supermarket Store/Fruits/Prefabs/Orange Variant.prefab b/Assets/Supermarket Store/Fruits/Prefabs/Orange Variant.prefab index b5f8361d..768d440e 100644 --- a/Assets/Supermarket Store/Fruits/Prefabs/Orange Variant.prefab +++ b/Assets/Supermarket Store/Fruits/Prefabs/Orange Variant.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c75502379e36749111a6d553056d025092249318ea48c4bde9e292bdd8645ab4 -size 2519 +oid sha256:78976b9d9712d333123e5728c858c3d30e4f6a514aa69ffb78a8dee5dde21e3c +size 25794 diff --git a/Assets/Supermarket Store/Fruits/Prefabs/RedApple Variant.prefab b/Assets/Supermarket Store/Fruits/Prefabs/RedApple Variant.prefab index eba0fac4..894066e7 100644 --- a/Assets/Supermarket Store/Fruits/Prefabs/RedApple Variant.prefab +++ b/Assets/Supermarket Store/Fruits/Prefabs/RedApple Variant.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2ea376498893782b22c94b2bba68af4ec815f508ea70f281884bdadbce6415a -size 2521 +oid sha256:21e6d35be45bc32aec52634dd0328992dc861f0cb12c2085fe622a6abdc00b37 +size 25182 diff --git a/Assets/Supermarket Store/Fruits/Prefabs/Watermelon Variant.prefab b/Assets/Supermarket Store/Fruits/Prefabs/Watermelon Variant.prefab index 0d846e19..96ecd514 100644 --- a/Assets/Supermarket Store/Fruits/Prefabs/Watermelon Variant.prefab +++ b/Assets/Supermarket Store/Fruits/Prefabs/Watermelon Variant.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d57bff11ecbc324c12e304d1c3eb220fd01f3f88e3c285349784d7f0e9f37470 -size 2523 +oid sha256:9f8b017fb8d47f144b32fd02268258a35e464de555646ce8b47890383c1bc5e5 +size 25165 diff --git a/Assets/vFavorites/vFavorites Data.asset b/Assets/vFavorites/vFavorites Data.asset index 5e6d6f20..f36c794f 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:4202773daf728fbc4c286d4cf88fe27efad94410a2e0205b6575243a5f4962ee -size 3052 +oid sha256:3d7baf59f1c28f64ef196414da009d07d9551543abd8f066fe758a6b3a6ed5d1 +size 2653