diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index 143108fe..96641364 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:c51e34bfbd37ce367b50aec72d2733d18eb47d1b893e4522d73345c345620848 -size 13425446 +oid sha256:95cd376ae5e0dfee035790c7054d66f2489ba40820855a4df1feeafbedcf8fbd +size 13425967 diff --git a/Assets/02_Scripts/Item/ItemData.cs b/Assets/02_Scripts/Item/ItemData.cs index 5ed2884f..4f32575a 100644 --- a/Assets/02_Scripts/Item/ItemData.cs +++ b/Assets/02_Scripts/Item/ItemData.cs @@ -78,6 +78,8 @@ public enum ProductGroup JAM, Juice, LaundryDetergent, - ClothesConditioner + ClothesConditioner, + KitchenDetergent, + Cleaner } } diff --git a/Assets/08_Data/Items/HouseHold/Cleaner.asset b/Assets/08_Data/Items/HouseHold/Cleaner.asset new file mode 100644 index 00000000..01eb3f2a --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/Cleaner.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:492b757f3d44a51fe8cb271af764d3299854e77003f62837ea7bd9b78f729d5b +size 725 diff --git a/Assets/08_Data/Items/HouseHold/Cleaner.asset.meta b/Assets/08_Data/Items/HouseHold/Cleaner.asset.meta new file mode 100644 index 00000000..1938c256 --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/Cleaner.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fc1a341a6557d0f429264d1c22a2c32f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/HouseHold/LaundryDetergent2.asset b/Assets/08_Data/Items/HouseHold/LaundryDetergent2.asset new file mode 100644 index 00000000..2860252d --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/LaundryDetergent2.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83aa7fd4401ef98f1d8d1737701ca333517e46ff23b0fd94b47f8a15ad533f42 +size 731 diff --git a/Assets/08_Data/Items/HouseHold/LaundryDetergent2.asset.meta b/Assets/08_Data/Items/HouseHold/LaundryDetergent2.asset.meta new file mode 100644 index 00000000..1bf8d7e6 --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/LaundryDetergent2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad290194a2b2674469b7564705a92b09 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/HouseHold/LaundryDetergent3.asset b/Assets/08_Data/Items/HouseHold/LaundryDetergent3.asset new file mode 100644 index 00000000..014bf206 --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/LaundryDetergent3.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea810e267a87e81b27d995a5dd9963fd25cbdd3386a15916323b1cc3956d18f0 +size 733 diff --git a/Assets/08_Data/Items/HouseHold/LaundryDetergent3.asset.meta b/Assets/08_Data/Items/HouseHold/LaundryDetergent3.asset.meta new file mode 100644 index 00000000..8e6bc9d1 --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/LaundryDetergent3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fee3a0a6f495914b994e5fc0837788c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/Cleaner.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/Cleaner.prefab index bc9745cc..c228da87 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/Cleaner.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/Cleaner.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6b653e9f7922ab1cac6cc79ce1709c6a730da6470c8508dbf47b9942c1ffae0 -size 2539 +oid sha256:161f4b46deb92d561053456d8c289bceda117aa08b5d074688cf83264d650365 +size 24970 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/FabricSoftener.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/FabricSoftener.prefab index 12477c18..adb670a3 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/FabricSoftener.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/FabricSoftener.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a72a3d428a6d5ba13655a9c2cdc78ecf1f3fa64669b3f523e4277e8c2d6f3d4a -size 2546 +oid sha256:7eb4ed785d54ce8f4b6bbcbd6b53f833532edc305db66a609c52cf03eb39907f +size 24992 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/SuperCleaner.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/SuperCleaner.prefab index 76cdc72b..f7bc4343 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/SuperCleaner.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/SuperCleaner.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5047179e2840233d1241392d068e14cfbe862eec265e66f1650450f674e6e78c -size 2544 +oid sha256:d1f595515128926477236b42fcee9cf3cfa93801570c8ce9d9b36ee2cf988e1d +size 24986 diff --git a/Assets/vFavorites/vFavorites Data.asset b/Assets/vFavorites/vFavorites Data.asset index 0b4fc270..4442b29c 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:f3e3b904c4d139f30c94c41a481555896ab6193424469e5944ad0088a0cf630d -size 1803 +oid sha256:53c6cbed3e563ee56d970a40e15fc36b73f25d054d4174d358fed91488b7d721 +size 3451