Blame view

src/models/Store.lua 16.4 KB
c5825110   saicom   新增用户商城相关数据
1
2
3
4
5
6
7
8
  -- 商店数据
  
  local Store = class("Store", require("shared.ModelBase"))
  
  function Store:ctor(properties)
  	Store.super.ctor(self, properties)
  end
  
51d9d20b   liuzujun   付费签到,应用市场反馈
9
10
11
12
  ActGoodsType = {
      paySignIn = 1,  -- 付费签到
  }
  
c5825110   saicom   新增用户商城相关数据
13
  Store.schema = {
3e20f499   saicom   完善商城相关协议
14
15
16
  	buyR		= {"table", {}},		-- 购买商品记录 {id=count}
  	payR	= {"table", {}},		-- 充值记录 {id=count}
  	growFund		= {"number", 0},		-- 成长基金
51d9d20b   liuzujun   付费签到,应用市场反馈
17
18
      growFundR  = {"string", ""},        -- 成长基金领取记录
  
3e20f499   saicom   完善商城相关协议
19
  	monthCardEx	= {"number", 0},		-- 月卡过期时间戳
51d9d20b   liuzujun   付费签到,应用市场反馈
20
21
      smonthCardEx	= {"number", 0},		-- 超级月卡过期时间戳
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
22
  	battleCard	= {"number", 0},		-- 赛季卡
3e20f499   saicom   完善商城相关协议
23
24
  	battleFR = {"string", ""},		-- 免费赛季卡领取记录
      battleLR = {"string", ""},		-- 付费赛季卡领取记录
51d9d20b   liuzujun   付费签到,应用市场反馈
25
  
00bf6029   liuzujun   限时礼包,抽卡ssr广播
26
      limitTPack = {"table", {}},      -- 限时礼包 {id={expire_ts, trigger_type}}
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
27
28
29
      privCardEx = {"number", 0},          -- 特权卡过期时间戳
      getMailT1 = {"number",0},       -- 上次发送月卡福利邮件的时间
      getMailT2 = {"number",0},       -- 上次发送超级月卡福利邮件的时间
00bf6029   liuzujun   限时礼包,抽卡ssr广播
30
      --packTrigger = {"table", {}},     -- 礼包触发记录 {关卡难度1={id, 通关关卡数,升级数,爬塔层数}, ...}
51d9d20b   liuzujun   付费签到,应用市场反馈
31
32
33
34
35
      
      -- 活动商品购买记录
      actGoodsFlag = {"table", {}},       -- ActGoodsType  1购买,0未购买
  
      bpInfo = {"table", {}},         -- battle pass 探索指令  1={flag=0 为1表示买了,br=""付费领取记录, fr=""免费领取记录},2,3,4
4f7cffe5   liuzujun   多队挂机任务取消功能,累充奖励
36
37
      
      totalRR  = {"string", ""},        -- 累计充值奖励领取记录
c5825110   saicom   新增用户商城相关数据
38
39
40
  }
  
  function Store:updateProperty(params)
3e20f499   saicom   完善商城相关协议
41
42
43
  	params = params or {}
  	if not self.schema[params.field] then
  		return
c5825110   saicom   新增用户商城相关数据
44
  	end
3e20f499   saicom   完善商城相关协议
45
  	local oldValue = self:getProperty(params.field)
c5825110   saicom   新增用户商城相关数据
46
47
  	if params.value then
  		self:setProperty(params.field, params.value)
3e20f499   saicom   完善商城相关协议
48
49
50
51
52
53
54
55
  	elseif params.delta then
  		self:incrProperty(params.field, params.delta)
  	else
  		return
  	end
  	local newValue = self:getProperty(params.field)
  	if not params.notNotify then
  		self:notifyUpdateProperty(params.field, newValue, oldValue)
c5825110   saicom   新增用户商城相关数据
56
  	end
c5825110   saicom   新增用户商城相关数据
57
58
  end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
59
60
61
  function Store:onCrossDay()
      self:sendMonthCardEmail()
      self:deleteExpireLimitGoods()
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
62
      --self:checkPaySignReward()
c5825110   saicom   新增用户商城相关数据
63
64
  end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
65
66
67
68
69
  -- 删除过期商品
  function Store:deleteExpireLimitGoods()
      local timeNow = skynet.timex()
      local limitGoodsList = self:getProperty("limitTPack")
      for k, v in pairs(limitGoodsList) do
