Merge branch 'tr/bugfix-qa' into tr/publish/qa-out

* tr/bugfix-qa: pvp 匹配和失败扣减积分 Revert "修改 robot" 修改 robot 联动任务活动 appid 好友赠送能量活动bug修复活动能量bug 修改联动好友赠送活动的消息通知结构少个大括号修改联动好友赠送获得的红点记录和通知未测试版好友能量助力活动联动签到活动调理剂生产和使用逻辑优化

Merge branch 'tr/bugfix-qa' into tr/publish/qa-out
* tr/bugfix-qa: pvp 匹配和失败扣减积分 Revert "修改 robot" 修改 robot 联动任务活动 appid 好友赠送能量活动bug修复活动能量bug 修改联动好友赠送活动的消息通知结构少个大括号修改联动好友赠送获得的红点记录和通知未测试版好友能量助力活动联动签到活动调理剂生产和使用逻辑优化
zhouhaihai
2 parents 33de037f 1d724b8b
Showing 18 changed files with 720 additions and 43 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/CarAction.lua
src/actions/DinerAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/RadioAction.lua
src/actions/RoleAction.lua
src/adv/Adv.lua
src/csvdata
src/models/Activity.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RolePvp.lua
src/models/RoleTask.lua
@@ -73,7 +73,7 @@ ItemType = {
 	EquipBase 					= 9,	-- 基础装备
 	Rune						= 10,	-- 符文
 	Cuisine						= 11,	-- 料理（用于增加好感度、贩卖获得金币）
-	LunchBox 					= 12,	-- 便当盒（料理合成，冒险系统消耗道具）
+	Potion 						= 12,	-- 拾荒药剂
 	TimeBox 					= 13,	-- 时间箱（开启需要时间，随机产出道具）
 	AdvItem						= 14, 	-- 冒险道具
 	FuncOpen					= 15, 	-- 管理功能开放
@@ -229,6 +229,8 @@ actionCodes = {
 	Activity_battleMilestoneRpc = 663,
 	Activity_bossRewardRpc = 664,
 	Activity_crisisMilestoneRpc = 665,
+	Activity_commonSignRpc = 666,
+	Activity_friendHelpRpc = 667,
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -47,6 +47,7 @@ FRIEND_KEY = &quot;role:%d:friend&quot;	--哈希表 好友
 FRIEND_APPLY_KEY = "role:%d:apply"	-- sort set 申请列表
 FRIEND_BLACK_KEY = "role:%d:black" -- set 黑名单
 FRIEND_POINT = "role:%d:point" -- set 当天送给我心的人
+FRIEND_ENERGY = "role:%d:energy" -- set 送给我活动能量的好友
 FRIEND_RECOMMEND = "friend:recommend" -- sort set 登录排序 获取推荐好友
 CHAT_OFFLINE = "chat:offline:%d" --消息离线缓存
@@ -259,7 +259,10 @@ function _M.actCalendaTaskRpc(agent, data)
 		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
+	role:checkTaskEnter("FinishSpeTask", {taskId = taskId, actId = actId})
+
 	SendPacket(actionCodes.Activity_actCalendaTaskRpc, MsgPack.pack(role:packReward(reward, change)))
+
 	return true
 end
@@ -905,4 +908,216 @@ function _M.bossRewardRpc(agent, data)
 	return true
 end
+function _M.commonSignRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	local index = msg.index
+
+	if not role.activity:isOpenById(actid, "CommonSignIn") then return 1 end
+
+	local actData = role.activity:getActData("CommonSignIn")
+	if (actData[0] or 0) < index then
+		return 2
+	end
+	if (actData[index] or 0) == 1 then
+		return 3
+	end
+
+	local actCfg = csvdb["activity_signInCsv"][actid]
+	if not actCfg then return 4 end
+	actCfg = actCfg[index]
+	if not actCfg then return 5 end
+
+	actData[index] = 1
+	role.activity:updateActData("CommonSignIn", actData)
+
+	local award = actCfg.reward:toNumMap()
+	local reward, change = role:award(award, {log = {desc = "commonSign", int1 = actid, int2 = index}})
+	SendPacket(actionCodes.Activity_commonSignRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+function _M.friendHelpRpc(agent, data)
+	local role = agent.role
+	local roleId = role:getProperty("id")
+	local msg = MsgPack.unpack(data)
+	local oper = tonumber(msg.oper) or -1
+	local award = {}
+	local result
+
+
+	local actid = 37
+	if not role.activity:isOpenById(actid, "FriendEnergy") then return 1 end
+	if oper < 1 or oper > 4 then return 2 end
+
+	local actCsv = csvdb["activity_ctrlCsv"][actid]
+	local getLimit = actCsv.condition
+	local gifts = actCsv.condition2:toTableArray(true)
+
+	local actData = role.activity:getActData("FriendEnergy") or {}
+
+	local function getIds()
+		local ids = {}
+		local friends = redisproxy:hgetall(FRIEND_KEY:format(roleId))
+		for i = 1, #friends , 2 do
+			local objId = tonumber(friends[i])
+			ids[objId] = 1
+		end
+		return ids
+	end
+
+	if oper == 1 then -- 赠送好友能量
+		local giveAE = actData.giveAE or {}
+		local objId = msg.roleId
+		local gift = gifts[1]
+		local ids = {}
+
+		if not objId then
+			return 3
+		end
+		if not redisproxy:hexists(FRIEND_KEY:format(roleId), objId) then
+			result = 2
+		end
+		if giveAE[objId] then
+			result = 1
+		end
+
+		if not result then
+			giveAE[objId] = 1
+			award[gift[1]] = gift[2]
+			redisproxy:sadd(FRIEND_ENERGY:format(objId), roleId)
+			rpcRole(objId, "SendPacket", actionCodes.Role_notifyNewEvent, MsgPack.pack({events = {actFriendGive = roleId}}))
+			actData.giveAE = giveAE
+		end
+	elseif oper == 2 then -- 收取能量
+		local objId = msg.roleId
+		local gift = gifts[2]
+		local getAE = actData.getAE or {}
+		local limit = actData.limit or 0
+
+		if limit >= getLimit then return 4 end
+		if not redisproxy:sismember(FRIEND_ENERGY:format(roleId), objId) then
+			result = 3
+		end
+		if getAE[objId] then
+			result = 2
+		end
+		if limit >= getLimit then
+			result = 1
+		end
+
+		if not result then
+			limit = limit + 1
+			getAE[objId] = 1
+			award[gift[1]] = gift[2]
+			redisproxy:srem(FRIEND_ENERGY:format(roleId), objId)
+			actData.limit = limit
+			actData.getAE = getAE
+		end
+	elseif oper == 3 then -- 一键送领全部
+		local giveAE = actData.giveAE or {}
+		local getAE = actData.getAE or {}
+		local gift1 = gifts[1]
+		local gift2 = gifts[2]
+		local limit = actData.limit or 0
+		local cmd1, cmd2 = 0, 0
+		local ids = getIds()
+
+		local members = {}
+		local temp = redisproxy:smembers(FRIEND_ENERGY:format(roleId))
+		for _, id in pairs(temp) do
+			members[tonumber(id)] = 1
+		end
+
+		redisproxy:pipelining(function(red)
+			for friendId, _ in pairs(ids) do
+				if not giveAE[friendId] then
+					giveAE[friendId] = 1
+					award[gift1[1]] = (award[gift1[1]] or 0) + gift1[2]
+					red:sadd(FRIEND_ENERGY:format(friendId), roleId)
+					rpcRole(friendId, "SendPacket", actionCodes.Role_notifyNewEvent, MsgPack.pack({events = {actFriendGive = roleId}}))
+					cmd1 = 2
+				end
+
+				if members[friendId] and not getAE[friendId] and limit <= getLimit then
+					cmd2 = 1
+					limit = limit + 1
+					getAE[friendId] = 1
+					award[gift2[1]] = (award[gift2[1]] or 0) + gift2[2]
+					red:srem(FRIEND_ENERGY:format(roleId), friendId)
+				end
+			end
+		end)
+
+		local sum = cmd1 + cmd2
+		if sum == 0 then
+			result = 3
+		elseif sum ~= 3 then
+			result = sum
+		end
+
+		actData.limit = limit
+		actData.giveAE = giveAE
+		actData.getAE = getAE
+	elseif oper == 4 then -- 抽大奖
+		local magic = actData.magic or 0
+		local rewards = actData.reward or {}
+		local rewardCsv = csvdb["activity_orderRewardsCsv"][actid]
+		local itemId1 = gifts[1][1]
+		local itemId2 = gifts[2][1]
+
+		local level = math.min(magic + 1,#rewardCsv)
+		local rewardData = rewardCsv[level]
+
+		local cost = {[itemId1] = rewardData.condition1, [itemId2] = rewardData.condition2}
+
+		if not role:checkItemEnough(cost) then return 7 end
+		role:costItems(cost, {log = {desc = "actFriendHelp", int1 = actid, int2 = level}})
+
+		if rewardData.reward ~= "" then
+			result = 1
+			award = rewardData.reward:toNumMap()
+		end
+		if rewardData.reward_random ~= "" then
+			result = 1
+			local pool = {}
+			for _, temp in pairs(rewardData.reward_random:toArray()) do
+				table.insert(pool, temp:toArray(true, "="))
+			end
+			local gift = pool[math.randWeight(pool, 3)]
+			award[gift[1]] = (award[gift[1]] or 0) + gift[2]
+		end
+		rewards[level] = 1
+		actData.reward = rewards
+		actData.magic = level
+	else
+		return 5
+	end
+
+	local ids = {}
+	local members = {}
+	local friendIds = getIds()
+	local temp = redisproxy:smembers(FRIEND_ENERGY:format(roleId))
+	for _, id in pairs(temp) do
+		members[tonumber(id)] = 1
+	end
+
+	for id, _ in pairs(friendIds) do
+		if members[id] then
+			ids[id] = 1
+		end
+	end
+
+	actData.new = ids
+
+	local reward, change
+	if next(award) then
+		reward, change = role:award(award, {log = {desc = "actFriendHelp", int1 = actid, int2 = level}})
+	end
+	role.activity:updateActData("FriendEnergy", actData)
+	SendPacket(actionCodes.Activity_friendHelpRpc, MsgPack.pack({result = result, reward = reward}))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -345,6 +345,7 @@ function _M.endHangRpc(agent, data)
 	adv_idle_time = adv_idle_time * 60
 	local reward, isFull, change, heroFaithMap
+	local heroCnt = 0
 	if skynet.timex() >= info.time then
 		-- 最新需求加成取消
 		--[[
@@ -379,6 +380,7 @@ function _M.endHangRpc(agent, data)
 		for _, heroId in pairs(info.format.heros) do
 			local curFaith = addHeroFaith(role, heroId, exp)
 			heroFaithMap[heroId] = curFaith
+			heroCnt = heroCnt + 1
 		end
 		local totalReward = campSiteData.idleReward_1 .. " " .. campSiteData.idleReward_2
@@ -407,6 +409,7 @@ function _M.endHangRpc(agent, data)
 	role:mylog("adv_action", {desc = "endHang", int1 = chapterId, short1 = cancel and 1 or 0})
 	role:checkTaskEnter("AdvHang", {})
+	role:checkTaskEnter("AdvHangHeroCnt", {count = heroCnt})
 	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull, heroFaith = heroFaithMap}))
 	return true
@@ -544,8 +547,8 @@ function _M.usePotionRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local potionId = msg.potionId -- 营养剂Id
 	local target = msg.target -- {roomId = 1, blockId = 1} 选择的目标
-	local potionLv = role.dinerData:getProperty("dishTree"):getv(potionId, 0)
-	if potionLv == 0 then return 1 end
+	local potionLv = role.dinerData:getProperty("dishTree"):getv(potionId, 1)
+	if potionLv < 1 then return 1 end
 	local potionSet = csvdb["adv_potionCsv"][potionId]
 	if not potionSet then return 2 end
@@ -553,12 +556,9 @@ function _M.usePotionRpc(agent, data)
 	local potionData = potionSet[potionLv]
 	if not potionData then return 3 end
-	local potionBag = role:getProperty("potionBag")
-	local own = potionBag[potionId] or 0
-	if own <= 0 then return 4 end
-
 	if not isCanContinue(role) then return end
 	local adv = role:getAdvData()
+	if not adv:cost({[potionId] = 1}, {}, true) then return 4 end
 	if adv:isWaitChooseArtifact() then return end
 	adv:mylog({desc = "usePotion", int1 = potionId})
@@ -566,8 +566,7 @@ function _M.usePotionRpc(agent, data)
 	local status = adv:doActive(potionData.effect, target) -- target
 	if not status then return end
-	potionBag[potionId] = own - 1
-	role:updateProperty({field = "potionBag", value = potionBag})
+	adv:cost({[potionId] = 1}, {log = {desc = "usePotion", int1 = potionId}})
 	adv:pushBackEvent(AdvBackEventType.Potion, {id = potionId})
 	adv:afterRound()
 	adv:saveDB()
@@ -738,7 +737,7 @@ function _M.endBattleRpc(agent, data)
 	role:finishGuide(52)
 	-- 调理剂使用引导(生命药剂)
 	if not role:checkOverGuide(61) then
-		local potionBag = role:getProperty("potionBag")
+		local potionBag = role:getProperty("advItems"):toNumMap()
 		local own = potionBag[10] or 0
 		if own > 0 then
 			-- 造假
@@ -13,7 +13,7 @@ function _M.makePotionRpc( agent, data )
 	local count = msg.count
 	if count < 1 then return 0 end
 	local potionBag = role:getProperty("potionBag")
-	local potionLv = role.dinerData:getProperty("dishTree"):getv(potionId, 0)
+	local potionLv = role.dinerData:getProperty("dishTree"):getv(potionId, 1)
 	if potionLv < 1 then return 1 end
 	local potionSet = csvdb["adv_potionCsv"][potionId]
@@ -22,20 +22,15 @@ function _M.makePotionRpc( agent, data )
 	local potionData = potionSet[potionLv]
 	if not potionData then return 3 end
-	local own = potionBag[potionId] or 0
-	if own+count > potionData.limit then
-		return 4
-	end
-
 	local cost = potionData.material:toNumMap()
 	for k, n in pairs(cost) do
 		cost[k] = n * count
 	end
 	if not role:checkItemEnough(cost) then
-		return 5
+		return 4
 	end
-
 	role:costItems(cost, {log = {desc = "makePotion", int1 = potionId, int2 = count}})
+	local own = potionBag[potionId] or 0
 	potionBag[potionId] = own + count
 	role:updateProperty({field = "potionBag", value = potionBag})
 	role:checkTaskEnter("PotionMake", {count = count, id = potionId})
@@ -385,22 +385,12 @@ function _M.talentUpRpc( agent, data )
 	local msg = MsgPack.unpack(data)
 	local dish = msg.dish
 	local dishTree = role.dinerData:getProperty("dishTree")
-	local dishLevel = dishTree:getv(dish, 0)
 	local talentSet = csvdb["diner_talentCsv"][dish]
 	if not talentSet then
 		return 1
 	end
-	local talentData = talentSet[dishLevel]
-	if not talentData then
-		return 2
-	end
-
-	if not talentSet[dishLevel+1] then
-		return 21
-	end
-
 	local typ = math.floor(dish/100 + 1)
 	local treeSet = csvdb["diner_treeCsv"][typ]
 	if not treeSet then
@@ -412,6 +402,17 @@ function _M.talentUpRpc( agent, data )
 		return 4
 	end
+	-- 调理剂的默认等级是1级
+	local dishLevel = dishTree:getv(dish, treeData.rarity == 2 and 1 or 0)
+	local talentData = talentSet[dishLevel]
+	if not talentData then
+		return 2
+	end
+
+	if not talentSet[dishLevel+1] then
+		return 21
+	end
+
 	local limit = talentData.pointFront:toNumMap()
 	for k,v in pairs(limit) do
 		local lv = dishTree:getv(k, 0)
@@ -534,11 +534,23 @@ end
 function _M.test(role, pms)
 	local id = tonum(pms.pm1, 0)
+	local actid = nil
+	if id > 100 then
+		actid = tonum(pms.pm2, 0)
+	end
 	--local hero = require ("actions.HeroAction")
 	--hero.unlockPoolRpc({role = role}, MsgPack.pack({type = id}))
 	--role:sendMail(13, nil, "1=2", {111})
-	dump(redisproxy:zrevrange("rank:tower", 0 , 10, "WITHSCORES"))
+	local file = io.open("draw_hero_"..id..".csv", "a")
+	for i=1, 10000 do
+		local heroIds = _M.drawHero(role, id, actid)
+		for k, v in ipairs(heroIds) do
+			print((i - 1)* 10 + k, v)
+			file:write(v.."\n")
+		end
+	end
+	io.close(file)
 	return "成功"
 end
@@ -563,5 +575,259 @@ function _M.cz(role, pms)
 	return "指令成功"
 end
+function _M.drawHero(role, t, act)
+	local btype = t	-- 1 2 3 4 5	卡池类型  4新手卡池 5心愿卡池
+	local subType = 1-- 定向卡池需要传 子类型
+	local drawType = 2 -- 1 单抽 2 十连
+	if btype ~= 1 then
+		subType = 1
+	end
+
+	local actid = act
+	-- 另开活动卡池
+	if actid then
+		--if not role.activity:isOpenById(actid, "ActHeroPool") then return end
+		local cfg = csvdb["activity_ctrlCsv"][actid]
+		if not cfg then return end
+
+		btype = cfg.condition
+	end
+
+	local buildTypeData = csvdb["build_typeCsv"][btype]
+	if not buildTypeData then return 2 end
+
+	local drawCount = {1, 10} -- 抽取次数
+	if not drawCount[drawType] then return 3 end
+
+	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype]
+	local floorHeroCount = role:getProperty("floorHero")[btype] or 0
+
+	-- 抽取的池子
+	local poolMap = buildTypeData["pool"]:toNumMap()
+	local poolId = poolMap[subType]
+	if not poolId then return 5 end
+	
+	--TODO 活动覆盖
+	local actPoolId = role.activity:getActivityPool(btype, subType)
+	if actPoolId ~= 0 then
+		poolId = actPoolId
+	end
+
+	local unitPool = csvdb["build_unitCsv"][poolId]
+	if not unitPool then return 7 end
+
+	-- 开始抽
+	local resultPool = {}
+	local function fillDrawPool(isFloorBack)
+		local condition = {"rare"}
+		local values = {}
+
+
+		for idx, field in ipairs(condition) do
+			if not values[idx] then
+				local lpool = {}
+				local curIdx = 1
+				while unitPool[field .. "_" .. curIdx] do
+					lpool[curIdx] = {unitPool[field .. "_" .. curIdx]}
+					curIdx = curIdx + 1
+				end
+
+				if next(lpool) then
+					values[idx] =  math.randWeight(lpool, 1)
+				end
+			end
+		end
+
+		local weight = 0
+		local up_pool = nil
+		local rand_v = math.randomInt(1, 100)
+		if values[1] == HeroQuality.SR then
+			weight = unitPool["up_sr_weight"]
+			up_pool = unitPool["up_sr_id"]
+		elseif values[1] == HeroQuality.SSR then
+			weight = unitPool["up_ssr_weight"]
+			up_pool = unitPool["up_ssr_id"]
+		end
+		--print(poolId, rand_v, weight, up_pool, values[1])
+		if rand_v < weight and up_pool then
+			up_pool = up_pool:toArray(true, "=")
+			if btype == 5 then -- 爱心卡池，使用玩家设置的备选池子
+				up_pool = role:getProperty("wishPool")
+				up_pool[1] = 606
+				up_pool[2] = 607
+				up_pool[3] = 608
+			end
+			for k, v in ipairs(up_pool) do
+				resultPool[v] = {1}
+			end
+		else
+			for itemId, oneData in pairs(isFloorBack and csvdb["build_floorCsv"] or csvdb["build_poolCsv"]) do
+				local pool_str = "pool_" .. poolId
+				if oneData[pool_str] and oneData[pool_str] ~= "" then
+					local itemData = csvdb["itemCsv"][itemId]
+					while itemData do
+						if itemData.type ~= ItemType.Hero then break end
+						local heroData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
+						if not heroData then break end
+						local ok = true
+						-- 保底是全随机，不用比较类型
+						if not isFloorBack then
+							for idx, field in ipairs(condition) do
+								if heroData[field] ~= values[idx] then ok = false break end
+							end
+						end
+						if not ok then break end
+						if oneData[pool_str] > 0 then
+							resultPool[itemId] = {oneData[pool_str]}  -- itemId, count, 概率
+						end
+						break
+					end
+				end
+			end
+		end
+	end
+
+	local guideHero = nil
+	if role:getProperty("newerGuide") == "8=1" then
+		guideHero = globalCsv.newdraw_hero_item_id or 503
+	end
+
+	local ssrCount = 0
+	local reward = {}
+	local logReward = {}
+	local result = {}
+	for i = 1, drawCount[drawType] do
+		floorHeroCount = floorHeroCount + 1
+		local isFloorBack = draw_floor_back_counts and floorHeroCount >= draw_floor_back_counts
+		resultPool = {}
+		fillDrawPool(isFloorBack)
+		if not next(resultPool) then
+			skynet.error("random pool error, poolId:" .. poolId, isFloorBack)
+			return 8
+		end
+
+		local itemId = math.randWeight(resultPool, 1)
+		if guideHero then
+			itemId = guideHero
+		end
+
+		local itemData = csvdb["itemCsv"][itemId]
+		if itemData.quality == HeroQuality.SSR then
+			ssrCount = ssrCount + 1
+			if not guideHero then
+				-- 广播获得ssr英雄
+				local ntf = {heroId = itemData.id - ItemStartId.Hero, nick = role:getProperty("name")}
+				--mcast_util.pub_world(actionCodes.Role_broadGetSSR, MsgPack.pack(ntf))
+			end
+		end
+
+		if btype == 4 and role:getProperty("newerDraw") == 0 then		-- 新手卡池
+			if itemData.quality == HeroQuality.SSR then
+				floorHeroCount = 0
+			end
+		else
+			if itemData.quality >= HeroQuality.SR then
+				floorHeroCount = 0
+			end
+		end
+
+		if role:isHaveHero(itemData.id - ItemStartId.Hero) then
+			local fragId = itemData.id - ItemStartId.Hero
+			local heroData = csvdb["unitCsv"][fragId]
+			local count = globalCsv.draw_unit_tofragment[heroData.rare]
+			role:award({[fragId] = count}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
+			logReward[fragId] = (logReward[fragId] or 0) + count
+			table.insert(reward, {id = fragId, count = count, from = itemId, fcount = 1})
+		else
+			role:award({[itemId] = 1}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
+			logReward[itemId] = (logReward[itemId] or 0) + 1
+			table.insert(reward, {id = itemId, count = 1})
+		end
+	end
+
+	if draw_floor_back_counts then
+		local floorHero = role:getProperty("floorHero")
+		floorHero[btype] = floorHeroCount
+		role:setProperty("floorHero", floorHero)
+	end
+
+	if btype == 4 then
+		local newCount = role:getProperty("newerDraw")
+		role:updateProperty({field="newerDraw", value = newCount + drawCount[drawType]})
+	end
+
+	--SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
+	for k, v in pairs(reward) do
+		local hero = v
+		if hero["from"] then
+			result[#result+1] = hero["from"]
+		else
+			result[#result+1] = hero["id"]
+		end
+	end
+
+	local feedbackId = buildTypeData["can_feedback"] or 0
+	if feedbackId ~= 0 then
+		-- 达到一定次数，给响应奖励
+		local oldVal = role:getProperty("repayHero") or 0
+		if actid then
+			local actData = role.activity:getActData("ActHeroPool")
+			oldVal = actData[btype] or 0
+		end
+		local newVal = oldVal + drawCount[drawType]
+		local drawCardReward, val = role:getDrawCardExtraReward(feedbackId, oldVal, newVal)
+		-- 空字符穿代表直接给英雄  走以前repayHeroRpc
+		if drawCardReward == "" then
+			local repayHeroMaxCount = role:getProperty("repayMaxC") or 0
+			repayHeroMaxCount = repayHeroMaxCount + 1
+
+			role:updateProperty({field = "repayMaxC", value = repayHeroMaxCount})
+			local even = repayHeroMaxCount % 2
+			local id = 0
+			if even == 1 then
+				id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
+			else
+				local giftHeroSet = {}
+				for gid, cfg in pairs(csvdb["build_giftCsv"]) do
+					if cfg["pool_"..feedbackId] ~= 0 and not role:isHaveHero(gid - ItemStartId.Hero) then
+						giftHeroSet[gid] = {1}
+					end
+				end
+				if next(giftHeroSet) then
+					id = math.randWeight(giftHeroSet, 1)
+				end
+			end
+			if id == 0 then
+				id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
+			end
+
+			local r,change = {}
+			local itemData = csvdb["itemCsv"][id]
+			--if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
+			--	local fragId = itemData.id - ItemStartId.Hero
+			--	local heroData = csvdb["unitCsv"][fragId]
+			--	local count = globalCsv.draw_unit_tofragment[heroData.rare]
+			--	r, change = role:award({[fragId] = count}, {log = {desc = "drawHeroExtraReward"}})
+			--	--r = {id = fragId, count = count, from = id, fcount = 1}
+			--else
+			r, change = role:award({[id] = 1}, {log = {desc = "drawHeroExtraReward"}})
+			--end
+			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
+		elseif drawCardReward and drawCardReward ~= "" then
+			local r,change = {}
+			r, change = role:award(drawCardReward, {log = {desc = "drawHeroExtraReward", int1 = oldVal, int2 = newVal}})
+			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
+		end
+		if not actid then
+			role:updateProperty({field = "repayHero", value = val})
+		else
+			local actData = role.activity:getActData("ActHeroPool")
+			actData[btype] = val
+			role.activity:updateActData("ActHeroPool", actData)
+		end
+	end
+	return result
+end
+
 return _M
 \ No newline at end of file
@@ -591,6 +591,8 @@ function _M.startBonusBattleRpc(agent, data)
 		local reward, change = bonusWinReward(role, bonusData, 3, count)
 		SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({reward = reward, change = change}))
+
+		role:checkTaskEnter("BonusQuick", {count = count})
 	else
 		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
 		if not next(bTeam) then return 5 end
@@ -179,6 +179,7 @@ function _M.finishQuestRpc(agent, data)
     msg["heroFaith"] = heroFaithMap
     SendPacket(actionCodes.Radio_finishQuestRpc, MsgPack.pack(msg))
+    role:checkTaskEnter("RadioTaskStart", {heroCnt = #task.heros})
     local herolist = {}
     for _, heroId in ipairs(task.heros) do
@@ -847,6 +847,11 @@ function _M.taskRpc(agent, data)
 	local reward, change = role:award(taskData.reward, {log = {desc = "finishTask", int1 = taskType, int2 = taskId}})
 	local active = (taskStatus["a"] or 0) + taskData.active
+	-- 日常活动完成
+	if taskType == 1 then
+		role:checkTaskEnter("DailyTask", {pre = (taskStatus["a"] or 0), cur = active})
+	end
+
 	role:changeUpdates({
 		{ type = roleField[taskType], field = {"t", taskId}, value = -1 },
 		{ type = roleField[taskType], field = "a", value = active},
@@ -142,6 +142,11 @@ function Adv:initByChapter(params)
 			isNewRelay = true
 		end
 	end
+
+	if self.level == 1 or self.isRelay then
+		self:supplyPotion()
+	end
+
 	self.maps = {}
 	self.maps[1] = AdvMap.new(self, 1, mapId, isEnter, isNewRelay)
@@ -404,9 +409,16 @@ function Adv:forceOver(notNotify)
 		local advTeam = self.owner:getProperty("advTeam")
 		advTeam.player = nil
+		local advPotionCsv = csvdb["adv_potionCsv"]
+		local potionBag = self.owner:getProperty("potionBag")
+
 		local reward = self.owner:getProperty("advItems"):toNumMap()
 		for itemId, count in pairs(reward) do
-			reward[itemId] = math.ceil(count * globalCsv.adv_fail_reward_ratio / 100) -- 奖励相当于失败
+			if advPotionCsv[itemId] then
+				potionBag[itemId] = (potionBag[itemId] or 0) + count
+			else
+				reward[itemId] = math.ceil(count * globalCsv.adv_fail_reward_ratio / 100) -- 奖励相当于失败
+			end
 		end
 		self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}, notNotify = notNotify})
@@ -417,6 +429,7 @@ function Adv:forceOver(notNotify)
 			advItems = "",
 			advAFGet = {},
 			advAFWear = {},
+			potionBag = potionBag,
 		}, notNotify)
 	end
 end
@@ -797,12 +810,18 @@ function Adv:over(success, rewardRatio, overType)
 	self.battle.player:triggerPassive(Passive.ADV_OVER, {score = score, level = self.level})
 	local reward = {}
+	local advPotionCsv = csvdb["adv_potionCsv"]
+	local potionBag = self.owner:getProperty("potionBag")
 	for itemId, count in pairs(self.owner:getProperty("advItems"):toNumMap()) do
 		local itemCsv = csvdb["itemCsv"][itemId]
 		if not itemCsv then
 			print("ERROR: no itemId in ItemCsv : ", itemId)
 		elseif itemCsv.type ~= ItemType.AdvItem then
-			reward[itemId] = math.ceil(count * rewardRatio / 100)
+			if advPotionCsv[itemId] then
+				potionBag[itemId] = (potionBag[itemId] or 0) + count
+			else
+				reward[itemId] = math.ceil(count * rewardRatio / 100)
+			end
 		end
 	end
 	reward = self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}})
@@ -898,6 +917,7 @@ function Adv:over(success, rewardRatio, overType)
 		advItems = "",
 		advAFGet = {},
 		advAFWear = {},
+		potionBag = potionBag,
 	})
 	self:pushBackEvent(AdvBackEventType.End, {
 		success = success,
@@ -982,7 +1002,8 @@ function Adv:award(gift, params, backRewardParams)
 		if globalCsv.adv_auto_useItem[itemId] and count > 0 then
 			autoUse[itemId] = count
 		else
-			local origin = items:getv(itemId, 0)
+			local transId = globalCsv.adv_item_potion[itemId] or itemId
+			local origin = items:getv(transId, 0)
 			local nums = origin + count
 			if csvdb["adv_artifactCsv"][itemId] then -- 获得神器
@@ -992,10 +1013,10 @@ function Adv:award(gift, params, backRewardParams)
 				end
 			else
 				if nums <= 0 then
-					items = items:delk(itemId)
+					items = items:delk(transId)
 					nums = 0
 				else
-					items = items:setv(itemId, nums)
+					items = items:setv(transId, nums)
 				end
 				if itemId == 16 and not self.owner:checkOverGuide(51,4) then
@@ -1073,6 +1094,7 @@ end
 -- 消耗物品 优先冒险背包  --check 只是检查够不够
 function Adv:cost(item, params, check)
 	local items = self.owner:getProperty("advItems")
+	local potionCsv = csvdb["adv_potionCsv"]
 	local less = {}
 	local advCost = {}
 	for itemId, count in pairs(item) do
@@ -1086,9 +1108,13 @@ function Adv:cost(item, params, check)
 			less[itemId] = -last
 		end
+		if potionCsv[itemId] and last < 0 then -- 只能使用冒险背包里的药水
+			return
+		end
 	end
 	if next(less) and not self.owner:checkItemEnough(less) then return end --不够
 	if check then return true end
+
 	self:award(advCost, params)
 	if next(less) then
 		self.owner:costItems(less, params)
@@ -1096,6 +1122,25 @@ function Adv:cost(item, params, check)
 	return true
 end
+-- 补满冒险背包药剂,从药剂背包扣除药水放到冒险背包
+function Adv:supplyPotion()
+	local potionCsv = csvdb["adv_potionCsv"]
+	local potionBag = self.owner:getProperty("potionBag")
+	local advItems = self.owner:getProperty("advItems")
+	for potionId, set in pairs(potionCsv) do
+		local count = potionBag[potionId] or 0
+		if count > 0 then
+			local num = math.min(set[1].limit,count)
+			advItems = advItems:setv(potionId,num)
+			potionBag[potionId] = num ~= count and (count - num) or nil
+		end
+	end
+	self.owner:updateProperties({
+		advItems = advItems,
+		potionBag = potionBag,
+	})
+end
+
 --事件点击处理
 local function clickOut(self, room, block, params, isExit)
 	if self:getCurMap():checkOver() then --检查是否可以出去了
@@ -2152,6 +2197,7 @@ function Adv:enemyDead(enemy, escape)
 				self:checkAchievement(Adv.AchievType.KillBossNoBuff, 1)
 				self:checkAchievement(Adv.AchievType.KillBossWithMWeapon, 1)
 				self:checkAchievement(Adv.AchievType.KillBossWithAMWeapon, 1)
+				self.owner:checkTaskEnter("AdvKillBoss")
 			elseif monsterData.type == 3 then
 				self:checkTask(Adv.TaskType.KillElite, 1, enemyId)
 			end
-Subproject commit 76b7ed2b1684a9741a5c531e616acc31c8b5aa9d
+Subproject commit b86293f02222b1fbd499e57de9ead6cbd6e0d736
@@ -30,6 +30,9 @@ Activity.ActivityType = {
 	ActShopGoods = 25, 	-- 活动商品
 	Crisis = 26, -- 宝藏怪活动
+
+	CommonSignIn = 28, 	--通用签到
+	FriendEnergy = 30, -- 好友互赠能量活动 
 }
 local function checkActivityType(activityType)
@@ -73,6 +76,9 @@ Activity.schema = {
 	act24		= {"table", {}, true},	-- 活动卡池 {id=repaynum}
 	act26 		= {"table", {}},	-- {task = {id = count}, socre = {id = status}}
+
+	act28		= {"table", {}},	-- 每日活跃签到 {0=day, 1=1,2=1,3=1}
+	act30 		= {"table", {}}, -- {magic = 0, limit = 0, reward = {id = 1, id = 1}, giveAE = {}, getAE = {}} 奖励字段1表示领取过奖励
 }
 function Activity:data()
@@ -93,6 +99,9 @@ function Activity:data()
 		act20 = self:getProperty("act20"),
 		act24 = self:getProperty("act24"),
 		act26 = self:getProperty("act26"),
+
+		act28 = self:getProperty("act28"),
+		act30 = self:getProperty("act30"),
 	}
 end
@@ -471,8 +480,9 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 		role:checkTaskEnter("RuneQualityCollect", {})
 	end,
-	-- ["close"] = function(self, actType, notify)
-	-- end,
+	["close"] = function(self, actType, notify)
+		self.owner:updateProperty({field="CalTask", value={}})
+	end,
 }
 -- 兑换
