Blame view

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