diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 4c40eea95..166233a82 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -2346,3 +2346,4 @@ room: poster-v: "ポスター(縦長)" sofa: "ソファ" spiral: "螺旋階段" + bin: "ゴミ箱" diff --git a/src/client/app/common/scripts/room/furnitures.json5 b/src/client/app/common/scripts/room/furnitures.json5 index 9fe7811f6..fec179165 100644 --- a/src/client/app/common/scripts/room/furnitures.json5 +++ b/src/client/app/common/scripts/room/furnitures.json5 @@ -341,4 +341,14 @@ Step: 'color' } }, + { + id: "bin", + place: "floor", + props: { + color: 'color' + }, + color: { + Bin: 'color' + } + }, ] diff --git a/src/client/assets/room/furnitures/bin/bin.blend b/src/client/assets/room/furnitures/bin/bin.blend new file mode 100644 index 000000000..446d069f3 --- /dev/null +++ b/src/client/assets/room/furnitures/bin/bin.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca88cc8e235be05b652d6a747cd5655ab9a03d06e5613177d78474a463d6cb29 +size 695704 diff --git a/src/client/assets/room/furnitures/bin/bin.glb b/src/client/assets/room/furnitures/bin/bin.glb new file mode 100644 index 000000000..4e7a40766 --- /dev/null +++ b/src/client/assets/room/furnitures/bin/bin.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83f32dd2224a478b5f457476a600de7510fb4cb7c22aee378979d62184b3f881 +size 22116 diff --git a/src/client/assets/room/furnitures/trash-can/trash-can.blend b/src/client/assets/room/furnitures/trash-can/trash-can.blend deleted file mode 100644 index 2a14139c1..000000000 --- a/src/client/assets/room/furnitures/trash-can/trash-can.blend +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea12b2d8d8ff5e28d6888dc75d6f4a80334de1cf5660903e2c5b898bd2012ae9 -size 710392 diff --git a/src/client/assets/room/furnitures/trash-can/trash-can.glb b/src/client/assets/room/furnitures/trash-can/trash-can.glb deleted file mode 100644 index 7c3e26cdc..000000000 --- a/src/client/assets/room/furnitures/trash-can/trash-can.glb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6a765cc28f1ee098c73d3e734525c384016438faf04835bf2256f05675abfe2 -size 22468