Merge branch 'develop' into qa

zhouhaihai
2 parents b6c4416d f66cfba4
Showing 2 changed files with 3 additions and 2 deletions Show diff stats
src/GlobalVar.lua
src/models/RoleCross.lua
@@ -110,7 +110,8 @@ ItemId = {
 	DinerSpTask = 20, -- 餐厅任务采购券
 	LoveBreak = 21, --好感度突破道具
 	PvpKey = 22, -- pvp钥匙
-	LunchFragment = 23, 
+	LunchFragment = 23,
+	RuneFragment = 24,
 	HeroFC = {700, 701, 702, 703},  --通用角色碎片
 	AdvKey = 80, -- 冒险钥匙
 	BoxKey = 60, -- 拆解工具
@@ -308,7 +308,7 @@ function CMD.pvpHInfo(roleId)
 end
  
 -- 高级pvp 排行榜
-function CMD:pvpHRankInfo(roleId)
+function CMD.pvpHRankInfo(roleId)
 	local info = CMD.getProperties(roleId, {"name", "level", "headId", "pvpTBVH", "ltime"})
 	local info = {
 		name = info.name,