From 423e65123bb757fdaeb31b81d2e221f00b322755 Mon Sep 17 00:00:00 2001 From: tohara <32989986+tokaritami@users.noreply.github.com> Date: Sat, 16 May 2020 23:50:25 +0900 Subject: [PATCH] Add Ai3Dstatic model for Room. (#6350) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add Ai3Dstatic model for Room. * Update src/client/scripts/room/furnitures.json5 Co-authored-by: rinsuki <428rinsuki+git@gmail.com> * Update src/client/scripts/room/furnitures.json5 Co-authored-by: rinsuki <428rinsuki+git@gmail.com> * doll-Aiの大文字を小文字へ変更 * Update furnitures.json5 * マテリアルをBackgroundからPrincipled BSDFに変更 * a * なんかファイルが二重にでてくるので削除 * テクスチャーファイルと3Dデータを再コミット * Remove noodle * Update doll-ai.glb Co-authored-by: syuilo Co-authored-by: rinsuki <428rinsuki+git@gmail.com> --- src/client/assets/room/furnitures/doll-ai/doll-ai.blend | 3 +++ src/client/assets/room/furnitures/doll-ai/doll-ai.glb | 3 +++ src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png | 3 +++ src/client/scripts/room/furnitures.json5 | 4 ++++ 4 files changed, 13 insertions(+) create mode 100644 src/client/assets/room/furnitures/doll-ai/doll-ai.blend create mode 100644 src/client/assets/room/furnitures/doll-ai/doll-ai.glb create mode 100644 src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png diff --git a/src/client/assets/room/furnitures/doll-ai/doll-ai.blend b/src/client/assets/room/furnitures/doll-ai/doll-ai.blend new file mode 100644 index 000000000..17d0dcefb --- /dev/null +++ b/src/client/assets/room/furnitures/doll-ai/doll-ai.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a981e56af39840b0356ff84a367fb69be3374695c9ba5a9fa9150016c513560 +size 1155028 diff --git a/src/client/assets/room/furnitures/doll-ai/doll-ai.glb b/src/client/assets/room/furnitures/doll-ai/doll-ai.glb new file mode 100644 index 000000000..d82587be8 --- /dev/null +++ b/src/client/assets/room/furnitures/doll-ai/doll-ai.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4066cc164c9cb6d3b4aefb4a59e628cf3fb468f13263838f9b02b80af3fd6035 +size 112160 diff --git a/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png b/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png new file mode 100644 index 000000000..3633b1f66 --- /dev/null +++ b/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b8dc0107717c04c07774a4abafea11b16a269914d4441cf0a95ab30c2e79e09 +size 10712 diff --git a/src/client/scripts/room/furnitures.json5 b/src/client/scripts/room/furnitures.json5 index c731e85a9..ae99c8bb8 100644 --- a/src/client/scripts/room/furnitures.json5 +++ b/src/client/scripts/room/furnitures.json5 @@ -395,5 +395,9 @@ { id: 'energy-drink', place: "floor", + }, + { + id: 'doll-ai', + place: "floor", } ]