00bf6029   liuzujun   限时礼包,抽卡ssr广播
70
          if timeNow > v[1] then
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
71
72
              limitGoodsList[k] = nil
          end
c5825110   saicom   新增用户商城相关数据
73
      end
00bf6029   liuzujun   限时礼包,抽卡ssr广播
74
      self:updateProperty({field = "limitTPack", value = limitGoodsList, notNotify = true})
c5825110   saicom   新增用户商城相关数据
75
76
77
78
  end
  
  -- 发送月卡邮件
  function Store:sendMonthCardEmail()
3e20f499   saicom   完善商城相关协议
79
      local timeNow = skynet.timex()
9ea0c502   liuzujun   限时礼包
80
      local tabs = {{ex="monthCardEx", t="getMailT1", mail=MailId.MonthCard, alert=MailId.MonthCardEx},
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
81
      {ex="smonthCardEx", t="getMailT2", mail=MailId.SuperMonthCard, alert=MailId.SuperMonthCardEx}}
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
82
83
84
85
86
87
88
89
90
91
92
      for _, v in ipairs(tabs) do
          local ex  = self:getProperty(v.ex)
          local ts  = self:getProperty(v.t) or 0
          local mailId = v.mail
          local alertId = v.alert
          local alertTs = dayLater(ex) - DAY_SEC
          if ex > timeNow then
              local cnt = 0
              if ts == 0 then
                  cnt = 1
              else
70aa8660   liuzujun   发送多天邮件bug
93
                  local diff = math.floor((dayLater(timeNow) - dayLater(ts))/DAY_SEC)
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
                  diff = diff < 0 and 0 or diff
                  diff = diff > 31 and 31 or diff
                  cnt = diff
              end
              for i = cnt - 1, 0, -1  do
                  local createTs = timeNow - i * DAY_SEC
                  self.owner:sendMail(mailId, createTs)
                  -- 过期头一天发提醒邮件
                  if dayLater(createTs) == alertTs then
                      self.owner:sendMail(alertId, createTs)
                  end
              end
              if cnt > 0 then
                  self:updateProperty({field=v.t, value=timeNow})
              end
          end
3e20f499   saicom   完善商城相关协议
110
      end
c5825110   saicom   新增用户商城相关数据
111
112
  end
  
317a46a9   liuzujun   添加特权卡
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
  function Store:isMonthCardExpire()
      local timeNow = skynet.timex()
      local ts = self:getProperty("monthCardEx")
      return ts < timeNow
  end
  
  function Store:isSuperMonthCardExpire()
      local timeNow = skynet.timex()
      local ts = self:getProperty("smonthCardEx")
      return ts < timeNow
  end
  
  function Store:isPrivCardExpire()
      local timeNow = skynet.timex()
      local ts = self:getProperty("privCardEx")
      return ts < timeNow
  end
  
317a46a9   liuzujun   添加特权卡
131
132
133
134
135
136
  -- 挂机栏位 特权卡额外个数
  function Store:getHangSlotExtraCount()
      if self:isPrivCardExpire() then
          return 0
      end
  
d9d51454   liuzujun   修改特权卡引用配置错误bug
137
      return globalCsv.shop_priv_card_hang_slot_cnt or 4
317a46a9   liuzujun   添加特权卡
138
139
140
141
142
143
144
  end
  
  -- 探索加速/餐厅加速 特权卡系数
  function Store:getProduceItemSpeedCoef()
      if self:isPrivCardExpire() then
          return 1
      end
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
145
146
      local coef = (globalCsv.shop_priv_card_produce_coef or 25)/ 100
      return 1 + coef
317a46a9   liuzujun   添加特权卡
147
148
149
150
151
152
153
154
  end
  
  -- 拆解室栏位 特权卡额外个数
  function Store:getTimeBoxSlotExtraCount()
      if self:isPrivCardExpire() then
          return 0
      end
  
d9d51454   liuzujun   修改特权卡引用配置错误bug
155
      return globalCsv.shop_priv_time_box_slot_cnt or 3
317a46a9   liuzujun   添加特权卡
156
157
158
159
160
161
162
163
  end
  
  -- 齿轮兑换 特权卡系数
  function Store:getGearExchangeCoef()
      if self:isPrivCardExpire() then
          return 1
      end
  
