From d4337a5f32fad30a0c68a97ca05ada9bf137526e Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sat, 24 Nov 2018 17:53:50 +0800
Subject: [PATCH] Fix Compress Bug & Error Message

---
 libs/events.js              |   2 +-
 libs/ui.js                  |  14 +++++++-------
 常用工具/JS代码压缩工具.exe | Bin 8192 -> 8704 bytes
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libs/events.js b/libs/events.js
index 72d6eacd..5a688f59 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -919,7 +919,7 @@ events.prototype.doAction = function() {
         case "switch": // 条件选择
             var key = core.calValue(data.condition)
             for (var i = 0; i < data.caseList.length; i++) {
-                if (data.caseList[i].case=="default" || core.calValue(data.caseList[i].case) == key) {
+                if (data.caseList[i]["case"]=="default" || core.calValue(data.caseList[i]["case"]) == key) {
                     core.events.insertAction(data.caseList[i].action);
                     break;
                 }
diff --git a/libs/ui.js b/libs/ui.js
index a9ad53e9..ecf31465 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -534,17 +534,17 @@ ui.prototype.drawTextBox = function(content, showAll) {
         }
 
         // get next character
-        var char = content.charAt(index++);
+        var ch = content.charAt(index++);
         // \n, \\n
-        if (char == '\n' || (char=='\\' && content.charAt(index)=='n')) {
+        if (ch == '\n' || (ch=='\\' && content.charAt(index)=='n')) {
             offsetx = content_left;
             offsety += textfont+5;
-            if (char=='\\') index++;
+            if (ch=='\\') index++;
             return drawNext();
         }
         // \r, \\r
-        if (char == '\r' || (char=='\\' && content.charAt(index)=='r')) {
-            if (char == '\\') index++;
+        if (ch == '\r' || (ch=='\\' && content.charAt(index)=='r')) {
+            if (ch == '\\') index++;
             changed = true;
             // 检查是不是 []
             var index2;
@@ -559,7 +559,7 @@ ui.prototype.drawTextBox = function(content, showAll) {
             return drawNext();
         }
         // 检查是不是自动换行
-        var charwidth = core.canvas.ui.measureText(char).width;
+        var charwidth = core.canvas.ui.measureText(ch).width;
         if (offsetx + charwidth > content_left + validWidth) {
             index--;
             offsetx = content_left;
@@ -567,7 +567,7 @@ ui.prototype.drawTextBox = function(content, showAll) {
             return drawNext();
         }
         // 输出
-        core.fillText('ui', char, offsetx, offsety);
+        core.fillText('ui', ch, offsetx, offsety);
         offsetx += charwidth;
         return true;
     };
diff --git a/常用工具/JS代码压缩工具.exe b/常用工具/JS代码压缩工具.exe
index 318afa287a52ed65a2d97bd5f5e4b98a7b1a33db..f0447910ce05278399e12b4108804b690f96fad3 100644
GIT binary patch
delta 1977
zcmZWqYitx%6h1Svv#++(Jv-akXLo12eJoIDg<z|QG-(MEpgh*{s#t2-kOt_~+ctq1
zSd=s|0zz{kC<Y@$62%{y)W;7)B+)-=Vj%cKL#V`%DE^T|)JOz8cV>syGRZyjoo~*)
z_nhy{ojKTXu<Q7%b<y-cy->bxfGkx=6#y|J{0{ki+r)*9TBr?Rl^{9*wyP6ay>dH1
zCHX%r21xO&+|0K~O~D;eqD&ew{+cvTO7KsmCduSeQk~gBD~RhE8ZxNhZvwci0Z8Q2
z@bVXpR=!U5$g914qr6N0S><2K1A#ckjZE_yjPn*HS(PyKWP1gLV*-<Wld|FQ6s8Pz
z3t;#hrlJ@i8)NqzH*UKL_M_wGvjD+7l9}4ae^Rm~)*`_$R$BE$9Z6Fbgd1kyMiEb0
z2J?9`Q+d5AQ<<+Lhyj)qQ>!dPJk1Fs)^*|llhMt35|fyCeQ?=t_a8j)HK)9+k7ne<
zVzxhT(v4+a7L1t3zI9PV*L+Vj%OpO#$JcneOSM>QmtSj9f<fKKYGrp)iOSNe(Wj>k
zJ=4Blh?2(4X+7j+izx_0><UHXGc+$>BPJty5Uscas}b#N^y-J<LMJ<%9*GQ-M<cX{
zq?>3OYy~ZO4$UZr$i`T|<Hl{*mDrq?n06nh5Ni&t)4T(b9TQ%Hyi9Pjt`c#Uc0<)l
zigdh)sG=9uEmn$rcAlOwQ6E3(NtUvhwKd2(8fa7d^sw8Bkkg6qtWG$s4bNz8ct&f(
z)+4ReXDz5tFWB?H-e#z`8O&gsdb^i;>t*MuGN-ZCPGheM!tU!F#YMd?LT!G(pN%NI
z+p}hO9oE^E)s-u=Yt|#a`98*J!aS8(B!XUpnw~TC`t}=iRxpS4r*#7(=%EIQ{xo2N
z;XQ{9QLG^wV`pe8fjAmu6ZTs`fZz7klp<)b4@D~CMYMAyF{5tnh9hQlx^|}w`<z5)
zh#8$BX7o`pW3v{FxeJzN9h7<!vmWa)M`G4IAThCqT@>kwBZU!1&TB*vFL}zmlT%i>
zw#bEt=!=JFiRwOm-$i-)H1!1==SrJNL|6v;28a?x$L2naAClJBy7+rZgcARi{P*Wd
znI~N7Df6njwNEYcgg;VkJ}u|x^4q@r(wlUAa|Zy{DFC-=<O-u~aA@a<*tWw5a7iVu
zrvOj|5F#$OqGx3n-9zMG;ywPREFE?FL^^}=fVnj2OX+?pLE&fop9C~Gp^PhD_>8X&
z%$K2w9|+tm-GcX&!*B~O+V(r;X?PP3$;ZfES5CoM_*Hoe0<fAkUH}zvovaQG(gH|A
z8`+#~=h=3V%`bta#CO_E!M457L(DEHksW~}WM6`lWDmjH(mVX?;IfcNSq$eIS0+6b
zN0m*>2ln(A2H4>6=z{L$&%(63eD6SUcy!Pjf}O?DzSV<6#qO~^FBBQ992#A;&?Y;r
z-D7)(%Cs9*u*TRxaq_s<DYdrrQcZ&}1Vu0@pH|pU_fD{2x9vYh{x*2h#tR9<<kjka
zPw3RmIrr9ITebG^8+Wg~JMhXkyeo2~-2}f6Jd&15rKow5$CPC4DPN-|YvFC-qTgSu
zi7Px7-ew~KY@h!Xx!(fd{!T^zQWC%&`aj;G_i00+tMFXozgu&$o!uw?xcujZkq>_H
tOlA$A6mD;GwF2lC*qq23az`8A8vU5J%I2gNyQ|9E+a@vnyEM`2`ww0MXXF3?

delta 1504
zcmZ`(U1%It6h1RM`<va#p1qry+5bP&4B1V8O^KG0kOcf|CC!@JR)Q%}ODye%8+}lr
z8;Av?t;u?QuoWwff}j<YRVj)>(H9jT`Xp6}KKP<2wJ3;Uvz|M%8=o9F-<<Q!IrpCX
z-8*-2d~sy;nc^4uua7|c`2kd=OX&hIhzPjkslmpZ2X%W8pel(GfEjP2z``>CVTym-
z1&|g6wIU8HeW9m&h{}^0;#sAvSmFbvPsxgPrI??g5#)0xnF?O`qZi<x2!KK{nNJ+B
zwu=c>QxAK^LG`$LT@#<Gvq1w5BUgC^4YAFWikJqohCZYUG|>|GdnR`$Fk$eY0Or>)
zVPcTb;y2we;e<(k%?<4WK*&adbz6MzDeSjzkv^bh9%2?+Xg)tTyr<P_`73E3-=@I4
z9is#c*m-*K1Co%{{N;`pXA%Ex-%|4d{*}0(-CIv$(rGqX%Tglq^ItouyiQFp9sMk2
zu=G%ciZF%g^Q_y)y(-LOH@`|5c8=<75;4T0sA060a9tgvPBTp3OqZ*2(&>|IFm*OQ
zM@q5`W(;o9kZYJRv76B1JKQkggdIUL{|Q2~Pf<#Zwj@+}2&4Q#86_#og$^+<5f^DT
z^wv_c9Un%;N7{~h7PHQ3v+imm>o&t&*e+5I4Va>(Bi867h3t|9sa;3%G)bPuG^R-M
z&o^2vAAg)?boJI<y<d}rqxWB%UfI*;Ffwpd3-B?Icvah9&tcAKB-d`l6+7l1@bg)!
zD0_KLs?RXO@&+pmt;hqE$HI9Q#~5m)oD{BzMZ>p-MH3mJ#ZOQvISGstCY|je#}!TP
zkh3?k<$8$4FwX0;IeB8*XN>i9#E83M^!$$)1rnox1<aEekI?z^A>(J|U{W@WxpKTk
z1o2lpyerKO8P*+@N?KbRzOw0cc{|(_9nUst&@KI>fO0DV3<H}4lSn#|8*q9_kqP84
zsDD1{Y5TL<k&iXU&#Lwos_!4I-aV=~zb@SZq9<tXy`%z^P61dRfS1Th)yMeU$zuz0
zj(2<jt6t)!sxU&AMwGbH9aDFW(|dyAOJXkAS4dMtgE&SF08Iosne?Tp;@#l;f`|Im
zUwXxb(2vK?!D-KPa1mBLD-eWzH0)OBf-eafFl8&GpqH@ZVA;W44!;M=#E&^l)xif~
zjF{taf^Y$zBzy{%2$$fD@}f|}!_E7`%bw<7bW~}+fk(BdhF4zCzI|i-@;A#b+%xfe
zMOele>Q~Y7imLDSmvmK+O~)P%1TwmOV$;q$Hch_x&e#~}T)J|-X<A&E_99Hb%4BuC
z`q|E#JAdBW*mwELCym^-<(97*wET)b(Y`;a0!|K!Y$6%zT&V!!_QZQlJ^8m+T^wv;
K{<_lG?*A8KTn94%