merge cn/develop to cn/publish/release

liuzujun
2 parents a8abfb64 a05f7f85
Showing 19 changed files with 485 additions and 62 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/DinerAction.lua
src/actions/EmailAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/RoleAction.lua
src/actions/TowerAction.lua
src/adv/Adv.lua
src/models/Daily.lua
src/models/Role.lua
src/models/RoleCross.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/services/dbseed.lua
src/utils/MysqlUtil.lua
@@ -397,10 +397,16 @@ TeamSystemType = {
 	Dinner = 4,
 	FriendBattle = 5,
 }
+-- 加速类型
+UpSpeedType = {
+	ExplorationUpSpeed = 1, -- 探索加速
+	GearUpSpeed = 2, 		-- 齿轮加速
+	Restaurant = 3, 		-- 餐厅加速
  
+}
 -- 某个功能对其他系统功能的加成类型
 SystemBnousType = {
-	TowerBuff = 1, 		-- 电波塔内战斗开始时获得buff
+	TowerBuff = 1, 		-- 电波塔内战斗开始时获得buff or
 	CrusadeTask = 2, 	-- 讨伐电台任务加速
 	DinerGet = 3, 		-- 食材供应商获取速度
 	DinerLimit = 4, 	-- 食材供应商上限
@@ -410,4 +416,11 @@ SystemBnousType = {
 	HangTime = 8, 		-- 挂机时间上限
 	PvpTicket = 9, 		-- 每周额外获得竞技场门票数量
 	SweepReward = 10, 	-- 奖励关卡每次扫荡额外获得道具
+	DismantlingMaximum = 11,-- 拆解术式模块运行时间上限
+	DismantlingImproved = 12,-- 拆解术式构筑效率提升
+	DailyReward = 13,-- 每日签到额外获得道具
+	TreasureBaseMaximum = 14, -- 增加宝藏资源值上限
+	UpSpeedNum = 15, -- 加速次数上限增加 15=1探索加速or 2齿轮加速or 3餐厅加速=增加次数
+	ChangeBaseCount = 16, -- 每日奖励关卡挑战卡基础数量增加
+	ChangeBuyCount = 17, -- 每日奖励关卡挑战卡可购买次数增加，
 }
@@ -55,6 +55,9 @@ actionCodes = {
 	Role_updateSpark = 139,		-- 更新火花
 	Role_diamondConvertRpc = 140, -- 钻石兑换成别的物品
 	Role_getTimeGiftRpc = 141,
+    Role_runeBuyRpc = 142,   	-- 铭文购买
+    Role_setFriendTeamRpc = 143,   	-- 设置好友切磋队伍
+    Role_setBgRpc = 144,   	-- 设置看板娘
  
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -136,7 +136,14 @@ function _M.signRpc(agent, data)
 	end
 	signs[curDay] = yearMonth
  
-	local reward, change = role:award(monthData[curDay].item, {log = {desc = "sign", int1 = yearMonth, int2 = curDay}})
+	-- 达到一定等级，签到会有额外奖励
+	local reward = role:getBnousDaily()
+	local change
+	local award = monthData[curDay].item:toNumMap() or {}
+	for k, v in pairs(award) do
+		reward[k] = (reward[k] or 0) + v
+	end
+	reward, change = role:award(reward, {log = {desc = "sign", int1 = yearMonth, int2 = curDay}})
 	role:changeUpdates({{type = "sign", field = curDay, value = yearMonth}})
 	role:checkTaskEnter("SignIn")
  
@@ -897,6 +897,11 @@ function _M.wheelSurfRpc(agent, data)
 	local costs = {[ItemId.OldCoin] = cost[ctype]}
 	if not next(costs) then return 6 end
  
+	local tmpcount = 1
+	if ctype == 2 then
+        tmpcount = 10
+	end
+    if role:checkRuneFully(tmpcount) then return 6 end
  
 	if not role:checkItemEnough(costs) then return 5 end
 	role:costItems(costs, {log = {desc = "advWheelSurf", int1 = ptype}})
@@ -251,11 +251,20 @@ end
 function _M.expediteSellRpc( agent, data )
 	local role = agent.role
 	local count = role.dinerData:getProperty("expedite")
-	local max = #globalCsv.diner_sell_quick_cost
-	if count > max then
-		return 1
+	local maxIdx = #globalCsv.diner_sell_quick_cost
+
+	-- 增加今日餐厅加速次数
+	local max = maxIdx + role:getBnousUpSpeedNum(UpSpeedType.Restaurant)
+	if count > max then return 1 end
+
+	local costs = clone(globalCsv.diner_sell_quick_cost)
+	if count > maxIdx then
+		for idx = maxIdx+1, count do
+			costs[idx] = costs[maxIdx]
+		end
 	end
-	local diamond = globalCsv.diner_sell_quick_cost[count]
+
+	local diamond = costs[count]
 	if diamond > 0 then
 		local cost = {[ItemId.Jade] = diamond}
 		if not role:checkItemEnough(cost) then
@@ -14,19 +14,27 @@ local function loadEmails(roleId)
 end
  
 local function delExpireEmails(roleId)
-	local sql = [[
-		DELETE FROM Email
-		WHERE id IN (
-			SELECT id FROM (
-			  SELECT id
-			  FROM Email WHERE roleId=%s
-			  ORDER BY createtime DESC, id desc
-			  LIMIT %s, 100000
-			) a
-		);
-	]]
+	--local sql = [[
+	--	DELETE FROM Email
+	--	WHERE id IN (
+	--		SELECT id FROM (
+	--		  SELECT id
+	--		  FROM Email WHERE roleId=%s
+	--		  ORDER BY createtime DESC, id desc
+	--		  LIMIT %s, 100000
+	--		) a
+	--	);
+	--]]
+    local sql = "SELECT id FROM Email WHERE roleId=%s ORDER BY createtime DESC, id desc LIMIT %s, 100000"
 	sql = string.format(sql, roleId, EMAIL_LIMIT)
-	mysqlproxy:query(sql)
+	local res = mysqlproxy:query(sql)
+    local tmp = {}
+    for _, v in ipairs(res) do
+        table.insert(tmp, v.id)
+    end
+    if next(tmp) then
+        mysqlproxy:query(string.format("DELETE FROM Email WHERE id IN (%s)", table.concat(tmp, ",")))
+    end
 end
  
 function _M.listRpc(agent, data)
@@ -94,7 +102,11 @@ local function getEmailAttachments( email )
 		local rewardPms = email:getProperty("rewardPms")
 		local emailData = csvdb["emailCsv"][email:getProperty("emailId")]
 		if emailData then
-			attachments = emailData.attachment:format(table.unpack(rewardPms))
+			if next(rewardPms) then
+				attachments = emailData.attachment:format(table.unpack(rewardPms))
+			else
+				attachments = emailData.attachment
+			end
 		end
 	end
 	return attachments
@@ -120,6 +132,8 @@ function _M.drawAllAttachRpc(agent, data)
 			role:mylog("mail_action", {desc = "draw_attach", int1 = email:getProperty("emailId"), key1 = email:getProperty("title"), key2 = attachments})
 		end
 	end
+	if role:checkRuneFullyByReward(reward) then return 1 end
+
 	reward, change = role:award(reward, {log = {desc = "draw_attach"}})
 	SendPacket(actionCodes.Email_drawAllAttachRpc, MsgPack.pack({ids = ids, reward = reward, change = change}))
 	return true
@@ -139,7 +153,18 @@ function _M.drawAttachRpc(agent, data)
 	local attachments = getEmailAttachments(email)
 	if attachments == "" then return end
  
-	local reward, change = role:award(attachments, {log = {desc = "draw_attach", int1 = id}})
+	local reward, change = {}
+	if type(attachments) == "string" then
+		for key, v in pairs(attachments:toNumMap()) do
+			reward[key] = (reward[key] or 0) + v
+		end
+	else
+		reward = attachments
+	end
+	if role:checkRuneFullyByReward(reward) then return 1 end
+	reward, change = role:award(reward, {log = {desc = "draw_attach", int1 = id}})
+
+
 	email:setProperty("status", 2, true)
 	email:log(role, 2)
 	SendPacket(actionCodes.Email_drawAttachRpc, MsgPack.pack({reward = reward, change = change}))
@@ -1027,4 +1027,49 @@ function _M.savegenius(role, pms)
 	return "天赋点设置成功"
 end
  
+table.insert(helpDes, {"清讨伐电台", "clear_radio", "id"})
+function _M.clear_radio(role, pms)
+	local id = pms.pm1
+	local radioTask = role:getProperty("radioTask")
+    if id == 0 then
+        radioTask[id] = nil
+    else
+        radioTask = {}
+    end
+
+    role:updateProperty({field = "radioTask", value = radioTask})
+
+	return "成功"
+end
+
+table.insert(helpDes, {"清代理拾荒", "clear_adv_hang", "id"})
+function _M.clear_adv_hang(role, pms)
+	local id = pms.pm1
+	local task = role:getProperty("advHang")
+    if id == 0 then
+        task[id] = nil
+    else
+        task = {}
+    end
+
+    role:updateProperty({field = "advHang", value = task})
+
+	return "成功"
+end
+
+table.insert(helpDes, {"清海港贸易", "clear_sea", "id"})
+function _M.clear_radio(role, pms)
+	local id = pms.pm1
+	local task = role:getProperty("seaport")
+    if id == 0 then
+        task.collect[id] = nil
+    else
+        task.collect = {}
+    end
+
+    role:updateProperty({field = "seaport", value = task})
+
+	return "成功"
+end
+
 return _M
 \ No newline at end of file
@@ -478,6 +478,18 @@ function _M.quickRpc(agent , data)
  
 	local curCount = role.dailyData:getProperty("hangQC") + 1
 	local costs = globalCsv.idle_quickproduce_cost:toArray(true, "=")
+
+    -- 增加今日探索加速次数
+	local maxIdx = #costs
+	local maxCount = maxIdx + role:getBnousUpSpeedNum(UpSpeedType.ExplorationUpSpeed)
+	if curCount > maxCount then return end
+
+	if curCount > maxIdx then
+		for idx = maxIdx+1, curCount do
+			costs[idx] = costs[maxIdx]
+		end
+	end
+
 	if not costs[curCount] then return end
 	if costs[curCount] > 0 then
 		if not role:checkItemEnough({[ItemId.Jade] = costs[curCount]}) then return end
@@ -568,7 +580,7 @@ function _M.buyBonusCountRpc(agent, data)
 	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 + extraCnt - bonusC[btype]["b"]
+	local lastCount = (globalCsv.bonus_daily_buy_count + role:getBnousChangeBuyCount()) * coef + extraCnt - bonusC[btype]["b"]
 	if math.illegalNum(count, 1, lastCount)  then return 1 end
  
 	if not role:checkItemEnough({[ItemId.Jade] = globalCsv.bonus_buy_cost * count}) then return 2 end
@@ -666,7 +678,7 @@ 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 math.illegalNum(count, 1, (globalCsv.bonus_daily_count + role:getBnousChangeBaseCount()) * coef + extraCnt - bonusC[bonusData.type]["c"]) then return 7 end
  
 			bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + count
 			role.dailyData:updateProperty({field = "bonusC", value = bonusC})
@@ -633,6 +633,7 @@ function _M.openTimeBoxRpc(agent, data)
 		else
 			local oldId, process, time = boxL[slot].id, boxL[slot].process, boxL[slot].time
 			local unitTime = globalCsv.box_key_time[oldId] * 60
+            unitTime = unitTime + role:getBnousDismantlingImproved(unitTime)
 			local doneCnt = time == 0 and 0 or math.floor((process + skynet.timex() - time) / unitTime)
 			if doneCnt > 0 then
 				reward = role:award({[oldId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
@@ -642,7 +643,7 @@ function _M.openTimeBoxRpc(agent, data)
 		if role:getItemCount(itemId) >= limit then return 3 end
  
 		boxL[slot] = {id = itemId, process = 0, time = skynet.timex()}
-		role:pushMsg({type = "box", slot = slot, time = skynet.timex() + globalCsv.box_productLine_time * 3600})
+		role:pushMsg({type = "box", slot = slot, time = skynet.timex() + globalCsv.box_productLine_time * 3600 + role:getBnousDismantlingMaximum()})
 	elseif oper == 2 then -- 重置运行时间（可以使用加速）
 		local quick = msg.quick
 		if not boxL[slot] then return 4 end
@@ -652,6 +653,7 @@ function _M.openTimeBoxRpc(agent, data)
 		local stopTime = nowTime
 		local itemData = csvdb["itemCsv"][itemId]
 		local unitTime = globalCsv.box_key_time[itemId] * 60
+		unitTime = unitTime + role:getBnousDismantlingImproved(unitTime)
 		if quick then
 			stopTime = nowTime + quick
 			local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
@@ -661,6 +663,8 @@ function _M.openTimeBoxRpc(agent, data)
 		else
 			stopTime = math.min(nowTime,time + globalCsv.box_productLine_time * 3600)
 		end
+        stopTime = stopTime +  role:getBnousDismantlingMaximum()
+
 		role:pushCancel({type = "box", slot = slot})
  
 		local doneCnt = math.floor((process + stopTime - time) / unitTime)
@@ -672,20 +676,24 @@ function _M.openTimeBoxRpc(agent, data)
 		end
  
 		boxL[slot] = {id = itemId, process = (process + stopTime - time) % unitTime, time = nowTime}
-		role:pushMsg({type = "box", slot = slot, time = nowTime + globalCsv.box_productLine_time * 3600})
+		role:pushMsg({type = "box", slot = slot, time = nowTime + globalCsv.box_productLine_time * 3600 + role:getBnousDismantlingMaximum()})
 	elseif oper == 3 then -- 开箱子
 		local costId = msg.costId
 		local costs = (msg.costs or ""):toNumMap()
 		if not costId or not csvdb["itemCsv"][costId] or not next(costs) then return 6 end
-		
+
 		local costIdData = csvdb["itemCsv"][costId]
-		local count = 0
+		local count, runeCount = 0, 0
 		for itemId, num in pairs(costs) do
 			local itemIdData = csvdb["itemCsv"][itemId]
 			if not itemIdData or not csvdb["item_randomCsv"][itemId] or costIdData.quality ~= itemIdData.quality then return 7 end
+
+			if itemIdData.type == ItemType.Rune then runeCount = runeCount + num end
 			count = count + num
 		end
  
+        if role:checkRuneFully(runeCount) then return 10 end --开箱子，如果铭文仓库已经满了则不让开箱
+
 		if role:getItemCount(costId) < count then return 8 end
 		if not role:checkItemEnough(costs) then return 9 end
  
@@ -699,8 +707,8 @@ function _M.openTimeBoxRpc(agent, data)
 			role:costItems({[itemId] = value}, {log = {desc = "openTimeBox"}})
 			for _ = 1, value do
 				for i = 1, 10 do
-					local num = randomData["num" .. i] 
-					local gift = randomData["gift" .. i]
+					local num = randomData["num" .. tostring(i)]
+					local gift = randomData["gift" .. tostring(i)]
 					if num and gift and num > 0 and gift ~= "" then
 						local pool = {}
 						for _, temp in ipairs(gift:toArray()) do
@@ -1332,11 +1340,17 @@ function _M.guideRpc(agent, data)
 	local funcGuide = role:getProperty("funcGuide")
 	if cmdType == 1 then
 		-- 新手引导
-		local master = msg.master or -1
-		local slave = msg.slave or -1
-		if master < 0 or slave < 0 then return end
-
-		role:saveGuide(master, slave)
+		if msg.masters then
+			for _, master in pairs(msg.masters) do
+				role:saveGuide(master,1,true)
+			end		
+		else
+			local master = msg.master or -1
+			local slave = msg.slave or -1
+			if master < 0 or slave < 0 then return end
+			role:saveGuide(master, slave)
+		end
+		
 	elseif cmdType == 2 then
 		-- 系统引导（玩家可选择是否进行）
 		if not msg.skip then return end
@@ -1384,7 +1398,20 @@ end
 function _M.goldBuyRpc(agent, data)
 	local role = agent.role
 	local curT = role.dailyData:getProperty("goldBuyT")
-	local costD = globalCsv.idle_quickMoney_cost[curT]
+
+	local costs = clone(globalCsv.idle_quickMoney_cost)
+	-- 增加今日齿轮加速次数
+	local maxIdx = #globalCsv.idle_quickMoney_cost
+	local maxCount = maxIdx + role:getBnousUpSpeedNum(UpSpeedType.GearUpSpeed)
+	if curT > maxCount then return end
+	if curT > maxIdx then
+		for idx = maxIdx+1, curCount do
+			costs[idx] = costs[maxIdx]
+		end
+	end
+
+	local costD = costs[curT]
+
 	if not costD then
 		return 1
 	end
@@ -1562,4 +1589,42 @@ function _M.getTimeGiftRpc(agent, data)
 	return true
 end
  
+function _M.runeBuyRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+    local count = msg.count
+
+	local glodCount = globalCsv.rune_exchange * count
+	if not role:checkItemEnough({[ItemId.Gold] = glodCount}) then return end
+	role:costItems({[ItemId.Gold] = glodCount}, {log = {desc = "glodConvertRune", int1 = count, int2 = glodCount}})
+	local reward, change = {}
+	reward[ItemId.RuneFragment] = count
+	reward, change = role:award(reward, {log = {desc = "glodConvertRune"}})
+	SendPacket(actionCodes.Role_runeBuyRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+function _M.setFriendTeamRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+    local team = msg.team
+    local info = {}
+    info.team = role:getTeamHerosInfo(team)
+    info.bInfo = role:getTeamBattleInfo(team)
+    info.v = role:getTeamBattleValue(team.heros)
+    role:updateProperty({field="friendTeam", value=info})
+
+	SendPacket(actionCodes.Role_setFriendTeamRpc, "")
+	return true
+end
+
+function _M.setBgRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+    role:updateProperty({field="bgId", value=msg.id})
+
+	SendPacket(actionCodes.Role_setBgRpc, "")
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -114,9 +114,9 @@ function _M.endBattleRpc(agent, data)
  
 		curLevel = curLevel + 1
 		reward, change = role:award(rewardStr, {log = {desc = "towerBattle", int1 = id}})
-		if towerType == 0 then
-			role:checkTaskEnter("TowerPass", {level = towerInfo.l, type = towerType + 1})
-		end
+		--if towerType == 0 then
+        role:checkTaskEnter("TowerPass", {level = curLevel % 10000, type = towerType + 1})
+		--end
 	end
  
 	if towerType == 0 then
@@ -881,6 +881,8 @@ function Adv:over(success, rewardRatio, overType)
 			reward[itemId] = math.ceil(count * rewardRatio / 100)
 		end
 	end
+
+	self.owner:checkRuneCount(reward)
 	reward = self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}})
  
 	local backAdvCount
@@ -21,7 +21,8 @@ Daily.schema = {
 	giveFP			= {"table", {}},		-- 给谁送过心心
 	getFP			= {"table", {}},		-- 领过谁的心心
 	pvpFree			= {"number", 0},		-- pvp使用免费次数
-	pvpFreeH		= {"number", 0},		-- 高级pvp使用免费次数
+	pvpFreeH		= {"number", 0},		-- 高级pvp使用免费次
+	pvpBought		= {"number", 0},		-- 门票购买次数
  
 	dailySDC		= {"table", {}},		-- daily shop diamond  count {[id] = count} -- 每日商城购买次数统计
 	dailySDD		= {"table", {}},		-- daily shop diamond  disount {[id] = 1} -- 每日商城折扣统计
@@ -67,8 +68,12 @@ function Daily:refreshDailyData(notify)
 			end
 		elseif field == "id" then
             -- skip
+		elseif field == "treasureBase" then
+			dataMap[field] = globalCsv.idle_treasure_base
 		elseif field == "treasureList" then
 			dataMap[field] = self:getTreasrueList()
+		elseif field == "pvpBought" then
+			dataMap[field] = 0
 		elseif field ~= "key" then
 			local typ, def = table.unpack(schema)
 			dataMap[field] = def
@@ -133,10 +138,6 @@ function Daily:checkTreasureExpired(treasureAttr, treasureList)
 				end
 				curInfo = clone(treasureAttr)
 			end
-		elseif curInfo["end_time"] then
-			print("end_time")
-			print(curInfo["end_time"])
-			print(skynet.timex())
 		end
 	else
 		curInfo = clone(treasureAttr)
@@ -399,12 +400,14 @@ function Daily:data()
 		getFP = self:getProperty("getFP"),
 		pvpFree = self:getProperty("pvpFree"),
 		pvpFreeH = self:getProperty("pvpFreeH"),
+		pvpBought = self:getProperty("pvpBought"),
 		dailySDC = self:getProperty("dailySDC"),
 		dailySDD = self:getProperty("dailySDD"),
 		advSupRe = self:getProperty("advSupRe"),
 		goldBuyT = self:getProperty("goldBuyT"),
 		unlockPool = self:getProperty("unlockPool"),
 		curPool = self:getProperty("curPool"),
+		treasureBase = self:getProperty("treasureBase"),
 		treasureList = self:getProperty("treasureList"),
 	}
 end
@@ -30,6 +30,7 @@ function Role:ctor( properties )
 	self.advData = nil
 	self.activity = nil
 	self._pushToken = nil
+    self._lastSaveTs = skynet.timex()
 	self.advElChapter = tonum(redisproxy:hget("adv_season", "chapter"), globalCsv.adv_endless_default_chapter) -- 无尽模式记录的赛季对应章节
 	self.advOverTime = tonum(redisproxy:hget("adv_season", "overTime")) -- 无尽模式关闭时间戳
 	if self.advOverTime == 0 then
@@ -75,6 +76,7 @@ Role.schema = {
 	expireItem			= {"table", {}}, --物品过期检查
 	funcOpen			= {"table", {}}, --功能是否开放
 	funcLv				= {"table", {}}, --功能等级
+	levelBnous			= {"table", {}}, --等级奖励
 	-- loveStatus			= {"string", ""}, --统计角色的最高 好感度等级 类型相关 -- type=loveL type=loveL
 	crown				= {"number", 0},	-- 看伴娘
 	silent				= {"number", 0}, --禁言解禁时间
@@ -205,6 +207,10 @@ Role.schema = {
 	roleIncre			= {"table", {}},  -- 角色英雄，铭文，火花自增序列 {heroId = 1, runeId = 1, sparkId = 1}
  
 	unlockChap			= {"table", {}},	-- 解锁的章节
+
+	heroCnt			    = {"number", 0},	-- 英雄数量
+	friendTeam			= {"table", {}},	-- 好友切磋队伍信息 {bInfo = {}, team = {}, v = 0}
+	bgId			    = {"number", 0},	-- 看板娘id
 }
  
  
@@ -349,6 +355,7 @@ function Role:data()
 		items = self:getProperty("items"):toNumMap(),
 		funcOpen = self:getProperty("funcOpen"),
 		funcLv = self:getProperty("funcLv"),
+		levelBnous = self:getProperty("levelBnous"),
 		-- loveStatus = self:getProperty("loveStatus"):toNumMap(),
 		timeReset = self:getProperty("timeReset"),
 		diamond = self:getAllDiamond(),
@@ -444,6 +451,8 @@ function Role:data()
 		returner = self:getProperty("returner"),
  
 		unlockChap	= self:getProperty("unlockChap"),	-- 解锁的章节
+		friendTeam	= self:getProperty("friendTeam"),
+		bgId	= self:getProperty("bgId"),
 	}
 end
  
@@ -11,7 +11,9 @@ RoleCross.bind = function (Role)
 			level = self:getProperty("level"),
 			headId = self:getProperty("headId"),
 			ltime = self:getProperty("ltime"),
-			battleV = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTBVC") or self:getProperty("hangTBV")
+
+            battleV = self.getProperty("friendTeam").v or 0,
+			--battleV = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTBVC") or self:getProperty("hangTBV")
 		}
 		return info
 	end
@@ -19,8 +21,13 @@ RoleCross.bind = function (Role)
 	-- 好友详细队伍信息
 	function Role:friendInfo()
 		local info = self:friendSInfo()
-		local team = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTSC") or self:getProperty("hangTS")
-		info.team = team
+		--local team = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTSC") or self:getProperty("hangTS")
+		--info.team = team
+        info.team = self:getProperty("friendTeam").team or {}
+        info.heroCnt = self:getProperty("heroCnt")
+        info.achieveCnt = table.numbers(self:getProperty("achiveV"))
+        info.bgId = self:getProperty("bgId")
+        info.hangPass = self:getProperty("hangPass")
 		return info
 	end
  
@@ -274,31 +281,42 @@ function CMD.getProperties(roleId, fields)
 end
  
 function CMD.friendSInfo(roleId)
-	local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "pvpTBVC", "hangTBV"})
+	--local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "pvpTBVC", "hangTBV"})
+	local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "friendTeam"})
 	return {
 		name = info.name,
 		level = info.level,
 		headId = info.headId,
 		ltime = info.ltime,
-		battleV = info.pvpTBVC ~= 0 and info.pvpTBVC or info.hangTBV,
+		--battleV = info.pvpTBVC ~= 0 and info.pvpTBVC or info.hangTBV,
+		battleV = info.friendTeam.v or 0,
 	}
 end
  
 function CMD.friendInfo(roleId)