7f9f002d   liuzujun   循环周活动
164
      local coef = (globalCsv.shop_priv_exchange_gear_coef or 50)/ 100
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
165
      return 1 + coef
317a46a9   liuzujun   添加特权卡
166
167
  end
  
00bf6029   liuzujun   限时礼包,抽卡ssr广播
168
169
170
171
172
173
174
175
176
177
178
179
180
  -- 奖励关卡 特权卡额外数量
  function Store:getBonusExtraFightCount()
      if self:isPrivCardExpire() then
          return 0
      end
  
      local cnt = globalCsv.bonus_extra_fight_count or 1
      return cnt
  end
  
  -- 挂机道具掉落系数 特权卡挂机掉落系数
  function Store:getHangDropCoef()
      if self:isPrivCardExpire() then
aae56896   liuzujun   特权卡bug
181
          return 1, 1
00bf6029   liuzujun   限时礼包,抽卡ssr广播
182
183
184
185
186
187
      end
  
      return (1 + globalCsv.hang_drop_exp_coef) or 1, (1 + globalCsv.hang_drop_item_coef) or 1
  end
  
  
c5825110   saicom   新增用户商城相关数据
188
  -- 购买通行证
37bb4611   liuzujun   付费签到,抽卡阶段奖励,探索指令
189
  function Store:onBuyCard(type, duration, id)
c5825110   saicom   新增用户商城相关数据
190
      local timeNow = skynet.timex()
3e20f499   saicom   完善商城相关协议
191
      if type == CardType.NormalMonthCard then
317a46a9   liuzujun   添加特权卡
192
193
194
195
196
          if self:isMonthCardExpire() then
              self:updateProperty({field = "monthCardEx", value = timeNow + duration})
          else
              self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + duration})
          end
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
197
          self:sendMonthCardEmail()
3e20f499   saicom   完善商城相关协议
198
      elseif type == CardType.SuperMonthCard then
317a46a9   liuzujun   添加特权卡
199
200
201
202
203
          if self:isSuperMonthCardExpire() then
              self:updateProperty({field = "smonthCardEx", value = timeNow + duration})
          else
              self:updateProperty({field = "smonthCardEx", value = self:getProperty("smonthCardEx") + duration})
          end
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
204
          self:sendMonthCardEmail()
3e20f499   saicom   完善商城相关协议
205
      elseif type == CardType.PrivilegeCard then
317a46a9   liuzujun   添加特权卡
206
207
208
209
210
          if self:isPrivCardExpire() then
              self:updateProperty({field = "privCardEx", value = timeNow + duration})
          else
              self:updateProperty({field = "privCardEx", value = self:getProperty("privCardEx") + duration})
          end
3e20f499   saicom   完善商城相关协议
211
212
213
      elseif type == CardType.GrowFund then
          self:updateProperty({field = "growFund", value = 1})
      elseif type == CardType.BattleCard then
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
214
          self:updateProperty({field = "battleCard", value = 1})
37bb4611   liuzujun   付费签到,抽卡阶段奖励,探索指令
215
216
217
218
      elseif type == CardType.PaySignCard then
          self:onBuyPaySignCard(duration)
      elseif type == CardType.BattlePassCard then
          local index = id - 400          -- 401:初级 402:中级 403:高级 404:终极
51d9d20b   liuzujun   付费签到,应用市场反馈
219
220
221
222
223
          local bpInfo = self:getProperty("bpInfo") or {}
          local info = bpInfo[index] or {}
          info["flag"] = 1
          bpInfo[index] = info
          self:updateProperty({field = "bpInfo", value = bpInfo})
c5825110   saicom   新增用户商城相关数据
224
225
226
      end
  end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
227
  --检测购买是否超过限制数量
3e20f499   saicom   完善商城相关协议
228
  function Store:checkRechargeRecord(limit, id)
3a3a3ddf   liuzujun   下单前检测商品限购次数
229
      local rechargeRecord = self:getProperty("payR") or {}
c5825110   saicom   新增用户商城相关数据
230
      if limit ~= 0 and limit <= (rechargeRecord[id] or 0) then
d705a315   zhouhaihai   充值 整理
231
          skynet.error(string.format("[recharge] recharge id:%d count over limit, user id:%d", id, self.owner:getProperty("id")))
c5825110   saicom   新增用户商城相关数据
232
233
          return false
      end
