Merge branch 'develop' into qa

zhouhaihai
2 parents 2a1d5c8c 9e25c63d
Showing 14 changed files with 367 additions and 48 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/PvpAction.lua
src/actions/StoreAction.lua
src/models/Diner.lua
src/models/HeroPlugin.lua
src/models/Order.lua
src/models/Role.lua
src/models/RoleCross.lua
src/models/RolePlugin.lua
src/models/RolePvp.lua
@@ -76,7 +76,13 @@ FuncOpenType = {
 	AdvWS 						= 6, -- 工坊解锁
 	AdvWheelSurf 				= 7, -- 抽奖解锁
 	TimeBoxSlot 				= 8, -- 时钟箱槽
+	AdvCount 					= 9, -- 冒险 次数上限
+ 	AdvCountEL 					= 10, -- 无尽冒险 次数上限
 }
+TypeIsFunc = {}
+for _, v in pairs(FuncOpenType) do
+	TypeIsFunc[v] = true
+end
 -- 关卡通关相关的 功能开放 对应 guide_unlock
 FuncUnlock = {
@@ -90,10 +96,6 @@ FuncUnlock = {
  	Adv = 8, -- 冒险
 }
-TypeIsFunc = {}
-for _, v in pairs(FuncOpenType) do
-	TypeIsFunc[v] = true
-end
 -- 物品起始id
 ItemStartId = {
@@ -252,3 +254,8 @@ SettingStatus = {
 }
 EMAIL_LIMIT = 20  --邮件最大数量
+
+RedPointTags = {
+	PvpCR = 1,
+	PvpHR = 2,
+}
@@ -174,6 +174,12 @@ actionCodes = {
 	Store_rechargeRpc = 550,
 	Store_dailyBuyRpc = 551,
 	Store_dinerBuyRpc = 552,
+	Store_googleRechargeRpc = 553,
+	Store_purchaseOrderResult = 554,
+	Store_ayncPurchaseRpc = 555,
+	Store_myCardRechargeRpc = 556,
+	Store_iosRechargeRpc = 557,
+
 	Email_listRpc = 600,
 	Email_drawAllAttachRpc = 601,
@@ -514,6 +514,10 @@ function _M.helpRpc(agent, data)
 	return true
 end
+-- 充值回调
+function _M.ayncPurchase(role, params)
+	return role:handlePurchase(params)
+end
@@ -474,7 +474,12 @@ function _M.endBonusBattleRpc(agent, data)
 		bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + 1
 		role.dailyData:updateProperty({field = "bonusC", value = bonusC})
- 		reward = role:award(bonusData.reward, {log = {desc = "bonusBattle", int1 = id}})
+		reward = bonusData.reward:toNumMap()
+		local chance = bonusData.chance:randWeight(true)
+		if chance[1] ~= 0 then
+			reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
+		end
+ 		reward = role:award(reward, {log = {desc = "bonusBattle", int1 = id}})
  		role:checkTaskEnter("BonusPass", {id = id})
  	end
@@ -762,7 +762,7 @@ function _M.drawHeroRpc(agent, data)
 	-- 开始抽
 	local resultPool = {}
-	local function fillDrawPool(fixRare, fixCamp, ssrUp)
+	local function fillDrawPool(fixRare, fixCamp, ssrUp, floorBack)
 		local condition = {"rare", "camp"}
 		local values = {fixRare, fixCamp}
@@ -781,8 +781,16 @@ function _M.drawHeroRpc(agent, data)
 					for _, weight in pairs(lpool) do
 						all = all + weight[1]
 					end
-
-					lpool[4][1] = lpool[4][1] + (ssrUp or 0) * all
+					--[[
+						SSR概率值：初始概率 + 步长概率
+						SR概率值：初始概率 * [ (初始概率+R初始概率) - 步长概率 ] /（初始概率+R初始概率）
+						R概率值：初始概率 * [ (初始概率+SR初始概率) - 步长概率 ] /（初始概率+SR初始概率）
+					]]
+					local ssrAdd = (ssrUp or 0) * all
+					local last = all - lpool[4][1]
+					lpool[4][1] = lpool[4][1] + ssrAdd
+					lpool[3][1] = lpool[3][1] * (last - ssrAdd) / last
+					lpool[2][1] = lpool[2][1] * (last - ssrAdd) / last
 				end
 				if next(lpool) then
@@ -791,7 +799,7 @@ function _M.drawHeroRpc(agent, data)
 			end
 		end
-		for itemId, oneData in pairs(csvdb["build_poolCsv"]) do
+		for itemId, oneData in pairs(floorBack and csvdb["build_floorCsv"] or csvdb["build_poolCsv"]) do
 			if oneData["pool_" .. pool] and oneData["pool_" .. pool] ~= "" then
 				local itemData = csvdb["itemCsv"][itemId]
 				while itemData do
@@ -839,13 +847,15 @@ function _M.drawHeroRpc(agent, data)
 		local ssrUp = 0
 		if draw_ssr_up_count_rate then
-			ssrUp = math.floor(ssrUpCount / draw_ssr_up_count_rate[1]) * draw_ssr_up_count_rate[2] / 100
+			ssrUp = math.min(math.floor(ssrUpCount / draw_ssr_up_count_rate[1]) * draw_ssr_up_count_rate[2], draw_ssr_up_count_rate[3]) / 100
 		end
 		while not next(resultPool) do
 			if isNewerSSR then
 				fillDrawPool(4) -- 新手保底的 ssr 
 			elseif isFloorBack then
-				fillDrawPool(3) -- 保底 sr 【郑斌】明确
+				-- 保底 sr 【郑斌】明确
+				-- 保底 sr 改为 池子随机 sr 或者 ssr【郑斌】
+				fillDrawPool(nil, nil, nil, true)     
 			else
 				fillDrawPool(nil, nil, ssrUp)
 			end
@@ -857,17 +867,17 @@ function _M.drawHeroRpc(agent, data)
 		if itemData.quality == 4 then
 			ssrCount = ssrCount + 1
 			ssrUpCount = 0
-			
 			if btype == 4 then
 				newerHadSSR = newerHadSSR + 1
 			end
-		elseif itemData.quality == 3 then
-			floorHeroCount = 0
-			ssrUpCount = ssrUpCount + 1
 		else
 			ssrUpCount = ssrUpCount + 1
 		end
+		if itemData.quality >= 3 then
+			floorHeroCount = 0
+		end
+
 		if role:isHaveHero(itemData.id - ItemStartId.Hero) then
 			local fragId = itemData.id - ItemStartId.Hero
 			local heroData = csvdb["unitCsv"][fragId]
@@ -381,6 +381,8 @@ function _M.endBattleRpc(agent, data)
 				sdelta = matchScore - oldMatchScore,
 			}))
 			red:ltrim(dbKey, 0, 9)
