From d46a8c8b988764c869efaa91b4e3cfecf5a89fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com>
Date: Tue, 18 Mar 2025 21:55:57 +0800
Subject: [PATCH] =?UTF-8?q?Update:=20=E8=B0=83=E6=95=B4blockly=E7=9A=84med?=
 =?UTF-8?q?ia=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/blockly.css                        |   8 +-
 common/media/blockly/1x1.gif                  | Bin 0 -> 43 bytes
 common/media/{ => blockly}/click.mp3          | Bin
 common/media/{ => blockly}/click.ogg          | Bin
 common/media/{ => blockly}/click.wav          | Bin
 common/media/{ => blockly}/delete-icon.svg    |   0
 common/media/{ => blockly}/delete.mp3         | Bin
 common/media/{ => blockly}/delete.ogg         | Bin
 common/media/{ => blockly}/delete.wav         | Bin
 common/media/{ => blockly}/disconnect.mp3     | Bin
 common/media/{ => blockly}/disconnect.ogg     | Bin
 common/media/{ => blockly}/disconnect.wav     | Bin
 common/media/blockly/dropdown-arrow.svg       |   1 +
 common/media/{ => blockly}/foldout-icon.svg   |   0
 common/media/{ => blockly}/handclosed.cur     | Bin
 common/media/{ => blockly}/handdelete.cur     | Bin
 common/media/{ => blockly}/handopen.cur       | Bin
 common/media/blockly/pilcrow.png              | Bin 0 -> 1010 bytes
 common/media/blockly/quote0.png               | Bin 0 -> 771 bytes
 common/media/blockly/quote1.png               | Bin 0 -> 738 bytes
 common/media/{ => blockly}/resize-handle.svg  |   0
 common/media/{ => blockly}/sprites.png        | Bin
 common/media/blockly/sprites.svg              |  74 ++++++++++++++++++
 .../mixly-modules/common/editor-blockly.js    |   2 +-
 24 files changed, 80 insertions(+), 5 deletions(-)
 create mode 100644 common/media/blockly/1x1.gif
 rename common/media/{ => blockly}/click.mp3 (100%)
 rename common/media/{ => blockly}/click.ogg (100%)
 rename common/media/{ => blockly}/click.wav (100%)
 rename common/media/{ => blockly}/delete-icon.svg (100%)
 rename common/media/{ => blockly}/delete.mp3 (100%)
 rename common/media/{ => blockly}/delete.ogg (100%)
 rename common/media/{ => blockly}/delete.wav (100%)
 rename common/media/{ => blockly}/disconnect.mp3 (100%)
 rename common/media/{ => blockly}/disconnect.ogg (100%)
 rename common/media/{ => blockly}/disconnect.wav (100%)
 create mode 100644 common/media/blockly/dropdown-arrow.svg
 rename common/media/{ => blockly}/foldout-icon.svg (100%)
 rename common/media/{ => blockly}/handclosed.cur (100%)
 rename common/media/{ => blockly}/handdelete.cur (100%)
 rename common/media/{ => blockly}/handopen.cur (100%)
 create mode 100644 common/media/blockly/pilcrow.png
 create mode 100644 common/media/blockly/quote0.png
 create mode 100644 common/media/blockly/quote1.png
 rename common/media/{ => blockly}/resize-handle.svg (100%)
 rename common/media/{ => blockly}/sprites.png (100%)
 create mode 100644 common/media/blockly/sprites.svg

diff --git a/common/css/blockly.css b/common/css/blockly.css
index e4aa3b1e..fbbcd40f 100644
--- a/common/css/blockly.css
+++ b/common/css/blockly.css
@@ -117,25 +117,25 @@
 
 .classic-theme .blocklyTreeRow.blocklyTreeSelected .blocklyTreeIcon.blocklyTreeIconOpen,
 .dark-theme .blocklyTreeRow .blocklyTreeIcon.blocklyTreeIconOpen {
-    background-image: url('../../common/media/sprites.png') !important;
+    background-image: url('../../common/media/blockly/sprites.svg') !important;
     background-position: -16px -17px !important;
 }
 
 .classic-theme .blocklyTreeRow.blocklyTreeSelected .blocklyTreeIcon.blocklyTreeIconClosed,
 .dark-theme .blocklyTreeRow .blocklyTreeIcon.blocklyTreeIconClosed {
-    background-image: url('../../common/media/sprites.png') !important;
+    background-image: url('../../common/media/blockly/sprites.svg') !important;
     background-position: -32px -17px !important;
 }
 
 .classic-theme .blocklyTreeRow .blocklyTreeIcon.blocklyTreeIconOpen,
 .dark-theme .blocklyTreeRow.blocklyTreeSelected .blocklyTreeIcon.blocklyTreeIconOpen {
-    background-image: url('../../common/media/sprites.png') !important;
+    background-image: url('../../common/media/blockly/sprites.svg') !important;
     background-position: -16px -1px !important;
 }
 
 .classic-theme .blocklyTreeRow .blocklyTreeIcon.blocklyTreeIconClosed,
 .dark-theme .blocklyTreeRow.blocklyTreeSelected .blocklyTreeIcon.blocklyTreeIconClosed {
-    background-image: url('../../common/media/sprites.png') !important;
+    background-image: url('../../common/media/blockly/sprites.svg') !important;
     background-position: -32px -1px !important;
 }
 
