From c06043c8a96b38528adf2468a4d37bfca93bc3cf Mon Sep 17 00:00:00 2001
From: wangsq <358009775@qq.com>
Date: Sat, 9 Jan 2021 10:03:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=90=88=E5=B9=B6=EF=BC=8C=E5=BF=BD=E7=95=A5=E6=8E=89?=
 =?UTF-8?q?34=E7=BA=A7JOY?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_crazy_joy_coin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jd_crazy_joy_coin.js b/jd_crazy_joy_coin.js
index 25969487..4119d7c7 100644
--- a/jd_crazy_joy_coin.js
+++ b/jd_crazy_joy_coin.js
@@ -266,7 +266,7 @@ function checkCanMerge() {
   let obj = {};
   let canMerge = false;
   $.joyIds.forEach((vo, idx) => {
-    if (vo !== 0) {
+    if (vo !== 0 && vo !== 34) {
       if (obj[vo]) {
         obj[vo].push(idx)
         canMerge = true;