Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

liuzujun
2 parents 8efb24c9 be24b6ad
Showing 9 changed files with 305 additions and 148 deletions Show diff stats
src/RedisKeys.lua
src/actions/HangAction.lua
src/actions/StoreAction.lua
src/adv/AdvBuff.lua
src/adv/AdvPlayer.lua
src/models/Role.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/Store.lua
@@ -12,6 +12,8 @@ R_RUNE = &quot;role:%d:rune:%d&quot;       -- 符文详细信息
 R_EMAIL = "role:%d:emailIds" --邮件列表
 R_EMAIL_ITEM = "email:%d:%d" --邮件
 R_STORE = "role:%d:store"   -- 商店
+R_ORDERS = "role:%d:orders" -- 订单
+R_ORDER = "order:%d:%d"
  
  
 -- rank
@@ -498,10 +498,53 @@ function _M.buyBonusCountRpc(agent, data)
 	return true
 end
  
+local function bonusWinReward(role, bonusData, bwin, count)
+	count = count or 1
+	local open, actId = role.activity:isOpen("BonusDouble")
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	local extraCnt = role.storeData:getBonusExtraFightCount()
+
+	local coef = 1
+	if open and actData then
+		coef = tonumber(actData.condition2)
+	end
+	local bonusC = role.dailyData:getProperty("bonusC")
+	bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
+	if globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"] < count then return false, 1 end
+	bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + count
+	role.dailyData:updateProperty({field = "bonusC", value = bonusC})
+
+	local reward, change
+	reward = bonusData.reward:toNumMap()
+	for itemId, c in pairs(reward) do
+		reward[itemId] = c * count
+	end
+	for i = 1, count do
+		local chance = bonusData.chance:randWeight(true)
+		if chance[1] ~= 0 then
+			reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
+		end
+	end
+
+	for k, v  in pairs(reward) do
+		reward[k] = v * (coef > 1 and actData.condition or 1)
+	end
+	
+	if bwin then -- 满星 额外奖励
+		for k, v in pairs(bonusData.perfect_reward:toNumMap()) do
+			reward[k] = (reward[k] or 0) + v
+		end
+	end
+	reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = id}})
+	role:checkTaskEnter("BonusPass", {id = id, count = count})
+	return true, reward, change
+end
+
 function _M.startBonusBattleRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
+	local count = msg.count or 1
  
 	local open, actId = role.activity:isOpen("BonusDouble")
  
@@ -516,9 +559,6 @@ function _M.startBonusBattleRpc(agent, data)
 	if not bonusData then return 3 end
 	if not role:checkHangPass(bonusData.unlock) then return 4 end
  
-	local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
-	if not next(bTeam) then return 5 end
-
 	local bonusC = role.dailyData:getProperty("bonusC")
 	bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
  
@@ -529,15 +569,24 @@ function _M.startBonusBattleRpc(agent, data)
 	if open and actData then
 		coef = tonumber(actData.condition2)
 	end
+	
+	if math.illegalNum(count, 1, globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"]) then return 7 end
  
-	if globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"] <= 0 then return 7 end
-
+	local bonusStar = role:getProperty("bonusStar")
+	if bonusStar[id] and bonusStar[id] >= (1 << #bonusData.sweep_condition:toTableArray(true)) - 1 then 
+		local status, reward, change = bonusWinReward(role, bonusData, nil, count)
+		if not status then return 10 * (reward or 0) end
+		SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({reward = reward, change = change}))
+	else
+		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
+		if not next(bTeam) then return 5 end
+		role.__bonusBattleCache = {
+			key = tostring(math.random()),
+			id = id,
+		}
+		SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({key = role.__bonusBattleCache.key}))
+	end
  
-	role.__bonusBattleCache = {
-		key = tostring(math.random()),
-		id = id,
-	}
-	SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({key = role.__bonusBattleCache.key}))
 	return true
 end
  