3e20f499   saicom   完善商城相关协议
234
235
      rechargeRecord[id] = (rechargeRecord[id] or 0) + 1
      self:updateProperty({field = "payR", value = rechargeRecord})
c5825110   saicom   新增用户商城相关数据
236
237
238
      return true
  end
  
3e20f499   saicom   完善商城相关协议
239
240
241
242
243
244
245
246
247
  function Store:notifyUpdateProperty(field, newValue, oldValue)
  	local datas = {
  		key = field,
  		newValue = newValue,
  		oldValue = oldValue,
  	}
  	SendPacket(actionCodes.Store_updateproperty, MsgPack.pack(datas))
  end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
248
249
  -- 赛季卡重置 需要把未能领取的奖励通过邮件发送
  function Store:onBattleCardReset()
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
250
      local gift = {}
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
251
      local function concatGift(data)
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
252
253
          for key, v in pairs(data:toNumMap()) do
              gift[key] = (gift[key] or 0) + v
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
254
255
256
257
258
259
260
261
262
263
264
          end
      end
      local battleCardFlag = self:getProperty("battleCard")
      local battleCardFreeRecord = self:getProperty("battleFR")
      local battleCardLimitRecord = self:getProperty("battleLR")
      local battlePoint = self.owner:getProperty("battlePoint")
  
      for id, config in pairs(csvdb["reward_battlepassCsv"]) do
          if config then
              local freeFlag = string.char(string.getbit(battleCardFreeRecord, id))
              local limitFlag = string.char(string.getbit(battleCardLimitRecord, id))
9ea0c502   liuzujun   限时礼包
265
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
266
267
268
269
270
271
272
273
274
275
              if battlePoint < config.point then
                  break
              end
              if freeFlag == "0" then
                  concatGift(config.giftFree)
              end
              if limitFlag == "0" and battleCardFlag == 1 then
                  concatGift(config.giftLimit)
              end
          end
9ea0c502   liuzujun   限时礼包
276
      end
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
277
      self.owner:sendMail(MailId.BattleCardAward, nil, gift)
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
278
279
      -- 计算剩余奖励
      self:updateProperty({field = "battleCard", value=0})
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
280
281
282
283
284
285
      self:updateProperty({field = "battleFR", value=""})
      self:updateProperty({field = "battleLR", value=""})
      self.owner:updateProperty({field = "battlePoint", value=0})
  end
  
  -- 重置购买记录
1a0b3c56   liuzujun   抽卡保底,切换定向卡池
286
287
288
289
290
291
292
293
  function Store:resetStoreReored(resetId)
      local payRecord = self:getProperty("payR") or {}
      local buyRecord = self:getProperty("buyR") or {}
      for k, v in pairs(payRecord) do
          local config = csvdb["shop_rechargeCsv"][k]
          if config then
              if config.resetTime == resetId then
                  payRecord[k] = nil
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
294
295
296
297
298
299
                  --通行证商店
                  if config.shop == 2 then
                      if config.type == CardType.BattleCard then
                          self:onBattleCardReset()
                      end
                  end
1a0b3c56   liuzujun   抽卡保底,切换定向卡池
300
              end
8e892c71   liuzujun   挑战关卡活动打完再扣门票
301
302
          else
              payRecord[k] = nil
1a0b3c56   liuzujun   抽卡保底,切换定向卡池
303
304
305
306
307
308
309
310
311
          end
      end
      self:updateProperty({field = "payR", value = payRecord})
      for k, v in pairs(buyRecord) do
          local config = csvdb["shop_normalCsv"][k]
          if config then
              if config.resetTime == resetId then
                  buyRecord[k] = nil
              end
8e892c71   liuzujun   挑战关卡活动打完再扣门票
312
313
          else
              buyRecord[k] = nil
1a0b3c56   liuzujun   抽卡保底,切换定向卡池
314
315
316
317
318
          end
      end
      self:updateProperty({field = "buyR", value = buyRecord})
  end
  
9ea0c502   liuzujun   限时礼包
319
320
321
  --触发限时礼包
  function Store:OnTriggerLimitTimePack(eventType, param)
      local limitPack = self:getProperty("limitTPack")
00bf6029   liuzujun   限时礼包,抽卡ssr广播
322
      --local payRecord = self:getProperty("payR")