diff --git a/common/media/blockly/1x1.gif b/common/media/blockly/1x1.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3085511236caea65b69ad30a68979c9b95f4a425
GIT binary patch
literal 43
qcmZ?wbhEHbWMp7uXkY+=|Ns9h{$$}~01D`U_#hbuCMF+725SJojRy(<

literal 0
HcmV?d00001

diff --git a/common/media/click.mp3 b/common/media/blockly/click.mp3
similarity index 100%
rename from common/media/click.mp3
rename to common/media/blockly/click.mp3
diff --git a/common/media/click.ogg b/common/media/blockly/click.ogg
similarity index 100%
rename from common/media/click.ogg
rename to common/media/blockly/click.ogg
diff --git a/common/media/click.wav b/common/media/blockly/click.wav
similarity index 100%
rename from common/media/click.wav
rename to common/media/blockly/click.wav
diff --git a/common/media/delete-icon.svg b/common/media/blockly/delete-icon.svg
similarity index 100%
rename from common/media/delete-icon.svg
rename to common/media/blockly/delete-icon.svg
diff --git a/common/media/delete.mp3 b/common/media/blockly/delete.mp3
similarity index 100%
rename from common/media/delete.mp3
rename to common/media/blockly/delete.mp3
diff --git a/common/media/delete.ogg b/common/media/blockly/delete.ogg
similarity index 100%
rename from common/media/delete.ogg
rename to common/media/blockly/delete.ogg
diff --git a/common/media/delete.wav b/common/media/blockly/delete.wav
similarity index 100%
rename from common/media/delete.wav
rename to common/media/blockly/delete.wav
diff --git a/common/media/disconnect.mp3 b/common/media/blockly/disconnect.mp3
similarity index 100%
rename from common/media/disconnect.mp3
rename to common/media/blockly/disconnect.mp3
diff --git a/common/media/disconnect.ogg b/common/media/blockly/disconnect.ogg
similarity index 100%
rename from common/media/disconnect.ogg
rename to common/media/blockly/disconnect.ogg
diff --git a/common/media/disconnect.wav b/common/media/blockly/disconnect.wav
similarity index 100%
rename from common/media/disconnect.wav
rename to common/media/blockly/disconnect.wav
diff --git a/common/media/blockly/dropdown-arrow.svg b/common/media/blockly/dropdown-arrow.svg
new file mode 100644
index 00000000..4e6ce19e
--- /dev/null
+++ b/common/media/blockly/dropdown-arrow.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="12.71" height="8.79" viewBox="0 0 12.71 8.79"><title>dropdown-arrow</title><g opacity="0.1"><path d="M12.71,2.44A2.41,2.41,0,0,1,12,4.16L8.08,8.08a2.45,2.45,0,0,1-3.45,0L0.72,4.16A2.42,2.42,0,0,1,0,2.44,2.48,2.48,0,0,1,.71.71C1,0.47,1.43,0,6.36,0S11.75,0.46,12,.71A2.44,2.44,0,0,1,12.71,2.44Z" fill="#231f20"/></g><path d="M6.36,7.79a1.43,1.43,0,0,1-1-.42L1.42,3.45a1.44,1.44,0,0,1,0-2c0.56-.56,9.31-0.56,9.87,0a1.44,1.44,0,0,1,0,2L7.37,7.37A1.43,1.43,0,0,1,6.36,7.79Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/common/media/foldout-icon.svg b/common/media/blockly/foldout-icon.svg
similarity index 100%
rename from common/media/foldout-icon.svg
rename to common/media/blockly/foldout-icon.svg
diff --git a/common/media/handclosed.cur b/common/media/blockly/handclosed.cur
similarity index 100%
rename from common/media/handclosed.cur
rename to common/media/blockly/handclosed.cur
diff --git a/common/media/handdelete.cur b/common/media/blockly/handdelete.cur
similarity index 100%
rename from common/media/handdelete.cur
rename to common/media/blockly/handdelete.cur
diff --git a/common/media/handopen.cur b/common/media/blockly/handopen.cur
similarity index 100%
rename from common/media/handopen.cur
rename to common/media/blockly/handopen.cur
diff --git a/common/media/blockly/pilcrow.png b/common/media/blockly/pilcrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f224c35868a35f31f5f836943ac03ef951bbfa2d
GIT binary patch
literal 1010
zcmV<O0}cF%P)<h;3K|Lk000e1NJLTq001li002G+1^@s6P@4IX00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGxhX4Q_hXIe}@nrx202p*dSaefwW^{L9
za%BK;VQFr3E^cLXAT%y9E;jv63FrU-17k@<K~!i%?V8<-4PhL|cdd78BcyG^1y-`T
zK&h2*<)wA!LTPW5+~7+27laT=Ucw>~NpgWidAYDCB{xzCg$v62`}%y(^E=vS&YW}R
zIA_L8olku(cINkc=DV|JXP$Y^G}Nh61N!><ny?i+Z~-niyKo6E#JSjxV{m}AmWA3D
zoPjH_+csAQjg2@BH{n(MfWOUR<oC<(_yX_aZM=!s@Dkp@2lyO6;xEjPtG+giQ67pF
zbT(c_4U{ymaiqm54TVE+EB?U$!87c%IHjR*FrHJ_KcHVwADOSYpM1VxsT1%GdvPN+
zTb$BRsE>ipY&rB1d5HUQ4bI2$I282@AHyK}XVm^?T%-*F?qH)ui3Sa`u+&-jj0bVL
zwS>a{9u)_eXS=n3rrYGvYrCUE(?!=C$~~N7r6r**{=hU$!eUp0yVzo-WuZ2a!0TLJ
z0iUql$|6C1B7u*(z5;rzBr@u8tsXTG{K)kcu-Hl>Lr)@s-@87KpE%k|B12ESfhpGY
zG3;Xh#!4!JzSsi~$FRVUt)wF8i#@RJaGEUzd1)mTL0=-D;U})oL-+S+_w|0zlStr`
zuFper(`8l?8F~^4yx#Q{p!sm*rv^cNB7rAkezxBq-L6+#StO{BKd_+bit8;vSCCa0
zY5GT9Vu3rc*z{6o|2R&>lEK-ZSYTb=cIDcOqqBV;b;c*)Kx_XC+mZ<^Xw>uEh1?M3
z(Pi%y>IrxU>dAU7-oha91Qs;wR(&KlOzns-a2^KHg2vO_aMcrkV8KAcup6&q*zG$i
z$pr2XgO0<cxEar&9-Xv?phb_jn193%yPhW>I1COn2=!MOfm$0Ig(ombIs%8m!4J6%
z9;ps|z-91Ab>Mw2gGZ_Z?{yhGQXP1Y%ixjfz`I=rk5mWV=`whvI`DRv!6Vgyx48@+
zsSdowW$;LKV9hmx)X#9u;NY423}@~tk-6(|=I(Tvn@ePFwwAg1aOR#kGWSdu`sKLo
z*8VwelZU<<uI$V4YS6(@ufH5dy=o9dD@a;<)9VFct4UflJ%t@MWPEUtsd(BBS}htw
ztDmhld~IRi4H$MttK}Vb*<oq}1Fp;s9UuC3cB~z)dKjz?H8a!Floq*b<yq8=BzoJW
g$qrYij!#3wAF_|R%?%z7a{vGU07*qoM6N<$g0mCX%m4rY

