From 36b340003a255aa7d09500a62938ffe672d91dc7 Mon Sep 17 00:00:00 2001 From: Fang Date: Fri, 16 Jun 2023 10:22:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E5=86=92=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/dungeon/dungeon_difficulty_ui.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua index f9ee43f2..3d05b949 100644 --- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua +++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua @@ -74,7 +74,7 @@ function DungeonDifficultyUI:onLoadRootComplete() end self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeStr)) self.txFrist:setText(I18N:getGlobalText(I18N.GlobalConst.FIRST_PASS)) - self.rewardTx:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)..":") + self.rewardTx:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)) self.txLock:setText(I18N:getGlobalText(I18N.GlobalConst.PASS_REQUIRE)) self:refreshDifficulty() From 212abb61d52c3f861e289c20435c45d3e693f4cd Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 16 Jun 2023 10:26:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=B7=E6=AD=8C=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/sdk_pay_google_manager.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/app/common/sdk_pay_google_manager.lua b/lua/app/common/sdk_pay_google_manager.lua index 614ab2be..7ba33046 100644 --- a/lua/app/common/sdk_pay_google_manager.lua +++ b/lua/app/common/sdk_pay_google_manager.lua @@ -28,7 +28,7 @@ function SDKPayGoogleManager.onGooglePayDelayCallback(code, msg) return end if result.obfuscatedAccountId then - PayManager:requestRewards(purchaseToken, result.obfuscatedAccountId, result.orderId) + PayManager:requestRewards(purchaseToken, result.obfuscatedAccountId, result.orderId, result.productId) end end end @@ -125,7 +125,7 @@ function SDKPayGoogleManager:reqPayReward(uncompleteList, productId, callback) elseif uncompleteOrder.purchaseToken then -- 去服务器验证 if uncompleteOrder.obfuscatedAccountId then - PayManager:requestRewards(uncompleteOrder.purchaseToken, uncompleteOrder.obfuscatedAccountId, uncompleteOrder.orderId, true, function() + PayManager:requestRewards(uncompleteOrder.purchaseToken, uncompleteOrder.obfuscatedAccountId, uncompleteOrder.orderId, uncompleteOrder.productId, true, function() index = index + 1 handleOrder(uncompleteList[index]) end)