diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 2af0e56e5..31d51c25f 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -2350,3 +2350,4 @@ room: spiral: "螺旋階段" bin: "ゴミ箱" cup-noodle: "カップ麺" + holo-display: "ホログラフィックディスプレイ" diff --git a/src/client/app/common/scripts/room/furnitures.json5 b/src/client/app/common/scripts/room/furnitures.json5 index 5893147dc..b6ddd5c2b 100644 --- a/src/client/app/common/scripts/room/furnitures.json5 +++ b/src/client/app/common/scripts/room/furnitures.json5 @@ -354,5 +354,32 @@ { id: "cup-noodle", place: "floor" + }, + { + id: "holo-display", + place: "floor", + props: { + image: 'image' + }, + texture: { + Image_Front: { + prop: 'image', + uv: { + x: 0, + y: 0, + width: 1024, + height: 1024, + }, + }, + Image_Back: { + prop: 'image', + uv: { + x: 0, + y: 0, + width: 1024, + height: 1024, + }, + }, + }, } ] diff --git a/src/client/assets/room/furnitures/holo-display/holo-display.blend b/src/client/assets/room/furnitures/holo-display/holo-display.blend new file mode 100644 index 000000000..87c748ffe Binary files /dev/null and b/src/client/assets/room/furnitures/holo-display/holo-display.blend differ diff --git a/src/client/assets/room/furnitures/holo-display/holo-display.glb b/src/client/assets/room/furnitures/holo-display/holo-display.glb new file mode 100644 index 000000000..541b184fa Binary files /dev/null and b/src/client/assets/room/furnitures/holo-display/holo-display.glb differ diff --git a/src/client/assets/room/furnitures/holo-display/ray-uv.png b/src/client/assets/room/furnitures/holo-display/ray-uv.png new file mode 100644 index 000000000..aa7e817e0 Binary files /dev/null and b/src/client/assets/room/furnitures/holo-display/ray-uv.png differ diff --git a/src/client/assets/room/furnitures/holo-display/ray.png b/src/client/assets/room/furnitures/holo-display/ray.png new file mode 100644 index 000000000..6a5d24e14 Binary files /dev/null and b/src/client/assets/room/furnitures/holo-display/ray.png differ