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

liuzujun
2 parents ddcf1a3a e524bcc3
Showing 2 changed files with 3 additions and 0 deletions Show diff stats
src/actions/RoleAction.lua
src/models/RoleTask.lua
@@ -185,6 +185,7 @@ function _M.loginRpc( agent, data )
 		role.activity:checkActivityStatus(now, false, false)
 		role:log("onLogin")
 	end
+	role:checkTaskEnter("LoginAddUp", {})
  
 	redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
  
@@ -120,6 +120,7 @@ local TaskType = {
     CostJade = 914, 			-- 消耗虹光玉
 	BuyLimitPack = 915, 		-- 购买指定id礼包触发
 	CostItem = 916,			-- 消耗道具
+	LoginAddUp = 917,			-- 累计登录
  
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -336,6 +337,7 @@ local CalendaTaskListener = {
 		[TaskType.CostJade] = {{43, 1, f("count")}},
 		[TaskType.HeroStartSum] = {{44, 3}},
 		[TaskType.WakeCGSum] = {{45, 1, f("count")}},
+		[TaskType.LoginAddUp] = {{46, 1}},
 	}
 }