From b46d8de73a73834c06e2a98fc6a719a7fb6e0059 Mon Sep 17 00:00:00 2001
From: Fang <ky_fang@juzugame.com>
Date: Tue, 25 Jul 2023 15:50:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=96=E5=8A=B1=E7=95=8C=E9=9D=A2=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/global/global_func.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua
index fef8def8..cf666a8e 100644
--- a/lua/app/global/global_func.lua
+++ b/lua/app/global/global_func.lua
@@ -703,7 +703,7 @@ function GFunc.showRewardBox(rewards, extParams, callback)
 	local params = extParams or {}
 	local newRewards = {}
 	if not params.noMerge then
-		GFunc.mergeRewards2(rewards, newRewards)
+		GFunc.mergeRewards2(rewards, newRewards, true)
 	else
 		newRewards = rewards
 	end