wasteland / server

Commit 8e0e3fe97b41eb33c50464b2d3d090a00004c199

Authored by zhouhaihai
2 parents b6c4416d f66cfba4

Merge branch 'develop' into qa

Showing 2 changed files with 3 additions and 2 deletions   Show diff stats
Inline Side-by-side
@@ -110,7 +110,8 @@ ItemId = { @@ -110,7 +110,8 @@ ItemId = {
110 DinerSpTask = 20, -- 餐厅任务采购券 110 DinerSpTask = 20, -- 餐厅任务采购券
111 LoveBreak = 21, --好感度突破道具 111 LoveBreak = 21, --好感度突破道具
112 PvpKey = 22, -- pvp钥匙 112 PvpKey = 22, -- pvp钥匙
113 - LunchFragment = 23, 113 + LunchFragment = 23,
  114 + RuneFragment = 24,
114 HeroFC = {700, 701, 702, 703}, --通用角色碎片 115 HeroFC = {700, 701, 702, 703}, --通用角色碎片
115 AdvKey = 80, -- 冒险钥匙 116 AdvKey = 80, -- 冒险钥匙
116 BoxKey = 60, -- 拆解工具 117 BoxKey = 60, -- 拆解工具
src/models/RoleCross.lua
  Show/Hide comments   View file @8e0e3fe
@@ -308,7 +308,7 @@ function CMD.pvpHInfo(roleId) @@ -308,7 +308,7 @@ function CMD.pvpHInfo(roleId)
308 end 308 end
309 309
310 -- 高级pvp 排行榜 310 -- 高级pvp 排行榜
311 -function CMD:pvpHRankInfo(roleId) 311 +function CMD.pvpHRankInfo(roleId)
312 local info = CMD.getProperties(roleId, {"name", "level", "headId", "pvpTBVH", "ltime"}) 312 local info = CMD.getProperties(roleId, {"name", "level", "headId", "pvpTBVH", "ltime"})
313 local info = { 313 local info = {
314 name = info.name, 314 name = info.name,