diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index 1312c21b..143108fe 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:690be872d36a0f42a629baaf83406f890c9d97eeb8a6ca714ef08d55b598856b -size 13425685 +oid sha256:c51e34bfbd37ce367b50aec72d2733d18eb47d1b893e4522d73345c345620848 +size 13425446 diff --git a/Assets/02_Scripts/Item/ItemData.cs b/Assets/02_Scripts/Item/ItemData.cs index 07027d34..5ed2884f 100644 --- a/Assets/02_Scripts/Item/ItemData.cs +++ b/Assets/02_Scripts/Item/ItemData.cs @@ -74,6 +74,10 @@ public enum ProductGroup Gum, WetWipes, Toothpaste, - DogFood + DogFood, + JAM, + Juice, + LaundryDetergent, + ClothesConditioner } } diff --git a/Assets/08_Data/Items/Bakery.meta b/Assets/08_Data/Items/Bakery.meta new file mode 100644 index 00000000..a72ba442 --- /dev/null +++ b/Assets/08_Data/Items/Bakery.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee7deb23bc045df439547910ea1147e0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Bakery/KiwiJAM.asset b/Assets/08_Data/Items/Bakery/KiwiJAM.asset new file mode 100644 index 00000000..fe2431d3 --- /dev/null +++ b/Assets/08_Data/Items/Bakery/KiwiJAM.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:627d139449d8b7c9b13e1efdd7ab3c9bbc3823fde3f7370b41b21401f3e78333 +size 692 diff --git a/Assets/08_Data/Items/Bakery/KiwiJAM.asset.meta b/Assets/08_Data/Items/Bakery/KiwiJAM.asset.meta new file mode 100644 index 00000000..16c33b74 --- /dev/null +++ b/Assets/08_Data/Items/Bakery/KiwiJAM.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8150b9b0870f3d246ad0602e08002e80 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Bakery/PlumJAM.asset b/Assets/08_Data/Items/Bakery/PlumJAM.asset new file mode 100644 index 00000000..d9722958 --- /dev/null +++ b/Assets/08_Data/Items/Bakery/PlumJAM.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b145e43b4d99ba7860d410ac8edac572c2bac73ab5f8109505a96b6f7f5c53f7 +size 690 diff --git a/Assets/08_Data/Items/Bakery/PlumJAM.asset.meta b/Assets/08_Data/Items/Bakery/PlumJAM.asset.meta new file mode 100644 index 00000000..e1abf3f0 --- /dev/null +++ b/Assets/08_Data/Items/Bakery/PlumJAM.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3fb50a744d644c44cb4a6810de4c6596 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Drink.meta b/Assets/08_Data/Items/Drink.meta new file mode 100644 index 00000000..174773c3 --- /dev/null +++ b/Assets/08_Data/Items/Drink.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c3d92942365c353428567ae8d0d3623d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/Drink/LemonJuice.asset b/Assets/08_Data/Items/Drink/LemonJuice.asset new file mode 100644 index 00000000..4f0280fe --- /dev/null +++ b/Assets/08_Data/Items/Drink/LemonJuice.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5f9282d38d5f01b31a598a2399318e40365b41a26e1025d1e224c9eb9e710cc +size 717 diff --git a/Assets/08_Data/Items/Drink/LemonJuice.asset.meta b/Assets/08_Data/Items/Drink/LemonJuice.asset.meta new file mode 100644 index 00000000..95565605 --- /dev/null +++ b/Assets/08_Data/Items/Drink/LemonJuice.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aadf8306ab34bc84ba8921a2cc0e969e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/HouseHold/ClothesConditioner.asset b/Assets/08_Data/Items/HouseHold/ClothesConditioner.asset new file mode 100644 index 00000000..b536fed4 --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/ClothesConditioner.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a317efc62e34a46e3d50168623b2927d9505be0d1d804304aa4a8d789d504fd +size 739 diff --git a/Assets/08_Data/Items/HouseHold/ClothesConditioner.asset.meta b/Assets/08_Data/Items/HouseHold/ClothesConditioner.asset.meta new file mode 100644 index 00000000..3d47d2e4 --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/ClothesConditioner.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c1fe87fba0c8694a863bc440c0a6eda +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/HouseHold/LaundryDetergent.asset b/Assets/08_Data/Items/HouseHold/LaundryDetergent.asset new file mode 100644 index 00000000..db3da2ec --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/LaundryDetergent.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c5dc6f03fb6f2475650780b231fe286b141c420f47daab47314f04b8f073ac9 +size 732 diff --git a/Assets/08_Data/Items/HouseHold/LaundryDetergent.asset.meta b/Assets/08_Data/Items/HouseHold/LaundryDetergent.asset.meta new file mode 100644 index 00000000..2d2857c5 --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/LaundryDetergent.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cfc1be248dd668749a6705b4708d8a5f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/ConditionerOrange.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/ConditionerOrange.prefab index 299f9145..843c5ede 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/ConditionerOrange.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/ConditionerOrange.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b032f804acf093d9663c264fe5461d631ad1b47ce52d9e30a677f6ed7bc50d6 -size 2549 +oid sha256:8e55c647b99d83c5537ce6f53c909f64d4c349dc4731a8008778432270280d5b +size 25013 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/KiwiJelly.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/KiwiJelly.prefab index 721d8582..9b8ffd63 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/KiwiJelly.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/KiwiJelly.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2548d6d05c389b864afdc087eac7a4fbd50374dfc52e733f4cd1a83015d07ca -size 2541 +oid sha256:e45bd68c332532a8afd2a5ff032f7c009ddfebc1e5a6b98a5b451ae4cce302b0 +size 25522 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/LemonJuice.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/LemonJuice.prefab index 2be0df2d..845f1421 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/LemonJuice.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/LemonJuice.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5083dcc3d3ec3d2a935d24db5744c27649cc5faba9da4f2f48a44b751e23eca -size 2542 +oid sha256:355506458633d911d92a89b44f841281b3d038a6787b807b89f3ab9244bbb8e7 +size 24923 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/PlumJam.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/PlumJam.prefab index 64596885..b59b1d4d 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/PlumJam.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/PlumJam.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4999149a74e04df8ff3a052fe0cda03668729377a183d1740e6b3f5976d99de6 -size 2539 +oid sha256:a3563f60ef4039318b389db97b0bec910fa9b85dd555ba4a40e81ecdd2cc641a +size 25528 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/WashingGel.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/WashingGel.prefab index dfed2b56..6ad20467 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/WashingGel.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/WashingGel.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bec67a7d01b7b169dbb284789ad7cd8b6b897817ada6abc27ad55e2ec8ada202 -size 2542 +oid sha256:bb6960294a73c9b3eef7141bad208888b2d6a1fcbe29a41a0570c4b86eb080a7 +size 24992 diff --git a/Assets/vFavorites/vFavorites Data.asset b/Assets/vFavorites/vFavorites Data.asset index 3dc99754..0b4fc270 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:12ea320367f8b5c0805094efe149d20cc55610b2606b4212ab0c3fc7a8a93b55 +oid sha256:f3e3b904c4d139f30c94c41a481555896ab6193424469e5944ad0088a0cf630d size 1803