Merge branch 'cn/develop' into cn/publish/release

熊润斐
2 parents a3e27e79 56763ca7
Showing 4 changed files with 139 additions and 77 deletions Show diff stats
src/actions/RadioAction.lua
src/actions/RoleAction.lua
src/models/Diner.lua
src/models/RolePlugin.lua
@@ -35,6 +35,79 @@ local function getQuestMax(role)
     return count + (globalCsv.cursade_team_count_initial or 0)
 end
+local function getCrusadeReward(role, id)
+    local radioTask = role:getProperty("radioTask")
+    local task = radioTask[id]
+    if not task then return 1 end
+    --  check id
+    local config = csvdb["crusadeCsv"][id]
+    if not config then return 2 end
+    local carbonData = csvdb["idle_battleCsv"][config.unlock]
+    if not carbonData then return 3 end
+    --  get heros
+    local totalCoef = 0
+    local exp = config.time / 60
+    local heroFaithMap = {}
+    for _, heroId in ipairs(task.heros) do
+        local hero = role.heros[heroId]
+        if hero then
+            totalCoef = totalCoef + getHeroCoef(hero, config.success)
+            -- 增加英雄信赖
+            hero:addHeroFaith(exp)
+            heroFaithMap[heroId] = hero:getProperty("faith")
+        end
+    end
+    -- send award
+    local bigSuccess = false
+    local result = math.randomInt(0, 100)
+    if result < totalCoef then
+        bigSuccess = true
+    end
+    local money = math.ceil(carbonData.money / 5) * config.time * config.money_clear
+    local exp = math.ceil(carbonData.exp / 5) * config.time * config.exp_clear
+    local itemReward = config.item_clear_special:toNumMap()
+    itemReward[ItemId.Gold] = (itemReward[ItemId.Gold] or 0) + money
+    itemReward[ItemId.Exp] = (itemReward[ItemId.Exp] or 0) + exp
+    if bigSuccess then
+        for key, value in pairs(itemReward) do
+            itemReward[key] = math.ceil(1.5 * value)
+        end
+    end
+
+    local r, change = role:award(itemReward, {log = {desc = "radioQuest", int1 = id}})
+
+    radioTask[id] = nil
+    role:updateProperty({field="radioTask", value=radioTask, notNotify = true})
+
+    local msg = role:packReward(r, change)
+    msg["big"] = bigSuccess
+    msg["id"] = id
+    msg["heroFaith"] = heroFaithMap
+
+    role:checkTaskEnter("RadioTaskStart", {heroCnt = #task.heros})
+
+    local herolist = {}
+    for _, heroId in ipairs(task.heros) do
+        local hero = role.heros[heroId]
+        if hero then
+            table.insert(herolist, hero:getProperty("type"))
+        end
+    end
+
+    --  讨伐行动
+    role:log("punitive_action", {
+        mission_id	= id, --关卡ID
+        mission_herolist = herolist, -- 英雄ID，排序以玩家出战设置为准，示例：[111, 222, 333, 444, 555]
+        mission_success_rate = totalCoef, -- 大成功几率
+        mission_reward = r, -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
+        mission_result = 1, -- 战斗结果(0-无效，1-胜利，2-失败)
+        mission_roundtime = config.time, -- 完成耗时（秒）
+        mission_cleartype = 2,  -- 1-开始; 2-完成(领取奖励时）
+    })
+    role:mylog("role_action", {desc = "radioTask", int1 = id, short1 = bigSuccess and 1 or 0})
+    return msg
+end
+
 function _M.startQuestRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -132,76 +205,15 @@ function _M.finishQuestRpc(agent, data)
     -- check finish time
     local radioTask = role:getProperty("radioTask")
     local task = radioTask[id]
-    if not task then return 1 end
-    if skynet.timex() < task.time then return 2 end
-    --  check id
-    local config = csvdb["crusadeCsv"][id]
-    if not config then return 3 end
-    local carbonData = csvdb["idle_battleCsv"][config.unlock]
-    if not carbonData then return 4 end
-    --  get heros
-    local totalCoef = 0
-    local exp = config.time / 60
-    local heroFaithMap = {}
-    for _, heroId in ipairs(task.heros) do
-        local hero = role.heros[heroId]
-        if hero then
-            totalCoef = totalCoef + getHeroCoef(hero, config.success)
-            -- 增加英雄信赖
-            hero:addHeroFaith(exp)
-            heroFaithMap[heroId] = hero:getProperty("faith")
-        end
-    end
-    -- send award
-    local bigSuccess = false
-    local result = math.randomInt(0, 100)
-    if result < totalCoef then
-        bigSuccess = true
-    end
-    local money = math.ceil(carbonData.money / 5) * config.time * config.money_clear
-    local exp = math.ceil(carbonData.exp / 5) * config.time * config.exp_clear
-    local itemReward = config.item_clear_special:toNumMap()
-    itemReward[ItemId.Gold] = (itemReward[ItemId.Gold] or 0) + money
-    itemReward[ItemId.Exp] = (itemReward[ItemId.Exp] or 0) + exp
-    if bigSuccess then
-        for key, value in pairs(itemReward) do
-            itemReward[key] = math.ceil(1.5 * value)
-        end
-    end
-
-    local r, change = role:award(itemReward, {log = {desc = "radioQuest", int1 = id}})
-    
-    radioTask[id] = nil
-    role:updateProperty({field="radioTask", value=radioTask, notNotify = true})
-
-    local msg = role:packReward(r, change)
-    msg["big"] = bigSuccess
-    msg["id"] = id
-    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
-        local hero = role.heros[heroId]
-        if hero then
-            table.insert(herolist, hero:getProperty("type"))
-        end
+    if not task then return 4 end
+    if skynet.timex() < task.time then return 5 end
+
+    local reward = getCrusadeReward(role, id)
+    if type(reward) == "number" then
+        return reward
+    else
+        SendPacket(actionCodes.Radio_finishQuestRpc, MsgPack.pack(reward))
     end
-
-	--  讨伐行动 
-	role:log("punitive_action", {
-		mission_id	= id, --关卡ID
-		mission_herolist = herolist, -- 英雄ID，排序以玩家出战设置为准，示例：[111, 222, 333, 444, 555]
-		mission_success_rate = totalCoef, -- 大成功几率
-		mission_reward = r, -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
-		mission_result = 1, -- 战斗结果(0-无效，1-胜利，2-失败)
-        mission_roundtime = config.time, -- 完成耗时（秒）
-        mission_cleartype = 2,  -- 1-开始; 2-完成(领取奖励时）
-    })
-    role:mylog("role_action", {desc = "radioTask", int1 = id, short1 = bigSuccess and 1 or 0})
-
 	return true
 end
@@ -212,12 +224,23 @@ function _M.cancelQuestRpc(agent, data)
     -- check finish time
     local radioTask = role:getProperty("radioTask")
     local task = radioTask[id]
-    if not task then return 1 end
-    if skynet.timex() > task.time then return 2 end
-    radioTask[id] = nil
-    role:updateProperty({field="radioTask", value=radioTask, notNotify = true})
-
-    SendPacket(actionCodes.Radio_cancelQuestRpc, MsgPack.pack({id = id}))
+    if not task then return 4 end
+    if skynet.timex() > task.time then return 5 end
+
+    local remainT = task.time - skynet.timex()
+    if remainT > 0 then
+        local cost = math.ceil(remainT / 3600) * globalCsv.crusade_quicken
+        if not role:checkItemEnough({[ItemId.Jade] = cost}) then return 6 end
+        role:costItems({[ItemId.Jade] = cost}, {log = {desc = "radioQuest", int1 = id}})
+        local reward = getCrusadeReward(role, id)
+        if type(reward) == "number" then
+            return reward
+        else
+            SendPacket(actionCodes.Radio_cancelQuestRpc, MsgPack.pack(reward))
+        end
+    else
+        SendPacket(actionCodes.Radio_cancelQuestRpc, MsgPack.pack({id = id}))
+    end
     return true
 end
@@ -493,6 +493,10 @@ function _M.changeNameRpc(agent, data)
 		["name"] = newName,
 	})
+	role.dinerData:updateRankRoleName(newName)
+	role:updateTowerRankName(newName)
+	role:updateAdvRankName(newName)
+
 	role:changeCrossServerPvpSelfInfo("name")
 	role:checkTaskEnter("Rename", {})
 	SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 0}))
