From 28b04f27eefeb92d8534feb8c6e55d64546e53bb Mon Sep 17 00:00:00 2001
From: John Smith <xfgryujk@126.com>
Date: Sat, 29 Aug 2020 14:27:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=80=E4=BA=9B=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/config.js                    | 2 +-
 frontend/src/views/StyleGenerator/stylegen.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/api/config.js b/frontend/src/api/config.js
index 96c1c7e..a4a44a2 100644
--- a/frontend/src/api/config.js
+++ b/frontend/src/api/config.js
@@ -5,7 +5,7 @@ export const DEFAULT_CONFIG = {
   showDanmaku: true,
   showGift: true,
   showGiftName: false,
-  mergeSimilarDanmaku: true,
+  mergeSimilarDanmaku: false,
   mergeGift: true,
   maxNumber: 60,
 
diff --git a/frontend/src/views/StyleGenerator/stylegen.js b/frontend/src/views/StyleGenerator/stylegen.js
index 5e96ab0..9af3482 100644
--- a/frontend/src/views/StyleGenerator/stylegen.js
+++ b/frontend/src/views/StyleGenerator/stylegen.js
@@ -17,7 +17,7 @@ export const DEFAULT_CONFIG = {
   ownerUserNameColor: '#ffd600',
   moderatorUserNameColor: '#5e84f1',
   memberUserNameColor: '#0f9d58',
-  showBadges: false,
+  showBadges: true,
   showColon: true,
 
   messageFont: 'Imprima',