wasteland / server

Commit 9ffa5949b5fb8ecae3d1edf29a3293b52313a8f9

Authored by zhouhaihai
2 parents 8193e07b f0aff632

Merge branch 'bugfix' into tr/publish 

* bugfix:
  调整顺序
  签到成就
Showing 3 changed files with 8 additions and 6 deletions   Show diff stats
Inline Side-by-side
src/actions/ActivityAction.lua
  Show/Hide comments   View file @9ffa594
@@ -138,6 +138,7 @@ function _M.signRpc(agent, data) @@ -138,6 +138,7 @@ function _M.signRpc(agent, data)
138 138
139 local reward, change = role:award(monthData[curDay].item, {log = {desc = "sign", int1 = yearMonth, int2 = curDay}}) 139 local reward, change = role:award(monthData[curDay].item, {log = {desc = "sign", int1 = yearMonth, int2 = curDay}})
140 role:changeUpdates({{type = "sign", field = curDay, value = yearMonth}}) 140 role:changeUpdates({{type = "sign", field = curDay, value = yearMonth}})
  141 + role:checkTaskEnter("SignIn")
141 142
142 SendPacket(actionCodes.Activity_signRpc, MsgPack.pack(role:packReward(reward, change))) 143 SendPacket(actionCodes.Activity_signRpc, MsgPack.pack(role:packReward(reward, change)))
143 return true 144 return true
src/models/RoleLog.lua
  Show/Hide comments   View file @9ffa594
@@ -367,7 +367,6 @@ local MethodType = { @@ -367,7 +367,6 @@ local MethodType = {
367 --]] 367 --]]
368 friend_opt = { --好友操作 368 friend_opt = { --好友操作
369 friend_opt_type = true, -- 好友操作类型，见枚举表中 好友操作类型枚举表 369 friend_opt_type = true, -- 好友操作类型，见枚举表中 好友操作类型枚举表
370 - friend_accountid = true, -- 好友账户id  
371 friend_roleid = true, -- 好友账户下的角色id 370 friend_roleid = true, -- 好友账户下的角色id
372 friend_cnt = true, -- 操作后好友数量 371 friend_cnt = true, -- 操作后好友数量
373 }, 372 },
src/models/RoleTask.lua
  Show/Hide comments   View file @9ffa594
@@ -82,8 +82,13 @@ local TaskType = { @@ -82,8 +82,13 @@ local TaskType = {
82 GetFriendP = 803, -- 获得友情点 - count 82 GetFriendP = 803, -- 获得友情点 - count
83 83
84 -- 角色相关 84 -- 角色相关
85 - RoleLevelUp = 901, -- 角色升级 - curlevel  
86 - RuneQualityCollect = 902, -- 铭文品质收集进度 85 + RoleLevelUp = 851, -- 角色升级 - curlevel
  86 + RuneQualityCollect = 852, -- 铭文品质收集进度
  87 +
  88 + -- 其他相关
  89 + SignIn = 901, -- 签到
  90 + Pay = 902, -- 充值
  91 + ShopAll = 903, -- 在任意商店购买
87 92
88 --功能未实现 todo 93 --功能未实现 todo
89 AdvShop = 1002, -- 冒险商城 94 AdvShop = 1002, -- 冒险商城
@@ -93,9 +98,6 @@ local TaskType = { @@ -93,9 +98,6 @@ local TaskType = {
93 BindPhone = 1008, -- 绑定手机 98 BindPhone = 1008, -- 绑定手机
94 WeChat = 1009, -- 关注微信 99 WeChat = 1009, -- 关注微信
95 WeBlog = 1010, -- 关注微博 100 WeBlog = 1010, -- 关注微博
96 - SignIn = 1011, -- 签到  
97 - ShopAll = 1013, -- 在任意商店购买  
98 - Pay = 1014, -- 充值  
99 } 101 }
100 102
101 local function f(field, func) 103 local function f(field, func)