diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2021-03-06 13:23:59 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2021-03-06 13:23:59 +0900 |
| commit | bca4e5f0faf45ab227bf64a4a6b8f3793c7a79c2 (patch) | |
| tree | 96d544f3b7b7493af9f14feaa21225564dae22bb | |
| parent | Improve usability (diff) | |
| download | sharkey-bca4e5f0faf45ab227bf64a4a6b8f3793c7a79c2.tar.gz sharkey-bca4e5f0faf45ab227bf64a4a6b8f3793c7a79c2.tar.bz2 sharkey-bca4e5f0faf45ab227bf64a4a6b8f3793c7a79c2.zip | |
refactor assets
| -rw-r--r-- | assets/room/furnitures/banknote/banknote.blend (renamed from src/client/assets/room/furnitures/banknote/banknote.blend) | bin | 716076 -> 716076 bytes | |||
| -rw-r--r-- | assets/room/furnitures/banknote/banknote.glb (renamed from src/client/assets/room/furnitures/banknote/banknote.glb) | bin | 48988 -> 48988 bytes | |||
| -rw-r--r-- | assets/room/furnitures/banknote/tex.png (renamed from src/client/assets/room/furnitures/banknote/tex.png) | bin | 43794 -> 43794 bytes | |||
| -rw-r--r-- | assets/room/furnitures/bed/bed.blend (renamed from src/client/assets/room/furnitures/bed/bed.blend) | bin | 573584 -> 573584 bytes | |||
| -rw-r--r-- | assets/room/furnitures/bed/bed.glb (renamed from src/client/assets/room/furnitures/bed/bed.glb) | bin | 8944 -> 8944 bytes | |||
| -rw-r--r-- | assets/room/furnitures/bin/bin.blend (renamed from src/client/assets/room/furnitures/bin/bin.blend) | bin | 695512 -> 695512 bytes | |||
| -rw-r--r-- | assets/room/furnitures/bin/bin.glb (renamed from src/client/assets/room/furnitures/bin/bin.glb) | bin | 22140 -> 22140 bytes | |||
| -rw-r--r-- | assets/room/furnitures/book/book.blend (renamed from src/client/assets/room/furnitures/book/book.blend) | bin | 511864 -> 511864 bytes | |||
| -rw-r--r-- | assets/room/furnitures/book/book.glb (renamed from src/client/assets/room/furnitures/book/book.glb) | bin | 4304 -> 4304 bytes | |||
| -rw-r--r-- | assets/room/furnitures/book2/barcode.png (renamed from src/client/assets/room/furnitures/book2/barcode.png) | bin | 3505 -> 3505 bytes | |||
| -rw-r--r-- | assets/room/furnitures/book2/book2.blend (renamed from src/client/assets/room/furnitures/book2/book2.blend) | bin | 521456 -> 521456 bytes | |||
| -rw-r--r-- | assets/room/furnitures/book2/book2.glb (renamed from src/client/assets/room/furnitures/book2/book2.glb) | bin | 82920 -> 82920 bytes | |||
| -rw-r--r-- | assets/room/furnitures/book2/texture.afdesign (renamed from src/client/assets/room/furnitures/book2/texture.afdesign) | bin | 875434 -> 875434 bytes | |||
| -rw-r--r-- | assets/room/furnitures/book2/texture.png (renamed from src/client/assets/room/furnitures/book2/texture.png) | bin | 61019 -> 61019 bytes | |||
| -rw-r--r-- | assets/room/furnitures/book2/uv.png (renamed from src/client/assets/room/furnitures/book2/uv.png) | bin | 8611 -> 8611 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cardboard-box/cardboard-box.blend (renamed from src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend) | bin | 515036 -> 515036 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cardboard-box/cardboard-box.glb (renamed from src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb) | bin | 4568 -> 4568 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cardboard-box2/cardboard-box2.blend (renamed from src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend) | bin | 545788 -> 545788 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cardboard-box2/cardboard-box2.glb (renamed from src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb) | bin | 24084 -> 24084 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cardboard-box2/texture.png (renamed from src/client/assets/room/furnitures/cardboard-box2/texture.png) | bin | 16879 -> 16879 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cardboard-box2/uv.png (renamed from src/client/assets/room/furnitures/cardboard-box2/uv.png) | bin | 4630 -> 4630 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cardboard-box3/cardboard-box3.blend (renamed from src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend) | bin | 547868 -> 547868 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cardboard-box3/cardboard-box3.glb (renamed from src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb) | bin | 23668 -> 23668 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cardboard-box3/texture.png (renamed from src/client/assets/room/furnitures/cardboard-box3/texture.png) | bin | 16204 -> 16204 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cardboard-box3/texture.xcf (renamed from src/client/assets/room/furnitures/cardboard-box3/texture.xcf) | bin | 242066 -> 242066 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cardboard-box3/uv.png (renamed from src/client/assets/room/furnitures/cardboard-box3/uv.png) | bin | 3598 -> 3598 bytes | |||
| -rw-r--r-- | assets/room/furnitures/carpet-stripe/carpet-stripe.blend (renamed from src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend) | bin | 481784 -> 481784 bytes | |||
| -rw-r--r-- | assets/room/furnitures/carpet-stripe/carpet-stripe.glb (renamed from src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb) | bin | 4956 -> 4956 bytes | |||
| -rw-r--r-- | assets/room/furnitures/chair/chair.blend (renamed from src/client/assets/room/furnitures/chair/chair.blend) | bin | 500696 -> 500696 bytes | |||
| -rw-r--r-- | assets/room/furnitures/chair/chair.glb (renamed from src/client/assets/room/furnitures/chair/chair.glb) | bin | 4252 -> 4252 bytes | |||
| -rw-r--r-- | assets/room/furnitures/chair2/chair2.blend (renamed from src/client/assets/room/furnitures/chair2/chair2.blend) | bin | 523036 -> 523036 bytes | |||
| -rw-r--r-- | assets/room/furnitures/chair2/chair2.glb (renamed from src/client/assets/room/furnitures/chair2/chair2.glb) | bin | 6140 -> 6140 bytes | |||
| -rw-r--r-- | assets/room/furnitures/color-box/color-box.blend (renamed from src/client/assets/room/furnitures/color-box/color-box.blend) | bin | 631168 -> 631168 bytes | |||
| -rw-r--r-- | assets/room/furnitures/color-box/color-box.glb (renamed from src/client/assets/room/furnitures/color-box/color-box.glb) | bin | 7492 -> 7492 bytes | |||
| -rw-r--r-- | assets/room/furnitures/corkboard/corkboard.blend (renamed from src/client/assets/room/furnitures/corkboard/corkboard.blend) | bin | 565404 -> 565404 bytes | |||
| -rw-r--r-- | assets/room/furnitures/corkboard/corkboard.glb (renamed from src/client/assets/room/furnitures/corkboard/corkboard.glb) | bin | 7180 -> 7180 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cube/cube.blend (renamed from src/client/assets/room/furnitures/cube/cube.blend) | bin | 646184 -> 646184 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cube/cube.glb (renamed from src/client/assets/room/furnitures/cube/cube.glb) | bin | 188392 -> 188392 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cup-noodle/cup-noodle.blend (renamed from src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend) | bin | 855164 -> 855164 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cup-noodle/cup-noodle.glb (renamed from src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb) | bin | 318332 -> 318332 bytes | |||
| -rw-r--r-- | assets/room/furnitures/cup-noodle/noodle.png (renamed from src/client/assets/room/furnitures/cup-noodle/noodle.png) | bin | 297154 -> 297154 bytes | |||
| -rw-r--r-- | assets/room/furnitures/desk/desk.blend (renamed from src/client/assets/room/furnitures/desk/desk.blend) | bin | 541980 -> 541980 bytes | |||
| -rw-r--r-- | assets/room/furnitures/desk/desk.glb (renamed from src/client/assets/room/furnitures/desk/desk.glb) | bin | 10184 -> 10184 bytes | |||
| -rw-r--r-- | assets/room/furnitures/doll-ai/doll-ai.blend (renamed from src/client/assets/room/furnitures/doll-ai/doll-ai.blend) | bin | 1155028 -> 1155028 bytes | |||
| -rw-r--r-- | assets/room/furnitures/doll-ai/doll-ai.glb (renamed from src/client/assets/room/furnitures/doll-ai/doll-ai.glb) | bin | 112160 -> 112160 bytes | |||
| -rw-r--r-- | assets/room/furnitures/doll-ai/doll_ai_tex.png (renamed from src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png) | bin | 10712 -> 10712 bytes | |||
| -rw-r--r-- | assets/room/furnitures/energy-drink/energy-drink.blend (renamed from src/client/assets/room/furnitures/energy-drink/energy-drink.blend) | bin | 724764 -> 724764 bytes | |||
| -rw-r--r-- | assets/room/furnitures/energy-drink/energy-drink.glb (renamed from src/client/assets/room/furnitures/energy-drink/energy-drink.glb) | bin | 145836 -> 145836 bytes | |||
| -rw-r--r-- | assets/room/furnitures/energy-drink/texture.afdesign (renamed from src/client/assets/room/furnitures/energy-drink/texture.afdesign) | bin | 824566 -> 824566 bytes | |||
| -rw-r--r-- | assets/room/furnitures/energy-drink/texture.png (renamed from src/client/assets/room/furnitures/energy-drink/texture.png) | bin | 127510 -> 127510 bytes | |||
| -rw-r--r-- | assets/room/furnitures/energy-drink/uv.png (renamed from src/client/assets/room/furnitures/energy-drink/uv.png) | bin | 22142 -> 22142 bytes | |||
| -rw-r--r-- | assets/room/furnitures/eraser/cover.png (renamed from src/client/assets/room/furnitures/eraser/cover.png) | bin | 8336 -> 8336 bytes | |||
| -rw-r--r-- | assets/room/furnitures/eraser/cover.psd (renamed from src/client/assets/room/furnitures/eraser/cover.psd) | bin | 219123 -> 219123 bytes | |||
| -rw-r--r-- | assets/room/furnitures/eraser/eraser-uv.png (renamed from src/client/assets/room/furnitures/eraser/eraser-uv.png) | bin | 11164 -> 11164 bytes | |||
| -rw-r--r-- | assets/room/furnitures/eraser/eraser.blend (renamed from src/client/assets/room/furnitures/eraser/eraser.blend) | bin | 527996 -> 527996 bytes | |||
| -rw-r--r-- | assets/room/furnitures/eraser/eraser.glb (renamed from src/client/assets/room/furnitures/eraser/eraser.glb) | bin | 15748 -> 15748 bytes | |||
| -rw-r--r-- | assets/room/furnitures/facial-tissue/facial-tissue-uv.png (renamed from src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png) | bin | 4470 -> 4470 bytes | |||
| -rw-r--r-- | assets/room/furnitures/facial-tissue/facial-tissue.blend (renamed from src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend) | bin | 533220 -> 533220 bytes | |||
| -rw-r--r-- | assets/room/furnitures/facial-tissue/facial-tissue.glb (renamed from src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb) | bin | 8332 -> 8332 bytes | |||
| -rw-r--r-- | assets/room/furnitures/facial-tissue/facial-tissue.png (renamed from src/client/assets/room/furnitures/facial-tissue/facial-tissue.png) | bin | 688 -> 688 bytes | |||
| -rw-r--r-- | assets/room/furnitures/facial-tissue/facial-tissue.psd (renamed from src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd) | bin | 111968 -> 111968 bytes | |||
| -rw-r--r-- | assets/room/furnitures/fan/fan.blend (renamed from src/client/assets/room/furnitures/fan/fan.blend) | bin | 772732 -> 772732 bytes | |||
| -rw-r--r-- | assets/room/furnitures/fan/fan.glb (renamed from src/client/assets/room/furnitures/fan/fan.glb) | bin | 51612 -> 51612 bytes | |||
| -rw-r--r-- | assets/room/furnitures/holo-display/holo-display.blend (renamed from src/client/assets/room/furnitures/holo-display/holo-display.blend) | bin | 788456 -> 788456 bytes | |||
| -rw-r--r-- | assets/room/furnitures/holo-display/holo-display.glb (renamed from src/client/assets/room/furnitures/holo-display/holo-display.glb) | bin | 148928 -> 148928 bytes | |||
| -rw-r--r-- | assets/room/furnitures/holo-display/ray-uv.png (renamed from src/client/assets/room/furnitures/holo-display/ray-uv.png) | bin | 20901 -> 20901 bytes | |||
| -rw-r--r-- | assets/room/furnitures/holo-display/ray.png (renamed from src/client/assets/room/furnitures/holo-display/ray.png) | bin | 104293 -> 104293 bytes | |||
| -rw-r--r-- | assets/room/furnitures/keyboard/keyboard.blend (renamed from src/client/assets/room/furnitures/keyboard/keyboard.blend) | bin | 1005588 -> 1005588 bytes | |||
| -rw-r--r-- | assets/room/furnitures/keyboard/keyboard.glb (renamed from src/client/assets/room/furnitures/keyboard/keyboard.glb) | bin | 132360 -> 132360 bytes | |||
| -rw-r--r-- | assets/room/furnitures/low-table/low-table.blend (renamed from src/client/assets/room/furnitures/low-table/low-table.blend) | bin | 497336 -> 497336 bytes | |||
| -rw-r--r-- | assets/room/furnitures/low-table/low-table.glb (renamed from src/client/assets/room/furnitures/low-table/low-table.glb) | bin | 2364 -> 2364 bytes | |||
| -rw-r--r-- | assets/room/furnitures/mat/mat.blend (renamed from src/client/assets/room/furnitures/mat/mat.blend) | bin | 489304 -> 489304 bytes | |||
| -rw-r--r-- | assets/room/furnitures/mat/mat.glb (renamed from src/client/assets/room/furnitures/mat/mat.glb) | bin | 1700 -> 1700 bytes | |||
| -rw-r--r-- | assets/room/furnitures/milk/milk-uv.png (renamed from src/client/assets/room/furnitures/milk/milk-uv.png) | bin | 16577 -> 16577 bytes | |||
| -rw-r--r-- | assets/room/furnitures/milk/milk.blend (renamed from src/client/assets/room/furnitures/milk/milk.blend) | bin | 539836 -> 539836 bytes | |||
| -rw-r--r-- | assets/room/furnitures/milk/milk.glb (renamed from src/client/assets/room/furnitures/milk/milk.glb) | bin | 8456 -> 8456 bytes | |||
| -rw-r--r-- | assets/room/furnitures/milk/milk.png (renamed from src/client/assets/room/furnitures/milk/milk.png) | bin | 658 -> 658 bytes | |||
| -rw-r--r-- | assets/room/furnitures/milk/milk.psd (renamed from src/client/assets/room/furnitures/milk/milk.psd) | bin | 125415 -> 125415 bytes | |||
| -rw-r--r-- | assets/room/furnitures/monitor/monitor.blend (renamed from src/client/assets/room/furnitures/monitor/monitor.blend) | bin | 586820 -> 586820 bytes | |||
| -rw-r--r-- | assets/room/furnitures/monitor/monitor.glb (renamed from src/client/assets/room/furnitures/monitor/monitor.glb) | bin | 35300 -> 35300 bytes | |||
| -rw-r--r-- | assets/room/furnitures/monitor/monitor.psd (renamed from src/client/assets/room/furnitures/monitor/monitor.psd) | bin | 3692204 -> 3692204 bytes | |||
| -rw-r--r-- | assets/room/furnitures/monitor/screen-uv.png (renamed from src/client/assets/room/furnitures/monitor/screen-uv.png) | bin | 1495 -> 1495 bytes | |||
| -rw-r--r-- | assets/room/furnitures/monitor/screen.jpg (renamed from src/client/assets/room/furnitures/monitor/screen.jpg) | bin | 24842 -> 24842 bytes | |||
| -rw-r--r-- | assets/room/furnitures/moon/moon.blend (renamed from src/client/assets/room/furnitures/moon/moon.blend) | bin | 725536 -> 725536 bytes | |||
| -rw-r--r-- | assets/room/furnitures/moon/moon.glb (renamed from src/client/assets/room/furnitures/moon/moon.glb) | bin | 122112 -> 122112 bytes | |||
| -rw-r--r-- | assets/room/furnitures/moon/moon.jpg (renamed from src/client/assets/room/furnitures/moon/moon.jpg) | bin | 87151 -> 87151 bytes | |||
| -rw-r--r-- | assets/room/furnitures/mousepad/mousepad.blend (renamed from src/client/assets/room/furnitures/mousepad/mousepad.blend) | bin | 495008 -> 495008 bytes | |||
| -rw-r--r-- | assets/room/furnitures/mousepad/mousepad.glb (renamed from src/client/assets/room/furnitures/mousepad/mousepad.glb) | bin | 4360 -> 4360 bytes | |||
| -rw-r--r-- | assets/room/furnitures/pc/motherboard-uv.png (renamed from src/client/assets/room/furnitures/pc/motherboard-uv.png) | bin | 2920 -> 2920 bytes | |||
| -rw-r--r-- | assets/room/furnitures/pc/motherboard-uv.psd (renamed from src/client/assets/room/furnitures/pc/motherboard-uv.psd) | bin | 7131432 -> 7131432 bytes | |||
| -rw-r--r-- | assets/room/furnitures/pc/motherboard.jpg (renamed from src/client/assets/room/furnitures/pc/motherboard.jpg) | bin | 64600 -> 64600 bytes | |||
| -rw-r--r-- | assets/room/furnitures/pc/pc.blend (renamed from src/client/assets/room/furnitures/pc/pc.blend) | bin | 818152 -> 818152 bytes | |||
| -rw-r--r-- | assets/room/furnitures/pc/pc.glb (renamed from src/client/assets/room/furnitures/pc/pc.glb) | bin | 103620 -> 103620 bytes | |||
| -rw-r--r-- | assets/room/furnitures/pencil/pencil.blend (renamed from src/client/assets/room/furnitures/pencil/pencil.blend) | bin | 683032 -> 683032 bytes | |||
| -rw-r--r-- | assets/room/furnitures/pencil/pencil.glb (renamed from src/client/assets/room/furnitures/pencil/pencil.glb) | bin | 7788 -> 7788 bytes | |||
| -rw-r--r-- | assets/room/furnitures/photoframe/photo-uv.png (renamed from src/client/assets/room/furnitures/photoframe/photo-uv.png) | bin | 2639 -> 2639 bytes | |||
| -rw-r--r-- | assets/room/furnitures/photoframe/photo.jpg (renamed from src/client/assets/room/furnitures/photoframe/photo.jpg) | bin | 30500 -> 30500 bytes | |||
| -rw-r--r-- | assets/room/furnitures/photoframe/photoframe.blend (renamed from src/client/assets/room/furnitures/photoframe/photoframe.blend) | bin | 551416 -> 551416 bytes | |||
| -rw-r--r-- | assets/room/furnitures/photoframe/photoframe.glb (renamed from src/client/assets/room/furnitures/photoframe/photoframe.glb) | bin | 37612 -> 37612 bytes | |||
| -rw-r--r-- | assets/room/furnitures/piano/piano.blend (renamed from src/client/assets/room/furnitures/piano/piano.blend) | bin | 713228 -> 713228 bytes | |||
| -rw-r--r-- | assets/room/furnitures/piano/piano.glb (renamed from src/client/assets/room/furnitures/piano/piano.glb) | bin | 73320 -> 73320 bytes | |||
| -rw-r--r-- | assets/room/furnitures/pinguin/pinguin.blend (renamed from src/client/assets/room/furnitures/pinguin/pinguin.blend) | bin | 778976 -> 778976 bytes | |||
| -rw-r--r-- | assets/room/furnitures/pinguin/pinguin.glb (renamed from src/client/assets/room/furnitures/pinguin/pinguin.glb) | bin | 60172 -> 60172 bytes | |||
| -rw-r--r-- | assets/room/furnitures/plant/plant-soil-uv.png (renamed from src/client/assets/room/furnitures/plant/plant-soil-uv.png) | bin | 4509 -> 4509 bytes | |||
| -rw-r--r-- | assets/room/furnitures/plant/plant-soil.png (renamed from src/client/assets/room/furnitures/plant/plant-soil.png) | bin | 10852 -> 10852 bytes | |||
| -rw-r--r-- | assets/room/furnitures/plant/plant-soil.psd (renamed from src/client/assets/room/furnitures/plant/plant-soil.psd) | bin | 390188 -> 390188 bytes | |||
| -rw-r--r-- | assets/room/furnitures/plant/plant.blend (renamed from src/client/assets/room/furnitures/plant/plant.blend) | bin | 604488 -> 604488 bytes | |||
| -rw-r--r-- | assets/room/furnitures/plant/plant.glb (renamed from src/client/assets/room/furnitures/plant/plant.glb) | bin | 27664 -> 27664 bytes | |||
| -rw-r--r-- | assets/room/furnitures/plant2/plant2.blend (renamed from src/client/assets/room/furnitures/plant2/plant2.blend) | bin | 1060816 -> 1060816 bytes | |||
| -rw-r--r-- | assets/room/furnitures/plant2/plant2.glb (renamed from src/client/assets/room/furnitures/plant2/plant2.glb) | bin | 133212 -> 133212 bytes | |||
| -rw-r--r-- | assets/room/furnitures/plant2/soil.png (renamed from src/client/assets/room/furnitures/plant2/soil.png) | bin | 10852 -> 10852 bytes | |||
| -rw-r--r-- | assets/room/furnitures/poster-h/poster-h.blend (renamed from src/client/assets/room/furnitures/poster-h/poster-h.blend) | bin | 667604 -> 667604 bytes | |||
| -rw-r--r-- | assets/room/furnitures/poster-h/poster-h.glb (renamed from src/client/assets/room/furnitures/poster-h/poster-h.glb) | bin | 1280 -> 1280 bytes | |||
| -rw-r--r-- | assets/room/furnitures/poster-h/uv.png (renamed from src/client/assets/room/furnitures/poster-h/uv.png) | bin | 3786 -> 3786 bytes | |||
| -rw-r--r-- | assets/room/furnitures/poster-v/poster-v.blend (renamed from src/client/assets/room/furnitures/poster-v/poster-v.blend) | bin | 650740 -> 650740 bytes | |||
| -rw-r--r-- | assets/room/furnitures/poster-v/poster-v.glb (renamed from src/client/assets/room/furnitures/poster-v/poster-v.glb) | bin | 1280 -> 1280 bytes | |||
| -rw-r--r-- | assets/room/furnitures/poster-v/uv.png (renamed from src/client/assets/room/furnitures/poster-v/uv.png) | bin | 3795 -> 3795 bytes | |||
| -rw-r--r-- | assets/room/furnitures/pudding/pudding.blend (renamed from src/client/assets/room/furnitures/pudding/pudding.blend) | bin | 694784 -> 694784 bytes | |||
| -rw-r--r-- | assets/room/furnitures/pudding/pudding.glb (renamed from src/client/assets/room/furnitures/pudding/pudding.glb) | bin | 10612 -> 10612 bytes | |||
| -rw-r--r-- | assets/room/furnitures/rubik-cube/rubik-cube.blend (renamed from src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend) | bin | 745960 -> 745960 bytes | |||
| -rw-r--r-- | assets/room/furnitures/rubik-cube/rubik-cube.glb (renamed from src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb) | bin | 67688 -> 67688 bytes | |||
| -rw-r--r-- | assets/room/furnitures/server/rack-uv.png (renamed from src/client/assets/room/furnitures/server/rack-uv.png) | bin | 6705 -> 6705 bytes | |||
| -rw-r--r-- | assets/room/furnitures/server/rack.png (renamed from src/client/assets/room/furnitures/server/rack.png) | bin | 7046 -> 7046 bytes | |||
| -rw-r--r-- | assets/room/furnitures/server/server.blend (renamed from src/client/assets/room/furnitures/server/server.blend) | bin | 684372 -> 684372 bytes | |||
| -rw-r--r-- | assets/room/furnitures/server/server.glb (renamed from src/client/assets/room/furnitures/server/server.glb) | bin | 149480 -> 149480 bytes | |||
| -rw-r--r-- | assets/room/furnitures/server/server.png (renamed from src/client/assets/room/furnitures/server/server.png) | bin | 116866 -> 116866 bytes | |||
| -rw-r--r-- | assets/room/furnitures/server/uv.png (renamed from src/client/assets/room/furnitures/server/uv.png) | bin | 4012 -> 4012 bytes | |||
| -rw-r--r-- | assets/room/furnitures/sofa/sofa.blend (renamed from src/client/assets/room/furnitures/sofa/sofa.blend) | bin | 711488 -> 711488 bytes | |||
| -rw-r--r-- | assets/room/furnitures/sofa/sofa.glb (renamed from src/client/assets/room/furnitures/sofa/sofa.glb) | bin | 37656 -> 37656 bytes | |||
| -rw-r--r-- | assets/room/furnitures/spiral/spiral.blend (renamed from src/client/assets/room/furnitures/spiral/spiral.blend) | bin | 1241416 -> 1241416 bytes | |||
| -rw-r--r-- | assets/room/furnitures/spiral/spiral.glb (renamed from src/client/assets/room/furnitures/spiral/spiral.glb) | bin | 251788 -> 251788 bytes | |||
| -rw-r--r-- | assets/room/furnitures/tv/screen-uv.png (renamed from src/client/assets/room/furnitures/tv/screen-uv.png) | bin | 3792 -> 3792 bytes | |||
| -rw-r--r-- | assets/room/furnitures/tv/tv.blend (renamed from src/client/assets/room/furnitures/tv/tv.blend) | bin | 587640 -> 587640 bytes | |||
| -rw-r--r-- | assets/room/furnitures/tv/tv.glb (renamed from src/client/assets/room/furnitures/tv/tv.glb) | bin | 8580 -> 8580 bytes | |||
| -rw-r--r-- | assets/room/furnitures/wall-clock/wall-clock.blend (renamed from src/client/assets/room/furnitures/wall-clock/wall-clock.blend) | bin | 574128 -> 574128 bytes | |||
| -rw-r--r-- | assets/room/furnitures/wall-clock/wall-clock.glb (renamed from src/client/assets/room/furnitures/wall-clock/wall-clock.glb) | bin | 47848 -> 47848 bytes | |||
| -rw-r--r-- | assets/room/rooms/default/default.blend (renamed from src/client/assets/room/rooms/default/default.blend) | bin | 618364 -> 618364 bytes | |||
| -rw-r--r-- | assets/room/rooms/default/default.glb (renamed from src/client/assets/room/rooms/default/default.glb) | bin | 12280 -> 12280 bytes | |||
| -rw-r--r-- | assets/room/rooms/washitsu/husuma-uv.png (renamed from src/client/assets/room/rooms/washitsu/husuma-uv.png) | bin | 4037 -> 4037 bytes | |||
| -rw-r--r-- | assets/room/rooms/washitsu/husuma.png (renamed from src/client/assets/room/rooms/washitsu/husuma.png) | bin | 2539 -> 2539 bytes | |||
| -rw-r--r-- | assets/room/rooms/washitsu/tatami-single1600.png (renamed from src/client/assets/room/rooms/washitsu/tatami-single1600.png) | bin | 1173343 -> 1173343 bytes | |||
| -rw-r--r-- | assets/room/rooms/washitsu/tatami-uv.png (renamed from src/client/assets/room/rooms/washitsu/tatami-uv.png) | bin | 4075 -> 4075 bytes | |||
| -rw-r--r-- | assets/room/rooms/washitsu/tatami.afdesign (renamed from src/client/assets/room/rooms/washitsu/tatami.afdesign) | bin | 2501804 -> 2501804 bytes | |||
| -rw-r--r-- | assets/room/rooms/washitsu/tatami.png (renamed from src/client/assets/room/rooms/washitsu/tatami.png) | bin | 313722 -> 313722 bytes | |||
| -rw-r--r-- | assets/room/rooms/washitsu/washitsu.blend (renamed from src/client/assets/room/rooms/washitsu/washitsu.blend) | bin | 664000 -> 664000 bytes | |||
| -rw-r--r-- | assets/room/rooms/washitsu/washitsu.glb (renamed from src/client/assets/room/rooms/washitsu/washitsu.glb) | bin | 415180 -> 415180 bytes | |||
| -rw-r--r-- | assets/sounds/aisha/1.mp3 (renamed from src/client/assets/sounds/aisha/1.mp3) | bin | 34480 -> 34480 bytes | |||
| -rw-r--r-- | assets/sounds/aisha/2.mp3 (renamed from src/client/assets/sounds/aisha/2.mp3) | bin | 24031 -> 24031 bytes | |||
| -rw-r--r-- | assets/sounds/aisha/3.mp3 (renamed from src/client/assets/sounds/aisha/3.mp3) | bin | 29256 -> 29256 bytes | |||
| -rw-r--r-- | assets/sounds/noizenecio/kick_gaba.mp3 (renamed from src/client/assets/sounds/noizenecio/kick_gaba.mp3) | bin | 18866 -> 18866 bytes | |||
| -rw-r--r-- | assets/sounds/noizenecio/kick_gaba2.mp3 (renamed from src/client/assets/sounds/noizenecio/kick_gaba2.mp3) | bin | 27144 -> 27144 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/down.mp3 (renamed from src/client/assets/sounds/syuilo/down.mp3) | bin | 18240 -> 18240 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/kick.mp3 (renamed from src/client/assets/sounds/syuilo/kick.mp3) | bin | 15672 -> 15672 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/pirori-square-wet.mp3 (renamed from src/client/assets/sounds/syuilo/pirori-square-wet.mp3) | bin | 139200 -> 139200 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/pirori-wet.mp3 (renamed from src/client/assets/sounds/syuilo/pirori-wet.mp3) | bin | 139200 -> 139200 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/pirori.mp3 (renamed from src/client/assets/sounds/syuilo/pirori.mp3) | bin | 19200 -> 19200 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/poi1.mp3 (renamed from src/client/assets/sounds/syuilo/poi1.mp3) | bin | 18240 -> 18240 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/poi2.mp3 (renamed from src/client/assets/sounds/syuilo/poi2.mp3) | bin | 18240 -> 18240 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/pope1.mp3 (renamed from src/client/assets/sounds/syuilo/pope1.mp3) | bin | 18240 -> 18240 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/pope2.mp3 (renamed from src/client/assets/sounds/syuilo/pope2.mp3) | bin | 18240 -> 18240 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/popo.mp3 (renamed from src/client/assets/sounds/syuilo/popo.mp3) | bin | 18240 -> 18240 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/reverved.mp3 (renamed from src/client/assets/sounds/syuilo/reverved.mp3) | bin | 276480 -> 276480 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/ryukyu.mp3 (renamed from src/client/assets/sounds/syuilo/ryukyu.mp3) | bin | 139200 -> 139200 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/snare.mp3 (renamed from src/client/assets/sounds/syuilo/snare.mp3) | bin | 26121 -> 26121 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/square-pico.mp3 (renamed from src/client/assets/sounds/syuilo/square-pico.mp3) | bin | 19200 -> 19200 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/triple.mp3 (renamed from src/client/assets/sounds/syuilo/triple.mp3) | bin | 18240 -> 18240 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/up.mp3 (renamed from src/client/assets/sounds/syuilo/up.mp3) | bin | 18240 -> 18240 bytes | |||
| -rw-r--r-- | assets/sounds/syuilo/waon.mp3 (renamed from src/client/assets/sounds/syuilo/waon.mp3) | bin | 18240 -> 18240 bytes | |||
| -rw-r--r-- | gulpfile.ts | 27 | ||||
| -rw-r--r-- | src/client/assets/manifest.json | 4 | ||||
| -rw-r--r-- | src/client/pages/v.vue | 2 | ||||
| -rw-r--r-- | src/client/pages/welcome.entrance.a.vue | 2 | ||||
| -rw-r--r-- | src/client/pages/welcome.entrance.b.vue | 2 | ||||
| -rw-r--r-- | src/client/pages/welcome.entrance.c.vue | 2 | ||||
| -rw-r--r-- | src/client/scripts/room/room.ts | 4 | ||||
| -rw-r--r-- | src/client/scripts/sound.ts | 2 | ||||
| -rw-r--r-- | src/server/api/openapi/gen-spec.ts | 2 | ||||
| -rw-r--r-- | src/server/web/index.ts | 30 | ||||
| -rw-r--r-- | src/server/web/manifest.ts | 2 | ||||
| -rw-r--r-- | src/server/web/views/info.pug | 2 | ||||
| -rw-r--r-- | src/services/send-email.ts | 2 | ||||
| -rw-r--r-- | webpack.config.ts | 2 |
182 files changed, 38 insertions, 47 deletions
diff --git a/src/client/assets/room/furnitures/banknote/banknote.blend b/assets/room/furnitures/banknote/banknote.blend Binary files differindex 60b1968a29..60b1968a29 100644 --- a/src/client/assets/room/furnitures/banknote/banknote.blend +++ b/assets/room/furnitures/banknote/banknote.blend diff --git a/src/client/assets/room/furnitures/banknote/banknote.glb b/assets/room/furnitures/banknote/banknote.glb Binary files differindex f4ef0b91e7..f4ef0b91e7 100644 --- a/src/client/assets/room/furnitures/banknote/banknote.glb +++ b/assets/room/furnitures/banknote/banknote.glb diff --git a/src/client/assets/room/furnitures/banknote/tex.png b/assets/room/furnitures/banknote/tex.png Binary files differindex 9106dc1457..9106dc1457 100644 --- a/src/client/assets/room/furnitures/banknote/tex.png +++ b/assets/room/furnitures/banknote/tex.png diff --git a/src/client/assets/room/furnitures/bed/bed.blend b/assets/room/furnitures/bed/bed.blend Binary files differindex 731df76d0c..731df76d0c 100644 --- a/src/client/assets/room/furnitures/bed/bed.blend +++ b/assets/room/furnitures/bed/bed.blend diff --git a/src/client/assets/room/furnitures/bed/bed.glb b/assets/room/furnitures/bed/bed.glb Binary files differindex f35ecb9ef4..f35ecb9ef4 100644 --- a/src/client/assets/room/furnitures/bed/bed.glb +++ b/assets/room/furnitures/bed/bed.glb diff --git a/src/client/assets/room/furnitures/bin/bin.blend b/assets/room/furnitures/bin/bin.blend Binary files differindex 8d459a0869..8d459a0869 100644 --- a/src/client/assets/room/furnitures/bin/bin.blend +++ b/assets/room/furnitures/bin/bin.blend diff --git a/src/client/assets/room/furnitures/bin/bin.glb b/assets/room/furnitures/bin/bin.glb Binary files differindex b45f203802..b45f203802 100644 --- a/src/client/assets/room/furnitures/bin/bin.glb +++ b/assets/room/furnitures/bin/bin.glb diff --git a/src/client/assets/room/furnitures/book/book.blend b/assets/room/furnitures/book/book.blend Binary files differindex 0d4899d4ae..0d4899d4ae 100644 --- a/src/client/assets/room/furnitures/book/book.blend +++ b/assets/room/furnitures/book/book.blend diff --git a/src/client/assets/room/furnitures/book/book.glb b/assets/room/furnitures/book/book.glb Binary files differindex 546893da06..546893da06 100644 --- a/src/client/assets/room/furnitures/book/book.glb +++ b/assets/room/furnitures/book/book.glb diff --git a/src/client/assets/room/furnitures/book2/barcode.png b/assets/room/furnitures/book2/barcode.png Binary files differindex 37cfe5add3..37cfe5add3 100644 --- a/src/client/assets/room/furnitures/book2/barcode.png +++ b/assets/room/furnitures/book2/barcode.png diff --git a/src/client/assets/room/furnitures/book2/book2.blend b/assets/room/furnitures/book2/book2.blend Binary files differindex e0fdb48101..e0fdb48101 100644 --- a/src/client/assets/room/furnitures/book2/book2.blend +++ b/assets/room/furnitures/book2/book2.blend diff --git a/src/client/assets/room/furnitures/book2/book2.glb b/assets/room/furnitures/book2/book2.glb Binary files differindex 2b26402f8c..2b26402f8c 100644 --- a/src/client/assets/room/furnitures/book2/book2.glb +++ b/assets/room/furnitures/book2/book2.glb diff --git a/src/client/assets/room/furnitures/book2/texture.afdesign b/assets/room/furnitures/book2/texture.afdesign Binary files differindex b63771607a..b63771607a 100644 --- a/src/client/assets/room/furnitures/book2/texture.afdesign +++ b/assets/room/furnitures/book2/texture.afdesign diff --git a/src/client/assets/room/furnitures/book2/texture.png b/assets/room/furnitures/book2/texture.png Binary files differindex 5aa84f0340..5aa84f0340 100644 --- a/src/client/assets/room/furnitures/book2/texture.png +++ b/assets/room/furnitures/book2/texture.png diff --git a/src/client/assets/room/furnitures/book2/uv.png b/assets/room/furnitures/book2/uv.png Binary files differindex 61c4fb0400..61c4fb0400 100644 --- a/src/client/assets/room/furnitures/book2/uv.png +++ b/assets/room/furnitures/book2/uv.png diff --git a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend b/assets/room/furnitures/cardboard-box/cardboard-box.blend Binary files differindex 3a528de32a..3a528de32a 100644 --- a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend +++ b/assets/room/furnitures/cardboard-box/cardboard-box.blend diff --git a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb b/assets/room/furnitures/cardboard-box/cardboard-box.glb Binary files differindex bed372e94f..bed372e94f 100644 --- a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb +++ b/assets/room/furnitures/cardboard-box/cardboard-box.glb diff --git a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend b/assets/room/furnitures/cardboard-box2/cardboard-box2.blend Binary files differindex 5f146267ac..5f146267ac 100644 --- a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend +++ b/assets/room/furnitures/cardboard-box2/cardboard-box2.blend diff --git a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb b/assets/room/furnitures/cardboard-box2/cardboard-box2.glb Binary files differindex 85fcb5c0b6..85fcb5c0b6 100644 --- a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb +++ b/assets/room/furnitures/cardboard-box2/cardboard-box2.glb diff --git a/src/client/assets/room/furnitures/cardboard-box2/texture.png b/assets/room/furnitures/cardboard-box2/texture.png Binary files differindex e498d8f65b..e498d8f65b 100644 --- a/src/client/assets/room/furnitures/cardboard-box2/texture.png +++ b/assets/room/furnitures/cardboard-box2/texture.png diff --git a/src/client/assets/room/furnitures/cardboard-box2/uv.png b/assets/room/furnitures/cardboard-box2/uv.png Binary files differindex d547843ee0..d547843ee0 100644 --- a/src/client/assets/room/furnitures/cardboard-box2/uv.png +++ b/assets/room/furnitures/cardboard-box2/uv.png diff --git a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend b/assets/room/furnitures/cardboard-box3/cardboard-box3.blend Binary files differindex 00681a3cfd..00681a3cfd 100644 --- a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend +++ b/assets/room/furnitures/cardboard-box3/cardboard-box3.blend diff --git a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb b/assets/room/furnitures/cardboard-box3/cardboard-box3.glb Binary files differindex 1ef0427689..1ef0427689 100644 --- a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb +++ b/assets/room/furnitures/cardboard-box3/cardboard-box3.glb diff --git a/src/client/assets/room/furnitures/cardboard-box3/texture.png b/assets/room/furnitures/cardboard-box3/texture.png Binary files differindex 56c914cb9d..56c914cb9d 100644 --- a/src/client/assets/room/furnitures/cardboard-box3/texture.png +++ b/assets/room/furnitures/cardboard-box3/texture.png diff --git a/src/client/assets/room/furnitures/cardboard-box3/texture.xcf b/assets/room/furnitures/cardboard-box3/texture.xcf Binary files differindex 7ffb3e3439..7ffb3e3439 100644 --- a/src/client/assets/room/furnitures/cardboard-box3/texture.xcf +++ b/assets/room/furnitures/cardboard-box3/texture.xcf diff --git a/src/client/assets/room/furnitures/cardboard-box3/uv.png b/assets/room/furnitures/cardboard-box3/uv.png Binary files differindex 797ac509db..797ac509db 100644 --- a/src/client/assets/room/furnitures/cardboard-box3/uv.png +++ b/assets/room/furnitures/cardboard-box3/uv.png diff --git a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend b/assets/room/furnitures/carpet-stripe/carpet-stripe.blend Binary files differindex 750343d4f0..750343d4f0 100644 --- a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend +++ b/assets/room/furnitures/carpet-stripe/carpet-stripe.blend diff --git a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb b/assets/room/furnitures/carpet-stripe/carpet-stripe.glb Binary files differindex 3066a69e35..3066a69e35 100644 --- a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb +++ b/assets/room/furnitures/carpet-stripe/carpet-stripe.glb diff --git a/src/client/assets/room/furnitures/chair/chair.blend b/assets/room/furnitures/chair/chair.blend Binary files differindex 79c29a8401..79c29a8401 100644 --- a/src/client/assets/room/furnitures/chair/chair.blend +++ b/assets/room/furnitures/chair/chair.blend diff --git a/src/client/assets/room/furnitures/chair/chair.glb b/assets/room/furnitures/chair/chair.glb Binary files differindex 08ee1a0bb0..08ee1a0bb0 100644 --- a/src/client/assets/room/furnitures/chair/chair.glb +++ b/assets/room/furnitures/chair/chair.glb diff --git a/src/client/assets/room/furnitures/chair2/chair2.blend b/assets/room/furnitures/chair2/chair2.blend Binary files differindex c6a1acd96f..c6a1acd96f 100644 --- a/src/client/assets/room/furnitures/chair2/chair2.blend +++ b/assets/room/furnitures/chair2/chair2.blend diff --git a/src/client/assets/room/furnitures/chair2/chair2.glb b/assets/room/furnitures/chair2/chair2.glb Binary files differindex 5ea2f3518b..5ea2f3518b 100644 --- a/src/client/assets/room/furnitures/chair2/chair2.glb +++ b/assets/room/furnitures/chair2/chair2.glb diff --git a/src/client/assets/room/furnitures/color-box/color-box.blend b/assets/room/furnitures/color-box/color-box.blend Binary files differindex f96a4ff766..f96a4ff766 100644 --- a/src/client/assets/room/furnitures/color-box/color-box.blend +++ b/assets/room/furnitures/color-box/color-box.blend diff --git a/src/client/assets/room/furnitures/color-box/color-box.glb b/assets/room/furnitures/color-box/color-box.glb Binary files differindex 43f2abcae8..43f2abcae8 100644 --- a/src/client/assets/room/furnitures/color-box/color-box.glb +++ b/assets/room/furnitures/color-box/color-box.glb diff --git a/src/client/assets/room/furnitures/corkboard/corkboard.blend b/assets/room/furnitures/corkboard/corkboard.blend Binary files differindex 9a7e1878cd..9a7e1878cd 100644 --- a/src/client/assets/room/furnitures/corkboard/corkboard.blend +++ b/assets/room/furnitures/corkboard/corkboard.blend diff --git a/src/client/assets/room/furnitures/corkboard/corkboard.glb b/assets/room/furnitures/corkboard/corkboard.glb Binary files differindex fee108fb91..fee108fb91 100644 --- a/src/client/assets/room/furnitures/corkboard/corkboard.glb +++ b/assets/room/furnitures/corkboard/corkboard.glb diff --git a/src/client/assets/room/furnitures/cube/cube.blend b/assets/room/furnitures/cube/cube.blend Binary files differindex 1af5bf40a9..1af5bf40a9 100644 --- a/src/client/assets/room/furnitures/cube/cube.blend +++ b/assets/room/furnitures/cube/cube.blend diff --git a/src/client/assets/room/furnitures/cube/cube.glb b/assets/room/furnitures/cube/cube.glb Binary files differindex 4ac8b6036d..4ac8b6036d 100644 --- a/src/client/assets/room/furnitures/cube/cube.glb +++ b/assets/room/furnitures/cube/cube.glb diff --git a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend b/assets/room/furnitures/cup-noodle/cup-noodle.blend Binary files differindex 37ca8868c7..37ca8868c7 100644 --- a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend +++ b/assets/room/furnitures/cup-noodle/cup-noodle.blend diff --git a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb b/assets/room/furnitures/cup-noodle/cup-noodle.glb Binary files differindex 58efb1b3b4..58efb1b3b4 100644 --- a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb +++ b/assets/room/furnitures/cup-noodle/cup-noodle.glb diff --git a/src/client/assets/room/furnitures/cup-noodle/noodle.png b/assets/room/furnitures/cup-noodle/noodle.png Binary files differindex 1d74e0bbe7..1d74e0bbe7 100644 --- a/src/client/assets/room/furnitures/cup-noodle/noodle.png +++ b/assets/room/furnitures/cup-noodle/noodle.png diff --git a/src/client/assets/room/furnitures/desk/desk.blend b/assets/room/furnitures/desk/desk.blend Binary files differindex c88d01f0b2..c88d01f0b2 100644 --- a/src/client/assets/room/furnitures/desk/desk.blend +++ b/assets/room/furnitures/desk/desk.blend diff --git a/src/client/assets/room/furnitures/desk/desk.glb b/assets/room/furnitures/desk/desk.glb Binary files differindex 4a58513095..4a58513095 100644 --- a/src/client/assets/room/furnitures/desk/desk.glb +++ b/assets/room/furnitures/desk/desk.glb diff --git a/src/client/assets/room/furnitures/doll-ai/doll-ai.blend b/assets/room/furnitures/doll-ai/doll-ai.blend Binary files differindex a912231ecb..a912231ecb 100644 --- a/src/client/assets/room/furnitures/doll-ai/doll-ai.blend +++ b/assets/room/furnitures/doll-ai/doll-ai.blend diff --git a/src/client/assets/room/furnitures/doll-ai/doll-ai.glb b/assets/room/furnitures/doll-ai/doll-ai.glb Binary files differindex ec55a7bd7b..ec55a7bd7b 100644 --- a/src/client/assets/room/furnitures/doll-ai/doll-ai.glb +++ b/assets/room/furnitures/doll-ai/doll-ai.glb diff --git a/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png b/assets/room/furnitures/doll-ai/doll_ai_tex.png Binary files differindex 370ca5f75b..370ca5f75b 100644 --- a/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png +++ b/assets/room/furnitures/doll-ai/doll_ai_tex.png diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.blend b/assets/room/furnitures/energy-drink/energy-drink.blend Binary files differindex 65fc41273e..65fc41273e 100644 --- a/src/client/assets/room/furnitures/energy-drink/energy-drink.blend +++ b/assets/room/furnitures/energy-drink/energy-drink.blend diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.glb b/assets/room/furnitures/energy-drink/energy-drink.glb Binary files differindex 7fb1c27836..7fb1c27836 100644 --- a/src/client/assets/room/furnitures/energy-drink/energy-drink.glb +++ b/assets/room/furnitures/energy-drink/energy-drink.glb diff --git a/src/client/assets/room/furnitures/energy-drink/texture.afdesign b/assets/room/furnitures/energy-drink/texture.afdesign Binary files differindex 8c117a49b1..8c117a49b1 100644 --- a/src/client/assets/room/furnitures/energy-drink/texture.afdesign +++ b/assets/room/furnitures/energy-drink/texture.afdesign diff --git a/src/client/assets/room/furnitures/energy-drink/texture.png b/assets/room/furnitures/energy-drink/texture.png Binary files differindex 484ca0f96f..484ca0f96f 100644 --- a/src/client/assets/room/furnitures/energy-drink/texture.png +++ b/assets/room/furnitures/energy-drink/texture.png diff --git a/src/client/assets/room/furnitures/energy-drink/uv.png b/assets/room/furnitures/energy-drink/uv.png Binary files differindex 2a3f20c999..2a3f20c999 100644 --- a/src/client/assets/room/furnitures/energy-drink/uv.png +++ b/assets/room/furnitures/energy-drink/uv.png diff --git a/src/client/assets/room/furnitures/eraser/cover.png b/assets/room/furnitures/eraser/cover.png Binary files differindex 932a3fc62e..932a3fc62e 100644 --- a/src/client/assets/room/furnitures/eraser/cover.png +++ b/assets/room/furnitures/eraser/cover.png diff --git a/src/client/assets/room/furnitures/eraser/cover.psd b/assets/room/furnitures/eraser/cover.psd Binary files differindex c393337833..c393337833 100644 --- a/src/client/assets/room/furnitures/eraser/cover.psd +++ b/assets/room/furnitures/eraser/cover.psd diff --git a/src/client/assets/room/furnitures/eraser/eraser-uv.png b/assets/room/furnitures/eraser/eraser-uv.png Binary files differindex 89e4ea4c45..89e4ea4c45 100644 --- a/src/client/assets/room/furnitures/eraser/eraser-uv.png +++ b/assets/room/furnitures/eraser/eraser-uv.png diff --git a/src/client/assets/room/furnitures/eraser/eraser.blend b/assets/room/furnitures/eraser/eraser.blend Binary files differindex 103c54fbae..103c54fbae 100644 --- a/src/client/assets/room/furnitures/eraser/eraser.blend +++ b/assets/room/furnitures/eraser/eraser.blend diff --git a/src/client/assets/room/furnitures/eraser/eraser.glb b/assets/room/furnitures/eraser/eraser.glb Binary files differindex 016b60df20..016b60df20 100644 --- a/src/client/assets/room/furnitures/eraser/eraser.glb +++ b/assets/room/furnitures/eraser/eraser.glb diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png b/assets/room/furnitures/facial-tissue/facial-tissue-uv.png Binary files differindex e3865ad15e..e3865ad15e 100644 --- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png +++ b/assets/room/furnitures/facial-tissue/facial-tissue-uv.png diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend b/assets/room/furnitures/facial-tissue/facial-tissue.blend Binary files differindex d59f87c1ee..d59f87c1ee 100644 --- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend +++ b/assets/room/furnitures/facial-tissue/facial-tissue.blend diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb b/assets/room/furnitures/facial-tissue/facial-tissue.glb Binary files differindex 48b36ef347..48b36ef347 100644 --- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb +++ b/assets/room/furnitures/facial-tissue/facial-tissue.glb diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png b/assets/room/furnitures/facial-tissue/facial-tissue.png Binary files differindex 7cee4b1859..7cee4b1859 100644 --- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png +++ b/assets/room/furnitures/facial-tissue/facial-tissue.png diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd b/assets/room/furnitures/facial-tissue/facial-tissue.psd Binary files differindex cd59fc007b..cd59fc007b 100644 --- a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd +++ b/assets/room/furnitures/facial-tissue/facial-tissue.psd diff --git a/src/client/assets/room/furnitures/fan/fan.blend b/assets/room/furnitures/fan/fan.blend Binary files differindex 8c8106e5fe..8c8106e5fe 100644 --- a/src/client/assets/room/furnitures/fan/fan.blend +++ b/assets/room/furnitures/fan/fan.blend diff --git a/src/client/assets/room/furnitures/fan/fan.glb b/assets/room/furnitures/fan/fan.glb Binary files differindex d9367f3534..d9367f3534 100644 --- a/src/client/assets/room/furnitures/fan/fan.glb +++ b/assets/room/furnitures/fan/fan.glb diff --git a/src/client/assets/room/furnitures/holo-display/holo-display.blend b/assets/room/furnitures/holo-display/holo-display.blend Binary files differindex 56d2e1f819..56d2e1f819 100644 --- a/src/client/assets/room/furnitures/holo-display/holo-display.blend +++ b/assets/room/furnitures/holo-display/holo-display.blend diff --git a/src/client/assets/room/furnitures/holo-display/holo-display.glb b/assets/room/furnitures/holo-display/holo-display.glb Binary files differindex 4d042a59b3..4d042a59b3 100644 --- a/src/client/assets/room/furnitures/holo-display/holo-display.glb +++ b/assets/room/furnitures/holo-display/holo-display.glb diff --git a/src/client/assets/room/furnitures/holo-display/ray-uv.png b/assets/room/furnitures/holo-display/ray-uv.png Binary files differindex aa7e817e0f..aa7e817e0f 100644 --- a/src/client/assets/room/furnitures/holo-display/ray-uv.png +++ b/assets/room/furnitures/holo-display/ray-uv.png diff --git a/src/client/assets/room/furnitures/holo-display/ray.png b/assets/room/furnitures/holo-display/ray.png Binary files differindex 6a5d24e143..6a5d24e143 100644 --- a/src/client/assets/room/furnitures/holo-display/ray.png +++ b/assets/room/furnitures/holo-display/ray.png diff --git a/src/client/assets/room/furnitures/keyboard/keyboard.blend b/assets/room/furnitures/keyboard/keyboard.blend Binary files differindex ab33d134b3..ab33d134b3 100644 --- a/src/client/assets/room/furnitures/keyboard/keyboard.blend +++ b/assets/room/furnitures/keyboard/keyboard.blend diff --git a/src/client/assets/room/furnitures/keyboard/keyboard.glb b/assets/room/furnitures/keyboard/keyboard.glb Binary files differindex 15dc69f47a..15dc69f47a 100644 --- a/src/client/assets/room/furnitures/keyboard/keyboard.glb +++ b/assets/room/furnitures/keyboard/keyboard.glb diff --git a/src/client/assets/room/furnitures/low-table/low-table.blend b/assets/room/furnitures/low-table/low-table.blend Binary files differindex e1592174d9..e1592174d9 100644 --- a/src/client/assets/room/furnitures/low-table/low-table.blend +++ b/assets/room/furnitures/low-table/low-table.blend diff --git a/src/client/assets/room/furnitures/low-table/low-table.glb b/assets/room/furnitures/low-table/low-table.glb Binary files differindex c69bf35d7b..c69bf35d7b 100644 --- a/src/client/assets/room/furnitures/low-table/low-table.glb +++ b/assets/room/furnitures/low-table/low-table.glb diff --git a/src/client/assets/room/furnitures/mat/mat.blend b/assets/room/furnitures/mat/mat.blend Binary files differindex a1e1a68c55..a1e1a68c55 100644 --- a/src/client/assets/room/furnitures/mat/mat.blend +++ b/assets/room/furnitures/mat/mat.blend diff --git a/src/client/assets/room/furnitures/mat/mat.glb b/assets/room/furnitures/mat/mat.glb Binary files differindex 87ccd44e1a..87ccd44e1a 100644 --- a/src/client/assets/room/furnitures/mat/mat.glb +++ b/assets/room/furnitures/mat/mat.glb diff --git a/src/client/assets/room/furnitures/milk/milk-uv.png b/assets/room/furnitures/milk/milk-uv.png Binary files differindex 258fd54638..258fd54638 100644 --- a/src/client/assets/room/furnitures/milk/milk-uv.png +++ b/assets/room/furnitures/milk/milk-uv.png diff --git a/src/client/assets/room/furnitures/milk/milk.blend b/assets/room/furnitures/milk/milk.blend Binary files differindex 2df508d5b9..2df508d5b9 100644 --- a/src/client/assets/room/furnitures/milk/milk.blend +++ b/assets/room/furnitures/milk/milk.blend diff --git a/src/client/assets/room/furnitures/milk/milk.glb b/assets/room/furnitures/milk/milk.glb Binary files differindex b335fe3d02..b335fe3d02 100644 --- a/src/client/assets/room/furnitures/milk/milk.glb +++ b/assets/room/furnitures/milk/milk.glb diff --git a/src/client/assets/room/furnitures/milk/milk.png b/assets/room/furnitures/milk/milk.png Binary files differindex 35181c8c8c..35181c8c8c 100644 --- a/src/client/assets/room/furnitures/milk/milk.png +++ b/assets/room/furnitures/milk/milk.png diff --git a/src/client/assets/room/furnitures/milk/milk.psd b/assets/room/furnitures/milk/milk.psd Binary files differindex f31e439277..f31e439277 100644 --- a/src/client/assets/room/furnitures/milk/milk.psd +++ b/assets/room/furnitures/milk/milk.psd diff --git a/src/client/assets/room/furnitures/monitor/monitor.blend b/assets/room/furnitures/monitor/monitor.blend Binary files differindex 6c042ccdd8..6c042ccdd8 100644 --- a/src/client/assets/room/furnitures/monitor/monitor.blend +++ b/assets/room/furnitures/monitor/monitor.blend diff --git a/src/client/assets/room/furnitures/monitor/monitor.glb b/assets/room/furnitures/monitor/monitor.glb Binary files differindex fc33286a15..fc33286a15 100644 --- a/src/client/assets/room/furnitures/monitor/monitor.glb +++ b/assets/room/furnitures/monitor/monitor.glb diff --git a/src/client/assets/room/furnitures/monitor/monitor.psd b/assets/room/furnitures/monitor/monitor.psd Binary files differindex 57afff9cd9..57afff9cd9 100644 --- a/src/client/assets/room/furnitures/monitor/monitor.psd +++ b/assets/room/furnitures/monitor/monitor.psd diff --git a/src/client/assets/room/furnitures/monitor/screen-uv.png b/assets/room/furnitures/monitor/screen-uv.png Binary files differindex 35f74de8aa..35f74de8aa 100644 --- a/src/client/assets/room/furnitures/monitor/screen-uv.png +++ b/assets/room/furnitures/monitor/screen-uv.png diff --git a/src/client/assets/room/furnitures/monitor/screen.jpg b/assets/room/furnitures/monitor/screen.jpg Binary files differindex 4004a1ede9..4004a1ede9 100644 --- a/src/client/assets/room/furnitures/monitor/screen.jpg +++ b/assets/room/furnitures/monitor/screen.jpg diff --git a/src/client/assets/room/furnitures/moon/moon.blend b/assets/room/furnitures/moon/moon.blend Binary files differindex 4ff3deab8e..4ff3deab8e 100644 --- a/src/client/assets/room/furnitures/moon/moon.blend +++ b/assets/room/furnitures/moon/moon.blend diff --git a/src/client/assets/room/furnitures/moon/moon.glb b/assets/room/furnitures/moon/moon.glb Binary files differindex 07fa7e4c02..07fa7e4c02 100644 --- a/src/client/assets/room/furnitures/moon/moon.glb +++ b/assets/room/furnitures/moon/moon.glb diff --git a/src/client/assets/room/furnitures/moon/moon.jpg b/assets/room/furnitures/moon/moon.jpg Binary files differindex 8988ac64b9..8988ac64b9 100644 --- a/src/client/assets/room/furnitures/moon/moon.jpg +++ b/assets/room/furnitures/moon/moon.jpg diff --git a/src/client/assets/room/furnitures/mousepad/mousepad.blend b/assets/room/furnitures/mousepad/mousepad.blend Binary files differindex 14bd139c94..14bd139c94 100644 --- a/src/client/assets/room/furnitures/mousepad/mousepad.blend +++ b/assets/room/furnitures/mousepad/mousepad.blend diff --git a/src/client/assets/room/furnitures/mousepad/mousepad.glb b/assets/room/furnitures/mousepad/mousepad.glb Binary files differindex 681ada49cd..681ada49cd 100644 --- a/src/client/assets/room/furnitures/mousepad/mousepad.glb +++ b/assets/room/furnitures/mousepad/mousepad.glb diff --git a/src/client/assets/room/furnitures/pc/motherboard-uv.png b/assets/room/furnitures/pc/motherboard-uv.png Binary files differindex 355009fe7c..355009fe7c 100644 --- a/src/client/assets/room/furnitures/pc/motherboard-uv.png +++ b/assets/room/furnitures/pc/motherboard-uv.png diff --git a/src/client/assets/room/furnitures/pc/motherboard-uv.psd b/assets/room/furnitures/pc/motherboard-uv.psd Binary files differindex 971f33f79e..971f33f79e 100644 --- a/src/client/assets/room/furnitures/pc/motherboard-uv.psd +++ b/assets/room/furnitures/pc/motherboard-uv.psd diff --git a/src/client/assets/room/furnitures/pc/motherboard.jpg b/assets/room/furnitures/pc/motherboard.jpg Binary files differindex d894e4efcf..d894e4efcf 100644 --- a/src/client/assets/room/furnitures/pc/motherboard.jpg +++ b/assets/room/furnitures/pc/motherboard.jpg diff --git a/src/client/assets/room/furnitures/pc/pc.blend b/assets/room/furnitures/pc/pc.blend Binary files differindex 13dfec6ccc..13dfec6ccc 100644 --- a/src/client/assets/room/furnitures/pc/pc.blend +++ b/assets/room/furnitures/pc/pc.blend diff --git a/src/client/assets/room/furnitures/pc/pc.glb b/assets/room/furnitures/pc/pc.glb Binary files differindex 44a48b18ae..44a48b18ae 100644 --- a/src/client/assets/room/furnitures/pc/pc.glb +++ b/assets/room/furnitures/pc/pc.glb diff --git a/src/client/assets/room/furnitures/pencil/pencil.blend b/assets/room/furnitures/pencil/pencil.blend Binary files differindex 0fc6bdd776..0fc6bdd776 100644 --- a/src/client/assets/room/furnitures/pencil/pencil.blend +++ b/assets/room/furnitures/pencil/pencil.blend diff --git a/src/client/assets/room/furnitures/pencil/pencil.glb b/assets/room/furnitures/pencil/pencil.glb Binary files differindex a938b5cdcc..a938b5cdcc 100644 --- a/src/client/assets/room/furnitures/pencil/pencil.glb +++ b/assets/room/furnitures/pencil/pencil.glb diff --git a/src/client/assets/room/furnitures/photoframe/photo-uv.png b/assets/room/furnitures/photoframe/photo-uv.png Binary files differindex 9b94906413..9b94906413 100644 --- a/src/client/assets/room/furnitures/photoframe/photo-uv.png +++ b/assets/room/furnitures/photoframe/photo-uv.png diff --git a/src/client/assets/room/furnitures/photoframe/photo.jpg b/assets/room/furnitures/photoframe/photo.jpg Binary files differindex af14f0f36a..af14f0f36a 100644 --- a/src/client/assets/room/furnitures/photoframe/photo.jpg +++ b/assets/room/furnitures/photoframe/photo.jpg diff --git a/src/client/assets/room/furnitures/photoframe/photoframe.blend b/assets/room/furnitures/photoframe/photoframe.blend Binary files differindex 4224cde45b..4224cde45b 100644 --- a/src/client/assets/room/furnitures/photoframe/photoframe.blend +++ b/assets/room/furnitures/photoframe/photoframe.blend diff --git a/src/client/assets/room/furnitures/photoframe/photoframe.glb b/assets/room/furnitures/photoframe/photoframe.glb Binary files differindex 4255a77de6..4255a77de6 100644 --- a/src/client/assets/room/furnitures/photoframe/photoframe.glb +++ b/assets/room/furnitures/photoframe/photoframe.glb diff --git a/src/client/assets/room/furnitures/piano/piano.blend b/assets/room/furnitures/piano/piano.blend Binary files differindex 7653cdf672..7653cdf672 100644 --- a/src/client/assets/room/furnitures/piano/piano.blend +++ b/assets/room/furnitures/piano/piano.blend diff --git a/src/client/assets/room/furnitures/piano/piano.glb b/assets/room/furnitures/piano/piano.glb Binary files differindex 7242e78ceb..7242e78ceb 100644 --- a/src/client/assets/room/furnitures/piano/piano.glb +++ b/assets/room/furnitures/piano/piano.glb diff --git a/src/client/assets/room/furnitures/pinguin/pinguin.blend b/assets/room/furnitures/pinguin/pinguin.blend Binary files differindex 514c713e4c..514c713e4c 100644 --- a/src/client/assets/room/furnitures/pinguin/pinguin.blend +++ b/assets/room/furnitures/pinguin/pinguin.blend diff --git a/src/client/assets/room/furnitures/pinguin/pinguin.glb b/assets/room/furnitures/pinguin/pinguin.glb Binary files differindex 6df34c06e9..6df34c06e9 100644 --- a/src/client/assets/room/furnitures/pinguin/pinguin.glb +++ b/assets/room/furnitures/pinguin/pinguin.glb diff --git a/src/client/assets/room/furnitures/plant/plant-soil-uv.png b/assets/room/furnitures/plant/plant-soil-uv.png Binary files differindex d4971a896c..d4971a896c 100644 --- a/src/client/assets/room/furnitures/plant/plant-soil-uv.png +++ b/assets/room/furnitures/plant/plant-soil-uv.png diff --git a/src/client/assets/room/furnitures/plant/plant-soil.png b/assets/room/furnitures/plant/plant-soil.png Binary files differindex e79ccd240e..e79ccd240e 100644 --- a/src/client/assets/room/furnitures/plant/plant-soil.png +++ b/assets/room/furnitures/plant/plant-soil.png diff --git a/src/client/assets/room/furnitures/plant/plant-soil.psd b/assets/room/furnitures/plant/plant-soil.psd Binary files differindex 1457b7ea5b..1457b7ea5b 100644 --- a/src/client/assets/room/furnitures/plant/plant-soil.psd +++ b/assets/room/furnitures/plant/plant-soil.psd diff --git a/src/client/assets/room/furnitures/plant/plant.blend b/assets/room/furnitures/plant/plant.blend Binary files differindex aa38c7b54e..aa38c7b54e 100644 --- a/src/client/assets/room/furnitures/plant/plant.blend +++ b/assets/room/furnitures/plant/plant.blend diff --git a/src/client/assets/room/furnitures/plant/plant.glb b/assets/room/furnitures/plant/plant.glb Binary files differindex 38422b4a9b..38422b4a9b 100644 --- a/src/client/assets/room/furnitures/plant/plant.glb +++ b/assets/room/furnitures/plant/plant.glb diff --git a/src/client/assets/room/furnitures/plant2/plant2.blend b/assets/room/furnitures/plant2/plant2.blend Binary files differindex 6592c5d98d..6592c5d98d 100644 --- a/src/client/assets/room/furnitures/plant2/plant2.blend +++ b/assets/room/furnitures/plant2/plant2.blend diff --git a/src/client/assets/room/furnitures/plant2/plant2.glb b/assets/room/furnitures/plant2/plant2.glb Binary files differindex 223e6f5834..223e6f5834 100644 --- a/src/client/assets/room/furnitures/plant2/plant2.glb +++ b/assets/room/furnitures/plant2/plant2.glb diff --git a/src/client/assets/room/furnitures/plant2/soil.png b/assets/room/furnitures/plant2/soil.png Binary files differindex e79ccd240e..e79ccd240e 100644 --- a/src/client/assets/room/furnitures/plant2/soil.png +++ b/assets/room/furnitures/plant2/soil.png diff --git a/src/client/assets/room/furnitures/poster-h/poster-h.blend b/assets/room/furnitures/poster-h/poster-h.blend Binary files differindex 40f944f3c1..40f944f3c1 100644 --- a/src/client/assets/room/furnitures/poster-h/poster-h.blend +++ b/assets/room/furnitures/poster-h/poster-h.blend diff --git a/src/client/assets/room/furnitures/poster-h/poster-h.glb b/assets/room/furnitures/poster-h/poster-h.glb Binary files differindex c6032c1009..c6032c1009 100644 --- a/src/client/assets/room/furnitures/poster-h/poster-h.glb +++ b/assets/room/furnitures/poster-h/poster-h.glb diff --git a/src/client/assets/room/furnitures/poster-h/uv.png b/assets/room/furnitures/poster-h/uv.png Binary files differindex f854231e0b..f854231e0b 100644 --- a/src/client/assets/room/furnitures/poster-h/uv.png +++ b/assets/room/furnitures/poster-h/uv.png diff --git a/src/client/assets/room/furnitures/poster-v/poster-v.blend b/assets/room/furnitures/poster-v/poster-v.blend Binary files differindex 07fe971634..07fe971634 100644 --- a/src/client/assets/room/furnitures/poster-v/poster-v.blend +++ b/assets/room/furnitures/poster-v/poster-v.blend diff --git a/src/client/assets/room/furnitures/poster-v/poster-v.glb b/assets/room/furnitures/poster-v/poster-v.glb Binary files differindex 6e3782f193..6e3782f193 100644 --- a/src/client/assets/room/furnitures/poster-v/poster-v.glb +++ b/assets/room/furnitures/poster-v/poster-v.glb diff --git a/src/client/assets/room/furnitures/poster-v/uv.png b/assets/room/furnitures/poster-v/uv.png Binary files differindex 7bb2bf809e..7bb2bf809e 100644 --- a/src/client/assets/room/furnitures/poster-v/uv.png +++ b/assets/room/furnitures/poster-v/uv.png diff --git a/src/client/assets/room/furnitures/pudding/pudding.blend b/assets/room/furnitures/pudding/pudding.blend Binary files differindex bba40ce161..bba40ce161 100644 --- a/src/client/assets/room/furnitures/pudding/pudding.blend +++ b/assets/room/furnitures/pudding/pudding.blend diff --git a/src/client/assets/room/furnitures/pudding/pudding.glb b/assets/room/furnitures/pudding/pudding.glb Binary files differindex 06c9ed80cc..06c9ed80cc 100644 --- a/src/client/assets/room/furnitures/pudding/pudding.glb +++ b/assets/room/furnitures/pudding/pudding.glb diff --git a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend b/assets/room/furnitures/rubik-cube/rubik-cube.blend Binary files differindex 6c09067e78..6c09067e78 100644 --- a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend +++ b/assets/room/furnitures/rubik-cube/rubik-cube.blend diff --git a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb b/assets/room/furnitures/rubik-cube/rubik-cube.glb Binary files differindex d640df9b06..d640df9b06 100644 --- a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb +++ b/assets/room/furnitures/rubik-cube/rubik-cube.glb diff --git a/src/client/assets/room/furnitures/server/rack-uv.png b/assets/room/furnitures/server/rack-uv.png Binary files differindex 65bdb0ffd9..65bdb0ffd9 100644 --- a/src/client/assets/room/furnitures/server/rack-uv.png +++ b/assets/room/furnitures/server/rack-uv.png diff --git a/src/client/assets/room/furnitures/server/rack.png b/assets/room/furnitures/server/rack.png Binary files differindex b851295cfa..b851295cfa 100644 --- a/src/client/assets/room/furnitures/server/rack.png +++ b/assets/room/furnitures/server/rack.png diff --git a/src/client/assets/room/furnitures/server/server.blend b/assets/room/furnitures/server/server.blend Binary files differindex 6675dfbdc2..6675dfbdc2 100644 --- a/src/client/assets/room/furnitures/server/server.blend +++ b/assets/room/furnitures/server/server.blend diff --git a/src/client/assets/room/furnitures/server/server.glb b/assets/room/furnitures/server/server.glb Binary files differindex a8b530a2d2..a8b530a2d2 100644 --- a/src/client/assets/room/furnitures/server/server.glb +++ b/assets/room/furnitures/server/server.glb diff --git a/src/client/assets/room/furnitures/server/server.png b/assets/room/furnitures/server/server.png Binary files differindex 8e9a0d716c..8e9a0d716c 100644 --- a/src/client/assets/room/furnitures/server/server.png +++ b/assets/room/furnitures/server/server.png diff --git a/src/client/assets/room/furnitures/server/uv.png b/assets/room/furnitures/server/uv.png Binary files differindex ca2e747d16..ca2e747d16 100644 --- a/src/client/assets/room/furnitures/server/uv.png +++ b/assets/room/furnitures/server/uv.png diff --git a/src/client/assets/room/furnitures/sofa/sofa.blend b/assets/room/furnitures/sofa/sofa.blend Binary files differindex fb5aa51a2c..fb5aa51a2c 100644 --- a/src/client/assets/room/furnitures/sofa/sofa.blend +++ b/assets/room/furnitures/sofa/sofa.blend diff --git a/src/client/assets/room/furnitures/sofa/sofa.glb b/assets/room/furnitures/sofa/sofa.glb Binary files differindex 6ce77d94ac..6ce77d94ac 100644 --- a/src/client/assets/room/furnitures/sofa/sofa.glb +++ b/assets/room/furnitures/sofa/sofa.glb diff --git a/src/client/assets/room/furnitures/spiral/spiral.blend b/assets/room/furnitures/spiral/spiral.blend Binary files differindex 9d3be77bce..9d3be77bce 100644 --- a/src/client/assets/room/furnitures/spiral/spiral.blend +++ b/assets/room/furnitures/spiral/spiral.blend diff --git a/src/client/assets/room/furnitures/spiral/spiral.glb b/assets/room/furnitures/spiral/spiral.glb Binary files differindex ee8e3c23b1..ee8e3c23b1 100644 --- a/src/client/assets/room/furnitures/spiral/spiral.glb +++ b/assets/room/furnitures/spiral/spiral.glb diff --git a/src/client/assets/room/furnitures/tv/screen-uv.png b/assets/room/furnitures/tv/screen-uv.png Binary files differindex 4bb74f031f..4bb74f031f 100644 --- a/src/client/assets/room/furnitures/tv/screen-uv.png +++ b/assets/room/furnitures/tv/screen-uv.png diff --git a/src/client/assets/room/furnitures/tv/tv.blend b/assets/room/furnitures/tv/tv.blend Binary files differindex 490e298e7b..490e298e7b 100644 --- a/src/client/assets/room/furnitures/tv/tv.blend +++ b/assets/room/furnitures/tv/tv.blend diff --git a/src/client/assets/room/furnitures/tv/tv.glb b/assets/room/furnitures/tv/tv.glb Binary files differindex b9bd23896b..b9bd23896b 100644 --- a/src/client/assets/room/furnitures/tv/tv.glb +++ b/assets/room/furnitures/tv/tv.glb diff --git a/src/client/assets/room/furnitures/wall-clock/wall-clock.blend b/assets/room/furnitures/wall-clock/wall-clock.blend Binary files differindex 0a61c8f01e..0a61c8f01e 100644 --- a/src/client/assets/room/furnitures/wall-clock/wall-clock.blend +++ b/assets/room/furnitures/wall-clock/wall-clock.blend diff --git a/src/client/assets/room/furnitures/wall-clock/wall-clock.glb b/assets/room/furnitures/wall-clock/wall-clock.glb Binary files differindex b9f0093a8d..b9f0093a8d 100644 --- a/src/client/assets/room/furnitures/wall-clock/wall-clock.glb +++ b/assets/room/furnitures/wall-clock/wall-clock.glb diff --git a/src/client/assets/room/rooms/default/default.blend b/assets/room/rooms/default/default.blend Binary files differindex 661154724a..661154724a 100644 --- a/src/client/assets/room/rooms/default/default.blend +++ b/assets/room/rooms/default/default.blend diff --git a/src/client/assets/room/rooms/default/default.glb b/assets/room/rooms/default/default.glb Binary files differindex 3d378deee2..3d378deee2 100644 --- a/src/client/assets/room/rooms/default/default.glb +++ b/assets/room/rooms/default/default.glb diff --git a/src/client/assets/room/rooms/washitsu/husuma-uv.png b/assets/room/rooms/washitsu/husuma-uv.png Binary files differindex ae2fca3911..ae2fca3911 100644 --- a/src/client/assets/room/rooms/washitsu/husuma-uv.png +++ b/assets/room/rooms/washitsu/husuma-uv.png diff --git a/src/client/assets/room/rooms/washitsu/husuma.png b/assets/room/rooms/washitsu/husuma.png Binary files differindex 084cbed67c..084cbed67c 100644 --- a/src/client/assets/room/rooms/washitsu/husuma.png +++ b/assets/room/rooms/washitsu/husuma.png diff --git a/src/client/assets/room/rooms/washitsu/tatami-single1600.png b/assets/room/rooms/washitsu/tatami-single1600.png Binary files differindex c0e684d743..c0e684d743 100644 --- a/src/client/assets/room/rooms/washitsu/tatami-single1600.png +++ b/assets/room/rooms/washitsu/tatami-single1600.png diff --git a/src/client/assets/room/rooms/washitsu/tatami-uv.png b/assets/room/rooms/washitsu/tatami-uv.png Binary files differindex 5b16c66091..5b16c66091 100644 --- a/src/client/assets/room/rooms/washitsu/tatami-uv.png +++ b/assets/room/rooms/washitsu/tatami-uv.png diff --git a/src/client/assets/room/rooms/washitsu/tatami.afdesign b/assets/room/rooms/washitsu/tatami.afdesign Binary files differindex 9300a26950..9300a26950 100644 --- a/src/client/assets/room/rooms/washitsu/tatami.afdesign +++ b/assets/room/rooms/washitsu/tatami.afdesign diff --git a/src/client/assets/room/rooms/washitsu/tatami.png b/assets/room/rooms/washitsu/tatami.png Binary files differindex 8894d040ae..8894d040ae 100644 --- a/src/client/assets/room/rooms/washitsu/tatami.png +++ b/assets/room/rooms/washitsu/tatami.png diff --git a/src/client/assets/room/rooms/washitsu/washitsu.blend b/assets/room/rooms/washitsu/washitsu.blend Binary files differindex 84dc11374d..84dc11374d 100644 --- a/src/client/assets/room/rooms/washitsu/washitsu.blend +++ b/assets/room/rooms/washitsu/washitsu.blend diff --git a/src/client/assets/room/rooms/washitsu/washitsu.glb b/assets/room/rooms/washitsu/washitsu.glb Binary files differindex 5b4767bc73..5b4767bc73 100644 --- a/src/client/assets/room/rooms/washitsu/washitsu.glb +++ b/assets/room/rooms/washitsu/washitsu.glb diff --git a/src/client/assets/sounds/aisha/1.mp3 b/assets/sounds/aisha/1.mp3 Binary files differindex d8e9a2f265..d8e9a2f265 100644 --- a/src/client/assets/sounds/aisha/1.mp3 +++ b/assets/sounds/aisha/1.mp3 diff --git a/src/client/assets/sounds/aisha/2.mp3 b/assets/sounds/aisha/2.mp3 Binary files differindex 477c2eba43..477c2eba43 100644 --- a/src/client/assets/sounds/aisha/2.mp3 +++ b/assets/sounds/aisha/2.mp3 diff --git a/src/client/assets/sounds/aisha/3.mp3 b/assets/sounds/aisha/3.mp3 Binary files differindex fe0d8063df..fe0d8063df 100644 --- a/src/client/assets/sounds/aisha/3.mp3 +++ b/assets/sounds/aisha/3.mp3 diff --git a/src/client/assets/sounds/noizenecio/kick_gaba.mp3 b/assets/sounds/noizenecio/kick_gaba.mp3 Binary files differindex 616b506c4f..616b506c4f 100644 --- a/src/client/assets/sounds/noizenecio/kick_gaba.mp3 +++ b/assets/sounds/noizenecio/kick_gaba.mp3 diff --git a/src/client/assets/sounds/noizenecio/kick_gaba2.mp3 b/assets/sounds/noizenecio/kick_gaba2.mp3 Binary files differindex 33c2837620..33c2837620 100644 --- a/src/client/assets/sounds/noizenecio/kick_gaba2.mp3 +++ b/assets/sounds/noizenecio/kick_gaba2.mp3 diff --git a/src/client/assets/sounds/syuilo/down.mp3 b/assets/sounds/syuilo/down.mp3 Binary files differindex 4cd421139d..4cd421139d 100644 --- a/src/client/assets/sounds/syuilo/down.mp3 +++ b/assets/sounds/syuilo/down.mp3 diff --git a/src/client/assets/sounds/syuilo/kick.mp3 b/assets/sounds/syuilo/kick.mp3 Binary files differindex 4e0e72091c..4e0e72091c 100644 --- a/src/client/assets/sounds/syuilo/kick.mp3 +++ b/assets/sounds/syuilo/kick.mp3 diff --git a/src/client/assets/sounds/syuilo/pirori-square-wet.mp3 b/assets/sounds/syuilo/pirori-square-wet.mp3 Binary files differindex babf1fce60..babf1fce60 100644 --- a/src/client/assets/sounds/syuilo/pirori-square-wet.mp3 +++ b/assets/sounds/syuilo/pirori-square-wet.mp3 diff --git a/src/client/assets/sounds/syuilo/pirori-wet.mp3 b/assets/sounds/syuilo/pirori-wet.mp3 Binary files differindex 25e2c46a64..25e2c46a64 100644 --- a/src/client/assets/sounds/syuilo/pirori-wet.mp3 +++ b/assets/sounds/syuilo/pirori-wet.mp3 diff --git a/src/client/assets/sounds/syuilo/pirori.mp3 b/assets/sounds/syuilo/pirori.mp3 Binary files differindex a745415ac0..a745415ac0 100644 --- a/src/client/assets/sounds/syuilo/pirori.mp3 +++ b/assets/sounds/syuilo/pirori.mp3 diff --git a/src/client/assets/sounds/syuilo/poi1.mp3 b/assets/sounds/syuilo/poi1.mp3 Binary files differindex 59dae90965..59dae90965 100644 --- a/src/client/assets/sounds/syuilo/poi1.mp3 +++ b/assets/sounds/syuilo/poi1.mp3 diff --git a/src/client/assets/sounds/syuilo/poi2.mp3 b/assets/sounds/syuilo/poi2.mp3 Binary files differindex a65c653891..a65c653891 100644 --- a/src/client/assets/sounds/syuilo/poi2.mp3 +++ b/assets/sounds/syuilo/poi2.mp3 diff --git a/src/client/assets/sounds/syuilo/pope1.mp3 b/assets/sounds/syuilo/pope1.mp3 Binary files differindex d6f53cfacc..d6f53cfacc 100644 --- a/src/client/assets/sounds/syuilo/pope1.mp3 +++ b/assets/sounds/syuilo/pope1.mp3 diff --git a/src/client/assets/sounds/syuilo/pope2.mp3 b/assets/sounds/syuilo/pope2.mp3 Binary files differindex fe5d95e292..fe5d95e292 100644 --- a/src/client/assets/sounds/syuilo/pope2.mp3 +++ b/assets/sounds/syuilo/pope2.mp3 diff --git a/src/client/assets/sounds/syuilo/popo.mp3 b/assets/sounds/syuilo/popo.mp3 Binary files differindex a2a1605bbb..a2a1605bbb 100644 --- a/src/client/assets/sounds/syuilo/popo.mp3 +++ b/assets/sounds/syuilo/popo.mp3 diff --git a/src/client/assets/sounds/syuilo/reverved.mp3 b/assets/sounds/syuilo/reverved.mp3 Binary files differindex 47588ef270..47588ef270 100644 --- a/src/client/assets/sounds/syuilo/reverved.mp3 +++ b/assets/sounds/syuilo/reverved.mp3 diff --git a/src/client/assets/sounds/syuilo/ryukyu.mp3 b/assets/sounds/syuilo/ryukyu.mp3 Binary files differindex 9e935e3f37..9e935e3f37 100644 --- a/src/client/assets/sounds/syuilo/ryukyu.mp3 +++ b/assets/sounds/syuilo/ryukyu.mp3 diff --git a/src/client/assets/sounds/syuilo/snare.mp3 b/assets/sounds/syuilo/snare.mp3 Binary files differindex 9244189c2d..9244189c2d 100644 --- a/src/client/assets/sounds/syuilo/snare.mp3 +++ b/assets/sounds/syuilo/snare.mp3 diff --git a/src/client/assets/sounds/syuilo/square-pico.mp3 b/assets/sounds/syuilo/square-pico.mp3 Binary files differindex c4d8305ae7..c4d8305ae7 100644 --- a/src/client/assets/sounds/syuilo/square-pico.mp3 +++ b/assets/sounds/syuilo/square-pico.mp3 diff --git a/src/client/assets/sounds/syuilo/triple.mp3 b/assets/sounds/syuilo/triple.mp3 Binary files differindex 54ab974d46..54ab974d46 100644 --- a/src/client/assets/sounds/syuilo/triple.mp3 +++ b/assets/sounds/syuilo/triple.mp3 diff --git a/src/client/assets/sounds/syuilo/up.mp3 b/assets/sounds/syuilo/up.mp3 Binary files differindex 3f30867764..3f30867764 100644 --- a/src/client/assets/sounds/syuilo/up.mp3 +++ b/assets/sounds/syuilo/up.mp3 diff --git a/src/client/assets/sounds/syuilo/waon.mp3 b/assets/sounds/syuilo/waon.mp3 Binary files differindex a4af473861..a4af473861 100644 --- a/src/client/assets/sounds/syuilo/waon.mp3 +++ b/assets/sounds/syuilo/waon.mp3 diff --git a/gulpfile.ts b/gulpfile.ts index 7d20aba4e7..95b2394887 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -6,7 +6,6 @@ import * as fs from 'fs'; import * as gulp from 'gulp'; import * as ts from 'gulp-typescript'; import * as rimraf from 'rimraf'; -import * as rename from 'gulp-rename'; import * as replace from 'gulp-replace'; const terser = require('gulp-terser'); const cssnano = require('gulp-cssnano'); @@ -29,16 +28,16 @@ gulp.task('build:copy:views', () => ); gulp.task('build:copy:fonts', () => - gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/client/assets/fonts/')) + gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/assets/fonts/')) ); gulp.task('build:copy:locales', cb => { - fs.mkdirSync('./built/client/assets/locales', { recursive: true }); + fs.mkdirSync('./built/assets/locales', { recursive: true }); const v = { '_version_': meta.version }; for (const [lang, locale] of Object.entries(locales)) { - fs.writeFileSync(`./built/client/assets/locales/${lang}.${meta.version}.json`, JSON.stringify({ ...locale, ...v }), 'utf-8'); + fs.writeFileSync(`./built/assets/locales/${lang}.${meta.version}.json`, JSON.stringify({ ...locale, ...v }), 'utf-8'); } cb(); @@ -79,33 +78,17 @@ gulp.task('cleanall', gulp.parallel('clean', cb => rimraf('./node_modules', cb) )); -gulp.task('copy:client', () => - gulp.src([ - './assets/**/*', - './src/client/assets/**/*', - ]) - .pipe(rename(path => { - path.dirname = path.dirname!.replace('assets', '.'); - })) - .pipe(gulp.dest('./built/client/assets/')) -); - gulp.task('copy:docs', () => gulp.src([ './src/docs/**/*', ]) - .pipe(gulp.dest('./built/client/assets/docs/')) + .pipe(gulp.dest('./built/assets/docs/')) ); -gulp.task('build:client', gulp.parallel( - 'copy:client', - 'copy:docs' -)); - gulp.task('build', gulp.parallel( 'build:ts', 'build:copy', - 'build:client', + 'copy:docs', )); gulp.task('default', gulp.task('build')); diff --git a/src/client/assets/manifest.json b/src/client/assets/manifest.json index f5a1d47a8a..48030a2980 100644 --- a/src/client/assets/manifest.json +++ b/src/client/assets/manifest.json @@ -7,12 +7,12 @@ "theme_color": "#86b300", "icons": [ { - "src": "/assets/icons/192.png", + "src": "/static-assets/icons/192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/assets/icons/512.png", + "src": "/static-assets/icons/512.png", "sizes": "512x512", "type": "image/png" } diff --git a/src/client/pages/v.vue b/src/client/pages/v.vue index 021f8908fb..f456a29993 100644 --- a/src/client/pages/v.vue +++ b/src/client/pages/v.vue @@ -2,7 +2,7 @@ <div> <section class="_section"> <div class="_content" style="text-align: center;"> - <img src="/assets/icons/512.png" alt="" style="display: block; width: 100px; margin: 0 auto; border-radius: 16px;"/> + <img src="/static-assets/icons/512.png" alt="" style="display: block; width: 100px; margin: 0 auto; border-radius: 16px;"/> <div style="margin-top: 0.75em;">Misskey</div> <div style="opacity: 0.5;">v{{ version }}</div> </div> diff --git a/src/client/pages/welcome.entrance.a.vue b/src/client/pages/welcome.entrance.a.vue index 43d21d920a..872ea8797f 100644 --- a/src/client/pages/welcome.entrance.a.vue +++ b/src/client/pages/welcome.entrance.a.vue @@ -5,7 +5,7 @@ <XTimeline class="tl"/> <div class="shape1"></div> <div class="shape2"></div> - <img src="/assets/misskey.svg" class="misskey"/> + <img src="/static-assets/misskey.svg" class="misskey"/> <div class="emojis"> <MkEmoji :normal="true" :no-style="true" emoji="👍"/> <MkEmoji :normal="true" :no-style="true" emoji="❤"/> diff --git a/src/client/pages/welcome.entrance.b.vue b/src/client/pages/welcome.entrance.b.vue index 8a6f60e726..95b99fb466 100644 --- a/src/client/pages/welcome.entrance.b.vue +++ b/src/client/pages/welcome.entrance.b.vue @@ -29,7 +29,7 @@ </I18n> </div> </div> - <img src="/assets/misskey.svg" class="misskey"/> + <img src="/static-assets/misskey.svg" class="misskey"/> </div> </div> </template> diff --git a/src/client/pages/welcome.entrance.c.vue b/src/client/pages/welcome.entrance.c.vue index e9df492cb6..8aba80e781 100644 --- a/src/client/pages/welcome.entrance.c.vue +++ b/src/client/pages/welcome.entrance.c.vue @@ -11,7 +11,7 @@ <MkEmoji :normal="true" :no-style="true" emoji="🍮"/> </div> <div class="main"> - <img src="/assets/misskey.svg" class="misskey"/> + <img src="/static-assets/misskey.svg" class="misskey"/> <div class="form _panel"> <div class="bg"> <div class="fade"></div> diff --git a/src/client/scripts/room/room.ts b/src/client/scripts/room/room.ts index 45ccd59b70..8fe3ebdeb0 100644 --- a/src/client/scripts/room/room.ts +++ b/src/client/scripts/room/room.ts @@ -340,7 +340,7 @@ export class Room { @autobind private loadRoom() { const type = this.roomInfo.roomType; - new GLTFLoader().load(`/assets/room/rooms/${type}/${type}.glb`, gltf => { + new GLTFLoader().load(`/static-assets/room/rooms/${type}/${type}.glb`, gltf => { gltf.scene.traverse(child => { if (!(child instanceof THREE.Mesh)) return; @@ -375,7 +375,7 @@ export class Room { const def = furnitureDefs.find(d => d.id === furniture.type); return new Promise<GLTF>((res, rej) => { const loader = new GLTFLoader(); - loader.load(`/assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => { + loader.load(`/static-assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => { const model = gltf.scene; // Load animation diff --git a/src/client/scripts/sound.ts b/src/client/scripts/sound.ts index 176d2b68bf..bb4cfee06a 100644 --- a/src/client/scripts/sound.ts +++ b/src/client/scripts/sound.ts @@ -16,7 +16,7 @@ export function playFile(file: string, volume: number) { if (cache.has(file)) { audio = cache.get(file); } else { - audio = new Audio(`/assets/sounds/${file}.mp3`); + audio = new Audio(`/static-assets/sounds/${file}.mp3`); cache.set(file, audio); } audio.volume = masterVolume - ((1 - volume) * masterVolume); diff --git a/src/server/api/openapi/gen-spec.ts b/src/server/api/openapi/gen-spec.ts index 78e4810376..8fc634d69b 100644 --- a/src/server/api/openapi/gen-spec.ts +++ b/src/server/api/openapi/gen-spec.ts @@ -13,7 +13,7 @@ export function genOpenapiSpec(lang = 'ja-JP') { version: 'v1', title: 'Misskey API', description: getDescription(lang), - 'x-logo': { url: '/assets/api-doc.png' } + 'x-logo': { url: '/static-assets/api-doc.png' } }, externalDocs: { diff --git a/src/server/web/index.ts b/src/server/web/index.ts index a1d79100a6..27fa495f8d 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -28,7 +28,8 @@ const markdown = MarkdownIt({ html: true }); -const client = `${__dirname}/../../client/`; +const staticAssets = `${__dirname}/../../../assets/`; +const assets = `${__dirname}/../../assets/`; // Init app const app = new Koa(); @@ -57,24 +58,31 @@ const router = new Router(); //#region static assets +router.get('/static-assets/(.*)', async ctx => { + await send(ctx as any, ctx.path.replace('/static-assets/', ''), { + root: staticAssets, + maxage: ms('7 days'), + }); +}); + router.get('/assets/(.*)', async ctx => { - await send(ctx as any, ctx.path, { - root: client, + await send(ctx as any, ctx.path.replace('/assets/', ''), { + root: assets, maxage: ms('7 days'), }); }); // Apple touch icon router.get('/apple-touch-icon.png', async ctx => { - await send(ctx as any, '/assets/apple-touch-icon.png', { - root: client + await send(ctx as any, '/apple-touch-icon.png', { + root: assets }); }); // ServiceWorker router.get('/sw.js', async ctx => { - await send(ctx as any, `/assets/sw.${config.version}.js`, { - root: client + await send(ctx as any, `/sw.${config.version}.js`, { + root: assets }); }); @@ -82,8 +90,8 @@ router.get('/sw.js', async ctx => { router.get('/manifest.json', require('./manifest')); router.get('/robots.txt', async ctx => { - await send(ctx as any, '/assets/robots.txt', { - root: client + await send(ctx as any, '/robots.txt', { + root: assets }); }); @@ -91,8 +99,8 @@ router.get('/robots.txt', async ctx => { // Docs router.get('/api-doc', async ctx => { - await send(ctx as any, '/assets/redoc.html', { - root: client + await send(ctx as any, '/redoc.html', { + root: assets }); }); diff --git a/src/server/web/manifest.ts b/src/server/web/manifest.ts index 36c901d267..a1c937703b 100644 --- a/src/server/web/manifest.ts +++ b/src/server/web/manifest.ts @@ -1,5 +1,5 @@ import * as Koa from 'koa'; -import * as manifest from '../../client/assets/manifest.json'; +import * as manifest from '../../../src/client/assets/manifest.json'; import { fetchMeta } from '../../misc/fetch-meta'; module.exports = async (ctx: Koa.Context) => { diff --git a/src/server/web/views/info.pug b/src/server/web/views/info.pug index eed69fc99e..323dce974f 100644 --- a/src/server/web/views/info.pug +++ b/src/server/web/views/info.pug @@ -66,7 +66,7 @@ html main header h1 Misskey Version #{version} - img(src='/assets/misskey-php-like-logo.png' alt='') + img(src='/static-assets/misskey-php-like-logo.png' alt='') table tr th Instance diff --git a/src/services/send-email.ts b/src/services/send-email.ts index c716b36715..4814808392 100644 --- a/src/services/send-email.ts +++ b/src/services/send-email.ts @@ -8,7 +8,7 @@ export const logger = new Logger('email'); export async function sendEmail(to: string, subject: string, html: string, text: string) { const meta = await fetchMeta(true); - const iconUrl = `${config.url}/assets/mi-white.png`; + const iconUrl = `${config.url}/static-assets/mi-white.png`; const emailSettingUrl = `${config.url}/settings/email`; const enableAuth = meta.smtpUser != null && meta.smtpUser !== ''; diff --git a/webpack.config.ts b/webpack.config.ts index cc5264ceb1..c530cf335c 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -147,7 +147,7 @@ module.exports = { }), ], output: { - path: __dirname + '/built/client/assets', + path: __dirname + '/built/assets', filename: `[name].${meta.version}.js`, publicPath: `/assets/`, pathinfo: false, |