Merge branch 'cn/develop' into cn/publish/release

jiyue
2 parents 9a484947 9fa9ebd9
Showing 6 changed files with 102 additions and 64 deletions Show diff stats
src/actions/AdvAction.lua
src/actions/CapsuleAction.lua
src/actions/SeaportAction.lua
src/models/Capsule.lua
src/models/RolePlugin.lua
src/services/capsuled.lua
@@ -459,11 +459,12 @@ function _M.endHangRpc(agent, data)
 			heroCnt = heroCnt + 1
 		end
-		local totalReward = campSiteData.idleReward_1 .. " " .. campSiteData.idleReward_2
-
-		local idleReward = totalReward:toNumMap()
-		for itemId, count in pairs(idleReward) do
-			idleReward[itemId] = count * adv_idle_reward_coef
+		local idleReward = {}
+		for k, v in pairs(campSiteData.idleReward_1:toNumMap()) do
+			idleReward[k] = (idleReward[k] or 0) + v * adv_idle_reward_coef
+		end
+		for k, v in pairs(campSiteData.idleReward_2:toNumMap()) do
+			idleReward[k] = (idleReward[k] or 0) + v * adv_idle_reward_coef
 		end
 		local bnousReward = role:getBnousAdv()
@@ -17,18 +17,18 @@ function _M.listRpc(agent, data)
     local role = agent.role
     local msg = MsgPack.unpack(data)
     local typ = msg.typ
-    local coin = msg.coin
+    local id = msg.id
     local capsules = {}
     if typ == 1 then
-        local ret = skynet.call(agent.capsule_serv, "lua", "list", coin)
+        local ret = skynet.call(agent.capsule_serv, "lua", "list", id)
         if next(ret) then
             for k, v in pairs(ret) do
                 capsules[k] = v
             end
         end
     elseif typ == 0 then
-        local ret = role:getCapsuleList(coin)
+        local ret = role:getCapsuleList(id)
         if next(ret) then
             for k, v in pairs(ret) do
                 capsules[k] = v
@@ -267,7 +267,7 @@ function _M.shopRpc(agent, data)
 	local shopCsv = {}
 	local dataSet = csvdb["shop_normalCsv"]
 	for _, datat in pairs(dataSet) do
-		if datat.shop == 5 then
+		if datat.shop == 4 then
 			shopCsv[datat.id] = datat
 		end
 	end
@@ -145,7 +145,20 @@ function Capsule:isShow()
     return true
 end
-function Capsule:resetTimeOut(curTime, now)
+function Capsule:reset2TimeOut(curTime, now)
+    now = now or skynet.timex()
+    local interval
+    if now >= curTime then
+        self:init()
+        self:create()
+    else
+        interval = curTime - now
+    end
+    interval = (interval)* 100
+    skynet.timeout(interval, handler(self,self.reset3TimeOut)(curTime))
+end
+
+function Capsule:reset3TimeOut(curTime, now)
     now = now or skynet.timex()
     local cur4Time = curTime or (specTime({hour = 4},now))
@@ -162,8 +175,8 @@ function Capsule:resetTimeOut(curTime, now)
         local nextTime = dayLater(now)
         interval = nextTime - now
     end
-    interval = (interval + 1)* 100
-    skynet.timeout(interval, handler(self,self.resetTimeOut))
+    interval = (interval)* 100
+    skynet.timeout(interval, handler(self,self.reset3TimeOut))
 end
 function Capsule:reset4TimeOut(curTime, now)
@@ -180,19 +193,30 @@ function Capsule:reset4TimeOut(curTime, now)
         return false
     end
-    interval = (interval + 1)* 100
+    interval = (interval)* 100
     skynet.timeout(interval, handler(self,self.reset4TimeOut))
 end
-function Capsule:checkTime(resetArr, now)
-    if resetArr[1] == "3" then
+function Capsule:checkTime(reset, now)
+    local resetArr = reset:toArray(true, "=")
+    if not next(resetArr) then return false end
+
+    if resetArr[1] == 2 then
+        if self:getGoodsAmount() > 0 then return false end
+        local drawEndTime = self:getProperty("drawEndTime") or 0
+        if drawEndTime == 0 then return false end
+        if now - drawEndTime >= resetArr[2] then return true end
+        --self:reset2TimeOut(drawEndTime + resetArr[2], now)
+    elseif resetArr[1] == 3 then
         local cur4Time = specTime({hour = 4},now)
         if now == cur4Time then return true end
