merge: upstream

2024-01-09 02:57:57 +01:00 · 2024-01-09 02:57:57 +01:00 · 7552cea69a
commit 7552cea69a
parent 94fee180b9 34088ecd27
413 changed files with 5517 additions and 2309 deletions
--- a/packages/frontend/assets/drop-and-fusion/bgm_1.mp3
+++ b/packages/frontend/assets/drop-and-fusion/bgm_1.mp3
--- a/packages/frontend/assets/drop-and-fusion/bubble2.mp3
+++ b/packages/frontend/assets/drop-and-fusion/bubble2.mp3
--- a/packages/frontend/assets/drop-and-fusion/cold_face.png
+++ b/packages/frontend/assets/drop-and-fusion/cold_face.png
--- a/packages/frontend/assets/drop-and-fusion/drop-arrow.svg
+++ b/packages/frontend/assets/drop-and-fusion/drop-arrow.svg
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 128 128" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <path d="M0,0L128,0L64,64L0,0Z" style="fill:rgb(255,61,0);"/>
+    <path d="M0,0L128,0L64,64L0,0ZM28.971,12L64,47.029C64,47.029 99.029,12 99.029,12L28.971,12Z" style="fill:rgb(255,122,0);"/>
+</svg>
--- a/packages/frontend/assets/drop-and-fusion/dropper.png
+++ b/packages/frontend/assets/drop-and-fusion/dropper.png
--- a/packages/frontend/assets/drop-and-fusion/exploding_head.png
+++ b/packages/frontend/assets/drop-and-fusion/exploding_head.png
--- a/packages/frontend/assets/drop-and-fusion/face_with_open_mouth.png
+++ b/packages/frontend/assets/drop-and-fusion/face_with_open_mouth.png
--- a/packages/frontend/assets/drop-and-fusion/face_with_symbols_on_mouth.png
+++ b/packages/frontend/assets/drop-and-fusion/face_with_symbols_on_mouth.png
--- a/packages/frontend/assets/drop-and-fusion/frame-dark.svg
+++ b/packages/frontend/assets/drop-and-fusion/frame-dark.svg
--- a/packages/frontend/assets/drop-and-fusion/frame-light.svg
+++ b/packages/frontend/assets/drop-and-fusion/frame-light.svg
--- a/packages/frontend/assets/drop-and-fusion/gameover.png
+++ b/packages/frontend/assets/drop-and-fusion/gameover.png
--- a/packages/frontend/assets/drop-and-fusion/grinning_squinting_face.png
+++ b/packages/frontend/assets/drop-and-fusion/grinning_squinting_face.png
--- a/packages/frontend/assets/drop-and-fusion/heart_suit.png
+++ b/packages/frontend/assets/drop-and-fusion/heart_suit.png
--- a/packages/frontend/assets/drop-and-fusion/keycap_1.png
+++ b/packages/frontend/assets/drop-and-fusion/keycap_1.png
--- a/packages/frontend/assets/drop-and-fusion/keycap_10.png
+++ b/packages/frontend/assets/drop-and-fusion/keycap_10.png
--- a/packages/frontend/assets/drop-and-fusion/keycap_2.png
+++ b/packages/frontend/assets/drop-and-fusion/keycap_2.png
--- a/packages/frontend/assets/drop-and-fusion/keycap_3.png
+++ b/packages/frontend/assets/drop-and-fusion/keycap_3.png
--- a/packages/frontend/assets/drop-and-fusion/keycap_4.png
+++ b/packages/frontend/assets/drop-and-fusion/keycap_4.png
--- a/packages/frontend/assets/drop-and-fusion/keycap_5.png
+++ b/packages/frontend/assets/drop-and-fusion/keycap_5.png
--- a/packages/frontend/assets/drop-and-fusion/keycap_6.png
+++ b/packages/frontend/assets/drop-and-fusion/keycap_6.png
--- a/packages/frontend/assets/drop-and-fusion/keycap_7.png
+++ b/packages/frontend/assets/drop-and-fusion/keycap_7.png
--- a/packages/frontend/assets/drop-and-fusion/keycap_8.png
+++ b/packages/frontend/assets/drop-and-fusion/keycap_8.png
--- a/packages/frontend/assets/drop-and-fusion/keycap_9.png
+++ b/packages/frontend/assets/drop-and-fusion/keycap_9.png
--- a/packages/frontend/assets/drop-and-fusion/logo.png
+++ b/packages/frontend/assets/drop-and-fusion/logo.png
--- a/packages/frontend/assets/drop-and-fusion/pleading_face.png
+++ b/packages/frontend/assets/drop-and-fusion/pleading_face.png
--- a/packages/frontend/assets/drop-and-fusion/poi1.mp3
+++ b/packages/frontend/assets/drop-and-fusion/poi1.mp3
--- a/packages/frontend/assets/drop-and-fusion/poi2.mp3
+++ b/packages/frontend/assets/drop-and-fusion/poi2.mp3
--- a/packages/frontend/assets/drop-and-fusion/smiling_face_with_hearts.png
+++ b/packages/frontend/assets/drop-and-fusion/smiling_face_with_hearts.png
--- a/packages/frontend/assets/drop-and-fusion/smiling_face_with_sunglasses.png
+++ b/packages/frontend/assets/drop-and-fusion/smiling_face_with_sunglasses.png
--- a/packages/frontend/assets/drop-and-fusion/zany_face.png
+++ b/packages/frontend/assets/drop-and-fusion/zany_face.png