From d979fb6dc015029c81dc562fbb911fc6bf797c56 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: 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> --- .../assets/room/furnitures/doll-ai/doll-ai.blend | Bin 0 -> 1155028 bytes src/client/assets/room/furnitures/doll-ai/doll-ai.glb | Bin 0 -> 112160 bytes .../assets/room/furnitures/doll-ai/doll_ai_tex.png | Bin 0 -> 10712 bytes src/client/scripts/room/furnitures.json5 | 4 ++++ 4 files changed, 4 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 (limited to 'src') 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 0000000000..a912231ecb Binary files /dev/null and b/src/client/assets/room/furnitures/doll-ai/doll-ai.blend differ 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 0000000000..ec55a7bd7b Binary files /dev/null and b/src/client/assets/room/furnitures/doll-ai/doll-ai.glb differ 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 0000000000..370ca5f75b Binary files /dev/null and b/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png differ diff --git a/src/client/scripts/room/furnitures.json5 b/src/client/scripts/room/furnitures.json5 index c731e85a9f..ae99c8bb83 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", } ] -- cgit v1.2.3-freya