-        self:resetTimeOut(cur4Time, now)
-    elseif resetArr[1] == "4" then
+        --self:reset3TimeOut(cur4Time, now)
+    elseif resetArr[1] == 4 then
         if now == resetArr[2] then return true end
-        self:reset4TimeOut(resetArr[2], now)
+        --self:reset4TimeOut(resetArr[2], now)
     end
+
+    return false
 end
 function Capsule:refreshing(now)
@@ -204,29 +228,13 @@ function Capsule:refreshing(now)
     if reset == "0" then
         return false
     elseif reset == "1" then
-        if self:getProperty("resetTimes") == 1 then
+        if self:getProperty("resetTimes") == 0 then
+            self:setProperty("resetTime", 1)
             return true
         end
         return false
     else
-        local resetArr = reset:toArray(true, "=")
-        if not next(resetArr) then return false end
-
-        if resetArr[1] == "2" then
-            if self:getGoodsAmount() > 0 then return false end
-
-            local drawEndTime = self:getProperty("drawEndTime") or 0
-            if drawEndTime == 0 then return false end
-
-            if now - drawEndTime >= resetArr[2] then
-                return true
-            end
-            return false
-
-        else
-            self:checkTime(resetArr, now)
-        end
-
+        return self:checkTime(reset, now)
     end
     return false
@@ -613,24 +621,25 @@ function Capsule:checkIncentive(roleId, name, now)
         end
         local count = math.floor(amount / incentive["amount"]["np"])
-        local tmpCount = count * incentive["amount"]["np"]
-        notify["amount"] = {name = name, roleId= roleId, good_id = "amount", typ = RewardType.INCENTIVE, award = incentive["amount"]["award"], amount = count, quality = 2, create_time= now}
-
-        --填充v.calculated 字段，标识已经用于每x抽的计算中。
-        for _, v in pairs(roleRecord) do
-            if tmpCount <= 0 then break end
-
-            v.calculated = v.calculated or 0
-            if v.calculated ~= v.amount then
-                if tmpCount <= v.amount then
-                    v.calculated = tmpCount
-                    tmpCount = 0
-                else
-                    v.calculated = v.amount
-                    tmpCount = tmpCount - v.amount
+        if count > 0 then
+            local tmpCount = count * incentive["amount"]["np"]
+            notify["amount"] = {name = name, roleId= roleId, good_id = "amount", typ = RewardType.INCENTIVE, award = incentive["amount"]["award"], amount = count, quality = 2, create_time= now}
+
+            --填充v.calculated 字段，标识已经用于每x抽的计算中。
+            for _, v in pairs(roleRecord) do
+                if tmpCount <= 0 then break end
+
+                v.calculated = v.calculated or 0
+                if v.calculated ~= v.amount then
+                    if tmpCount <= v.amount then
+                        v.calculated = tmpCount
+                        tmpCount = 0
+                    else
+                        v.calculated = v.amount
+                        tmpCount = tmpCount - v.amount
+                    end
                 end
             end
-
         end
     end
@@ -757,7 +766,13 @@ function Capsule:drawByCount(roleId, count)
     local goodsBySpecial = self:checkSpecialReward(now, goodsAmount)
     local specialByRole = rewardCollectByRoleId(roleId, reward, goodsBySpecial)
-    return {reward = reward, usual = goodsByUsual, incentive = goodsByIncentive, specials = goodsBySpecial, special = specialByRole}
+    local drawReward = {}
+    drawReward["reward"] = reward
+    drawReward["usual"] = goodsByUsual
+    drawReward["specials"] = goodsBySpecial
+    if next(goodsByIncentive) then drawReward["incentive"] = goodsByIncentive end
+    if next(specialByRole) then drawReward["special"] = specialByRole end
+    return drawReward
 end
 function Capsule:drawAll(roleId)