@@ -661,9 +665,8 @@ function _M.openTimeBoxRpc(agent, data)
 			if not role:checkItemEnough({[ItemId.Jade] = costKey}) then return 5 end
 			role:costItems({[ItemId.Jade] = costKey}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
 		else
-			stopTime = math.min(nowTime,time + globalCsv.box_productLine_time * 3600)
+			stopTime = math.min(nowTime,time + globalCsv.box_productLine_time * 3600 +  role:getBnousDismantlingMaximum())
 		end
-        stopTime = stopTime +  role:getBnousDismantlingMaximum()
 		role:pushCancel({type = "box", slot = slot})
@@ -394,6 +394,18 @@ function Diner:getPopularRank()
 	return {list = list, rank = rank}
 end
+function Diner:updateRankRoleName(name)
+	if name:len() <= 0  then return end
+
+	local roleId = self.owner:getProperty("id")
+    local redret = redisproxy:hget(RANK_DINER_INFO, roleId)
+	if redret:len() > 0 then
+		local player = MsgPack.unpack(redret)
+        player.name = name
+		redisproxy:hset(RANK_DINER_INFO, roleId, MsgPack.pack(player))
+	end
+end
+
 function Diner:data()
 	local properties = {
 		"buildL", 
@@ -1697,6 +1697,30 @@ function RolePlugin.bind(Role)
 		end
 	end
+	function Role:updateTowerRankName(name)
+		if name:len() <= 0 then return end
+		local roleId = self:getProperty("id")
+		for _, info in pairs(TowerRankInfo) do
+			local data = redisproxy:hget(info.rankInfo, roleId)
+			if data then
+				local player = MsgPack.unpack(data)
+				player.name = name
+				redisproxy:hset(info.rankInfo, roleId, MsgPack.pack(player))
+			end
+		end
+	end
+
+    function Role:updateAdvRankName(name)
+		if name:len() <= 0 then return end
+		local roleId = self:getProperty("id")
+		local data = redisproxy:hget(RANK_ADV_INFO, roleId)
+		if data then
+			local player = MsgPack.unpack(data)
+			player.name = name
+			redisproxy:hset(RANK_ADV_INFO, roleId, MsgPack.pack(player))
+		end
+	end
+
 	function Role:addAdvLvExp(exp)
 		local advL = self:getProperty("advL")
 		local level = advL[1]