Blame view

src/models/Store.lua 14.8 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
c5825110   saicom   新增用户商城相关数据
36
37
38
  }
  
  function Store:updateProperty(params)
3e20f499   saicom   完善商城相关协议
39
40
41
  	params = params or {}
  	if not self.schema[params.field] then
  		return
c5825110   saicom   新增用户商城相关数据
42
  	end
3e20f499   saicom   完善商城相关协议
43
  	local oldValue = self:getProperty(params.field)
c5825110   saicom   新增用户商城相关数据
44
45
  	if params.value then
  		self:setProperty(params.field, params.value)
3e20f499   saicom   完善商城相关协议
46
47
48
49
50
51
52
53
  	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   新增用户商城相关数据
54
  	end
c5825110   saicom   新增用户商城相关数据
55
56
  end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
57
58
59
  function Store:onCrossDay()
      self:sendMonthCardEmail()
      self:deleteExpireLimitGoods()
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
60
      --self:checkPaySignReward()
c5825110   saicom   新增用户商城相关数据
61
62
  end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
63
64
65
66
67
  -- 删除过期商品
  function Store:deleteExpireLimitGoods()
      local timeNow = skynet.timex()
      local limitGoodsList = self:getProperty("limitTPack")
      for k, v in pairs(limitGoodsList) do
00bf6029   liuzujun   限时礼包,抽卡ssr广播
68
          if timeNow > v[1] then
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
69
70
              limitGoodsList[k] = nil
          end
c5825110   saicom   新增用户商城相关数据
71
      end
00bf6029   liuzujun   限时礼包,抽卡ssr广播
72
      self:updateProperty({field = "limitTPack", value = limitGoodsList, notNotify = true})
c5825110   saicom   新增用户商城相关数据
73
74
75
76
  end
  
  -- 发送月卡邮件
  function Store:sendMonthCardEmail()
3e20f499   saicom   完善商城相关协议
77
      local timeNow = skynet.timex()
9ea0c502   liuzujun   限时礼包
78
      local tabs = {{ex="monthCardEx", t="getMailT1", mail=MailId.MonthCard, alert=MailId.MonthCardEx},
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
79
      {ex="smonthCardEx", t="getMailT2", mail=MailId.SuperMonthCard, alert=MailId.SuperMonthCardEx}}
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
80
81
82
83
84
85
86
87
88
89
90
      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
91
                  local diff = math.floor((dayLater(timeNow) - dayLater(ts))/DAY_SEC)
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
                  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   完善商城相关协议
108
      end
c5825110   saicom   新增用户商城相关数据
109
110
  end
  
317a46a9   liuzujun   添加特权卡
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
  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   添加特权卡
129
130
131
132
133
134
  -- 挂机栏位 特权卡额外个数
  function Store:getHangSlotExtraCount()
      if self:isPrivCardExpire() then
          return 0
      end
  
d9d51454   liuzujun   修改特权卡引用配置错误bug
135
      return globalCsv.shop_priv_card_hang_slot_cnt or 4
317a46a9   liuzujun   添加特权卡
136
137
138
139
140
141
142
  end
  
  -- 探索加速/餐厅加速 特权卡系数
  function Store:getProduceItemSpeedCoef()
      if self:isPrivCardExpire() then
          return 1
      end
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
143
144
      local coef = (globalCsv.shop_priv_card_produce_coef or 25)/ 100
      return 1 + coef
317a46a9   liuzujun   添加特权卡
145
146
147
148
149
150
151
152
  end
  
  -- 拆解室栏位 特权卡额外个数
  function Store:getTimeBoxSlotExtraCount()
      if self:isPrivCardExpire() then
          return 0
      end
  
d9d51454   liuzujun   修改特权卡引用配置错误bug
153
      return globalCsv.shop_priv_time_box_slot_cnt or 3
317a46a9   liuzujun   添加特权卡
154
155
156
157
158
159
160
161
  end
  
  -- 齿轮兑换 特权卡系数
  function Store:getGearExchangeCoef()
      if self:isPrivCardExpire() then
          return 1
      end
  
7f9f002d   liuzujun   循环周活动
162
      local coef = (globalCsv.shop_priv_exchange_gear_coef or 50)/ 100
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
163
      return 1 + coef
317a46a9   liuzujun   添加特权卡
164
165
  end
  
00bf6029   liuzujun   限时礼包,抽卡ssr广播
166
167
168
169
170
171
172
173
174
175
176
177
178
  -- 奖励关卡 特权卡额外数量
  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
179
          return 1, 1
00bf6029   liuzujun   限时礼包,抽卡ssr广播
180
181
182
183
184
185
      end
  
      return (1 + globalCsv.hang_drop_exp_coef) or 1, (1 + globalCsv.hang_drop_item_coef) or 1
  end
  
  