@@ -819,7 +834,13 @@ function Capsule:drawAll(roleId)
     local goodsBySpecial = self:checkSpecialReward(now, goodsAmount)
     local specialByRole = rewardCollectByRoleId(roleId, reward, goodsBySpecial)
-    return {reward = reward, usual = goodsByUsual, incentive = goodsByIncentive, specials = goodsBySpecial, special = specialByRole}
+    local drawReward = {}
+    drawReward["reward"] = reward
+    drawReward["usual"] = goodsByUsual
+    drawReward["specials"] = goodsBySpecial
+    if next(goodsByIncentive) then drawReward["incentive"] = goodsByIncentive end
+    if next(specialByRole) then drawReward["special"] = specialByRole end
+    return drawReward
 end
 --@param
@@ -909,6 +930,18 @@ function Capsule:clearSpecialNty(roleId, good_ids)
     self:setProperty("specialsRecord", specialsRecord)
 end
+function Capsule:getRoleProgress(roleId)
+    local recordByRole = self:getProperty("recordByRole") or {}
+    local roleRecord = recordByRole[roleId] or {}
+    local amount = 0
+    for _, v in pairs(roleRecord) do
+        v.calculated = v.calculated or 0
+        if v.calculated ~= v.amount then
+            amount = amount + (v.amount - v.calculated)
+        end
+    end
+    return amount
+end
 function Capsule:data(roleId)
     return {
@@ -925,6 +958,7 @@ function Capsule:data(roleId)
         specials = self:getProperty("specials"),
         incentive = self:getProperty("incentive"),
         specialsRecord= self:getProperty("specialsRecord"),
+        roleProgress = self:getRoleProgress(roleId),
     }
 end
@@ -3153,10 +3153,10 @@ function RolePlugin.bind(Role)
 		return itemRandomOccupy
 	end
-    function Role:getCapsuleList(coin)
+    function Role:getCapsuleList(id)
 		local capsules = {}
 		for k, v in pairs(self.capsules) do
-			if v:getProperty("coin") == coin then
+			if v:getProperty("id") == id then
 				local onlineCount= v:getOnlineCount()
 				capsules[k] = {id=v:getProperty("id"), room=v:getProperty("room"), typ=v:getProperty("typ"), people=onlineCount[2], coin= v:getProperty("coin")}
 			end
@@ -81,7 +81,7 @@ end
 local function add(roleId, capsuleId)
     local capsule = capsules[capsuleId]
-    if not capsule then skynet.error("not capsule: " .. capsuleId) return end
+    if not capsule then skynet.error("add not capsule: " .. capsuleId) return end
     if next(capsule) then
         capsule:join(roleId)
         broadCastCapsule(roleId, capsuleId, {notifyType= NotifyChangeType.JOIN, roleId = roleId})
@@ -91,10 +91,12 @@ local function add(roleId, capsuleId)
     return nil
 end
-local function capsuleRefreshing()
-    local now = skynet.timex()
+local function capsuleRefreshing(now)
     for _, v in pairs(capsules) do
         if v:refreshing(now) then
+            print("刷新机器looooook....")
+            print(v:getProperty("id"))
+            print(v:getProperty("room"))
             v:init()
             v:create()
         end
@@ -103,8 +105,9 @@ end
 --扭蛋机刷新
 local function check_capsules()
-    pcall(capsuleRefreshing)
-    skynet.timeout(60, check_capsules)
+    local now = skynet.timex()
+    pcall(capsuleRefreshing, now)
+    skynet.timeout(100, check_capsules)
 end
 function CMD.reset()
@@ -168,10 +171,10 @@ function CMD.start()
     check_capsules()
 end
-function CMD.list(coin)
+function CMD.list(id)
     local tmpCapsules = {}
     for k, v in pairs(capsules) do
-        if v:getProperty("coin") == coin then
+        if v:getProperty("id") == id then
             local onlineCount= v:getOnlineCount()
             tmpCapsules[k] = {id=v:getProperty("id"), room=v:getProperty("room"), typ=v:getProperty("typ"), people=onlineCount[2], coin= v:getProperty("coin")}
         end