Commit 2ab0d91b2c60a2631e7532ec4581ee1674b3fa60
1 parent
cbc6973f
每日商店删掉 type [王宇杰]
Showing
2 changed files
with
5 additions
and
9 deletions
Show diff stats
src/actions/StoreAction.lua
| @@ -49,14 +49,10 @@ function _M.dailyBuyRpc(agent , data) | @@ -49,14 +49,10 @@ function _M.dailyBuyRpc(agent , data) | ||
| 49 | if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (dailySDC[id] or 0))) then return 1 end | 49 | if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (dailySDC[id] or 0))) then return 1 end |
| 50 | 50 | ||
| 51 | local cost = dataSet.cost | 51 | local cost = dataSet.cost |
| 52 | - if dataSet.type == 0 then | ||
| 53 | - local dailySDD = role.dailyData:getProperty("dailySDD") | ||
| 54 | - if dailySDD[id] then -- 折扣 | ||
| 55 | - cost = math.ceil(cost * (1 - dataSet.disount / 100)) | ||
| 56 | - end | ||
| 57 | - elseif dataSet.type == 1 then | ||
| 58 | - else | ||
| 59 | - return 3 | 52 | + |
| 53 | + local dailySDD = role.dailyData:getProperty("dailySDD") | ||
| 54 | + if dailySDD[id] then -- 折扣 | ||
| 55 | + cost = math.ceil(cost * (1 - dataSet.disount / 100)) | ||
| 60 | end | 56 | end |
| 61 | 57 | ||
| 62 | if not role:costDiamond({count = cost * count, log = {desc = "dailyShop", int1 = id, int2 = count}}) then | 58 | if not role:costDiamond({count = cost * count, log = {desc = "dailyShop", int1 = id, int2 = count}}) then |
src/models/Daily.lua
| @@ -64,7 +64,7 @@ function Daily:refreshDailyData(notify) | @@ -64,7 +64,7 @@ function Daily:refreshDailyData(notify) | ||
| 64 | local dailySDD = {} | 64 | local dailySDD = {} |
| 65 | local sddPool = {} | 65 | local sddPool = {} |
| 66 | for id, data in pairs(csvdb["shop_diamondCsv"]) do | 66 | for id, data in pairs(csvdb["shop_diamondCsv"]) do |
| 67 | - if data.type == 0 and data.disount ~= 0 then | 67 | + if data.disount ~= 0 then |
| 68 | table.insert(sddPool, id) | 68 | table.insert(sddPool, id) |
| 69 | end | 69 | end |
| 70 | end | 70 | end |