-	local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "pvpTBVC", "hangTBV", "pvpTSC", "hangTS"})
+	--local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "pvpTBVC", "hangTBV", "pvpTSC", "hangTS"})
+	local info = CMD.getProperties(roleId, {"name", "level", "headId", "ltime", "friendTeam", "heroCnt", "achiveV", "bgId", "hangPass"})
 	return {
 		name = info.name,
 		level = info.level,
 		headId = info.headId,
 		ltime = info.ltime,
-		battleV = info.pvpTBVC ~= 0 and info.pvpTBVC or info.hangTBV,
-		team =  info.pvpTBVC ~= 0 and info.pvpTSC or info.hangTS
+		--battleV = info.pvpTBVC ~= 0 and info.pvpTBVC or info.hangTBV,
+		--team =  info.pvpTBVC ~= 0 and info.pvpTSC or info.hangTS
+        battleV = info.friendTeam.v or 0,
+        team = info.friendTeam.team or {},
+        heroCnt = info.heroCnt,
+        achieveCnt = table.numbers(info.achiveV),
+        bgId = info.bgId,
+        hangPass = info.hangPass,
 	}
 end
  
 function CMD.friendBattleInfo(roleId)
-	local info = CMD.getProperties(roleId, {"pvpTBC", "hangTB"})
-	return (next(info.pvpTBC) and next(info.pvpTBC.heros)) and info.pvpTBC or info.hangTB
+	--local info = CMD.getProperties(roleId, {"pvpTBC", "hangTB"})
+	local info = CMD.getProperties(roleId, {"friendTeam"})
+	--return (next(info.pvpTBC) and next(info.pvpTBC.heros)) and info.pvpTBC or info.hangTB
+    return info.friendTeam.bInfo or {}
 end
  
 function CMD.pvpCInfo(roleId)