literal 0
HcmV?d00001

diff --git a/common/media/blockly/quote0.png b/common/media/blockly/quote0.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7820d6077e6d346b9015c22996745fbc4586fd4
GIT binary patch
literal 771
zcmeAS@N?(olHy`uVBq!ia0vp^IzX(#!2%>B?g=~xQY`6?zK#qG8~eHcB(eheOiAAE
zE)4(M`_JqL@;D1TB8wRqxP?KOkzv*x37{Z*iKnkC`y)<qVJU<ALZ=jfnv^_U978;g
z@11tmd#a<zG4`D$+OOJbXOup5Qt_1X>ekTZU8^Ck)Z(J+#Hpl_C8`@E!djcq-Ly@x
zBTzylkXvz~n63)P!qy8)8Rakc|JeFrpULw(GmRfFOaJ>g@m}$>%6o-+icyuvlA~g#
z-8f+KK4L!G`48+3ha<QB{lk)Q=UCb2E~oCCb3ZmYo!)ZvAm<XjncI~Ah<#aX5SAEr
z^O|JetZ6&jueAz9q<SWn-$?372)yWjLy+nFC+CFwFAUu-tmE5w$U)-H^&8m>v)4p7
zzhyRSJ2=bg?S!2ha%)7txbUp$$h`W}H23r#(QStdzbxEfJ7dT8@RqkLEi4oc2y@<E
z=cW{1YR4D$<4xmt;cZ1c>w8&^UpAiJqTb`*wXihmckC(N^~E_!2Ny5bExE#6ALuRd
zy)(Du_(8FG)eqW3W)~e^y#L7IcQ=lf^Y5Ly=2L%Cq3Y=y=Wj<G+M(rCf7OY9Wz(GG
zzRG7iPk(&2@xsES_zT8!!h8=36kfH|{$Kv;_ZGFi*11y5dp@4`jSi0Xu3cn$T|&=2
zT_$K^G+)P^_AO4PR*xs_Dqgm2)#7Xm!<aMf=PSQgD0;^8r`~s(TRbJ?VDuKPw-c7_
z`P%zjx?J_Td6vtPNb~=q-+!~*Qg`~K<j8+4X|3t%OV?M*g#>Mq@3mx?nq_!+$Msi{
z_qVCPzL>Gs^~U+0L-RJ--s&>VTfKC@$v?X(HxCQ4NiLkf_T=)i&OWx<p1JSpU+90R
z_~v?V>7p;d1f*Kx8c~vxSdwa$T$Bo=7>o=IEp!bmb&ZTe3@xpU%&bf-v<(cb3=AX=
gELw!3AvZrIGp!Q0hRnHAazG6Xp00i_>zopr0ACYJfB*mh

literal 0
HcmV?d00001

diff --git a/common/media/blockly/quote1.png b/common/media/blockly/quote1.png
new file mode 100644
index 0000000000000000000000000000000000000000..826583e0ad72dd1424a2ffe9e21a8b653b596058
GIT binary patch
literal 738
zcmV<80v-K{P)<h;3K|Lk000e1NJLTq001li001Ni1ONa4Sl$rl00002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru-vtU49yW>hppyUq0&_`3K~zY`
zwU*CIR8bVizi%)dr%W2FnSNk}mX$CPQd80l=@=9tO1LP9gf>Aze?W_ZAd3nT+6Pk9
zB8q4gJZRIxeo$192pP3d(M`3B=|$fbGxNOndG9^1MQ3#neBSq+d(J)QUf@5Or#j4F
zE9wy-zzpWS-|kPDMh6-ZAix6Vys`~z<z1>a&kJm|imv7ub-TtLCa_4e4I5=UIc=oR
zMZp~HHelG>w3R-sf=NDc2!CO_CY#_mUAB7>EzoVZHQ_FSe#`~{NC3zSC#Rbm6>q&j
z@5Sbta9Kce=vKUpKxc5ECM?@Y)`jaPksjiTxWXwc3)c%Gy#>t`;U6*3bhw@s=`#LQ
zgx|zK7hC@;CdDkb013dG#HfHafZ=eN#h56ZuI2a!d?)%Hf#Ti4gV;lk^&D{=`uAKH
z>As_!bMQrNY%+xcO4tP87l0Fr(gz&zW+I^^kw+i4SLqVeU+?i=+xKuriC~HwgdGn=
z_h&iBtV2O@KjE8@OLZ0puFhMItm66JPiMSI>{r}(jwa$xtr%TGBJ>G;*cI`RvVMxs
zLL&On7Or35l|6!X?J)HV@n-o}p+{V2`o01_tPF04@MVR5#+7#Pn08lp2(l%u8a;OK
zp!ISz(Yv&yU9p3`nyiop<}_K~ng$MQvd`J#lr2W)iTQcM6h}31f?4O#I;+uB+-3%Q
z`0*cPJNYsaZJP;O!<&(@=W~@+w3!zp^n`Il@%WNyddXfg_AZ&j<Cc=~YUDxH=PcN%
zIFH5(x>jk(TlN%G=_dLieUI)}5eKVv-52W;%U3({kc=kzi09cD^L9+|y1X;sFF|f&
UTm9BGZ2$lO07*qoM6N<$g0UG+&Hw-a

literal 0
HcmV?d00001

diff --git a/common/media/resize-handle.svg b/common/media/blockly/resize-handle.svg
similarity index 100%
rename from common/media/resize-handle.svg
rename to common/media/blockly/resize-handle.svg
diff --git a/common/media/sprites.png b/common/media/blockly/sprites.png
similarity index 100%
rename from common/media/sprites.png
rename to common/media/blockly/sprites.png
diff --git a/common/media/blockly/sprites.svg b/common/media/blockly/sprites.svg
new file mode 100644
index 00000000..3f09ef3a
--- /dev/null
+++ b/common/media/blockly/sprites.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="96px" height="124px">
+  <style type="text/css">
+#background {
+  fill: none;
+}
+.arrows {
+  fill: #000;
+  stroke: none;
+}
+.selected>.arrows {
+  fill: #fff;
+}
+.checkmark {
+  fill: #000;
+  font-family: sans-serif;
+  font-size: 10pt;
+  text-anchor: middle;
+}
+.trash {
+  fill: #888;
+}
+.zoom {
+  fill: none;
+  stroke: #888;
+  stroke-width: 2;
+  stroke-linecap: round;
+}
+.zoom>.center {
+  fill: #888;
+  stroke-width: 0;
+}
+  </style>
+  <rect id="background" width="96" height="124" x="0" y="0" />
+
+  <g>
+    <path class="arrows" d="M 13,1.5 13,14.5 1.74,8 z" />
+    <path class="arrows" d="M 17.5,3 30.5,3 24,14.26 z" />
+    <path class="arrows" d="M 35,1.5 35,14.5 46.26,8 z" />
+  </g>
+  <g class="selected" transform="translate(0, 16)">
+    <path class="arrows" d="M 13,1.5 13,14.5 1.74,8 z" />
+    <path class="arrows" d="M 17.5,3 30.5,3 24,14.26 z" />
+    <path class="arrows" d="M 35,1.5 35,14.5 46.26,8 z" />
+  </g>
+
+  <text class="checkmark" x="55.5" y="28">&#10003;</text>
+
+  <g class="trash">
+    <path d="M 2,41 v 6 h 42 v -6 h -10.5 l -3,-3 h -15 l -3,3 z" />
+    <rect width="36" height="20" x="5" y="50" />
+    <rect width="36" height="42" x="5" y="50" rx="4" ry="4" />
+  </g>
+
+  <g class="zoom">
+    <circle r="11.5" cx="16" cy="108" />
+    <circle r="4.3" cx="16" cy="108" class="center" />
+    <path d="m 28,108 h3" />
+    <path d="m 1,108 h3" />
+    <path d="m 16,120 v3" />
+    <path d="m 16,93 v3" />
+  </g>
+
+  <g class="zoom">
+    <circle r="15" cx="48" cy="108" />
+    <path d="m 48,101.6 v12.8" />
+    <path d="m 41.6,108 h12.8" />
+  </g>
+
+  <g class="zoom">
+    <circle r="15" cx="80" cy="108" />
+    <path d="m 73.6,108 h12.8" />
+  </g>
+</svg>
diff --git a/common/modules/mixly-modules/common/editor-blockly.js b/common/modules/mixly-modules/common/editor-blockly.js
index a8c7c552..f076d7ed 100644
--- a/common/modules/mixly-modules/common/editor-blockly.js
+++ b/common/modules/mixly-modules/common/editor-blockly.js
@@ -59,7 +59,7 @@ class EditorBlockly extends EditorBase {
         this.workspace = null;
         this.initBlockly = () => {
             const DEFAULT_CATEGORIES = HTMLTemplate.get('xml/default-categories.xml').render();
-            const media = path.join(Env.srcDirPath, 'common/media/');
+            const media = path.join(Env.srcDirPath, 'common/media/blockly');
             const renderer = ['geras', 'zelos'].includes(USER.blockRenderer) ? USER.blockRenderer : 'geras';
             this.editor = Blockly.inject(this.$blockly[0], {
                 media,