9ea0c502   liuzujun   限时礼包
323
      local timeNow = skynet.timex()
00bf6029   liuzujun   限时礼包,抽卡ssr广播
324
      --local find = false
9ea0c502   liuzujun   限时礼包
325
      -- 有未过期的限时礼包不再推送
00bf6029   liuzujun   限时礼包,抽卡ssr广播
326
327
328
329
330
331
332
333
334
335
336
337
338
      --for k, v in pairs(limitPack) do
      --    if v > timeNow and not payRecord[k] then
      --        find = true
      --        break
      --    end
      --end
      --if find == true then
      --    return
      --end
      --local hangPass = self.owner:getProperty("hangPass")
      --local triggerRecord = self:getProperty("packTrigger")
      --local result = {}
      --local maxDiff = 0
9ea0c502   liuzujun   限时礼包
339
      -- 取满足限时礼包关卡要求的对应数据
00bf6029   liuzujun   限时礼包,抽卡ssr广播
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
      --for diff, maxCarbonId in pairs(hangPass) do
      --    for id, cfg in pairs(csvdb["shop_packCsv"]) do
      --        local range = cfg.showRange:toArray(true, "=")
      --        local beginRange = range[1] or 0
      --        local endRange = range[2] or 0
      --        if maxCarbonId > beginRange and maxCarbonId <= endRange and cfg.type == eventType then
      --            result[diff] = cfg
      --            maxDiff = math.max(maxDiff, diff)
      --            break
      --        end
      --    end
      --end
      local config = nil
      for id, cfg in pairs(csvdb["shop_packCsv"]) do
          if cfg.type == eventType and cfg.condition == param then
              config = cfg
9ea0c502   liuzujun   限时礼包
356
357
          end
      end
00bf6029   liuzujun   限时礼包,抽卡ssr广播
358
359
      if config ~= nil then
          local rechargeCfg = csvdb["shop_rechargeCsv"][config.packId]
9ea0c502   liuzujun   限时礼包
360
          if rechargeCfg then
00bf6029   liuzujun   限时礼包,抽卡ssr广播
361
              limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
97807511   zhouhaihai   增加日志
362
363
364
365
              self.owner:log("push_gift", {
                  gift_id = rechargeCfg.id, --礼包ID
                  gift_name = rechargeCfg.title,   --礼包名称
              })
9ea0c502   liuzujun   限时礼包
366
367
368
              self:updateProperty({field = "limitTPack", value = limitPack})
          end
      end
00bf6029   liuzujun   限时礼包,抽卡ssr广播
369
370
371
      --if next(result) then
      --    self:updateProperty({field = "packTrigger", value = triggerRecord})
      --end
9ea0c502   liuzujun   限时礼包
372
373
  end
  
51d9d20b   liuzujun   付费签到,应用市场反馈
374
375
376
377
  function GetActGoodsIndex(goodsType)
      return ActGoodsType[goodsType] or 0
  end
  
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
378
  function Store:SetActGoodsFlag(goodsType, flag)
51d9d20b   liuzujun   付费签到,应用市场反馈
379
      local actGoodsFlag = self:getProperty("actGoodsFlag") or {}
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
380
      local goodsIndex = GetActGoodsIndex(goodsType)
51d9d20b   liuzujun   付费签到,应用市场反馈
381
382
383
384
      if goodsIndex == 0 then
          print("get act goods index fail :paySignIn")
          return
      end
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
385
      actGoodsFlag[goodsIndex] = flag
53b4b8bd   liuzujun   自动挂机下一关
386
      self:updateProperty({field = "actGoodsFlag", value = actGoodsFlag})
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
387
  end
51d9d20b   liuzujun   付费签到,应用市场反馈
388
  
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
389
390
391
  -- 购买付费签到 按开服时间算奖励
  function Store:onBuyPaySignCard(dur)
      local curTs = skynet.timex()
d4d00016   liuzujun   付费签到开始时间改为开服时间
392
  	curTs = getServerOpenTs()
51d9d20b   liuzujun   付费签到,应用市场反馈
393
  
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
394
      self:SetActGoodsFlag("paySignIn", curTs)
