From b770dcca7bb378789b7163401b88b4c001b5e755 Mon Sep 17 00:00:00 2001 From: "DESKTOP-VVOCIJO\\PC" Date: Fri, 1 May 2026 17:31:09 +0900 Subject: [PATCH] =?UTF-8?q?2026-05-01=20=EB=AC=BC=ED=92=88=20=EC=A4=91?= =?UTF-8?q?=EA=B0=84=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/MyProject/GameScene.unity | 4 ++-- Assets/02_Scripts/Item/ItemData.cs | 7 ++++++- .../Stylized_Hands/Poses/Pose_GrabSylinder.asset | 3 +++ .../Stylized_Hands/Poses/Pose_GrabSylinder.asset.meta | 8 ++++++++ .../Stylized_Hands/Poses/Pose_GrabSylinder2.asset | 3 +++ .../Stylized_Hands/Poses/Pose_GrabSylinder2.asset.meta | 8 ++++++++ Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTube.asset | 3 +++ .../Stylized_Hands/Poses/Pose_GrabTube.asset.meta | 8 ++++++++ Assets/08_Data/Items/HouseHold/Conditioner.asset | 3 +++ Assets/08_Data/Items/HouseHold/Conditioner.asset.meta | 8 ++++++++ Assets/08_Data/Items/HouseHold/HairSpray.asset | 3 +++ Assets/08_Data/Items/HouseHold/HairSpray.asset.meta | 8 ++++++++ Assets/08_Data/Items/HouseHold/Lotion.asset | 3 +++ Assets/08_Data/Items/HouseHold/Lotion.asset.meta | 8 ++++++++ Assets/08_Data/Items/HouseHold/ShaveFoam.asset | 3 +++ Assets/08_Data/Items/HouseHold/ShaveFoam.asset.meta | 8 ++++++++ Assets/08_Data/Items/HouseHold/SunCream.asset | 3 +++ Assets/08_Data/Items/HouseHold/SunCream.asset.meta | 8 ++++++++ .../Prefabs/RackAssets/Conditioner.prefab | 4 ++-- Assets/Supermarket Store/Prefabs/RackAssets/Cream.prefab | 4 ++-- .../Supermarket Store/Prefabs/RackAssets/CreamTube.prefab | 4 ++-- .../Supermarket Store/Prefabs/RackAssets/Shampoo.prefab | 4 ++-- .../Supermarket Store/Prefabs/RackAssets/ShaveFoam.prefab | 4 ++-- Assets/Supermarket Store/Prefabs/RackAssets/Spray.prefab | 4 ++-- Assets/vFavorites/vFavorites Data.asset | 4 ++-- 25 files changed, 110 insertions(+), 17 deletions(-) create mode 100644 Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder.asset create mode 100644 Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder.asset.meta create mode 100644 Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder2.asset create mode 100644 Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder2.asset.meta create mode 100644 Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTube.asset create mode 100644 Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTube.asset.meta create mode 100644 Assets/08_Data/Items/HouseHold/Conditioner.asset create mode 100644 Assets/08_Data/Items/HouseHold/Conditioner.asset.meta create mode 100644 Assets/08_Data/Items/HouseHold/HairSpray.asset create mode 100644 Assets/08_Data/Items/HouseHold/HairSpray.asset.meta create mode 100644 Assets/08_Data/Items/HouseHold/Lotion.asset create mode 100644 Assets/08_Data/Items/HouseHold/Lotion.asset.meta create mode 100644 Assets/08_Data/Items/HouseHold/ShaveFoam.asset create mode 100644 Assets/08_Data/Items/HouseHold/ShaveFoam.asset.meta create mode 100644 Assets/08_Data/Items/HouseHold/SunCream.asset create mode 100644 Assets/08_Data/Items/HouseHold/SunCream.asset.meta diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index d43ce27d..37ce4517 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:6dfe56458e61120ef91eeccec152a1c836f309a1f43a344387cb64518b43d4b2 -size 13560454 +oid sha256:4540d1b14aa1eeee94ef00216dfbd474d5a93ba4517ca015cf60f552691104df +size 13546582 diff --git a/Assets/02_Scripts/Item/ItemData.cs b/Assets/02_Scripts/Item/ItemData.cs index 2ec536e0..177cb033 100644 --- a/Assets/02_Scripts/Item/ItemData.cs +++ b/Assets/02_Scripts/Item/ItemData.cs @@ -64,6 +64,11 @@ public enum ProductGroup Milk, Diaper, GrainMixTea, - Shampoo + Shampoo, + Conditioner, + HairSpray, + ShaveFoam, + SunCream, + Lotion } } diff --git a/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder.asset b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder.asset new file mode 100644 index 00000000..16e2f26d --- /dev/null +++ b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5885cd8cca02be995bcabbc4af04e0a71e9f75f6e270e3cbcdc4485b24300ddf +size 4984 diff --git a/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder.asset.meta b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder.asset.meta new file mode 100644 index 00000000..303a9d26 --- /dev/null +++ b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d06208ef4d11def40888341d88e078a8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder2.asset b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder2.asset new file mode 100644 index 00000000..6fa69fe4 --- /dev/null +++ b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder2.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6cc2517eb00bb290c38069c020248d117125aabd1055d60d96566f05879b210 +size 4984 diff --git a/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder2.asset.meta b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder2.asset.meta new file mode 100644 index 00000000..d710e25f --- /dev/null +++ b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabSylinder2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 037f82e214d56a243a8337e8a80162ed +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTube.asset b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTube.asset new file mode 100644 index 00000000..a0b20d76 --- /dev/null +++ b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTube.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5168da99ee14b9b5f98f0cd2f13978fcdc3635e0711760c1ee7a69d6d6aa96af +size 4962 diff --git a/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTube.asset.meta b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTube.asset.meta new file mode 100644 index 00000000..25dcb9ba --- /dev/null +++ b/Assets/03_Models/Stylized_Hands/Poses/Pose_GrabTube.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cb22fbb4530bd6448910aba433e86528 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/HouseHold/Conditioner.asset b/Assets/08_Data/Items/HouseHold/Conditioner.asset new file mode 100644 index 00000000..f8d749ae --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/Conditioner.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15dc57c0ea154174c00c7aa12966bdae6fab142670461f6cfa644781950d3346 +size 725 diff --git a/Assets/08_Data/Items/HouseHold/Conditioner.asset.meta b/Assets/08_Data/Items/HouseHold/Conditioner.asset.meta new file mode 100644 index 00000000..fddb2e77 --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/Conditioner.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 276155440ea12a549807865745216fbe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/HouseHold/HairSpray.asset b/Assets/08_Data/Items/HouseHold/HairSpray.asset new file mode 100644 index 00000000..1c47a845 --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/HairSpray.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe5432c9b22b9e720bcd4b40646f32b84b2f53e9e907e7a2c2a08a67966444f8 +size 708 diff --git a/Assets/08_Data/Items/HouseHold/HairSpray.asset.meta b/Assets/08_Data/Items/HouseHold/HairSpray.asset.meta new file mode 100644 index 00000000..cd96225a --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/HairSpray.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c7b3c7f4dacc0414ca5c70ebfe8780a2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/HouseHold/Lotion.asset b/Assets/08_Data/Items/HouseHold/Lotion.asset new file mode 100644 index 00000000..df233aa3 --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/Lotion.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b5fd16c328012b11b59b44900746bb72f90b02b6ab27f86a4c40632762bc85b +size 718 diff --git a/Assets/08_Data/Items/HouseHold/Lotion.asset.meta b/Assets/08_Data/Items/HouseHold/Lotion.asset.meta new file mode 100644 index 00000000..28509b48 --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/Lotion.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e4cc3e0394b1ad41b33772270886daf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/HouseHold/ShaveFoam.asset b/Assets/08_Data/Items/HouseHold/ShaveFoam.asset new file mode 100644 index 00000000..4bc0f06c --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/ShaveFoam.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:636527f765a3356b1bae858997f392b3a64ccdb82b4e7fdefd60255ba3e7d7ea +size 718 diff --git a/Assets/08_Data/Items/HouseHold/ShaveFoam.asset.meta b/Assets/08_Data/Items/HouseHold/ShaveFoam.asset.meta new file mode 100644 index 00000000..9333f601 --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/ShaveFoam.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c8d407f9f55f7e34099d34ed27b0411f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/HouseHold/SunCream.asset b/Assets/08_Data/Items/HouseHold/SunCream.asset new file mode 100644 index 00000000..71f4dffa --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/SunCream.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57a38acc4814dc4fc6b4ea7b10aa51d756fc314e9c6f98920002582370ba406c +size 729 diff --git a/Assets/08_Data/Items/HouseHold/SunCream.asset.meta b/Assets/08_Data/Items/HouseHold/SunCream.asset.meta new file mode 100644 index 00000000..7134bd25 --- /dev/null +++ b/Assets/08_Data/Items/HouseHold/SunCream.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1e902a28a0e95e441bf24679d83a3781 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/Conditioner.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/Conditioner.prefab index 9c2c59e5..30aedc6e 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/Conditioner.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/Conditioner.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdc99e439665981f612b6847fba6d789a70bba2eaad78b874d7a14e9e22528d6 -size 2543 +oid sha256:d116946db8817607de78a22dbc2c3fcd21e656671697de81706030858faaa034 +size 24939 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/Cream.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/Cream.prefab index 7274097c..9d390baa 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/Cream.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/Cream.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:790bd084531d575134917d60bc9ebe169f8b23373d10be2fb6ecbd45b19c05e9 -size 2537 +oid sha256:e58c6febeeb5ab3d9c994ec828718beef89ae61164798e623c9e532cde442c25 +size 24939 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/CreamTube.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/CreamTube.prefab index 74b540c1..bded4986 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/CreamTube.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/CreamTube.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:597fddbe1fa8da2f28010fb0dc4c78e1ec4805b8d1de42698fb78b924db8ca23 -size 2541 +oid sha256:95fb381f5c9e44d3b37cc58372522598546dd99e28269a5ac90c89efe1ab707c +size 24945 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/Shampoo.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/Shampoo.prefab index 81d96a4a..9dff3716 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/Shampoo.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/Shampoo.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba04355a9943b8ebb80efca1a70b0174e6755f86f0fce5cfe6ef6f5c7a8c3ce6 -size 2539 +oid sha256:1073196828a6730c2adeb524d149a02d8fb3c3144fd7311dd39f346f384a2050 +size 24943 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/ShaveFoam.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/ShaveFoam.prefab index 9ff2fa83..746b8ff6 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/ShaveFoam.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/ShaveFoam.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eaf46d5ab1cf5479ca930255e01173f8381a2766599dc11d19b9e7e80a0997d6 -size 2541 +oid sha256:4956eab12de24640769c96903afa23361a44e19c896e3c54274bc32376e6264f +size 24925 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/Spray.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/Spray.prefab index a245d29a..2efa44d8 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/Spray.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/Spray.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d40d148a7d47c005cfc468702ce091c7db3710a23aa9c196b2290a52613046f -size 2537 +oid sha256:766378a5a41d25e8799cd8931f8c52fa7531b34e4a18e3a4e155859b8392f10c +size 24952 diff --git a/Assets/vFavorites/vFavorites Data.asset b/Assets/vFavorites/vFavorites Data.asset index 6f93bf02..4b183dde 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:8e38b52a55b2a60ac1cb8f8f03bfe3280c01ff4ffb40ab7e1d76074ddf030b7a -size 1803 +oid sha256:d7eafe6222930a87f5b7620b15ce17c57b385e81fce1537508784eaf2811aaa1 +size 2627