@@ -4,7 +4,7 @@ local logproxy = require &quot;shared.logproxy&quot;
  
 --[[
 	100	购买/兑换行为			
-	200	交易行为(与其他玩家)			
+	200	交易行为(与其他玩家)
 	300	通过关卡产出或消耗			
 	400	通过任务产出或消耗			
 	500	通过公会产出或消耗			
@@ -62,6 +62,7 @@ local ItemReason = {
 	convert = 146, -- 钻石兑换其他物品
 	giftTime = 147, -- 创角后的时间礼包
 	activityCrisis = 148, -- 物资危机奖励
+    glodConvertRune = 149, -- 金币兑换铭文
  
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗
@@ -284,6 +284,7 @@ function RolePlugin.bind(Role)
 				newExp = newExp - csvdb["player_expCsv"][level].exp
 				level = level + 1
 				self:checkTaskEnter("RoleLevelUp", {level = level})
+				self:getLevelBnous(level)
 			else
 				newExp = csvdb["player_expCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
 			end
@@ -603,6 +604,7 @@ function RolePlugin.bind(Role)
 			SendPacket(actionCodes.Hero_loadInfos, bin)
 		end
  
+        self:updateProperty({field = "heroCnt", value = #self.heros})
 		self:logItems(heroType + ItemStartId.Hero, 0, 1, params.log)
  
 		if params.log then
@@ -1929,10 +1931,15 @@ function RolePlugin.bind(Role)
 	function Role:onRecoverTimer(now)
 		self:updateTimeReset(now, true)
 		self:checkNewEvent(now)
-		self:saveRoleData()
+		self:saveRoleData(now)
 	end
  
-	function Role:saveRoleData()
+    local SAVE_DATA_INTERVAL = 3
+	function Role:saveRoleData(now)
+        if now - self._lastSaveTs < SAVE_DATA_INTERVAL then
+            return
+        end
+        self._lastSaveTs = now
 		self:update()
 		local objs = {self.activity, self.dailyData, self.dinerData, self.storeData, self.roleIncre}
 		for _, info in ipairs(objs) do
@@ -2753,45 +2760,149 @@ function RolePlugin.bind(Role)
  
 	function Role:getBnousCrusade(value)
 		local towerBnous = self:getTowerBnousActive()
-		return self:getDeltaValue(towerBnous[SystemBnousType.CrusadeTask], value)
+		local levelValue = self:getDeltaValue(self:getProperty("levelBnous")[SystemBnousType.CrusadeTask], value)
+		local towerValue = self:getDeltaValue(towerBnous[SystemBnousType.CrusadeTask], value)
+		return levelValue + towerValue
 	end
  
 	function Role:getBnousDiner(type, value)
 		local towerBnous = self:getTowerBnousActive()
 		type = type or 1
-		local result
+		local result, levelReault
 		if type == 1 then
 			result = towerBnous[SystemBnousType.DinerGet]
+			levelReault = self:getProperty("levelBnous")[SystemBnousType.DinerGet]
 		elseif type == 2 then
 			result = towerBnous[SystemBnousType.DinerLimit]
+			levelReault = self:getProperty("levelBnous")[SystemBnousType.DinerLimit]
 		elseif type == 3 then
 			result = towerBnous[SystemBnousType.DinerSell]
+			levelReault = self:getProperty("levelBnous")[SystemBnousType.DinerSell]
 		elseif type == 4 then
 			result = towerBnous[SystemBnousType.DinerPrice]
+			levelReault = self:getProperty("levelBnous")[SystemBnousType.DinerPrice]
 		end
-		return self:getDeltaValue(result, value)
+		return self:getDeltaValue(result, value) + self:getDeltaValue(levelReault, value)
 	end
  
+	local function appendBnous(dstBnous, srcBnous)
+		if not dstBnous or not srcBnous then return end
+		for time, set in pairs(srcBnous) do
+			if not dstBnous[time] then
+				dstBnous[time] = {}
+			end
+			for key, value in pairs(set) do
+				dstBnous[time][key] = (dstBnous[time][key] or 0) + value
+			end
+		end
+	end
 	function Role:getBnousAdv()
 		local towerBnous = self:getTowerBnousActive()
+		local levelBnous = self:getProperty("levelBnous")[SystemBnousType.Adv] or {}
+		appendBnous(towerBnous[SystemBnousType.Adv], levelBnous)
 		return towerBnous[SystemBnousType.Adv] or {}
 	end
  
 	function Role:getBnousHangTime()
 		local towerBnous = self:getTowerBnousActive()
-		return towerBnous[SystemBnousType.HangTime] or 0
+		local levelBnous = self:getProperty("levelBnous") or {}
+		local tmptime = 0
+		if next(levelBnous) then
+			tmptime = levelBnous[SystemBnousType.HangTime] or 0
+		end
+		return towerBnous[SystemBnousType.HangTime] or 0 + tmptime
 	end
  
 	function Role:getBnousPvpTicket()
 		local towerBnous = self:getTowerBnousActive()
+		local levelBnous = self:getProperty("levelBnous")[SystemBnousType.PvpTicket] or {}
+		appendBnous(towerBnous[SystemBnousType.PvpTicket], levelBnous)
 		return towerBnous[SystemBnousType.PvpTicket] or {}
 	end
  
 	function Role:getBnousSweep()
 		local towerBnous = self:getTowerBnousActive()
+		local levelBnous = self:getProperty("levelBnous")[SystemBnousType.SweepReward] or {}
+		appendBnous(towerBnous[SystemBnousType.SweepReward], levelBnous)
 		return towerBnous[SystemBnousType.SweepReward] or {}
 	end
  
+	function Role:getBnousDismantlingMaximum()
+		return self:getProperty("levelBnous")[SystemBnousType.DismantlingMaximum] or 0
+	end
+
+	function Role:getBnousDismantlingImproved(value)
+		local result = self:getProperty("levelBnous")[SystemBnousType.DismantlingImproved] or {}
+		return self:getDeltaValue(result, value)
+	end
+
+	function Role:getBnousDaily()
+		local reward = {}
+		local levelBnous = self:getProperty("levelBnous")[SystemBnousType.DailyReward] or {}
+		for k, v in pairs(levelBnous) do
+			reward[k] = (reward[k] or 0) + v
+		end
+		return reward
+	end
+
+	function Role:getBnousTreasureBaseMaximum()
+		local levelBnous = self:getProperty("levelBnous")[SystemBnousType.TreasureBaseMaximum] or 0
+		local treasureBase = self.dailyData:getProperty("treasureBase") + levelBnous
+		self.dailyData:updateProperty({field = "treasureBase", value = treasureBase})
+	end
+
+	--@upType 加速类型 1探索加速, 2齿轮加速, 3餐厅加速
+	function Role:getBnousUpSpeedNum(upType)
+		local levelBnous = self:getProperty("levelBnous")[SystemBnousType.UpSpeedNum] or {}
+		if next(levelBnous) then
+			return levelBnous[upType] or 0
+		end
+		return 0
+	end
+
+	function Role:getBnousChangeBaseCount()
+		return self:getProperty("levelBnous")[SystemBnousType.ChangeBaseCount] or 0
+	end
+
+	function Role:getBnousChangeBuyCount()
+		return self:getProperty("levelBnous")[SystemBnousType.ChangeBuyCount] or 0
+	end
+
+	function Role:getLevelBnous(level)
+		local levelBnous = self:getProperty("levelBnous")
+		local additionData = csvdb["level_additionCsv"][level]
+		if additionData then
+			local effects = additionData.effect:toTableArraySec()
+			for _, effect in pairs(effects) do
+				local pm1, pm2, pm3, pm4 = tonumber(effect[1]), tonumber(effect[2]), tonumber(effect[3]), tonumber(effect[4])
+				if not levelBnous[pm1] then
+					levelBnous[pm1] = {}
+				end
+				if pm1 == SystemBnousType.TowerBuff then
+
+				elseif pm1 == SystemBnousType.Adv then
+					if not levelBnous[pm1][pm4] then
+						levelBnous[pm1][pm4] = {}
+					end
+					levelBnous[pm1][pm4][pm2] = (levelBnous[pm1][pm4][pm2] or 0) + pm3
+				elseif pm1 == SystemBnousType.HangTime or
+						pm1 == SystemBnousType.DismantlingMaximum or
+						pm1 == SystemBnousType.TreasureBaseMaximum or
+						pm1 == SystemBnousType.ChangeBaseCount or
+						pm1 == SystemBnousType.ChangeBuyCount  then
+					if type(levelBnous[pm1]) == "table" then
+						levelBnous[pm1] = 0
+					end
+					levelBnous[pm1] = levelBnous[pm1] + pm2
+				else
+					levelBnous[pm1][pm2] = (levelBnous[pm1][pm2] or 0) + pm3
+				end
+			end
+		end
+		self:updateProperty({field = "levelBnous", value= levelBnous})
+		return levelBnous
+	end
+
 	function Role:getPotionLevel(id)
 		local level = self.dinerData:getProperty("dishTree"):getv(id, 1)
 		local talentSet = csvdb["diner_talentCsv"][id]
@@ -2823,6 +2934,74 @@ function RolePlugin.bind(Role)
         self:mylog("hero_action", {desc = desc, int1 = heroType})
     end
  
+    function Role:getRuneBatCount()
+		local count = 0
+        for _, rune in pairs(self.runeBag) do
+			if next(rune) then
+				count = count + 1
+			end
+        end
+		return count or 0
+	end
+
+	-- 铭文仓库是否满仓
+	function Role:checkRuneFully(count)
+		count = count or 0
+		local page = globalCsv.store_type[ItemType.Rune]
+		local limit = self:getProperty("bagLimit")[page]
+        return self:getRuneBatCount() + count > limit
+	end
+
+	function Role:checkRuneFullyByReward(reward)
+		local count = self:getRuneBatCount()
+		local page = globalCsv.store_type[ItemType.Rune]
+		local limit = self:getProperty("bagLimit")[page]
+		if count >= limit then
+			return true
+		end
+		for itemId, n in pairs(reward) do
+			local itemData = csvdb["itemCsv"][itemId]
+			if itemData and itemData.type == ItemType.Rune then
+				count = count + n
+				if count > limit then return true end
+			end
+		end
+        return false
+	end
+
+	-- 把溢出的铭文奖励通过邮件发送
+	function Role:checkRuneCount(reward)
+        local firstMore = false
+        local count = self:getRuneBatCount()
+		local page = globalCsv.store_type[ItemType.Rune]
+		local limit = self:getProperty("bagLimit")[page]
+		if count >= limit then
+			firstMore = true
+		end
+
+		local tmpreward = {}
+		for itemId, n in pairs(reward) do
+			local itemData = csvdb["itemCsv"][itemId]
+			if itemData and itemData.type == ItemType.Rune then
+				count = count + n
+				if count > limit then
+					if not firstMore then
+						firstMore = true
+						reward[itemId] = n - (count - limit)
+						tmpreward[itemId] = count - limit
+					else
+						reward[itemId] = nil
+						tmpreward[itemId] = n
+					end
+				end
+			end
+		end
+		if next(tmpreward) then
+			self:sendMail(20, nil, tmpreward)
+		end
+	end
+
+
 end
  
 return RolePlugin
 \ No newline at end of file
@@ -810,7 +810,7 @@ function RoleTask.bind(Role)
 									calTask[id] = (calTask[id] or 0) + 1
 								end
 							elseif cfg.type == 13 then	-- 挑战电波塔主塔
-								if cfg.condition2 == param1 and param2 == 1 then
+								if cfg.condition2 <= param1 and param2 == 1 then
 									calTask[id] = (calTask[id] or 0) + 1
 								end
 							end
@@ -100,6 +100,9 @@ local function initAutoIncreUidTable()
 		mysqlproxy:query(string.format(tpl, "seaportTime0", 0))
 		mysqlproxy:query(string.format(tpl, "seaportTime1", 0))
 		mysqlproxy:query(string.format(tpl, "seaportTime2", 0))
+
+        -- 记录当前更新版本
+		mysqlproxy:query(string.format(tpl, "db_ver", 0))
 	end
 end
  
@@ -255,6 +258,31 @@ local function selectDb()
 	end
 end
  
+local function doUpdateSql()
+    local updates = {
+        [1] = {
+            "ALTER TABLE `Email` ADD INDEX roleid_createtime_id(`roleId`,`createtime`,`id`),DROP INDEX roleId_Index",
+            "ALTER TABLE `Role` ADD INDEX uid_Index(`uid`)",
+        },
+    }
+	-- 更新记录表
+    local res = mysqlproxy:query("SELECT `value` FROM `autoincrement_set` WHERE `key` = 'db_ver';")
+    local ver = res[1].value
+    for k, sqls in ipairs(updates) do
+        if ver < k then
+            skynet.error("do update sql, version:"..k)
+            for _, sql in ipairs(sqls) do
+                local r = mysqlproxy:query(sql)
+                if r["errno"] then
+                    skynet.error(string.format("%s, err:%s",sql, r["err"]))
+                    return
+                end
+            end
+            mysqlproxy:query(string.format("UPDATE `autoincrement_set` SET `value` = %d WHERE `key` = 'db_ver';", k))
+        end
+    end
+end
+
 skynet.start(function ()
 	--local new = redisproxy:hsetnx("autoincrement_set", "server_start", os.date("%Y%m%d", skynet.timex())) == 1
 	--if not new then
@@ -273,6 +301,7 @@ skynet.start(function ()
 	initRedisDb()
 	initSeaportTask()		-- 海港任务数据初始化
 	loadAllUserInfo()
+    doUpdateSql()       -- 执行更新sql
 	selectDb()
 	skynet.exit()
 end)
 \ No newline at end of file
@@ -34,7 +34,6 @@ function addFriend(roleId, friendId)
 		rpcRole(roleId, "addFriend", friendId)
 		rpcRole(friendId, "addFriend", roleId)
     end
-    dump(r)
 end
  
 function delFriend(roleId, friendId)
@@ -44,7 +43,6 @@ function delFriend(roleId, friendId)
 		rpcRole(roleId, "delFriend", friendId)
 		rpcRole(friendId, "delFriend", roleId)
     end
-    dump(r)
 end
  
 function roleExists(roleId)