ede282c0   liuzujun   付费签到规则改为按登录天数计算进度...
395
396
397
      local actData = self.owner.activity:getActData("PaySignIn")
      actData[0] = 1
      self.owner.activity:updateActData("PaySignIn", actData)
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
  
      --local actGoodsFlag = self:getProperty("actGoodsFlag") or {}
      --local goodsIndex = GetActGoodsIndex("paySignIn")
      --if goodsIndex == 0 then
      --    print("get act goods index fail :paySignIn")
      --    return
      --end
      --actGoodsFlag[goodsIndex] = 1
      --self:updateProperty({field = "actGoodsFlag", value = actGoodsFlag})
      -- 发钱
      --local change
      --local reward, curData = self.owner.activity:getPaySignReward()
  	--if next(reward) then
      --    self.owner.activity:updateActData("PaySignIn", curData)
      --    reward, change = self.owner:award(reward, {log = {desc = "actPaySign"}})
  	--end
  
  	--self.owner:log("activity", {
  	--	activity_id = 0, -- 活动ID(或活动指定任务的ID)
  	--	activity_type = self.owner.activity.ActivityType.PaySignIn, -- 活动类型,见活动类型枚举表
  	--	activity_reward = reward, -- 活动奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
  	--})
  
  	--SendPacket(actionCodes.Activity_actPaySignRewardNtf, MsgPack.pack(self.owner:packReward(reward, change)))
51d9d20b   liuzujun   付费签到,应用市场反馈
422
423
424
425
426
427
428
429
430
431
  end
  
  function Store:checkPaySignReward()
      local reward, curData  = self.owner.activity:getPaySignReward()
      if next(reward) then
          self.owner.activity:updateActData("PaySignIn", curData)
          self.owner:sendMail(MailId.PaySignAward, nil, reward)
  	end
  end
  
f7a55da3   liuzujun   新增cb2临时限时礼包
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
  -- 临时用 登录触发限时礼包 时间点以后
  function Store:OnTriggerLimitTimePackAfterTs(eventType, param)
      local limitPack = self:getProperty("limitTPack")
      local timeNow = skynet.timex()
      local config = nil
      for id, cfg in pairs(csvdb["shop_packCsv"]) do
          local ts = toUnixtime(""..cfg.condition)
          if cfg.type == eventType and ts < param then
              config = cfg
  
              if config ~= nil then
                  local rechargeCfg = csvdb["shop_rechargeCsv"][config.packId]
                  if rechargeCfg then
                      if not limitPack[rechargeCfg.id] then
                          limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
                          self.owner:log("push_gift", {
                              gift_id = rechargeCfg.id, --礼包ID
                              gift_name = rechargeCfg.title,   --礼包名称
                          })
                          self:updateProperty({field = "limitTPack", value = limitPack, notNotify = false})
                      end
                  end
              end
          end
      end
  end
  
c5825110   saicom   新增用户商城相关数据
459
  function Store:data()
f7a55da3   liuzujun   新增cb2临时限时礼包
460
      self:OnTriggerLimitTimePackAfterTs(TriggerEventType.AfterTs, skynet.timex())
c5825110   saicom   新增用户商城相关数据
461
  	return {
3e20f499   saicom   完善商城相关协议
462
463
464
465
466
467
          buyR		= self:getProperty("buyR"),
          payR	= self:getProperty("payR"),
          growFund		= self:getProperty("growFund"),
          growFundR  = self:getProperty("growFundR"),
          monthCardEx  = self:getProperty("monthCardEx"),
          smonthCardEx  = self:getProperty("smonthCardEx"),
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
468
469
470
          battleCard  = self:getProperty("battleCard"),
          battleFR  = self:getProperty("battleFR"),
          battleLR  = self:getProperty("battleLR"),
3e20f499   saicom   完善商城相关协议
471
          limitTPack = self:getProperty("limitTPack"),
317a46a9   liuzujun   添加特权卡
472
          privCardEx = self:getProperty("privCardEx"),
00bf6029   liuzujun   限时礼包,抽卡ssr广播
473
          --packTrigger = self:getProperty("packTrigger"),
51d9d20b   liuzujun   付费签到,应用市场反馈
474
475
          actGoodsFlag = self:getProperty("actGoodsFlag"),
          bpInfo = self:getProperty("bpInfo"),
4f7cffe5   liuzujun   多队挂机任务取消功能,累充奖励
476
          totalRR = self:getProperty("totalRR"),
c5825110   saicom   新增用户商城相关数据
477
478
479
480
  	}
  end
  
  return Store