Merge branch 'develop' into tr/publish

熊润斐
2 parents 63df76e7 804a7eaf
Showing 15 changed files with 210 additions and 122 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/actions/TowerAction.lua
src/adv/AdvPlayer.lua
src/agent.lua
src/csvdata
src/models/Hero.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/Store.lua
src/services/agent_util.lua
src/utils/StringUtil.lua
@@ -69,6 +69,7 @@ ItemType = {
 	FuncOpen					= 15, 	-- 管理功能开放
 	SpeedBox					= 16, 	-- 加速箱子
 	SelectItemBox				= 17, 	-- 自选箱子
+	CommonPaster				= 18, 	-- 万能贴纸
 }
 --在这个里面的会记录的是功能开放 对应类型open 而不是 ID
@@ -307,9 +308,12 @@ MailId = {
 }
 TriggerEventType = {
-    HangPass = 1,
-    LevelUp = 2,
+	HangPass = 1,
+	AdvPass = 2,
     TowerPass = 3,
+	LevelUp = 4,
+	AddNewHero = 5,
+	SSRCount = 6,
 }
 DrawCardType = {
@@ -48,6 +48,7 @@ actionCodes = {
 	Role_getDownloadCvRewardRpc = 132,
 	Role_updateFeedbackInfoRpc = 133,
 	Role_useSelectItemRpc = 134,		-- 使用多选一礼包
+	Role_broadGetSSR = 135,		-- 全服广播 获得ssr英雄
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -26,6 +26,8 @@ local function checkReward(role)
 	local nowCoinTime = math.min(skynet.timex(), hangInfo.endCoinTime or 0)
 	local nowItemTime = math.min(skynet.timex(), hangInfo.endItemTime or 0)
+	local expCoef, itemCoef = role.storeData:getHangDropCoef()
+
 	-- 此次挂机，其中翻倍时长占多少
 	local doubleTime = role.activity:getActHangDoubleTime(hangInfo.coinTime, nowCoinTime)
 	local normalTime = nowCoinTime - hangInfo.coinTime - doubleTime
@@ -39,7 +41,7 @@ local function checkReward(role)
 	hangInfo.itemTime = nowItemTime
 	local items = role:getProperty("hangBag")
-	coinCount = coinCount + coinDoubleCount
+	coinCount = (coinCount + coinDoubleCount) * expCoef
 	items[ItemId.Gold] = math.floor((items[ItemId.Gold] or 0) + coinCount * expCarbonData.money)
 	items[ItemId.Exp] = math.floor((items[ItemId.Exp] or 0) + coinCount * expCarbonData.exp)
 	items[ItemId.PlayerExp] = math.floor((items[ItemId.PlayerExp] or 0) + coinCount * expCarbonData.playerExp)
@@ -75,6 +77,7 @@ local function checkReward(role)
 				if cur[1] == ItemId.BreakCost and doubleTime > 0 then
 					cur[2] = cur[2] * 2
 				end
+				cur[2] = cur[2] * itemCoef
 				if (items[cur[1]] and math.ceil((items[cur[1]] + cur[2]) / globalCsv.idle_field_limit) > math.ceil(items[cur[1]] / globalCsv.idle_field_limit))
 						or not items[cur[1]] then	--要占用新栏位的情况
 					local addFC
@@ -162,16 +165,6 @@ function _M.startRpc( agent, data )
 	role:updateProperty({field = "hangInfo", value = hangInfo})
-	-- 指定当前引导的步骤
-	if carbonId == 10101 then
-		role:saveGuide(5,11)
-	elseif carbonId == 10102 then
-		role:saveGuide(8,2)
-	elseif carbonId == 10103 then
-		role:saveGuide(9,2)
-	elseif carbonId == 10220 then
-		role:saveGuide(22,1)
-	end
 	role:mylog("hang_action", {desc = "startHang", int1 = carbonId})
 	SendPacket(actionCodes.Hang_startRpc, '')
 	return true
@@ -262,12 +255,7 @@ function _M.endBattleRpc(agent, data)
 		-- 引导
 		if carbonId == 10101 then
-			role:finishGuide(5)
-		elseif carbonId == 10102 then
-			role:finishGuide(8)
-			role:saveGuide(9, 2)
-		elseif carbonId == 10103 then
-			role:finishGuide(9)
+			role:finishGuide(6)
 		elseif carbonId == 20101 then
 			role:finishGuide(22)
 		end
@@ -341,7 +329,7 @@ function _M.roleFormatRpc(agent , data)
 	hangTeam.leader = msg.leader
 	hangTeam.supports = supports
 	role:saveHangTeam(hangTeam)
-	role:saveGuide(5,8)
+	role:finishGuide(5)
 	SendPacket(actionCodes.Hang_roleFormatRpc, '')
 	return true
 end
@@ -500,8 +488,9 @@ function _M.buyBonusCountRpc(agent, data)
 	end
 	local bonusC = role.dailyData:getProperty("bonusC")
+	local extraCnt = role.storeData:getBonusExtraFightCount()
 	bonusC[btype] = bonusC[btype] or {c = 0, b = 0}
-	local lastCount = globalCsv.bonus_daily_buy_count * coef - bonusC[btype]["b"]
+	local lastCount = globalCsv.bonus_daily_buy_count * coef + extraCnt - bonusC[btype]["b"]
 	if math.illegalNum(count, 1, lastCount)  then return 1 end
 	if not role:checkItemEnough({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}) then return 2 end
@@ -541,12 +530,13 @@ function _M.startBonusBattleRpc(agent, data)
 	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 globalCsv.bonus_daily_count * coef - bonusC[bonusData.type]["c"] <= 0 then return 7 end
+	if globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"] <= 0 then return 7 end
 	role.__bonusBattleCache = {
@@ -566,6 +556,7 @@ function _M.endBonusBattleRpc(agent, data)
 	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
@@ -583,7 +574,7 @@ function _M.endBonusBattleRpc(agent, data)
  		-- 胜利扣除次数
  		local bonusC = role.dailyData:getProperty("bonusC")
 		bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
-		if globalCsv.bonus_daily_count * coef - bonusC[bonusData.type]["c"] <= 0 then return 3 end
+		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})
@@ -54,9 +54,6 @@ function _M.levelUpRpc( agent, data )
 		hero_upgrade_scoreget = hero:getProperty("battleV") - oldBattleV, -- 通过英雄升级提升的评分
 	})