@@ -772,7 +782,46 @@ activityFunc[Activity.ActivityType.ActShopGoods] = {
 	end,
 }
+activityFunc[Activity.ActivityType.FriendEnergy] = {
+	["init"] = function (self, actType, isCrossDay, notify, actId)
+		local data = {magic = 0, limit = 0, reward = {}, giveAE = {}, getAE = {}, new = self:getActFriendNew()}
+		self:updateActData(actType, data, not notify)
+	end,
+	["login"] = function (self, actType)
+		local actData = self:getActData(actType) or {}
+		actData.new = self:getActFriendNew()
+		self:updateActData(actType, actData, not notify)
+	end,
+	["crossDay"] = function(self, actType, notify)
+		local actData = self:getActData(actType)
+		actData.limit = 0
+		actData.giveAE = {}
+		actData.getAE = {}
+		self:updateActData(actType, actData, not notify)
+	end,
+	["close"] = function (self, actType, notify, actId)
+		redisproxy:del(FRIEND_ENERGY:format(self.owner:getProperty("id")))
+	end
+}
+function Activity:getActFriendNew()
+	local roleId = self.owner:getProperty("id")
+	local friendIds = {}
+	local friends = redisproxy:hgetall(FRIEND_KEY:format(roleId))
+	for i = 1, #friends , 2 do
+		local objId = tonumber(friends[i])
+		friendIds[objId] = 1
+	end
+
+	local ids = {}
+	local members = redisproxy:smembers(FRIEND_ENERGY:format(roleId))
+	for _, id in pairs(members) do
+		if friendIds[tonumber(id)] then
+			ids[tonumber(id)] = 1
+		end
+	end
+	return ids
+end
 activityFunc[Activity.ActivityType.Crisis] = {
 	["check"] = function(self, actType, notify, atype, count) -- 检查
@@ -814,4 +863,40 @@ activityFunc[Activity.ActivityType.Crisis] = {
 	end,
 }
+activityFunc[Activity.ActivityType.CommonSignIn] = {
+	["init"] = function(self, actType, isCrossDay, notify, actId)
+		if not isCrossDay then
+			activityFunc[Activity.ActivityType.CommonSignIn]["crossDay"](self, actType, notify, actId)
+		end
+	end,
+	["crossDay"] = function(self, actType, notify, actId)
+		local actCfg = csvdb["activity_ctrlCsv"][actId]
+		if not actCfg then return end
+		local conArr = actCfg.condition2:toArray("true", "=")
+		-- 0 登录即可， 1 达到指定活跃度
+		if conArr[1] ~= 0 then
+			return
+		end
+		local curData = self:getActData(actType) or {}
+		curData[0] = (curData[0] or 0) + 1
+		self:updateActData(actType, curData, not notify)
+	end,
+	["check"] = function(self, actType, notify, pre, cur) -- 检查
+		local isOpen, actId = self:isOpen(actType)
+		local actData = self:getActData(actType) or {}
+		local actCfg = csvdb["activity_ctrlCsv"][actId]
+		if not actCfg then return end
+		local conArr = actCfg.condition2:toArray("true", "=")
+		-- 0 登录即可， 1 达到指定活跃度
+		if conArr[1] ~= 1 then
+			return
+		end
+		local val = conArr[2] or 0
+		if pre < val and cur >= val then
+			actData[0] = (actData[0] or 0) + 1
+			self:updateActData(actType, actData, not notify)
+		end
+	end,
+}
+
 return Activity
@@ -51,6 +51,8 @@ local ItemReason = {
 	actBattle = 135, -- 活动关卡
 	actMilestone = 136,	-- 活动关卡boss伤害里程碑
 	worldBossReward = 137,	-- 世界boss翻牌奖励
+	commonSign = 138,	-- 每日活跃签到
+	actFriendHelp = 139,-- 好友能量互助活动
 	advHang = 301, -- 拾荒挂机
@@ -131,6 +131,9 @@ function RolePlugin.bind(Role)
 					self:addItem(pms)
 				end
 			end,
+			[ItemType.Potion] = function ()
+				self:addPotion({id = itemId, count = count, notNotify = pms.notNotify, log = pms.log})
+			end,
 		}
 		-- 对数量筛查
 		count = checkItemCount(self, itemId, count)
@@ -290,6 +293,37 @@ function RolePlugin.bind(Role)
 		self:changeCrossServerPvpSelfInfo("level")
 	end
+	function Role:addPotion(params)
+		dump(params)
+		local pId = globalCsv.adv_item_potion[params.id]
+		local potionBag = self:getProperty("potionBag")
+		local origin = potionBag[pId] or 0
+		local nums = origin + params.count
+		potionBag[pId] = nums
+
+		self:logItems(params.id, origin, nums, params.log)
+		if params.log then
+			local log = clone(params.log)
+			if log["cint1"] or log["cint2"] then
+				print("addItem error log have cint1 or cint2  ", debug.traceback())
+			end
+			log["cint1"] = params.id
+			log["cint2"] = math.abs(params.count)
+			if params.count <= 0 then
+				self:mylog("out_item", log)
+			else
+				self:mylog("in_item", log)
+			end
+		else
+			print("addItem no log ", debug.traceback())
+		end
+
+		self:updateProperty({field = "potionBag", value = potionBag})
+		if not params.notNotify then
+			SendPacket(actionCodes.Role_updateItems, MsgPack.pack({[params.id] = params.count}))
+		end
+	end
+
 	function Role:addItem(params)
 		params = params or {}
 		params.count = math.floor(params.count or 0)
@@ -1581,7 +1615,6 @@ function RolePlugin.bind(Role)
 			if table.pack(next(newReward))[2] >= divisionData.limit then
 				return true
 			end
-			
 		end
 		local events = {}
@@ -9,7 +9,7 @@ local PVP_RANK_TIME_SORT_PRECISION = 360 -- 时间精度 每6分钟忽略差异
 local PVP_RANK_BASE_SCORE = globalCsv.pvp_base_score -- 初始积分
 -- 匹配规则改为以排名来匹配
-local PVP_GET_ROBOT_SCORE = 2400 -- 2400分以下低档位匹配机器人
+local PVP_GET_ROBOT_SCORE = 1300 -- 1300分以下低档位匹配机器人
 local PRE_RANGE_COUNT = 20 -- 每个档位人数
 local NEED_MATCH = 3 --匹配到多少人
@@ -73,7 +73,7 @@ function Role:changePvpScoreCommon(matchId, isWin)
 		if isWin then
 			local scoreChange = math.ceil(60 / (1 + 10 ^ ((myScore - matchScore) / 400)))
 			myScore = myScore + scoreChange
-			matchScore = matchScore - math.ceil(scoreChange / 3) -- 防守方失败时，扣分减为原来的1/3
+			matchScore = matchScore - math.ceil(scoreChange / 3 * 2) -- 防守方失败时，扣分减为原来的2/3
 		else
 			local scoreChange = math.ceil(60 / (1 + 10 ^ ((matchScore - myScore) / 400)))
 			myScore = myScore - scoreChange
@@ -139,7 +139,7 @@ function Role:changePvpScoreHigh(matchId, isWin)
 		if isWin then
 			local scoreChange = math.ceil(50 / (1 + 10 ^ ((myScore - matchScore) / 1000)))
 			myScore = myScore + scoreChange
-			matchScore = matchScore - math.ceil(scoreChange / 3) -- 防守方失败时，扣分减为原来的1/3
+			matchScore = matchScore - math.ceil(scoreChange / 3 * 2) -- 防守方失败时，扣分减为原来的2/3
 		else
 			local scoreChange = math.ceil(50 / (1 + 10 ^ ((matchScore - myScore) / 1000)))
 			myScore = myScore - scoreChange
@@ -34,6 +34,7 @@ local TaskType = {
 	HangBattle = 304,			-- 挂机战斗			- id
 	HangGetGold = 305,			-- 挂机获得齿轮		- count
 	BonusPass = 306,			-- 奖励副本通关		- id count
+	BonusQuick = 307, 			-- 奖励关卡扫荡		-- id count
 	-- 冒险相关
 	AdvPass = 401,				-- 冒险通过关			- id 	level 	score
@@ -50,7 +51,9 @@ local TaskType = {
 	AdvHang	= 412,				-- 代理拾荒次数
 	AdvMineKill = 413,			-- 宝藏怪击杀
 	AdvMineLayer = 414,			-- 宝藏洞激活
-	AdvPassFirst = 415,			-- 冒险首次通关			- id
+	AdvKillBoss	= 415,			-- 拾荒击杀boss
+	AdvHangHeroCnt	= 416,		-- 拾荒人数
+	AdvPassFirst = 417,			-- 冒险首次通关			- id
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -92,6 +95,9 @@ local TaskType = {
 	SignIn = 901,				-- 签到
 	Pay	= 902,					-- 充值
 	ShopAll = 903,				-- 在任意商店购买 	
+	DailyTask = 904,			-- 完成每日活跃任务
+	RadioTaskStart = 905,		-- 电台任务开始			
+	FinishSpeTask = 906,		-- 指定任务完成			
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -232,6 +238,7 @@ local ActivityListener = {
 		[TaskType.Pay] = {{Activity.ActivityType.PayBack, f("twd")}},
 		[TaskType.AdvMineKill] = {{Activity.ActivityType.Crisis, 1}},
 		[TaskType.AdvMineLayer] = {{Activity.ActivityType.Crisis, 2}},
+		[TaskType.DailyTask] = {{Activity.ActivityType.CommonSignIn, f("pre"), f("cur")}},
 	}
 }
@@ -269,6 +276,14 @@ local CalendaTaskListener = {
 		[TaskType.HangGet]= {{18, 3, f("reward")}},
 		[TaskType.RuneQualityCollect]= {{19, 3}},
 		[TaskType.OpenBox]= {{20, 3, f("count"), f("quality")}},
+		[TaskType.RadioTaskStart] = {{21, 1}, {22, 3, f("heroCnt")}},
+		[TaskType.BonusQuick] = {{23, 1, f("count")}},
+		[TaskType.AdvHangHeroCnt] = {{24, 3, f("HeroCnt")}},
+		[TaskType.AdvKillBoss] = {{25, 1}},
+		[TaskType.AdvMineKill] = {{26, 1}},
+		[TaskType.PvpBattle] = {{27, 1}},
+		[TaskType.FinishSpeTask] = {{28, 3, f("taskId"), f("actId")}},
+
 	}
 }
@@ -701,6 +716,15 @@ function RoleTask.bind(Role)
 										calTask[id] = 1
 									end
 								end
+							elseif cfg.type == 22 then	-- 电台任务出勤人数
+								calTask[id] = (calTask[id] or 0) + (param1 or 0)
+							elseif cfg.type == 24 then	-- 代理拾荒出勤人数
+								calTask[id] = (calTask[id] or 0) + (param1 or 0)
+							elseif cfg.type == 28 then	-- 完成指定任务
+								print(actId,param2, cfg.condition2, param1)
+								if actId == param2 and cfg.condition2 == param1 then
+									calTask[id] = (calTask[id] or 0) + 1
+								end
 							end
 						end
 					end
@@ -713,4 +737,4 @@ function RoleTask.bind(Role)
 end
-return RoleTask
 \ No newline at end of file
+return RoleTask