c5825110   saicom   新增用户商城相关数据
186
  -- 购买通行证
37bb4611   liuzujun   付费签到,抽卡阶段奖励,探索指令
187
  function Store:onBuyCard(type, duration, id)
c5825110   saicom   新增用户商城相关数据
188
      local timeNow = skynet.timex()
3e20f499   saicom   完善商城相关协议
189
      if type == CardType.NormalMonthCard then
317a46a9   liuzujun   添加特权卡
190
191
192
193
194
          if self:isMonthCardExpire() then
              self:updateProperty({field = "monthCardEx", value = timeNow + duration})
          else
              self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + duration})
          end
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
195
          self:sendMonthCardEmail()
3e20f499   saicom   完善商城相关协议
196
      elseif type == CardType.SuperMonthCard then
317a46a9   liuzujun   添加特权卡
197
198
199
200
201
          if self:isSuperMonthCardExpire() then
              self:updateProperty({field = "smonthCardEx", value = timeNow + duration})
          else
              self:updateProperty({field = "smonthCardEx", value = self:getProperty("smonthCardEx") + duration})
          end
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
202
          self:sendMonthCardEmail()
3e20f499   saicom   完善商城相关协议
203
      elseif type == CardType.PrivilegeCard then
317a46a9   liuzujun   添加特权卡
204
205
206
207
208
          if self:isPrivCardExpire() then
              self:updateProperty({field = "privCardEx", value = timeNow + duration})
          else
              self:updateProperty({field = "privCardEx", value = self:getProperty("privCardEx") + duration})
          end
3e20f499   saicom   完善商城相关协议
209
210
211
      elseif type == CardType.GrowFund then
          self:updateProperty({field = "growFund", value = 1})
      elseif type == CardType.BattleCard then
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
212
          self:updateProperty({field = "battleCard", value = 1})
37bb4611   liuzujun   付费签到,抽卡阶段奖励,探索指令
213
214
215
216
      elseif type == CardType.PaySignCard then
          self:onBuyPaySignCard(duration)
      elseif type == CardType.BattlePassCard then
          local index = id - 400          -- 401:初级 402:中级 403:高级 404:终极
51d9d20b   liuzujun   付费签到,应用市场反馈
217
218
219
220
221
          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   新增用户商城相关数据
222
223
224
      end
  end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
225
  --检测购买是否超过限制数量
3e20f499   saicom   完善商城相关协议
226
227
  function Store:checkRechargeRecord(limit, id)
      local rechargeRecord = self:getProperty("payR")
c5825110   saicom   新增用户商城相关数据
228
229
230
231
      if limit ~= 0 and limit <= (rechargeRecord[id] or 0) then
          skynet.error(string.format("recharge id:%d count over limit, user id:%d", id, self.owner:getProperty("id")))
          return false
      end
3e20f499   saicom   完善商城相关协议
232
233
      rechargeRecord[id] = (rechargeRecord[id] or 0) + 1
      self:updateProperty({field = "payR", value = rechargeRecord})
c5825110   saicom   新增用户商城相关数据
234
235
236
      return true
  end
  
3e20f499   saicom   完善商城相关协议
237
238
239
240
241
242
243
244
245
  function Store:notifyUpdateProperty(field, newValue, oldValue)
  	local datas = {
  		key = field,
  		newValue = newValue,
  		oldValue = oldValue,
  	}
  	SendPacket(actionCodes.Store_updateproperty, MsgPack.pack(datas))
  end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
246
247
  -- 赛季卡重置 需要把未能领取的奖励通过邮件发送
  function Store:onBattleCardReset()
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
248
      local gift = {}
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
249
      local function concatGift(data)
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
250
251
          for key, v in pairs(data:toNumMap()) do
              gift[key] = (gift[key] or 0) + v
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
252
253
254
255
256
257
258
259
260
261
262
          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   限时礼包
263
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
264
265
266
267
268
269
270
271
272
273
              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   限时礼包
274
      end
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
275
      self.owner:sendMail(MailId.BattleCardAward, nil, gift)
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
276
277
      -- 计算剩余奖励
      self:updateProperty({field = "battleCard", value=0})
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
278
279
280
281
282
283
      self:updateProperty({field = "battleFR", value=""})
      self:updateProperty({field = "battleLR", value=""})
      self.owner:updateProperty({field = "battlePoint", value=0})
  end
  
  -- 重置购买记录
1a0b3c56   liuzujun   抽卡保底,切换定向卡池
284
285
286
287
288
289
290
291
  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   月卡赛季卡发送邮件奖励
