wasteland / server

Commit 2806380f049f3ce456bf4fda6aeee8e395e0ebda

Authored by liuzujun
2 parents a3bb2d5d d1e76a07

Merge branch 'cn/develop-mysql' of 120.26.43.151:wasteland/server into cn/develop-mysql

Showing 3 changed files with 10 additions and 7 deletions   Show diff stats
Inline Side-by-side
src/actions/HeroAction.lua
  Show/Hide comments   View file @2806380
@@ -44,8 +44,7 @@ function _M.levelUpRpc( agent, data ) @@ -44,8 +44,7 @@ function _M.levelUpRpc( agent, data )
44 -- 通过指定关卡后才能升级英雄等级 44 -- 通过指定关卡后才能升级英雄等级
45 local pass = globalCsv.unit_exp_level_pass[level + 1] 45 local pass = globalCsv.unit_exp_level_pass[level + 1]
46 if pass then 46 if pass then
47 - local hangPass = role:getProperty("hangPass")  
48 - if not hangPass[pass] then return 4 end 47 + if not role:checkHangPass(pass) then return 4 end
49 end 48 end
50 49
51 role:costItems(cost, {log = {desc = "heroLevelUp", int1 = msg.id, int2 = hero:getProperty("type")}}) 50 role:costItems(cost, {log = {desc = "heroLevelUp", int1 = msg.id, int2 = hero:getProperty("type")}})
@@ -87,10 +86,9 @@ function _M.breakRpc( agent, data ) @@ -87,10 +86,9 @@ function _M.breakRpc( agent, data )
87 if not role:checkItemEnough(cost) then return 4 end 86 if not role:checkItemEnough(cost) then return 4 end
88 87
89 -- 通过指定关卡后才能突破英雄 88 -- 通过指定关卡后才能突破英雄
90 - local pass = globalCsv.unit_break_level_pass[breakL] 89 + local pass = globalCsv.unit_break_level_pass[breakL + 1]
91 if pass then 90 if pass then
92 - local hangPass = role:getProperty("hangPass")  
93 - if not hangPass[pass] then return 4 end 91 + if not role:checkHangPass(pass) then return 4 end
94 end 92 end
95 93
96 role:costItems(cost, {log = {desc = "heroBreak", int1 = msg.id, int2 = hero:getProperty("type")}}) 94 role:costItems(cost, {log = {desc = "heroBreak", int1 = msg.id, int2 = hero:getProperty("type")}})
src/actions/TowerAction.lua
  Show/Hide comments   View file @2806380
@@ -107,8 +107,13 @@ function _M.endBattleRpc(agent, data) @@ -107,8 +107,13 @@ function _M.endBattleRpc(agent, data)
107 --排行榜 107 --排行榜
108 role:setTowerRank(curLevel % 10000, towerType + 1) 108 role:setTowerRank(curLevel % 10000, towerType + 1)
109 109
  110 + local rewardStr = curTower.reward
  111 + if curTower.special_award ~= "" then
  112 + rewardStr = rewardStr .. " " .. curTower.special_award
  113 + end
  114 +
110 curLevel = curLevel + 1 115 curLevel = curLevel + 1
111 - reward, change = role:award(curTower.reward, {log = {desc = "towerBattle", int1 = id}}) 116 + reward, change = role:award(rewardStr, {log = {desc = "towerBattle", int1 = id}})
112 if towerType == 0 then 117 if towerType == 0 then
113 role:checkTaskEnter("TowerPass", {level = towerInfo.l}) 118 role:checkTaskEnter("TowerPass", {level = towerInfo.l})
114 end 119 end
src/models/RolePlugin.lua
  Show/Hide comments   View file @2806380
@@ -2309,7 +2309,7 @@ function RolePlugin.bind(Role) @@ -2309,7 +2309,7 @@ function RolePlugin.bind(Role)
2309 end 2309 end
2310 2310
2311 if diamondCount > 0 then 2311 if diamondCount > 0 then
2312 - reward[ItemId.Jade] = (reward[ItemId.Jade] or 0) + diamondCount 2312 + reward[ItemId.Diamond] = (reward[ItemId.Diamond] or 0) + diamondCount
2313 end 2313 end
2314 2314
2315 self:checkTaskEnter("Pay", {rmb = rechargeData.rmb, twd = rechargeData.twd}) 2315 self:checkTaskEnter("Pay", {rmb = rechargeData.rmb, twd = rechargeData.twd})