多编队功能

测试
1 parent 1a558f5e
Showing 6 changed files with 84 additions and 17 deletions Show diff stats
src/ProtocolCode.lua
src/actions/AdvAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RadioAction.lua
src/models/Role.lua
@@ -73,6 +73,7 @@ actionCodes = {
 	Adv_quickHangRpc = 170,
 	Adv_refreshSupportRpc = 171,
 	Adv_selectTeamRpc = 172,
+	Adv_roleFormatRpc = 173,
  
 	Hero_loadInfos = 201,
 	Hero_updateProperty = 202,
@@ -215,6 +216,10 @@ actionCodes = {
 	Activity_actPaySignRewardNtf = 654,
 	Activity_actCalendaTaskRpc = 655,
 	Activity_actPaySignRpc = 656,
+
+	Radio_listRpc = 700,		-- 获取电台讨伐任务列表
+	Radio_startQuestRpc = 701,
+	Radio_finishQuestRpc = 702,
 }
  
 rpcResponseBegin = 10000
@@ -980,15 +980,19 @@ function _M.roleFormatRpc(agent , data)
 	role:setAdvTeamFormat(index, team)
  
 	local advTeam = role:getProperty("advTeam")
-	table.clear(advTeam)
+	local curIndex = advTeam.index
+	if curIndex == index then
+		table.clear(advTeam)
  
-	advTeam.heros = {}
-	for slot, heroId in pairs(msg.heros) do
-		advTeam.heros[slot] = heroId
+		advTeam.heros = {}
+		for slot, heroId in pairs(msg.heros) do
+			advTeam.heros[slot] = heroId
+		end
+		advTeam.leader = msg.leader
+		advTeam.leader2 = msg.leader2
+		advTeam.index = index
+		role:updateProperty({field = "advTeam", value = advTeam})
 	end
-	advTeam.leader = msg.leader
-	advTeam.leader2 = msg.leader2
-	role:updateProperty({field = "advTeam", value = advTeam})
  
 	SendPacket(actionCodes.Adv_roleFormatRpc, '')
 	return true
@@ -1000,6 +1004,7 @@ function _M.selectTeamRpc(agent, data)
 	local index = msg.index	-- 阵容索引
 	local team = role:getAdvTeamFormat(index)
 	if not next(team) then return end
+	team["index"] = index
 	role:updateProperty({field = "advTeam", value = team})
  
 	SendPacket(actionCodes.Adv_selectTeamRpc, '')
@@ -315,7 +315,6 @@ function _M.roleFormatRpc(agent , data)
 	local msg = MsgPack.unpack(data)
 	local index = msg.index	-- 阵容索引
 	local title = msg.title -- 阵容名称
-	local type = msg.type	-- 系统类型
 	local team = {}
 	for slot, heroId in pairs(msg.heros) do
 		if not role.heros[heroId] then
@@ -349,13 +348,6 @@ function _M.roleFormatRpc(agent , data)
 	team.title = title
  
 	role:setTeamFormat(index, team)
-	if type == TeamSystemType.Hang then
-		role:finishGuide(5)
-		role:updateHangTeamInfo()
-	elseif type == TeamSystemType.BonusBattle then
-	elseif type == TeamSystemType.Tower then
-	elseif type == TeamSystemType.Dinner then
-	end
  
 	SendPacket(actionCodes.Hang_roleFormatRpc, '')
 	return true
@@ -710,6 +702,11 @@ function _M.selectTeamRpc(agent, data)
 	teamIndex[type] = index
 	role:updateProperty({field = "teamIndex", value = teamIndex})
  
+	if type == TeamSystemType.Hang then
+		role:finishGuide(5)
+		role:updateHangTeamInfo()
+	end
+
 	SendPacket(actionCodes.Hang_selectTeamRpc, '')
 	return true
 end
@@ -633,6 +633,7 @@ end
 function _M.getResetRewardRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
+	local pay = msg.pay
  
 	local hero = role.heros[msg.id]
 	if not hero then return end
@@ -641,8 +642,17 @@ function _M.getResetRewardRpc(agent, data)
 	local breakL = hero:getProperty("breakL")
 	local talent = hero:getProperty("talent")
  
+	local tmpLevel = level
 	if level <= 1 and talent == "" then return end
  
+	if level <= 60 then
+		pay = false
+	end
+
+	if pay and not role:costDiamond({count = globalCsv.unit_heroBack_cost or 200, log = {desc = "resetHero", int1 = msg.id}}) then
+		return 1
+	end
+
 	local reward = {}
 	while level > 1 do
 		local curData = csvdb["unit_expCsv"][level - 1]
@@ -708,9 +718,11 @@ function _M.getResetRewardRpc(agent, data)
 		rune = "",
 	})
 	hero:mylog({desc = "resetHero"})
-
+	
+	local coef = globalCsv.unit_back_discount
+	coef = (pay or tmpLevel <= 60) and  1 or coef
 	for itemId, count in pairs(reward) do
-		reward[itemId] = math.floor(count * globalCsv.unit_back_discount)
+		reward[itemId] = math.floor(count * coef)
 	end
 	local change
 	reward, change = role:award(reward, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
@@ -0,0 +1,47 @@
+local _M = {}
+
+function _M.listRpc(agent, data)
+	local role = agent.role
+	local roleId = role:getProperty("id")
+	local now = skynet.timex()
+	local result = {}
+
+
+	SendPacket(actionCodes.Email_listRpc, MsgPack.pack({list = result}))
+	return true
+end
+
+-- 获取英雄大成功率
+local function getHeroCoef()
+    return 0 
+end
+
+function _M.startQuestRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+	local heros = msg.heros
+    local result = {}
+    --  check id
+    --  check hero
+    -- start quest, set finish time
+
+	SendPacket(actionCodes.Email_listRpc, MsgPack.pack({list = result}))
+	return true
+end
+
+function _M.finishQuestRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+    local result = {}
+    -- check finish time
+    --  check id
+    --  get heros
+    -- send award
+
+	SendPacket(actionCodes.Email_listRpc, MsgPack.pack({list = result}))
+	return true
+end
+
+return _M
 \ No newline at end of file
@@ -363,6 +363,7 @@ function Role:data()
 		bTeam = self:getProperty("bTeam"),
 		hangTeams = self:getProperty("hangTeams"),
 		teamIndex = self:getProperty("teamIndex"),
+		advTeams = self:getProperty("advTeams"),
  
 		newerGuide = self:getProperty("newerGuide"),
 		funcGuide = self:getProperty("funcGuide"),