diff --git a/src/actions/EmailAction.lua b/src/actions/EmailAction.lua index 7a14ca9..dcdf87a 100644 --- a/src/actions/EmailAction.lua +++ b/src/actions/EmailAction.lua @@ -40,8 +40,15 @@ function _M.listRpc(agent, data) local count = 1 for _, data in ipairs(result) do local email = tarr2tab(data) - if tonum(email.createtime) > role:getProperty("ctime") - and ( not email.mid or tonum(email.mid) == mid ) + -- 0 需要判斷創角時間小於郵件創建時間 1 只需要在時間段內登陸即可領取 + local delayType = tonum(email.delayType) + local flag = false + if delayType == 1 then + flag = skynet.timex() > tonum(email.createtime) + else + flag = tonum(email.createtime) > role:getProperty("ctime") + end + if flag and ( not email.mid or tonum(email.mid) == mid ) and ( not email.endtime or tonum(email.endtime) > now )then local time = math.max(tonum(email.timestamp, 0) or email.createtime) redisproxy:insertEmail({ diff --git a/src/csvdata b/src/csvdata index 3a99f90..7320a5f 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit 3a99f907facf06d7f176df8a18a78594e29600e2 +Subproject commit 7320a5f8d782d63b7ad6fc6e310e3f7425c280a1 diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua index 09b43c0..f929040 100644 --- a/src/models/RolePlugin.lua +++ b/src/models/RolePlugin.lua @@ -1506,8 +1506,15 @@ function RolePlugin.bind(Role) end) for _, data in ipairs(redret) do local email = tarr2tab(data) - if tonum(email.createtime) > self:getProperty("ctime") - and ( not email.mid or tonum(email.mid) == mid ) + -- 0 需要判斷創角時間小於郵件創建時間 1 只需要在時間段內登陸即可領取 + local delayType = tonum(email.delayType) + local flag = false + if delayType == 1 then + flag = skynet.timex() > tonum(email.createtime) + else + flag = tonum(email.createtime) > self:getProperty("ctime") + end + if flag and ( not email.mid or tonum(email.mid) == mid ) and ( not email.endtime or tonum(email.endtime) > now )then return true end -- libgit2 0.21.2