From 76d00dce3433969d572cbae528be96911ff36a93 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 17 Jul 2020 11:39:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/SDK/Proxy/AndroidProxy.cs | 17 ++++++++ .../~Lua/Modules/Pay/PayManager.lua | 39 ++++++++----------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs b/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs index 3a075fe6b7..bc2d56f98f 100644 --- a/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs +++ b/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs @@ -55,6 +55,23 @@ namespace SDK public override void Pay(SDKPayArgs args) { + + Debug.Log("consumerId = " + args.roleID + + ",consumerName= " + args.roleName + + ",mhtCurrency= " + args.coinNum + + ",vipLevel= " + args.vip + + ",playerName= " + args.guildID + + ",roleName= " + args.roleName + + ",roleId= " + args.roleID + + ",orderDec= " + args.productDesc + + ",amount= " + args.price + + ",balance= " + "100" + + ",goodDec= " + args.productName + + ",count= " + args.buyNum + + ",goodsId= " + args.productId + + ",ext= " + GameLogic.Util.Base64Encode(args.extension) + ); + currentActivity.Call("Pay",args.productId, args.productName, args.productDesc, diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua index 6d72425e49..ab7d565874 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua @@ -31,38 +31,29 @@ end function this.RequestPay(context) SDKMgr.onPayCallback = function(payResp) local str = string.split(payResp, "#") - local code = tonumber(str[1]) - local result = str[2] - if code == SDKCodeResult.CODE_PAY_SUCCESS then - --PopupTipPanel.ShowTip("充值成功" .. result) - --Game.GlobalEvent:DispatchEvent(GameEvent.MoneyPay.OnPayResultSuccess,context.Id) - --FirstRechargeManager.RefreshAccumRechargeValue(context.Id) + local result = tonumber(str[1]) + if code == SDK_RESULT.SUCCESS then DataCenterManager.CommitPayStatus( "IN_GAME_"..context.Type, SDKMgr:GetPayOrderID(), "VALID", tostring(context.Price) ) - elseif code == SDKCodeResult.CODE_PAY_FAIL then - --PopupTipPanel.ShowTip("充值失败" .. result) + elseif code == SDK_RESULT.FAILED then DataCenterManager.CommitPayStatus( "IN_GAME_"..context.Type, SDKMgr:GetPayOrderID(), "INVALID", tostring(context.Price) ) - elseif code == SDKCodeResult.CODE_PAYING then - --PopupTipPanel.ShowTip("正在充值中" .. result) - elseif code == SDKCodeResult.CODE_PAY_CANCEL then + else --PopupTipPanel.ShowTip("取消充值" .. result) - DataCenterManager.CommitPayStatus( - "IN_GAME_"..context.Type, - SDKMgr:GetPayOrderID(), - "INVALID", - tostring(context.Price) - ) - elseif code == SDKCodeResult.CODE_PAY_UNKNOWN then - --PopupTipPanel.ShowTip("未知" .. result) + -- DataCenterManager.CommitPayStatus( + -- "IN_GAME_"..context.Type, + -- SDKMgr:GetPayOrderID(), + -- "INVALID", + -- tostring(context.Price) + -- ) end end local params = SDK.SDKPayArgs.New() @@ -73,18 +64,22 @@ function this.RequestPay(context) params.ratio = 1 params.buyNum = context.BuyNum or 1 params.coinNum = BagManager.GetItemCountById(16) + -- 服务器相关 params.zoneId = PlayerManager.serverInfo.server_id params.serverID = PlayerManager.serverInfo.server_id params.serverName = PlayerManager.serverInfo.name + -- 角色相关 params.roleID = tostring(PlayerManager.uid) params.roleName = PlayerManager.nickName params.roleLevel = PlayerManager.level params.vip = tostring(VipManager.GetVipLevel()) params.guildID = PlayerManager.familyId + -- 其他 params.payNotifyUrl = "" - params.extension = string.format("%s_%s_%s_%s_%s_%s", - AppConst.OpenId,context.Id,context.Price,PlayerManager.uid, - PlayerManager.serverInfo.server_id,PlayerManager.serverInfo.name) + params.extension = tostring(context.Id) + -- string.format("%s_%s_%s_%s_%s_%s", + -- AppConst.OpenId,context.Id,context.Price,PlayerManager.uid, + -- PlayerManager.serverInfo.server_id,PlayerManager.serverInfo.name) SDKMgr:Pay(params) end