diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index b496484c..2c7d7439 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:da42afedf1c541131be1a460397b78961e661800b4c9267055b247ec9b69b58f -size 13382117 +oid sha256:973c425a38008ff163a3b5a7dfc63f842aa8e3b27d7b38a2b218fdd3aa0831c2 +size 13285378 diff --git a/Assets/02_Scripts/Item/ItemData.cs b/Assets/02_Scripts/Item/ItemData.cs index 477d6c08..9e9626c3 100644 --- a/Assets/02_Scripts/Item/ItemData.cs +++ b/Assets/02_Scripts/Item/ItemData.cs @@ -47,7 +47,8 @@ public enum ItemCategory Snack, Household, Tea, - Pet + Pet, + Frozen } @@ -88,7 +89,8 @@ public enum ProductGroup Water, SoftFlour, StrongFlour, - MediumFlour + MediumFlour, + Icecream } } diff --git a/Assets/08_Data/Items/Drink/AppleJuice.asset b/Assets/08_Data/Items/Drink/AppleJuice.asset new file mode 100644 index 00000000..8763770b --- /dev/null +++ b/Assets/08_Data/Items/Drink/AppleJuice.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:233aee5d79cff7559920316f28e123e383d2521f7b0adae5d29ae44f50481128 +size 715 diff --git a/Assets/08_Data/Items/Drink/AppleJuice.asset.meta b/Assets/08_Data/Items/Drink/AppleJuice.asset.meta new file mode 100644 index 00000000..cae7eef0 --- /dev/null +++ b/Assets/08_Data/Items/Drink/AppleJuice.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bbaa82f293ccafc488c664fa48eb8a1e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Frozen.meta b/Assets/08_Data/Items/Frozen.meta new file mode 100644 index 00000000..9697efc3 --- /dev/null +++ b/Assets/08_Data/Items/Frozen.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d61386a9e3daec4a8fec2185fa7b2a9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Frozen/BananaIcecream.asset b/Assets/08_Data/Items/Frozen/BananaIcecream.asset new file mode 100644 index 00000000..3144ff95 --- /dev/null +++ b/Assets/08_Data/Items/Frozen/BananaIcecream.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9f697d4cb9449ee0e7d178396c3f95c0d02a8bd5dd2f9a940fc2b37602795a5 +size 724 diff --git a/Assets/08_Data/Items/Frozen/BananaIcecream.asset.meta b/Assets/08_Data/Items/Frozen/BananaIcecream.asset.meta new file mode 100644 index 00000000..4378bf55 --- /dev/null +++ b/Assets/08_Data/Items/Frozen/BananaIcecream.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cfb163036dd854944a860cdaade775dc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Frozen/KiwiIcecream.asset b/Assets/08_Data/Items/Frozen/KiwiIcecream.asset new file mode 100644 index 00000000..8a531a8d --- /dev/null +++ b/Assets/08_Data/Items/Frozen/KiwiIcecream.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0b1a2df3fc8fe89e3a0986aa2e1738fe53bad24b46372de1b17f7e7ef742aae +size 716 diff --git a/Assets/08_Data/Items/Frozen/KiwiIcecream.asset.meta b/Assets/08_Data/Items/Frozen/KiwiIcecream.asset.meta new file mode 100644 index 00000000..5cabf4a5 --- /dev/null +++ b/Assets/08_Data/Items/Frozen/KiwiIcecream.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0bb8f77052a62a40b82a96930d66414 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Frozen/StrawberryIcecream.asset b/Assets/08_Data/Items/Frozen/StrawberryIcecream.asset new file mode 100644 index 00000000..faef02c6 --- /dev/null +++ b/Assets/08_Data/Items/Frozen/StrawberryIcecream.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a5457488bdadd5a65635b118bdee8d4b73e301d26782e604621a35a81b5358d +size 722 diff --git a/Assets/08_Data/Items/Frozen/StrawberryIcecream.asset.meta b/Assets/08_Data/Items/Frozen/StrawberryIcecream.asset.meta new file mode 100644 index 00000000..74501160 --- /dev/null +++ b/Assets/08_Data/Items/Frozen/StrawberryIcecream.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 155ba752c722a0040828cfa95aac59e5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/AppleJuice.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/AppleJuice.prefab index 7ad1d7c0..8c3b33b0 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/AppleJuice.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/AppleJuice.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e69e6db35858b3c6accc9b7275ddecd8d8b1ba7f4328ad05aeac8c440ee65d56 -size 2542 +oid sha256:5d559021b5bf55d0d97638b56c64a4487e589ec0816a9e95d09dda3db584a30e +size 24936 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/IceCreamCoffe.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/IceCreamCoffe.prefab index 26612d79..512e1924 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/IceCreamCoffe.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/IceCreamCoffe.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c8aa39f86241f876e5f3ed69e51c75d78ce30b7d02641e820b2d1bbb233facb -size 2545 +oid sha256:e8180539eed7852233697c1ebe74d59441fc3cced39d0f94d44d570db337a8d1 +size 25479 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/IceCreamGreen.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/IceCreamGreen.prefab index 31f0b13f..b93ab6c3 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/IceCreamGreen.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/IceCreamGreen.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc0353e88930494e8b1968b52072c31f8c912620685a511c857f9913e54735c6 -size 2545 +oid sha256:9493ec19de1335ccdb5100beb7ab17aaa9a9cc3f5becf2b9578e8f5beef7dc6c +size 25484 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/IceCreamOrange.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/IceCreamOrange.prefab index 3bcb9c57..df57c257 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/IceCreamOrange.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/IceCreamOrange.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51c33969b2487a13e822ef147ab461880de7294935ae35f09e4e51f596d4b1ba -size 2546 +oid sha256:cc1cf2afc52f336134ca8d7fcc2ec060b5aaa67626afc303e0a0bb08ddda47d9 +size 25480 diff --git a/Assets/vFavorites/vFavorites Data.asset b/Assets/vFavorites/vFavorites Data.asset index 863e526a..5e6d6f20 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:1ff15a3ca264f4094c93ed613e8c6e5b9577ca05474eaa0d5896eae7955f8700 -size 3451 +oid sha256:4202773daf728fbc4c286d4cf88fe27efad94410a2e0205b6575243a5f4962ee +size 3052