-	if hero:getProperty("type") == 103 then
-		role:finishGuide(7)
-	end
 	hero:mylog({desc = "levelUp", int1 = hero:getProperty("level")})
 	role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
@@ -129,6 +126,10 @@ function _M.wakeRpc(agent, data)
 		hero_rise_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), --英雄觉醒效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 	})
+	if hero:getProperty("type") == 204 then
+		role:finishGuide(7)
+	end
+
 	SendPacket(actionCodes.Hero_wakeRpc, '')
 	role:checkTaskEnter("HeroStarCollect", {})
@@ -819,26 +820,44 @@ function _M.drawHeroRpc(agent, data)
 			end
 		end
-		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
+		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, "=")
+			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
-					if not ok then break end
-					if oneData[pool_str] > 0 then
-						resultPool[itemId] = {oneData[pool_str]}  -- itemId, count, 概率
-					end
-					break
 				end
 			end
 		end
@@ -846,9 +865,9 @@ function _M.drawHeroRpc(agent, data)
 	role:costItems(cost, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
-	local guideHero
-	if role:getProperty("newerGuide") == "11=1" then
-		guideHero = globalCsv.newdraw_hero_item_id or 613
+	local guideHero = nil
+	if role:getProperty("newerGuide") == "8=1" then
+		guideHero = globalCsv.newdraw_hero_item_id or 503
 	end
 	local ssrCount = 0
@@ -867,12 +886,16 @@ function _M.drawHeroRpc(agent, data)
 		local itemId = math.randWeight(resultPool, 1)
 		if guideHero then
 			itemId = guideHero
-			guideHero = nil
 		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 itemData.quality >= HeroQuality.SR then
@@ -903,7 +926,7 @@ function _M.drawHeroRpc(agent, data)
 	if ssrCount > 0 then
 		role:checkTaskEnter("DrawSSR", {count = ssrCount})
 	end
-	role:finishGuide(11)
+	role:finishGuide(8)
 	role:log("gacha", {
 		gacha_id = poolId, -- 卡池ID
@@ -1023,4 +1046,4 @@ function _M.changeCrown(agent, data)
 	return true
 end
-return _M
 \ No newline at end of file
+return _M
@@ -264,7 +264,8 @@ function _M.loginRpc( agent, data )
 	-- 发下缓存的世界消息
 	local worldChatResponse = {worldChats = {}}
-	local ok, msgs = pcall(skynet.call, '.globald', "lua", "getWorldMsg", role._channelIdx)
+	-- local ok, msgs = pcall(skynet.call, '.globald', "lua", "getWorldMsg", role._channelIdx)
+	local ok, msgs = true, {}
 	if not ok then 
 		msgs = {} 
 	end
@@ -945,7 +946,7 @@ function _M.chatRpc(agent, data)
 				end
 			end
 			mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
-			pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
+			-- pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
 			role:mylog("role_action", {desc = "chatWorld", text1 = content})
 		end,
 		-- 私聊
@@ -1235,7 +1236,7 @@ function _M.useSelectItemRpc(agent, data)
 	local count = msg.count
 	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
 	local itemData = csvdb["itemCsv"][itemId]
-	if itemData.type ~= ItemType.SelectItemBox then return end
+	if not (itemData.type == ItemType.SelectItemBox or itemData.type == ItemType.CommonPaster) then return end
 	local itemMap = itemData.use_effect:toNumMap()
 	local reward, change = {}
 	for k, v in pairs(itemMap) do
@@ -62,7 +62,7 @@ function _M.startBattleRpc(agent, data)
 	if not csvdb["tower_battleCsv"][id] then return end
 	local curCount, nextTime = getUpdateTime(towerInfo.c, towerInfo.t)
-	if curCount < 1 then return end -- 没有次数返回
+	--if curCount < 1 then return end -- 没有次数返回
 	--搞起来
 	towerInfo.c = curCount - 1
@@ -136,10 +136,15 @@ end
 function _M.bugCountRpc(agent, data)
 	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local buyCount = msg.count
 	local towerInfo = role:getProperty("towerInfo")
 	local curCount, nextTime = getUpdateTime(towerInfo.c, towerInfo.t)
 	local needCount = globalCsv.tower_count_limit - curCount
+	if needCount > buyCount then
+		needCount = buyCount
+	end
 	if needCount > 0 then -- 补充
 		local cost = globalCsv.tower_chance_item:toNumMap()
 		for k , v in pairs(cost) do
@@ -147,7 +152,7 @@ function _M.bugCountRpc(agent, data)
 		end
 		if not role:checkItemEnough(cost) then return end
 		role:costItems(cost, {log = {desc = "towerCount"}})
-		curCount = globalCsv.tower_count_limit
+		curCount = curCount + needCount
 	end
 	towerInfo.c = curCount
 	towerInfo.t = nextTime
@@ -670,7 +670,7 @@ function Player:effectBattleBuff()
 	for _, buff in ipairs(self.buffs) do
 		if not buff:isHide() and (buff:getType() == Buff.BATTLE_BUFF or buff:getType() == Buff.BATTLE_PASSIVE) then
 			buff:effect()
-			if not buff.buffData.classify:sismember(7, " ") then -- 神器buff 不会清除
+			if not buff.buffData.classify:sismember(7, " ") and not buff.buffData.classify:sismember(8, " ") then -- 神器buff 不会清除 队长技
 				buff:uncover()
 			end
 		end
@@ -29,12 +29,6 @@ _codeSession = {}
 --- {{{ 定时器相关
 local function handle_timeout()
 	if not agentInfo.open_timer then return end
-
-	if not agentInfo.role then
-		skynet.timeout(100, handle_timeout)
-		return
-	end
-
 	agent_util:update(agentInfo)
 	skynet.timeout(100, handle_timeout)
 end
@@ -274,6 +268,8 @@ function CMD.start(session, source, gate, fd, ip, hotfixs)
 		end
 	end
+	start_agent_timer()
+
 	-- 这里将消息伪装成 watchdog 发出，这样就由 A->B->C->B->A 变成 A->B->C->A
 	skynet.redirect(gate, source, "lua", session, skynet.pack("forward", fd, 0, skynet.self()))
 end
-Subproject commit 29d26c6e3083676ddaa828f8d0b22cd1d0ee48cf
+Subproject commit d2c3deaddd4952cd4b05306144cbcdfa09734cd3
@@ -109,4 +109,8 @@ function Hero:getCamp()
     return csvdb["unitCsv"][self:getProperty("type")].camp
 end
+function Hero:getRare()
+    return csvdb["unitCsv"][self:getProperty("type")].rare
+end
+
 return Hero
 \ No newline at end of file
@@ -452,7 +452,11 @@ function RolePlugin.bind(Role)
 		newHero.owner = self
 		newHero:saveBattleValue()
 		self.heros[heroId] = newHero
-		self:checkTaskEnter("AddHero", {heroType = heroType, wakeL = newHero:getProperty("wakeL"), camp = unitData.camp, job = unitData.job}, params.notNotify)
+		local ssrCount = 0
+		if unitData.rare == HeroQuality.SSR then
+			ssrCount = self:getSSRHeroCount()
+		end
+		self:checkTaskEnter("AddHero", {heroType = heroType, wakeL = newHero:getProperty("wakeL"), camp = unitData.camp, job = unitData.job, ssrCount = ssrCount}, params.notNotify)
 		self:checkTaskEnter("HeroQualityCollect", {})
 		if not params.notNotify then
 			local heroResponse = {}
@@ -486,6 +490,16 @@ function RolePlugin.bind(Role)
 		end
 	end
+	function Role:getSSRHeroCount()
+		local count = 0
+		for _, hero in pairs(self.heros) do
+			if hero:getRare() == HeroQuality.SSR then
+				count = count + 1
+			end
+		end
+		return count
+	end
+
 	function Role:loadHeros()
 		local roleId = self:getProperty("id")
@@ -1182,7 +1196,8 @@ function RolePlugin.bind(Role)
 		end
 		while newExp >= csvdb["adv_level_fundCsv"][level].exp do
-			if csvdb["adv_level_fundCsv"][level + 1] and self:advChapterIsOpen(100 + csvdb["adv_level_fundCsv"][level + 1].chapter) then -- 有下一级
+			--if csvdb["adv_level_fundCsv"][level + 1] and self:advChapterIsOpen(100 + csvdb["adv_level_fundCsv"][level + 1].chapter) then -- 有下一级
+			if csvdb["adv_level_fundCsv"][level + 1] then -- 有下一级
 				newExp = newExp - csvdb["adv_level_fundCsv"][level].exp
 				level = level + 1
 			else
@@ -235,6 +235,8 @@ local StoreListener = {
 		[TaskType.HangPass] = {{TriggerEventType.HangPass, f("id")}},
 		[TaskType.RoleLevelUp] = {{TriggerEventType.LevelUp, f("level")}},
 		[TaskType.TowerPass] = {{TriggerEventType.TowerPass, f("level")}},
+		[TaskType.AdvPass] = {{TriggerEventType.AdvPass, f("id")}},
+		[TaskType.AddHero] = {{TriggerEventType.AddNewHero, f("heroType")}, {TriggerEventType.SSRCount, f("ssrCount")}},
 	}
 }
@@ -243,7 +245,7 @@ local CalendaTaskListener = {
 	listen = {
 		[TaskType.DrawHero] = {{1, 1, f("count")}},
 		[TaskType.BonusPass]= {{2, 1}},
-		[TaskType.AdvPass]= {{3, 1}},
+		[TaskType.AdvStart]= {{3, 1}},
 		[TaskType.DinerLevelUp]= {{4, 2, f("level")}},
 		[TaskType.HeroLvlCollect]= {{5, 3}},		-- x名y级英雄
 		[TaskType.AdvHang]= {{6, 1}},			----
@@ -580,10 +582,12 @@ function RoleTask.bind(Role)
 	end
 	function Role:checkActivityTask(notNotify, activityType, ...)
+		if not self.activity then return end
 		self.activity:checkActivity(notNotify, activityType, ...)
 	end
 	function Role:checkStoreTask(notNotify, triggerType, param)
+		if not self.storeData then return end
 		self.storeData:OnTriggerLimitTimePack(triggerType, param)
 	end
@@ -629,7 +633,7 @@ function RoleTask.bind(Role)
 										count = count + 1
 									end
 								end
-								if calTask[id] < count then
+								if (calTask[id] or 0) < count then
 									calTask[id] = count
 								end
 							elseif cfg.type == 16 then	-- 英雄星级收集进度
@@ -639,7 +643,7 @@ function RoleTask.bind(Role)
 										count = count + 1
 									end
 								end
-								if calTask[id] < count then
+								if (calTask[id] or 0) < count then
 									calTask[id] = count
 								end
 							elseif cfg.type == 18 then	-- 挂机累计收获id,y个
@@ -23,11 +23,11 @@ Store.schema = {
 	battleFR = {"string", ""},		-- 免费赛季卡领取记录
     battleLR = {"string", ""},		-- 付费赛季卡领取记录
-    limitTPack = {"table", {}},      -- 限时礼包 {id=expire_ts}
+    limitTPack = {"table", {}},      -- 限时礼包 {id={expire_ts, trigger_type}}
     privCardEx = {"number", 0},          -- 特权卡过期时间戳
     getMailT1 = {"number",0},       -- 上次发送月卡福利邮件的时间
     getMailT2 = {"number",0},       -- 上次发送超级月卡福利邮件的时间
-    packTrigger = {"table", {}},     -- 礼包触发记录 {关卡难度1={id, 通关关卡数，升级数，爬塔层数}, ...}
+    --packTrigger = {"table", {}},     -- 礼包触发记录 {关卡难度1={id, 通关关卡数，升级数，爬塔层数}, ...}
     -- 活动商品购买记录
     actGoodsFlag = {"table", {}},       -- ActGoodsType  1购买，0未购买
@@ -65,10 +65,11 @@ function Store:deleteExpireLimitGoods()
     local timeNow = skynet.timex()
     local limitGoodsList = self:getProperty("limitTPack")
     for k, v in pairs(limitGoodsList) do
-        if timeNow > v then
+        if timeNow > v[1] then
             limitGoodsList[k] = nil
         end
     end
+    self:updateProperty({field = "limitTPack", value = limitGoodsList, notNotify = true})
 end
 -- 发送月卡邮件
@@ -162,6 +163,26 @@ function Store:getGearExchangeCoef()
     return 1 + coef
 end
+-- 奖励关卡 特权卡额外数量
+function Store:getBonusExtraFightCount()
+    if self:isPrivCardExpire() then
+        return 0
+    end
+
+    local cnt = globalCsv.bonus_extra_fight_count or 1
+    return cnt
+end
+
+-- 挂机道具掉落系数 特权卡挂机掉落系数
+function Store:getHangDropCoef()
+    if self:isPrivCardExpire() then
+        return 1, 1
+    end
+
+    return (1 + globalCsv.hang_drop_exp_coef) or 1, (1 + globalCsv.hang_drop_item_coef) or 1
+end
+
+
 -- 购买通行证
 function Store:onBuyCard(type, duration, id)
     local timeNow = skynet.timex()
@@ -292,64 +313,52 @@ end
 --触发限时礼包
 function Store:OnTriggerLimitTimePack(eventType, param)
     local limitPack = self:getProperty("limitTPack")
-    local payRecord = self:getProperty("payR")
+    --local payRecord = self:getProperty("payR")
     local timeNow = skynet.timex()
-    local find = false
+    --local find = false
     -- 有未过期的限时礼包不再推送
-    for k, v in pairs(limitPack) do
-        if v > timeNow and not payRecord[k] then
-            find = true
-            break
-        end
-    end
-    if find == true then
-        return
-    end
-    limitPack = {}
-    local hangPass = self.owner:getProperty("hangPass")
-    local triggerRecord = self:getProperty("packTrigger")
-    local result = {}
-    local maxDiff = 0
+    --for k, v in pairs(limitPack) do
+    --    if v > timeNow and not payRecord[k] then
+    --        find = true
+    --        break
+    --    end
+    --end
+    --if find == true then
+    --    return
+    --end
+    --local hangPass = self.owner:getProperty("hangPass")
+    --local triggerRecord = self:getProperty("packTrigger")
+    --local result = {}
+    --local maxDiff = 0
     -- 取满足限时礼包关卡要求的对应数据
-    for diff, maxCarbonId in pairs(hangPass) do
-        for id, cfg in pairs(csvdb["shop_packCsv"]) do
-            local range = cfg.showRange:toArray(true, "=")
-            local beginRange = range[1] or 0
-            local endRange = range[2] or 0
-            if maxCarbonId > beginRange and maxCarbonId <= endRange and cfg.type == eventType then
-                result[diff] = cfg
-                maxDiff = math.max(maxDiff, diff)
-                break
-            end
-        end
-    end
-    local shopGoodsId = 0
-    for diff, cfg in pairs(result) do
-        if diff == maxDiff then
-            local record = triggerRecord[diff] or {}
-            if (record[0] or 0) ~= cfg.id and next(record) then
-                record = {}
-            end
-            record[0] = cfg.id
-            record[eventType] = (record[eventType] or 0) + 1
-            if record[eventType] > 0 and record[eventType] % 10 == 0 then
-                local pool = cfg.packId:toArray(true, "=")
-                local idx = math.random(1, #pool)
-                shopGoodsId = pool[idx]
-            end
-            triggerRecord[diff] = record
+    --for diff, maxCarbonId in pairs(hangPass) do
+    --    for id, cfg in pairs(csvdb["shop_packCsv"]) do
+    --        local range = cfg.showRange:toArray(true, "=")
+    --        local beginRange = range[1] or 0
+    --        local endRange = range[2] or 0
+    --        if maxCarbonId > beginRange and maxCarbonId <= endRange and cfg.type == eventType then
+    --            result[diff] = cfg
+    --            maxDiff = math.max(maxDiff, diff)
+    --            break
+    --        end
+    --    end
+    --end
+    local config = nil
+    for id, cfg in pairs(csvdb["shop_packCsv"]) do
+        if cfg.type == eventType and cfg.condition == param then
+            config = cfg
         end
     end
-    if shopGoodsId ~= 0 then
-        local rechargeCfg = csvdb["shop_rechargeCsv"][shopGoodsId]
+    if config ~= nil then
+        local rechargeCfg = csvdb["shop_rechargeCsv"][config.packId]
         if rechargeCfg then
-            limitPack[rechargeCfg.id] = timeNow + rechargeCfg.time
+            limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
             self:updateProperty({field = "limitTPack", value = limitPack})
         end
     end
-    if next(result) then
-        self:updateProperty({field = "packTrigger", value = triggerRecord})
-    end
+    --if next(result) then
+    --    self:updateProperty({field = "packTrigger", value = triggerRecord})
+    --end
 end
 function GetActGoodsIndex(goodsType)
@@ -419,7 +428,7 @@ function Store:data()
         battleLR  = self:getProperty("battleLR"),
         limitTPack = self:getProperty("limitTPack"),
         privCardEx = self:getProperty("privCardEx"),
-        packTrigger = self:getProperty("packTrigger"),
+        --packTrigger = self:getProperty("packTrigger"),
         actGoodsFlag = self:getProperty("actGoodsFlag"),
         bpInfo = self:getProperty("bpInfo"),
 	}
@@ -17,15 +17,32 @@ local HEART_TIMEOUT_COUNT_MAX 	= 20
 local HEART_QUICK_COUNT_MAX 	= 5
 -- 心跳定时间隔
 local HEART_TIMER_INTERVAL 		= 5
+-- 忽略心跳的等待时间
+local WAIT_IGNORE_HEART			= 300
+
+--开始忽略心跳的时间
+local ignoreHeartTime = nil
 local function check_heart_beat(agent, now)
 	-- 充值等操作不检查心跳
 	local role = agent.role
-	if role.ignoreHeartbeat then
+	if not role or role.ignoreHeartbeat then
 		lastHeartCheckTime = now - HEART_TIMER_INTERVAL
 		heartTimeoutCount = 0
+
+		if not ignoreHeartTime then
+			ignoreHeartTime = now
+		end
+
+		if now - ignoreHeartTime >= WAIT_IGNORE_HEART then -- 等待太久了 踢掉
+			skynet.error("timeout! then agent will shut down by self with ignoreHeartbeat or no login", agent.client_fd)
+			skynet.call(agent.gate_serv, "lua", "kick", agent.client_fd)
+			ignoreHeartTime = nil
+		end
 		return
 	end
+	ignoreHeartTime = nil
+
 	if lastHeartCheckTime - now > HEART_TIMER_INTERVAL or
 		now - lastHeartCheckTime > HEART_TIMER_INTERVAL then
 		heartTimeoutCount = heartTimeoutCount + 1
@@ -46,6 +63,7 @@ function _M:update(agent)
 		pcall(check_heart_beat, agent, now)
 		nextCheckTime = now + HEART_TIMER_INTERVAL
 	end
+	if not role then return end
 	pcall(role.onRecoverTimer, role, now)
 end
@@ -73,6 +91,7 @@ end
 function _M:reset()
 	heartTimeoutCount = 0
 	heartQuickCount = 0
+	ignoreHeartTime = nil
 	lastHeartCheckTime = skynet.timex()
 end
@@ -347,4 +347,20 @@ function string.toMap(str, tonum, sep)
 		end
 	end
 	return tab
+end
+
+--[[
+from: 1=2=3=4
+to: {1,2,3,4}
+]]
+function string.toMap(str, tonum, sep)
+	local str_vec = string.split(str, " ")
+	local tab = {}
+	for _, v in pairs(str_vec) do
+		local vec = string.split(v, sep)
+		if #vec == 2 then
+			tab[vec[1]] = tonum and tonumber(vec[2]) or vec[2]
+		end
+	end
+	return tab
 end
 \ No newline at end of file