puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

Browse Source
This commit is contained in:
xiekaidong 2023-06-16 10:58:13 +08:00
commit 007bbc7cd0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/common/sdk_pay_google_manager.lua
View File

@ -28,7 +28,7 @@ function SDKPayGoogleManager.onGooglePayDelayCallback(code, msg)
return return
end end
if result.obfuscatedAccountId then if result.obfuscatedAccountId then
PayManager:requestRewards(purchaseToken, result.obfuscatedAccountId, result.orderId) PayManager:requestRewards(purchaseToken, result.obfuscatedAccountId, result.orderId, result.productId)
end end
end end
end end
@ -125,7 +125,7 @@ function SDKPayGoogleManager:reqPayReward(uncompleteList, productId, callback)
elseif uncompleteOrder.purchaseToken then elseif uncompleteOrder.purchaseToken then
-- 去服务器验证 -- 去服务器验证
if uncompleteOrder.obfuscatedAccountId 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 index = index + 1
handleOrder(uncompleteList[index]) handleOrder(uncompleteList[index])
end) end)

2
lua/app/ui/dungeon/dungeon_difficulty_ui.lua
View File

@ -74,7 +74,7 @@ function DungeonDifficultyUI:onLoadRootComplete()
end end
self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeStr)) self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeStr))
self.txFrist:setText(I18N:getGlobalText(I18N.GlobalConst.FIRST_PASS)) 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.txLock:setText(I18N:getGlobalText(I18N.GlobalConst.PASS_REQUIRE))
self:refreshDifficulty() self:refreshDifficulty()