Merge branch 'cn/develop' into cn/publish

chenyueqi
2 parents 4d8d33c3 f9b72d4f
Showing 3 changed files with 60 additions and 6 deletions Show diff stats
src/ProtocolCode.lua
src/actions/StoreAction.lua
src/adv/AdvPlayer.lua
@@ -202,7 +202,9 @@ actionCodes = {
 	Store_getGrowFundRewardRpc = 561,	--成长助力奖励
 	Store_getBattlePassRewardRpc = 562,	--赛季卡奖励
 	Store_getExploreCommandRewardRpc = 563, --探索指令
-
+	Store_biliAndroidRechargeRpc = 564,
+	Store_biliCpsRechargeRpc = 565,
+	Store_biliUoRechargeRpc = 566,
 	Email_listRpc = 600,
 	Email_drawAllAttachRpc = 601,
@@ -61,7 +61,7 @@ function _M.biliAndroidRechargeRpc(agent, data)
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = makeOrder(roleId, id)
+	local partnerOrderId = role:getPurchaseOrder(id)
 	-- 签名
 	local secret_key = "8920e9dcf0cb4ebca87393ce48021ead"
 	local need = {
@@ -76,6 +76,58 @@ function _M.biliAndroidRechargeRpc(agent, data)
 	return true
 end
+-- 享游sdk充值
+function _M.biliCpsRechargeRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+	local dataSet = csvdb["shop_rechargeCsv"][id]
+	if not dataSet then return end
+	local roleId = role:getProperty("id")
+
+	role.ignoreHeartbeat = true
+	--创建订单号
+	local partnerOrderId = role:getPurchaseOrder(id)
+	-- 签名
+	local secret_key = "d69365fe15144af990065443749f0f1b"
+	local need = {
+		out_trade_no = partnerOrderId,
+		money = dataSet.rmb * 100,
+		game_money = dataSet.diamond,
+		notify_url = msg.notifyUrl
+	}
+	local sign = signPms(need, secret_key)
+
+	SendPacket(actionCodes.Store_biliCpsRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
+	return true
+end
+
+-- 享游sdk充值
+function _M.biliUoRechargeRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+	local dataSet = csvdb["shop_rechargeCsv"][id]
+	if not dataSet then return end
+	local roleId = role:getProperty("id")
+
+	role.ignoreHeartbeat = true
+	--创建订单号
+	local partnerOrderId = role:getPurchaseOrder(id)
+	-- 签名
+	local secret_key = "4243b5fb44b64175a20a53dcfb1346eb"
+	local need = {
+		out_trade_no = partnerOrderId,
+		money = dataSet.rmb * 100,
+		game_money = dataSet.diamond,
+		notify_url = msg.notifyUrl
+	}
+	local sign = signPms(need, secret_key)
+
+	SendPacket(actionCodes.Store_biliUoRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
+	return true
+end
+
 -- google 充值 入口
 function _M.googleRechargeRpc(agent, data)
 	local role = agent.role
@@ -130,7 +182,7 @@ function _M.myCardRechargeRpc(agent, data)
 	return true
 end
--- mycard 充值 入口
+-- bili ios 充值 入口
 function _M.iosRechargeRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -143,12 +195,12 @@ function _M.iosRechargeRpc(agent, data)
 	--创建订单号
 	local partnerOrderId = role:getPurchaseOrder(id)
 	-- 签名
-	local secret_key = "9647d2efe1074c73b9ac19af4337a70e"
+	local secret_key = "1916d62251dd4a8aa5e452121eefc9a1"
 	local need = {
 		out_trade_no = partnerOrderId,
 		money = dataSet.rmb * 100,
 		game_money = dataSet.diamond,
-		product_id = dataSet.iap_product_id,
+		-- product_id = dataSet.iap_product_id,
 		notify_url = msg.notifyUrl
 	}
 	local sign = signPms(need, secret_key)
@@ -144,7 +144,7 @@ function BaseObject:getDisablePassiveCount()
 end
 function BaseObject:getDisableAuraCount()
-	local count
+	local count = 0
 	for _, buff in ipairs(self.buffs) do
 		if not buff:isHide() and buff:getType() == Buff.DISABLE_AURA then
 			if buff:effect() == 0 then