@@ -548,14 +597,7 @@ function _M.endBonusBattleRpc(agent, data)
 	local key = msg.key
 	local starNum = msg.starNum
 	if not role.__bonusBattleCache then return 1 end
-	local open, actId = role.activity:isOpen("BonusDouble")
-	local actData = csvdb["activity_ctrlCsv"][actId]
-	local extraCnt = role.storeData:getBonusExtraFightCount()
-
-	local coef = 1
-	if open and actData then
-		coef = tonumber(actData.condition2)
-	end
+	
  
 	if role.__bonusBattleCache.id ~= id or role.__bonusBattleCache.key ~= key then 
 		SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
@@ -564,24 +606,79 @@ function _M.endBonusBattleRpc(agent, data)
 	local bonusData = csvdb["bonus_battleCsv"][id]
  
 	local reward, change
+
+	local bonusStar = role:getProperty("bonusStar")
+	local curStar = 0
  	if starNum and starNum > 0 then
  		-- 胜利扣除次数
- 		local bonusC = role.dailyData:getProperty("bonusC")
-		bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
-		if globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"] <= 0 then return 3 end
-		bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + 1
-		role.dailyData:updateProperty({field = "bonusC", value = bonusC})
-
-		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]
+ 		
+ 		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
+ 		local herosInfo = role:getTeamHerosInfo(bTeam.heros)
+
+ 		local check = {}
+ 		-- 1 通关
+		check[1] = function(_)
+			return true
+		end
+		-- 2 阵亡人数 <= N
+		check[2] = function(_, cond)
+			return msg.info.dead and msg.info.dead <= cond
+		end
+		-- 3 全员存活
+		check[3] = function(_)
+			return msg.info.dead and msg.info.dead == 0
+		end
+		-- 4 指定种族 >= N
+		check[4] = function(_, cond)
+			local count = 0
+			for _, one in pairs(herosInfo) do
+				local heroData = csv["unitCsv"][one.type]
+				if heroData.camp == cond then
+					count = count + 1
+				end
+			end
+			return count >= cond
 		end
-		for k, v  in pairs(reward) do
-			reward[k] = v * (coef > 1 and actData.condition or 1)
+		-- 5 指定职业 >= N
+		check[5] = function(_, cond)
+			local count = 0
+			for _, one in pairs(herosInfo) do
+				local heroData = csv["unitCsv"][one.type]
+				if heroData.job == cond then
+					count = count + 1
+				end
+			end
+			return count >= cond
 		end