292
293
294
295
296
297
                  --通行证商店
                  if config.shop == 2 then
                      if config.type == CardType.BattleCard then
                          self:onBattleCardReset()
                      end
                  end
1a0b3c56   liuzujun   抽卡保底,切换定向卡池
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
              end
          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
          end
      end
      self:updateProperty({field = "buyR", value = buyRecord})
  end
  
9ea0c502   liuzujun   限时礼包
313
314
315
  --触发限时礼包
  function Store:OnTriggerLimitTimePack(eventType, param)
      local limitPack = self:getProperty("limitTPack")
00bf6029   liuzujun   限时礼包,抽卡ssr广播
316
      --local payRecord = self:getProperty("payR")
9ea0c502   liuzujun   限时礼包
317
      local timeNow = skynet.timex()
00bf6029   liuzujun   限时礼包,抽卡ssr广播
318
      --local find = false
9ea0c502   liuzujun   限时礼包
319
      -- 有未过期的限时礼包不再推送
00bf6029   liuzujun   限时礼包,抽卡ssr广播
320
321
322
323
324
325
326
327
328
329
330
331
332
      --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   限时礼包
333
      -- 取满足限时礼包关卡要求的对应数据
00bf6029   liuzujun   限时礼包,抽卡ssr广播
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
      --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   限时礼包
350
351
          end
      end
00bf6029   liuzujun   限时礼包,抽卡ssr广播
352
353
      if config ~= nil then
          local rechargeCfg = csvdb["shop_rechargeCsv"][config.packId]
9ea0c502   liuzujun   限时礼包
354
          if rechargeCfg then
00bf6029   liuzujun   限时礼包,抽卡ssr广播
355
              limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
97807511   zhouhaihai   增加日志
356
357
358
359
              self.owner:log("push_gift", {
                  gift_id = rechargeCfg.id, --礼包ID
                  gift_name = rechargeCfg.title,   --礼包名称
              })
9ea0c502   liuzujun   限时礼包
360
361
362
              self:updateProperty({field = "limitTPack", value = limitPack})
          end
      end
00bf6029   liuzujun   限时礼包,抽卡ssr广播
363
364
365
      --if next(result) then
      --    self:updateProperty({field = "packTrigger", value = triggerRecord})
      --end
9ea0c502   liuzujun   限时礼包
366
367
  end
  
51d9d20b   liuzujun   付费签到,应用市场反馈
368
369
370
371
  function GetActGoodsIndex(goodsType)
      return ActGoodsType[goodsType] or 0
  end
  
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
372
  function Store:SetActGoodsFlag(goodsType, flag)
51d9d20b   liuzujun   付费签到,应用市场反馈
373
      local actGoodsFlag = self:getProperty("actGoodsFlag") or {}
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
374
      local goodsIndex = GetActGoodsIndex(goodsType)
51d9d20b   liuzujun   付费签到,应用市场反馈
375
376
377
378
      if goodsIndex == 0 then
          print("get act goods index fail :paySignIn")
          return
      end
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
379
      actGoodsFlag[goodsIndex] = flag
53b4b8bd   liuzujun   自动挂机下一关
380
      self:updateProperty({field = "actGoodsFlag", value = actGoodsFlag})
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
381
  end
51d9d20b   liuzujun   付费签到,应用市场反馈
382
  
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
383
384
385
  -- 购买付费签到 按开服时间算奖励
  function Store:onBuyPaySignCard(dur)
      local curTs = skynet.timex()
51d9d20b   liuzujun   付费签到,应用市场反馈
386
  
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
      self:SetActGoodsFlag("paySignIn", curTs)
  
      --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   付费签到,应用市场反馈
412
413
414
415
416
417
418
419
420
421
  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
  
c5825110   saicom   新增用户商城相关数据
422
423
  function Store:data()
  	return {
3e20f499   saicom   完善商城相关协议
424
425
426
427
428
429
          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   月卡赛季卡发送邮件奖励
430
431
432
          battleCard  = self:getProperty("battleCard"),
          battleFR  = self:getProperty("battleFR"),
          battleLR  = self:getProperty("battleLR"),
3e20f499   saicom   完善商城相关协议
433
          limitTPack = self:getProperty("limitTPack"),
317a46a9   liuzujun   添加特权卡
434
          privCardEx = self:getProperty("privCardEx"),
00bf6029   liuzujun   限时礼包,抽卡ssr广播
435
          --packTrigger = self:getProperty("packTrigger"),
51d9d20b   liuzujun   付费签到,应用市场反馈
436
437
          actGoodsFlag = self:getProperty("actGoodsFlag"),
          bpInfo = self:getProperty("bpInfo"),
c5825110   saicom   新增用户商城相关数据
438
439
440
441
  	}
  end
  
  return Store