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..48e6e1504 --- /dev/null +++ b/src/client/assets/room/furnitures/holo-display/holo-display.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ce0643418ec05dcfef7e62787a8e78010c9e5c54a268af9aa857cdb8776f8ca +size 788876 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..504135605 --- /dev/null +++ b/src/client/assets/room/furnitures/holo-display/holo-display.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e99494570bef2d1df52564a33d01f30668a8207b3967adb9aebc3e467022cfc8 +size 149912 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..b1865bc00 --- /dev/null +++ b/src/client/assets/room/furnitures/holo-display/ray-uv.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f49fe38d1e4c100896e881144b78d36001376760b12943485448b21460f6dd5 +size 20901 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..b16aac8c4 --- /dev/null +++ b/src/client/assets/room/furnitures/holo-display/ray.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d567d13d3d2d061c74dbcc3ffbb8b332a671807e20839764c6a6d56326a7a609 +size 104293