diff --git a/src/models/Capsule.lua b/src/models/Capsule.lua index 11cb104..17cff91 100644 --- a/src/models/Capsule.lua +++ b/src/models/Capsule.lua @@ -528,8 +528,6 @@ function Capsule:getKing(record, recordAmount, now) end table.sort(roleRecord, function(a, b) return a.count > b.count end) - --tmp[spKey] = {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = award, amount = 1, quality = typ, create_time= now} - local count = math.min(special["amount"], #roleRecord) local rewardByRole = {} @@ -541,7 +539,7 @@ function Capsule:getKing(record, recordAmount, now) index = index + 1 local name = getNameByRoleId(tmp.roleId) - rewardByRole[tmp.roleId][spKey] = {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = special["award"], amount = 1, SpecialType.KING, create_time= now} + table.insert(rewardByRole, {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = special["award"], amount = 1, SpecialType.KING, create_time= now}) end special["amount"] = count diff --git a/src/services/capsuled.lua b/src/services/capsuled.lua index 7b62c03..946b46b 100644 --- a/src/services/capsuled.lua +++ b/src/services/capsuled.lua @@ -92,8 +92,9 @@ local function add(roleId, capsuleId) end local function capsuleRefreshing() + local now = skynet.timex() for _, v in pairs(capsules) do - if v:refreshing() then + if v:refreshing(now) then v:init() v:create() end @@ -151,11 +152,14 @@ function CMD.start() if val.type == 1 then local key = val.id..val.room if not capsules[key] then - local capsule = require("models.Capsule").new({ key = CAPSULE_PUBLIC:format(key), id= val.id, room = val.room, typ = 1, name=val.name}) - capsule:init() - capsule:create() - capsules[key] = capsule - redisproxy:sadd(CAPSULE_INFO, key) + if now < val.hide_time then + local capsule = require("models.Capsule").new({ key = CAPSULE_PUBLIC:format(key), id= val.id, room = val.room, typ = 1, name=val.name}) + capsule:init() + capsule:create() + + capsules[key] = capsule + redisproxy:sadd(CAPSULE_INFO, key) + end end end end -- libgit2 0.21.2