+
+			rpcRole(match.id, "redPTag", RedPointTags.PvpCR, now)
 		end
 	end)
@@ -670,6 +672,7 @@ function _M.endBattleHRpc(agent, data)
 				record = recordBattle,
 			}))
 			red:ltrim(dbKey, 0, 9)
+			rpcRole(match.id, "redPTag", RedPointTags.PvpHR, now)
 		end
 	end)
@@ -786,7 +789,7 @@ function _M.recordListRpc(agent, data)
 			info.video = temp.video
 			info.sdelta = temp.sdelta
 		end
-		
+		role:clearRedPTag(RedPointTags.PvpCR)
 	elseif ptype == 2 then -- 高级pvp
 		local rlist = redisproxy:lrange(string.format(RECORD_PVP_HIGH, roleId), 0 , 9)
 		local tempList = {}
@@ -806,6 +809,8 @@ function _M.recordListRpc(agent, data)
 			info.sdelta = temp.sdelta
 			info.record = temp.record
 		end
+		role:clearRedPTag(RedPointTags.PvpHR)
+
 	else
 		return
 	end
 local _M = {}
+local serverId = tonumber(skynet.getenv("servId"))
+local md5 = require "md5"
+
+local function makeOrder(roleId, rechargeId)
+	local orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
+	local partnerOrderId = string.format("%d_%d_%d", serverId, roleId, orderId)
+	local orderKey = string.format("order:%d:%d", roleId, orderId)
+	redisproxy:del(orderKey)
+	local order = require("models.Order").new({ 
+		key = orderKey, 
+		order = partnerOrderId, 
+		rechargeId = rechargeId, 
+	})
+	order:create()
+	redisproxy:sadd(string.format("role:%d:orders", roleId), partnerOrderId)
+	return partnerOrderId
+end
+
+-- 入口在正式服关闭  -- mock 充值
 function _M.rechargeRpc(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 diamondCount
-	if dataSet.type == 0 then -- 钻石
-		local rechargeF = role:getProperty("rechargeF")
-		diamondCount = dataSet.diamond + dataSet.diamondExtra
-		if not rechargeF[id] then
-			diamondCount = diamondCount + dataSet.diamondFirst
-			rechargeF[id] = 1
-			role:updateProperty({field = "rechargeF", value = rechargeF})
-		end
-		role:gainDiamond({count = diamondCount, isRecharge = true, log = {desc = "recharge", int1 = id}})
-	elseif dataSet.type == 1 then  --月卡
-		return
-	elseif dataSet.type == 2 then  -- 赛季通行证
-		return
-	else
-		return
+	local roleId = role:getProperty("id")
+	
+	--创建订单号
+	local partnerOrderId = makeOrder(roleId, id)
+	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
+
+	-- 测试的 直接发奖励了
+	skynet.timeout(10, function ()
+		role:handlePurchase({
+			order = partnerOrderId,
+			amount = dataSet.rmb,
+			game_money = dataSet.diamond,
+			product_id = dataSet.productId,
+			pay_time = skynet.timex(),
+			transactionId = "onlyTest",
+		})
+	end)
+	
+	return true
+end
+
+local function table_keys( t )
+    local keys = {}
+    for k, _ in pairs( t ) do
+        keys[#keys + 1] = k
+    end
+    return keys
+end
+
+local function signPms(params, secret_key)
+    local keys = table_keys(params)
+    table.sort(keys)
+    local urlCode = ""
+    for index, key in ipairs(keys) do
+		urlCode = urlCode .. params[key]
 	end
+	return md5.sumhexa(urlCode .. secret_key):lower()
+end
-	-- 累充
-	local rmb = dataSet.rmb
-	role:updateProperty({field = "rmbC", delta = rmb})
-	
-	role:log("role_action", {desc = "recharge", int1 = id, int2 = rmb})
-	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({diamond = diamondCount}))
+-- google 充值 入口
+function _M.googleRechargeRpc(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 = makeOrder(roleId, id)
+	-- 签名
+	local secret_key = "b7657fa7ccd44c16a35e3f454ac7a075"
+	local need = {
+		out_trade_no = partnerOrderId,
+		money = dataSet.rmb,
+		game_money = dataSet.diamond,
+		product_id = dataSet.productId,
+	}
+	local sign = signPms(need, secret_key)
+
+	SendPacket(actionCodes.Store_googleRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
+	return true
+end
+
+-- mycard 充值 入口
+function _M.myCardRechargeRpc(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 = makeOrder(roleId, id)
+	-- 签名
+	local secret_key = "48759e07540f46d9af17ec82669b4272"
+	local need = {
+		out_trade_no = partnerOrderId,
+		money = dataSet.rmb,
+		game_money = dataSet.diamond,
+	}
+	local sign = signPms(need, secret_key)
+
+	SendPacket(actionCodes.Store_myCardRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
+	return true
+end
+
+-- mycard 充值 入口
+function _M.iosRechargeRpc(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 = makeOrder(roleId, id)
+	-- 签名
+	local secret_key = "9647d2efe1074c73b9ac19af4337a70e"
+	local need = {
+		out_trade_no = partnerOrderId,
+		money = dataSet.rmb,
+		game_money = dataSet.diamond,
+		product_id = dataSet.productId,
+	}
+	local sign = signPms(need, secret_key)
+
+	SendPacket(actionCodes.Store_iosRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
+	return true
+end
+
+function _M.purchaseOrderResult(agent, data)
+	local role = agent.role
+
+	local roleId = role:getProperty("id")
+	local msg = MsgPack.unpack(data)
+
+	role.ignoreHeartbeat = false
+
+	local partnerOrderStr = msg.order
+	local _, _, orderId = string.match(partnerOrderStr, "(.+)_(.+)_(.+)")
+	local orderObject = require("models.Order").new({ key = string.format("order:%d:%d", roleId, orderId) })
+	if not orderObject:load() then
+		-- 订单不存在
+		skynet.error("cancelPurchaseRpc", string.format("order %s not exist", partnerOrderStr))
+		return true
+	end
+
+	if msg.status == "success" then
+		orderObject:setProperty("transactionId", msg.platformOrder or "")
+		return true
+	end
+
+	if orderObject:getProperty("finishTime") > 0 then
+		return true
+	end
+
+	orderObject:setProperty("status", msg.status)
+
+	redisproxy:srem(string.format("role:%d:orders", roleId), partnerOrderStr)
 	return true
 end
@@ -73,11 +73,11 @@ function Diner:refreshDailyData(notify)
 	local guide = self.owner:getProperty("newerGuide")
 	local master, slave = string.match(guide,"(%d+)=(%d+)")
 	if tonumber(master) <= 26 then
-		entrust[1] = 1031
-		entrust[2] = 3
+		entrust[1] = 1001
+		entrust[2] = 1
 	elseif tonumber(master) <= 29 then
 		local temp = entrust[1]
-		entrust[1] = 3
+		entrust[1] = 1
 		entrust[2] = temp
 	end
@@ -208,10 +208,10 @@ function HeroPlugin.bind(Hero)
 	end
-	-- 战斗力（当前属性）= POWER[（生命 + 防御 * 23 + 闪避 * 4）*（攻击*14 + 命中 * 2）*（1 + 暴击几率/100 * 暴击伤害/100）* 攻击速度 / 60000 ，0.8 ]
+	-- 战斗力（当前属性）= POWER[（生命 + 防御 * 7 + 闪避 * 4）*（攻击*4 + 命中 * 2）*（1 + 暴击几率/100 * 暴击伤害/100）* 攻击速度 / 60000 ，0.8 ]
 	function Hero:getBattleValue(activeRelation) -- isReal包括队伍加成
 	    local attrs = self:getTotalAttrs({activeRelation = activeRelation})
-	    local battleValue = ((attrs["hp"] + attrs["def"] * 23 + attrs["miss"] * 4) * (attrs["atk"] * 14 + attrs["hit"] * 2) * (1 + attrs["crit"]/100 * attrs["critHurt"]/100) * attrs["atkSpeed"] / 600000) ^ 0.8
+	    local battleValue = ((attrs["hp"] + attrs["def"] * 7 + attrs["miss"] * 4) * (attrs["atk"] * 4 + attrs["hit"] * 2) * (1 + attrs["crit"]/100 * attrs["critHurt"]/100) * attrs["atkSpeed"] / 600000) ^ 0.8
 	    return math.floor(battleValue)
 	end
@@ -0,0 +1,26 @@
+local Order = class("Order", require("shared.ModelBase"))
+
+function Order:ctor(properties)
+	Order.super.ctor(self, properties)
+end
+
+Order.schema = {
+    key     	= {"string"},       -- redis key
+    order 		= {"string"},      	-- 自己订单号
+    rechargeId  = {"number", 0},
+    transactionId = {"string", ""},
+    createTime  = {"number", skynet.timex()},       -- 订单创建时间
+    finishTime 	= {"number", 0},	-- 服务端验证完成时间
+    status 		= {"string", "create"},
+}
+
+Order.fields = {
+	order = true,
+	rechargeId = true,
+	transactionId = true,
+	createTime = true,
+	finishTime = true,
+	status = true,
+}
+
+return Order
 \ No newline at end of file
@@ -150,6 +150,8 @@ Role.schema = {
 	sudoku				= {"table", {}}, -- 九宫格   {[-1] = 1, task = {[1] = {}, [2] = {}}}} -- [-1] 阶段 如果为 -1 关闭(都做完了), task 当前阶段任务进度， reward  连串奖励领取情况
 	sign 				= {"table", {}}, -- 签到记录 {[1] = 20181029}
+
+	redp 				= {"table", {}}, -- 待消除红点 -- 通常打开对应界面就消除的红点  红点消除的方法 在对应的协议中使用 {tag = pms }
 }
@@ -359,6 +361,8 @@ function Role:data()
 		sudoku = self:getProperty("sudoku"),
 		sign = self:getProperty("sign"),
+
+		redp = self:getProperty("redp"),
 	}
 end
@@ -67,6 +67,15 @@ RoleCross.bind = function (Role)
 		return info
 	end
+	function Role:redPTag(tag, pms)
+		pms = pms or 1
+		local redp = self:getProperty("redp")
+		if not redp[tag] or redp[tag] ~= pms then
+			redp[tag] = pms
+			self:updateProperty({field = "redp", value = redp})
+		end
+	end
+
 	function Role:accountInit(initData)
 		-- 道具
 		local reward = {}
@@ -318,6 +327,16 @@ function CMD.pvpHRankInfo(roleId)
 	return info
 end
+-- 记录红点
+function CMD.redPTag(roleId, tag, pms)
+	pms = pms or 1
+	local redp = CMD.getProperty(roleId, "redp")
+	if not redp[tag] or redp[tag] ~= pms then
+		redp[tag] = pms
+		CMD.setProperty(roleId, "redp", redp)
+	end
+end
+
 RoleCross.handle = function(cmd, roleId, ...)
 	SRole = SRole or require("models.Role")
 	if CMD[cmd] then
@@ -830,13 +830,11 @@ function RolePlugin.bind(Role)
 	end
 	function Role:getAdvHangLimit()
-		-- todo 
-		return globalCsv.adv_daily_cross_count
+		return globalCsv.adv_daily_cross_count + self:getFuncLv(FuncOpenType.AdvCount)
 	end
 	function Role:getAdvElLimit()
-		-- todo 
-		return globalCsv.adv_endless_daily_cross_count
+		return globalCsv.adv_endless_daily_cross_count + self:getFuncLv(FuncOpenType.AdvCountEL)
 	end
 	-- 走 guide_unlock 表的 被动解锁
@@ -1392,6 +1390,101 @@ function RolePlugin.bind(Role)
 		return false
 	end
+	-- 消除指定tag 红点
+	function Role:clearRedPTag(tag)
+		local redp = self:getProperty("redp")
+		redp[tag] = nil
+		self:updateProperty({field = "redp", value = redp})
+	end
+
+
+	-- 充值 --
+	--[[
+	request.order = data.out_trade_no
+	request.amount = data.money / 100
+	request.game_money = data.game_money
+	request.product_id = data.product_id
+	request.pay_time = data.pay_time
+	request.transactionId = data.order_no
+	]]
+	function Role:handlePurchase(params)
+		local roleId = self:getProperty("id")
+		local partnerOrderStr = params.order
+
+		local _, _, orderId = string.match(partnerOrderStr, "(.+)_(.+)_(.+)")
+		local orderObject = require("models.Order").new({ key = string.format("order:%d:%d", roleId, orderId) })
+		if not orderObject:load() then
+			-- 订单不存在
+			skynet.error("ayncPurchaseRpc", string.format("order %s not exist", partnerOrderStr))
+			return
+		end
+
+		if orderObject:getProperty("finishTime") > 0 then
+			-- 订单已经处理
+			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ result = "handled" }))
+			return
+		end
+
+		local rechargeData = csvdb["shop_rechargeCsv"][orderObject:getProperty("rechargeId")]
+		if rechargeData.rmb ~= tonumber(params.amount) then
+			skynet.error(string.format("fake order: %s, roleId: %d, order: %s", 
+				params.transactionId, roleId, partnerOrderStr
+			))
+			return
+		end
+
+		local diamond = self:recharge({ 
+			id = orderObject:getProperty("rechargeId"),
+			transactionId = params.transactionId,
+			pay_time = params.pay_time,
+			order = partnerOrderStr
+		})
+		orderObject:setProperty("finishTime", skynet.time())
+		orderObject:setProperty("status", "finish")
+
+		redisproxy:srem(string.format("role:%d:orders", roleId), partnerOrderStr)
+		SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
+			result = "success", diamond = diamond}))
+
+		return orderObject:getProperty("rechargeId")
+	end
+
+
+	function Role:recharge(params)
+		local id = tonumber(params.id)
+		local rechargeData = csvdb["shop_rechargeCsv"][id]
+		if not rechargeData then
+			skynet.error("recharge id not exist", id)
+			return
+		end
+
+		local diamondCount = 0
+		if rechargeData.type == 0 then -- 钻石
+			local rechargeF = self:getProperty("rechargeF")
+			diamondCount = rechargeData.diamond + rechargeData.diamondExtra
+			if not rechargeF[id] then
+				diamondCount = diamondCount + rechargeData.diamondFirst
+				rechargeF[id] = 1
+				self:updateProperty({field = "rechargeF", value = rechargeF})
+			end
+			self:gainDiamond({count = diamondCount, isRecharge = true, log = {desc = "recharge", int1 = id}})
+		elseif rechargeData.type == 1 then  --月卡
+			return
+		elseif rechargeData.type == 2 then  -- 赛季通行证
+			return
+		else
+			return
+		end
+
+		-- 累充
+		local rmb = rechargeData.rmb
+		self:updateProperty({field = "rmbC", delta = rmb})
+		
+		self:log("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = params.pay_time})
+
+		return diamondCount
+	end
+
 end
 return RolePlugin
 \ No newline at end of file
@@ -140,7 +140,7 @@ function Role:changePvpScoreHigh(matchId, isWin)
 			break
 		end
 	end
-	if newDivision ~= oldMyDivision then
+	if newDivision ~= oldMyDivision or self:getProperty("pvpHGTime") == 0 then
 		--刷新段位奖励
 		local newTime, newReward = self:calculatePvpHGift(oldMyDivision)
 		self:updateProperties({