- 		reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = id}})
- 		role:checkTaskEnter("BonusPass", {id = id})
+		-- 6 含有指定角色 
+		check[6] = function(_, cond)
+			for _, one in pairs(herosInfo) do
+				if one.type == cond then
+					return true
+				end
+			end
+			return false
+		end
+		-- 7 通关耗时 <= X 秒  msg.info.atime
+		check[7] = function(_, cond)
+			return msg.info.atime and msg.info.atime <= cond
+		end
+		curStar = 0
+		local sweepConds = bonusData.sweep_condition:toTableArray(true)
+ 		for i, cond in ipairs(sweepConds) do
+ 			if check[cond[1]] and check[cond[1]](table.unpack(cond)) then
+ 				curStar = curStar + (1 << (i - 1))
+ 			end
+ 		end
+ 		local status
+ 		status, reward, change = bonusWinReward(role, bonusData, curStar >= (1 << #sweepConds) - 1)
+ 		if not status then return 10 + (reward or 0) end
+ 	else
+ 		curStar = 0
+ 	end
+ 	if curStar ~= bonusStar[id] then
+ 		bonusStar[id] = curStar
+ 		role:updateProperty({field = "bonusStar", value = bonusStar})
  	end
  
  	role:checkBattle("bonus", {
 local _M = {}
  
-local serverId = tonumber(skynet.getenv("servId"))
 local md5 = require "md5"
  
-local function makeOrder(role, rechargeId)
-	local roleId = role:getProperty("id")
-	local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
-	if not rechargeData then
-		skynet.error("recharge id not exist", rechargeId)
-		return ""
-	end
-	local limit = rechargeData.limit
-    local rechargeRecord = role:getProperty("payR") or {}
-    if limit ~= 0 and limit <= (rechargeRecord[rechargeId] or 0) then
-        skynet.error(string.format("recharge id:%d count over limit, user id:%d", rechargeId, roleId))
-        return ""
-    end
-
-	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
@@ -41,7 +12,7 @@ function _M.rechargeRpc(agent , data)
 	local roleId = role:getProperty("id")
  
 	--创建订单号
-	local partnerOrderId = makeOrder(role, id)
+	local partnerOrderId = role:getPurchaseOrder(id)
 	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
  
  
@@ -90,7 +61,7 @@ function _M.googleRechargeRpc(agent, data)
  
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = makeOrder(role, id)
+	local partnerOrderId = role:getPurchaseOrder(id)
 	-- 签名
 	local secret_key = "b7657fa7ccd44c16a35e3f454ac7a075"
 	local need = {
@@ -117,7 +88,7 @@ function _M.myCardRechargeRpc(agent, data)
  
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = makeOrder(role, id)
+	local partnerOrderId = role:getPurchaseOrder(id)
 	-- 签名
 	local secret_key = "48759e07540f46d9af17ec82669b4272"
 	local need = {
@@ -143,7 +114,7 @@ function _M.iosRechargeRpc(agent, data)
  
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = makeOrder(role, id)
+	local partnerOrderId = role:getPurchaseOrder(id)
 	-- 签名
 	local secret_key = "9647d2efe1074c73b9ac19af4337a70e"
 	local need = {
@@ -167,43 +138,15 @@ function _M.purchaseOrderResult(agent, 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 "")
-		local rechargeId = orderObject:getProperty("rechargeId")
-		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
-		
-		role:log("setOrder", {
-			order_status = 100, -- "订单状态：100 - 开始下单（玩家还未开始付费行为记录）200 - 支付完成并发货（SDK通知可以发货时记录），300 - 订单被取消，1000 - 其他"
-			item_id = rechargeId, -- 道具id
-			item_type = dataSet.type, -- 购买的道具类型，具体见"onItems"方法中道具类型枚举表
-			item_name = dataSet.title, -- 购买的道具名
-			item_number = 1, -- 购买的道具数量
-			item_level = 1, -- 购买的道具等级
-			order_cost = dataSet.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
-			order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
-			order_type = role:getProperty("rmbC") > 0 and 0 or 1, -- 订单类型，首充记录为1，否则为0
-			order_id = msg.platformOrder, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
-		})
-
-		return true
-	end
+	local status = {
+		fail = true,
+		success = true
+	}
  
-	if orderObject:getProperty("finishTime") > 0 then
-		return true
+	local partnerOrderStr = msg.order
+	if partnerOrderStr then
+		role:updatePurchaseOrder(partnerOrderStr, msg.platformOrder, status[msg.status] and msg.status or "unknown")
 	end
-
-	orderObject:setProperty("status", msg.status)
-
-	redisproxy:srem(string.format("role:%d:orders", roleId), partnerOrderStr)
 	return true
 end
  
@@ -36,6 +36,8 @@ Buff.SNEAK = 32 --潜行
 Buff.DROP_BUFF_BY_ENEMY = 33 -- 怪物掉落加成  -- 怪物使用
 Buff.GET_PASSIVE = 34 -- 获得 passive -- 结束失效
 Buff.OBSTACLE_CHANGE = 35 -- 看守类型改变  -- 怪物使用  0 - 1
+Buff.DISABLE_AURA = 36 -- 禁用光环
+Buff.GET_AURA = 37 -- 获得光环
  
  
 --角色一些属性的变化
@@ -332,6 +334,18 @@ local BuffFactory = {
 		end
 	end,
  
+	[Buff.DISABLE_AURA] = function(_Buff)
+		_Buff._effectValue = function(self)
+			return self.buffData.effectValue1
+		end
+	end,
+
+	[Buff.GET_AURA] = function(_Buff)
+		_Buff._effectValue = function(self)
+			return self.buffData.effectValue1
+		end
+	end,
+
 	[Buff.SP_MAX_CHANGE] = function(_Buff)
 		_Buff._init = function(self) --初始化变化值
 			self.owner:reSetSpMax()
@@ -143,6 +143,19 @@ function BaseObject:getDisablePassiveCount()
 	return count
 end
  
+function BaseObject:getDisableAuraCount()
+	local count
+	for _, buff in ipairs(self.buffs) do
+		if not buff:isHide() and buff:getType() == Buff.DISABLE_AURA then
+			if buff:effect() == 0 then
+				return 0
+			end
+			count = (count or 0) + buff:effect()
+		end
+	end
+	return count
+end
+
 function BaseObject:addBuff(buffId, releaser, layer)
 	layer = layer or 1
 	local buffData = csvdb["adv_map_buffCsv"][buffId]
@@ -229,22 +242,36 @@ function BaseObject:checkAuraBuff(buffs)
 end
  
 function BaseObject:getAuras()
+	local disable = self:getDisableAuraCount()
 	local auras = {}
+	local function addAura(one)
+		if disable > 0 then
+			disable = disable - 1
+		else
+			table.insert(auras, one)
+		end
+	end
 	if self:is("Enemy") then
 		local halo = csvdb["event_monsterCsv"][self.monsterId].halo
 		if halo then
 			for _, one in ipairs(halo:toArray(true, "=")) do
-				table.insert(auras, one)
+				addAura(one)
 			end
 		end
 	elseif self:is("Build") then
 		local halo = csvdb["event_buildingCsv"][self.id].halo
 		if halo then
 			for _, one in ipairs(halo:toArray(true, "=")) do
-				table.insert(auras, one)
+				addAura(one)
 			end
 		end
-	end 
+	end
+
+	for _, buff in ipairs(self.buffs) do
+		if not buff:isHide() and buff:getType() == Buff.GET_AURA then
+			addAura(buff:effect())
+		end
+	end
  
 	return auras
 end
@@ -114,6 +114,8 @@ Role.schema = {
 	teamIndex			= {"table", {}},	-- 各个系统使用的编队索引 type->index 见TeamSystemType
 	advTeams			= {"table", {}},	-- 拾荒自选编队
  
+	bonusStar			= {"table", {}}, 	-- 奖励关卡 通关星星  {[id] = 1}  三个二进制位 表示三个星 从低到高  (1 << 0) (1 << 1) (1 << 2)  满星 (1 << 3) - 1
+
 	--引导相关
 	newerGuide 			= {"string","1=1"}, -- 新手引导 master=slave
 	funcGuide 			= {"string",""}, -- 功能引导 0=0跳过次数(999永久跳过) 1=1功能1触发情况
@@ -360,6 +362,8 @@ function Role:data()
 		hangTeams = self:getProperty("hangTeams"),
 		teamIndex = self:getProperty("teamIndex"),
 		advTeams = self:getProperty("advTeams"),
+		
+		bonusStar = self:getProperty("bonusStar"),
  
 		newerGuide = self:getProperty("newerGuide"),
 		funcGuide = self:getProperty("funcGuide"),
  
-
+local serverId = tonumber(skynet.getenv("servId"))
 local RolePlugin = {}
  
 function RolePlugin.bind(Role)
@@ -1534,6 +1534,102 @@ function RolePlugin.bind(Role)
 		self:updateProperty({field = "redp", value = redp})
 	end
  
+	-- 获取充值订单号
+	function Role:getPurchaseOrder(rechargeId)
+		local roleId = self:getProperty("id")
+		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
+		if not rechargeData then
+			skynet.error("recharge id not exist", rechargeId)
+			return ""
+		end
+		local limit = rechargeData.limit
+	    local rechargeRecord = self:getProperty("payR") or {}
+	    if limit ~= 0 and limit <= (rechargeRecord[rechargeId] or 0) then
+	        return ""
+	    end
+
+	    local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
+	    if orderId then
+	    	local orderObject = require("models.Order").new({ key = string.format(R_ORDER, roleId, orderId) })
+			if orderObject:load() and orderObject:getProperty("rechargeId") == rechargeId and math.abs(skynet.timex() - orderObject:getProperty("createTime")) < 5 * 60 then
+				return string.format("%d_%d_%d", serverId, roleId, orderId)
+			end
+	    end
+
+		orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
+		local partnerOrderId = string.format("%d_%d_%d", serverId, roleId, orderId)
+		local orderKey = string.format(R_ORDER, roleId, orderId)
+		redisproxy:del(orderKey) -- 删掉可能有了
+		local order = require("models.Order").new({ 
+			key = orderKey, 
+			order = partnerOrderId, 
+			rechargeId = rechargeId, 
+		})
+		order:create()
+		-- 正在进行中的订单 缓存
+		redisproxy:hset(string.format(R_ORDERS, roleId), rechargeId, orderId)
+		return partnerOrderId
+	end
+
+	-- 更新订单信息
+	--[[
+
+	status
+
+	success
+	fail
+	finsh
+	unknow
+
+	--]]
+	function Role:updatePurchaseOrder(partnerOrderStr, platformOrder, status)
+		if not partnerOrderStr then return false end
+		local _, _, orderId = string.match(partnerOrderStr, "(.+)_(.+)_(.+)")
+
+		local roleId = self:getProperty("id")
+		local orderObject = require("models.Order").new({ key = string.format(R_ORDER, roleId, orderId) })
+		if not orderObject:load() then
+			return false
+		end
+
+		local rechargeId = orderObject:getProperty("rechargeId")
+		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
+
+		if orderObject:getProperty("finishTime") > 0 then
+			return false, "finsh"
+		end
+		
+		if platformOrder then
+			orderObject:setProperty("transactionId", platformOrder)
+		end
+		orderObject:setProperty("status", status)
+
+		-- 开始下单
+		if status == "success" then
+		elseif status == "fail" then
+			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
+		elseif status == "finsh" then
+			orderObject:setProperty("finishTime", skynet.time())
+			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
+		end
+
+		if status ~= "unknow" then
+			self:log("setOrder", {
+				order_status = ({success = 100, finsh = 200, fail = 300})[status] or 1000, -- "订单状态：100 - 开始下单（玩家还未开始付费行为记录）200 - 支付完成并发货（SDK通知可以发货时记录），300 - 订单被取消，1000 - 其他"
+				item_id = rechargeId, -- 道具id
+				item_type = dataSet.type, -- 购买的道具类型，具体见"onItems"方法中道具类型枚举表
+				item_name = dataSet.title, -- 购买的道具名
+				item_number = 1, -- 购买的道具数量
+				item_level = 1, -- 购买的道具等级
+				order_cost = dataSet.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
+				order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
+				order_type = self:getProperty("rmbC") > 0 and 0 or 1, -- 订单类型，首充记录为1，否则为0
+				order_id = platformOrder, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
+			})
+		end
+
+		return true, rechargeId
+	end
  
 	-- 充值 --
 	--[[
@@ -1548,63 +1644,37 @@ function RolePlugin.bind(Role)
 		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" }))
+		local status, back = self:updatePurchaseOrder(partnerOrderStr, params.transactionId, "finsh")
+		if not status then
+			if back == "finsh" then
+				-- 订单已经处理
+				SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ result = "handled" }))
+			end
 			return
 		end
-		local rechargeId = orderObject:getProperty("rechargeId")
+		local rechargeId = back
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
 		if rechargeData.rmb ~= tonumber(params.amount) then
-			skynet.error(string.format("fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
+			skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
 				params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
 			))
 			return
 		end
  
-		local order_type = self:getProperty("rmbC") > 0 and 0 or 1
 		local status, reward = self:recharge({ 
 			id = 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)
  
 		if not status then
-			status = 200
-		else
-			status = 1000 + status
-		end
-		self:log("setOrder", {
-			order_status = status, -- "订单状态：100 - 开始下单（玩家还未开始付费行为记录）200 - 支付完成并发货（SDK通知可以发货时记录），300 - 订单被取消，1000 - 其他"
-			item_id = rechargeId, -- 道具id
-			item_type = rechargeData.type, -- 购买的道具类型，具体见"onItems"方法中道具类型枚举表
-			item_name = rechargeData.title, -- 购买的道具名
-			item_number = 1, -- 购买的道具数量
-			item_level = 1, -- 购买的道具等级
-			order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
-			order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
-			order_type = order_type, -- 订单类型，首充记录为1，否则为0
-			order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
-		})
-		if status ~= 200 then return end
-		
-		SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
-			result = "success", reward = reward}))
+			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
+				result = "success", reward = reward}))
+		end
  
-		return orderObject:getProperty("rechargeId")
+		return rechargeId
 	end
  
  
@@ -1612,7 +1682,7 @@ function RolePlugin.bind(Role)
 		local id = tonumber(params.id)
 		local rechargeData = csvdb["shop_rechargeCsv"][id]
 		if not rechargeData then
-			skynet.error("recharge id not exist", id)
+			skynet.error("[recharge] recharge id not exist", id)
 			return 1
 		end
  
@@ -1637,7 +1707,7 @@ function RolePlugin.bind(Role)
 		elseif rechargeData.shop == 3 then  -- 礼包商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
 		else
-			skynet.error("invalid recharge shop type " .. id)
+			skynet.error("[recharge] invalid recharge shop type " .. id)
 			return 3
 		end
  
@@ -33,7 +33,7 @@ local TaskType = {
 	HangQuick = 303, 			-- 快速挂机
 	HangBattle = 304,			-- 挂机战斗			- id
 	HangGetGold = 305,			-- 挂机获得齿轮		- count
-	BonusPass = 306,			-- 奖励副本通关		- id
+	BonusPass = 306,			-- 奖励副本通关		- id count
  
 	-- 冒险相关
 	AdvPass = 401,				-- 冒险通过关			- id 	level 	score
@@ -142,7 +142,7 @@ local CommonListener = {
 		[TaskType.GiveFriendP] = {{20, f("count")}},
 		[TaskType.UnionBoss] = {{21}},
 		[TaskType.GetFriendP] = {{22, f("count")}},
-		[TaskType.BonusPass] = {{23}},
+		[TaskType.BonusPass] = {{23, f("count")}},
 		[TaskType.AdvStartSelf] = {{24}},
 		[TaskType.ShopAll] = {{25, f("count")}},
 		[TaskType.RuneUp] = {{26}},
@@ -244,7 +244,7 @@ local CalendaTaskListener = {
 	func = "checkCalendaTask",
 	listen = {
 		[TaskType.DrawHero] = {{1, 1, f("count")}},
-		[TaskType.BonusPass]= {{2, 1}},
+		[TaskType.BonusPass]= {{2, 1, f("count")}},
 		[TaskType.AdvStart]= {{3, 1}},
 		[TaskType.DinerLevelUp]= {{4, 2, f("level")}},
 		[TaskType.HeroLvlCollect]= {{5, 3}},		-- x名y级英雄
@@ -226,7 +226,7 @@ end
 function Store:checkRechargeRecord(limit, id)
     local rechargeRecord = self:getProperty("payR") or {}
     if limit ~= 0 and limit <= (rechargeRecord[id] or 0) then
-        skynet.error(string.format("recharge id:%d count over limit, user id:%d", id, self.owner:getProperty("id")))
+        skynet.error(string.format("[recharge] recharge id:%d count over limit, user id:%d", id, self.owner:getProperty("id")))
         return false
     end
     rechargeRecord[id] = (rechargeRecord[id] or 0) + 1