Blame view

src/actions/StoreAction.lua 12.5 KB
cccc9c70   zhouhaihai   商城
1
2
  local _M = {}
  
b6ed652b   zhouhaihai   充值
3
  local md5 = require "md5"
192b96d3   zhouhaihai   重置
4
  
b6ed652b   zhouhaihai   充值
5
6
  -- 入口在正式服关闭  -- mock 充值
  function _M.rechargeRpc(agent , data)
1ecdc048   zhouhaihai   屏蔽充值接口
7
  	if true then return end
cccc9c70   zhouhaihai   商城
8
9
10
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
11
  	local choose = msg.choose or ""
cccc9c70   zhouhaihai   商城
12
  	local dataSet = csvdb["shop_rechargeCsv"][id]
cccc9c70   zhouhaihai   商城
13
  	if not dataSet then return end
b6ed652b   zhouhaihai   充值
14
15
  	local roleId = role:getProperty("id")
  	
192b96d3   zhouhaihai   重置
16
  	--创建订单号
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
17
  	local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
eb5ffd1c   liuzujun   世界boss翻牌奖励 活动卡池保底...
18
19
20
  	if partnerOrderId == "" then
  		return 1
  	end
b6ed652b   zhouhaihai   充值
21
  	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
192b96d3   zhouhaihai   重置
22
  
39bcd7ca   zhouhaihai   LOG
23
  
b6ed652b   zhouhaihai   充值
24
25
26
27
  	-- 测试的 直接发奖励了
  	skynet.timeout(10, function ()
  		role:handlePurchase({
  			order = partnerOrderId,
668f23ea   zhouhaihai   单位分
28
  			amount = dataSet.rmb * 100,
b6ed652b   zhouhaihai   充值
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
  			game_money = dataSet.diamond,
  			product_id = dataSet.productId,
  			pay_time = skynet.timex(),
  			transactionId = "onlyTest",
  		})
  	end)
  	
  	return true
  end
  
  local function table_keys( t )
      local keys = {}
      for k, _ in pairs( t ) do
          keys[#keys + 1] = k
      end
      return keys
  end
  
  local function signPms(params, secret_key)
      local keys = table_keys(params)
      table.sort(keys)
      local urlCode = ""
      for index, key in ipairs(keys) do
  		urlCode = urlCode .. params[key]
  	end
  	return md5.sumhexa(urlCode .. secret_key):lower()
  end
  
  
  -- google 充值 入口
  function _M.googleRechargeRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
63
  	local choose = msg.choose or ""
b6ed652b   zhouhaihai   充值
64
65
66
  	local dataSet = csvdb["shop_rechargeCsv"][id]
  	if not dataSet then return end
  	local roleId = role:getProperty("id")
192b96d3   zhouhaihai   重置
67
  
192b96d3   zhouhaihai   重置
68
  	role.ignoreHeartbeat = true
b6ed652b   zhouhaihai   充值
69
  	--创建订单号
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
70
  	local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
b6ed652b   zhouhaihai   充值
71
72
73
74
  	-- 签名
  	local secret_key = "b7657fa7ccd44c16a35e3f454ac7a075"
  	local need = {
  		out_trade_no = partnerOrderId,
f9f877b1   zhouhaihai   商店
75
  		money = dataSet.rmb * 100,
b6ed652b   zhouhaihai   充值
76
77
  		game_money = dataSet.diamond,
  		product_id = dataSet.productId,
ba84f3c7   zhouhaihai   签名回调地址由客户端上传
78
  		notify_url = msg.notifyUrl
b6ed652b   zhouhaihai   充值
79
80
81
82
  	}
  	local sign = signPms(need, secret_key)
  
  	SendPacket(actionCodes.Store_googleRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
192b96d3   zhouhaihai   重置
83
84
85
  	return true
  end
  
8ae04b5a   zhouhaihai   mycard
86
87
88
89
90
  -- mycard 充值 入口
  function _M.myCardRechargeRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
91
  	local choose = msg.choose or ""
8ae04b5a   zhouhaihai   mycard
92
93
94
95
96
97
  	local dataSet = csvdb["shop_rechargeCsv"][id]
  	if not dataSet then return end
  	local roleId = role:getProperty("id")
  
  	role.ignoreHeartbeat = true
  	--创建订单号
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
98
  	local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
8ae04b5a   zhouhaihai   mycard
99
100
101
102
  	-- 签名
  	local secret_key = "48759e07540f46d9af17ec82669b4272"
  	local need = {
  		out_trade_no = partnerOrderId,
f9f877b1   zhouhaihai   商店
103
  		money = dataSet.rmb * 100,
8ae04b5a   zhouhaihai   mycard
104
  		game_money = dataSet.diamond,
ba84f3c7   zhouhaihai   签名回调地址由客户端上传
105
  		notify_url = msg.notifyUrl
8ae04b5a   zhouhaihai   mycard
106
107
108
  	}
  	local sign = signPms(need, secret_key)
  
e629295d   zhouhaihai   协议
109
  	SendPacket(actionCodes.Store_myCardRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
8ae04b5a   zhouhaihai   mycard
110
111
  	return true
  end
b6ed652b   zhouhaihai   充值
112
  
9e25c63d   zhouhaihai   iospay
113
114
115
116
117
  -- mycard 充值 入口
  function _M.iosRechargeRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
118
  	local choose = msg.choose or ""
9e25c63d   zhouhaihai   iospay
119
120
121
122
123
124
  	local dataSet = csvdb["shop_rechargeCsv"][id]
  	if not dataSet then return end
  	local roleId = role:getProperty("id")
  
  	role.ignoreHeartbeat = true
  	--创建订单号
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
125
  	local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
9d88f923   liuzujun   删除调试日志
126
  	--skynet.error(string.format("iosRechargeRpc user_id:%d,orderId:%s", role:getProperty("id"), partnerOrderId))
9e25c63d   zhouhaihai   iospay
127
128
129
130
  	-- 签名
  	local secret_key = "9647d2efe1074c73b9ac19af4337a70e"
  	local need = {
  		out_trade_no = partnerOrderId,
f9f877b1   zhouhaihai   商店
131
  		money = dataSet.rmb * 100,
9e25c63d   zhouhaihai   iospay
132
  		game_money = dataSet.diamond,
3ab906d5   zhouhaihai   重置项目
133
  		product_id = dataSet.iap_product_id,
ba84f3c7   zhouhaihai   签名回调地址由客户端上传
134
  		notify_url = msg.notifyUrl
9e25c63d   zhouhaihai   iospay
135
136
137
138
139
140
141
  	}
  	local sign = signPms(need, secret_key)
  
  	SendPacket(actionCodes.Store_iosRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
  	return true
  end
  
192b96d3   zhouhaihai   重置
142
143
144
145
146
147
148
149
  function _M.purchaseOrderResult(agent, data)
  	local role = agent.role
  
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
  
  	role.ignoreHeartbeat = false
  
d705a315   zhouhaihai   充值 整理
150
151
152
153
  	local status = {
  		fail = true,
  		success = true
  	}
192b96d3   zhouhaihai   重置
154
  
d705a315   zhouhaihai   充值 整理
155
156
157
  	local partnerOrderStr = msg.order
  	if partnerOrderStr then
  		role:updatePurchaseOrder(partnerOrderStr, msg.platformOrder, status[msg.status] and msg.status or "unknown")
cccc9c70   zhouhaihai   商城
158
  	end
cccc9c70   zhouhaihai   商城
159
160
161
162
  	return true
  end
  
  
c5825110   saicom   新增用户商城相关数据
163
164
165
166
167
168
169
170
171
  function _M.shopBuyRpc(agent , data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
  	local count = msg.count or 1
  
  	local dataSet = csvdb["shop_normalCsv"][id]
  	if not dataSet then return end
  
9ea0c502   liuzujun   限时礼包
172
  	if dataSet.unlock ~= "" then
c72853af   liuzujun   修改每日礼包检测开启bug
173
  		if not role:checkHangPass(tonumber(dataSet.unlock)) then
9ea0c502   liuzujun   限时礼包
174
175
176
177
178
  			skynet.error(string.format("shopBuyRpc,user do not finish hang pass, user_id:%d", role:getProperty("id")))
  			return 1
  		end
  	end
  
3e20f499   saicom   完善商城相关协议
179
180
181
182
183
  	local buyRecord = role.storeData:getProperty("buyR")
  	if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (buyRecord[id] or 0))) then 
  		skynet.error(string.format("shop buy over limit, user_id:%d, goods_id:%d", role:getProperty("id"), id))
  		return 1 
  	end
c5825110   saicom   新增用户商城相关数据
184
185
186
  
  	local cost = {[dataSet.icon] = dataSet.cost * count}
  
c6a4c456   liuzujun   boss挑战门票购买可以超出上限
187
  	local desc = "unknowShop"
c5825110   saicom   新增用户商城相关数据
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
  	if dataSet.shop == 1 then		-- 普通商店
  		desc = "dailyShop"
  		local dailySDD = role.dailyData:getProperty("dailySDD")
  		if dailySDD[id] then -- 折扣
  			cost = math.ceil(dataSet.cost * (1 - dataSet.disount / 100))
  		end
  	elseif dataSet.shop == 2 then		-- 美食商店
  		desc = "dinerShop"
  	elseif dataSet.shop == 3 then		-- 竞技场商店
  		desc = "pvpShop"
  	end
  
  	if not role:checkItemEnough(cost) then return end
  
  	if dataSet.limit ~= 0 then
  		buyRecord[id] = (buyRecord[id] or 0) + count
3e20f499   saicom   完善商城相关协议
204
  		role.storeData:updateProperty({field = "buyR", value = buyRecord})
c5825110   saicom   新增用户商城相关数据
205
  	end
c5825110   saicom   新增用户商城相关数据
206
207
208
209
210
211
212
213
  	role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count}})
  
  	local gift = {}
  	for _id, _count in pairs(dataSet.gift:toNumMap()) do
  		gift[_id] = _count * count
  	end
  	local reward = role:award(gift, {log = {desc = desc, int1 = id, int2 = count}})
  	
7f9f002d   liuzujun   循环周活动
214
215
216
  	if dataSet.shop == 1 then
  		role:checkTaskEnter("ShopAll", {count = count})
  	end
c59e058b   zhouhaihai   新一批日志记录
217
218
219
220
221
222
223
224
225
226
227
  	local costId, costCount = next(cost)
  
  	role:log("shop_purchase", {
  		item_id = id, -- 道具id
  		item_type = 0, -- 道具类型,具体见枚举表中道具类型枚举表
  		item_level = 0, -- 道具等级
  		item_cnt = count, -- 购买数量技术
  		currency_type = costId or 0, -- 购买道具消耗的货币类型,记录货币ID
  		shop_purchase_current = costCount or 0, -- 购买道具消耗的货币数量
  		shop_id = dataSet.shop, -- 商店ID
  	})
f22a33af   zhouhaihai   自己的日志
228
  	role:mylog("role_action", {desc = desc, int1 = id, int2 = count})
c5825110   saicom   新增用户商城相关数据
229
230
231
232
  	SendPacket(actionCodes.Store_shopBuyRpc, MsgPack.pack({reward = reward}))
  	return true
  end
  
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
233
  function _M.getFreeChestRpc(agent, data)
3e20f499   saicom   完善商城相关协议
234
235
236
237
238
239
240
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
  
  	local config = csvdb["shop_rechargeCsv"][id]
  	if not config then return end
  
d19b2af3   liuzujun   活动免费礼包判断活动是否开启
241
242
243
244
245
246
247
  	--判断是否是活动商品
  	if config.activity_id ~= 0 then
  		local actCfg = csvdb["activity_ctrlCsv"][config.activity_id]
  		if not actCfg then return 2 end
  		if not role.activity:isOpenById(config.activity_id, "ActShopGoods") then return 3 end
  	end
  
3e20f499   saicom   完善商城相关协议
248
249
250
251
252
      local rechargeRecord = role.storeData:getProperty("payR")
  	local getCount = (rechargeRecord[id] or 0)
  	if getCount >= config.limit then
  		return 1
  	end
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
253
  	local reward, _ = role:award(config.itemFirst, {log = {desc = "freeGift", int1 = id}})
3e20f499   saicom   完善商城相关协议
254
255
256
257
  
  	rechargeRecord[id] = getCount + 1
  	role.storeData:updateProperty({field = "payR", value = rechargeRecord})
  
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
258
  	SendPacket(actionCodes.Store_getFreeChestRpc, MsgPack.pack({reward = reward}))
317a46a9   liuzujun   添加特权卡
259
  	return true
3e20f499   saicom   完善商城相关协议
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
  end
  
  function _M.getGrowFundRewardRpc(agent, data)	
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
  
  	local config = csvdb["reward_newbeeCsv"][id]
  	if not config then return end
  
      local growFundFlag = role.storeData:getProperty("growFund")
  	local growFundRecord = role.storeData:getProperty("growFundR")
  	
  	if growFundFlag == 0 then
  		skynet.error("user do not buy grow fund")
  		return 1
  	end
  
  	if not role:checkHangPass(config.condition) then
  		skynet.error(string.format("user do not finish hang pass, user_id:%d", role:getProperty("id")))
  		return 1
  	end
  
  	local b = string.getbit(growFundRecord, id)
  	if string.char(b) == "1" then
  		return 1
  	end
  
  	growFundRecord = string.setbit(growFundRecord, id)
  	role.storeData:updateProperty({field = "growFundR", value = growFundRecord})
  
  	local gift = config.giftFree .. " " .. config.giftLimit
  	local reward, _ = role:award(gift, {log = {desc = "grownFund", int1 = id}})
  
  	SendPacket(actionCodes.Store_getGrowFundRewardRpc, MsgPack.pack({reward = reward}))
317a46a9   liuzujun   添加特权卡
295
  	return true
3e20f499   saicom   完善商城相关协议
296
297
  end
  
51d9d20b   liuzujun   付费签到,应用市场反馈
298
  -- 赛季卡
3e20f499   saicom   完善商城相关协议
299
300
301
302
303
304
305
306
307
  function _M.getBattlePassRewardRpc(agent, data)	
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id
  
  	local config = csvdb["reward_battlepassCsv"][id]
  	if not config then return end
  
  	local timeNow = skynet.timex()
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
308
      local battleCardFlag = role.storeData:getProperty("battleCard")
3e20f499   saicom   完善商城相关协议
309
310
311
312
313
314
315
316
317
318
319
  	local battleCardFreeRecord = role.storeData:getProperty("battleFR")
  	local battleCardLimitRecord = role.storeData:getProperty("battleLR")
  
  	local freeFlag = string.char(string.getbit(battleCardFreeRecord, id))
  	local limitFlag = string.char(string.getbit(battleCardLimitRecord, id))
  
  	if freeFlag == "1" and limitFlag == "1" then
  		skynet.error("user already get battle pass reward")
  		return 1
  	end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
320
  	if battleCardFlag == 1 and limitFlag == "1" then
3e20f499   saicom   完善商城相关协议
321
322
323
  		return 1
  	end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
324
  	if role:getProperty("battlePoint") < config.point then
1a0b3c56   liuzujun   抽卡保底,切换定向卡池
325
326
327
328
  		skynet.error(string.format("user do not have enough battle point, user_id:%d", role:getProperty("id")))
  		return 1
  	end
  
3e20f499   saicom   完善商城相关协议
329
330
331
332
333
334
335
336
  	local gift = ""
  	if  freeFlag == "0" then
  		gift = config.giftFree
  
  		battleCardFreeRecord = string.setbit(battleCardFreeRecord, id)
  		role.storeData:updateProperty({field = "battleFR", value = battleCardFreeRecord})
  	end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
337
  	if battleCardFlag == 1 and limitFlag == "0" then
3e20f499   saicom   完善商城相关协议
338
339
340
341
342
343
  		if gift ~= "" then
  			gift = gift .. " "
  		end
  		gift = gift .. config.giftLimit
  
  		battleCardLimitRecord = string.setbit(battleCardLimitRecord, id)
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
344
  		role.storeData:updateProperty({field = "battleLR", value = battleCardLimitRecord})
3e20f499   saicom   完善商城相关协议
345
346
347
348
349
  	end
  	
  	local reward, _ = role:award(gift, {log = {desc = "battleCard", int1 = id}})
  
  	SendPacket(actionCodes.Store_getBattlePassRewardRpc, MsgPack.pack({reward = reward}))
317a46a9   liuzujun   添加特权卡
350
  	return true
3e20f499   saicom   完善商城相关协议
351
352
  end
  
51d9d20b   liuzujun   付费签到,应用市场反馈
353
354
355
356
357
358
359
  -- 探索指令奖励
  function _M.getExploreCommandRewardRpc(agent, data)	
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local id = msg.id		-- 探索id
  	local subId = msg.subId		-- 领取的阶段id
  
37bb4611   liuzujun   付费签到,抽卡阶段奖励,探索指令
360
  	local tab_name = "reward_levelpass" .. id .. "Csv"
e52c384f   liuzujun   探索指令bug, 充值返利活动
361
  	local config = csvdb[tab_name][subId]
51d9d20b   liuzujun   付费签到,应用市场反馈
362
363
  	if not config then return end
  
c99f08df   liuzujun   探索指令调试完成
364
  	local bpInfo = role.storeData:getProperty("bpInfo") or {}
51d9d20b   liuzujun   付费签到,应用市场反馈
365
366
  	local info = bpInfo[id] or {}
  	local flag = info["flag"] or 0
c99f08df   liuzujun   探索指令调试完成
367
  	--if flag == 0 then return 1 end
51d9d20b   liuzujun   付费签到,应用市场反馈
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
  
  	local freeRecord = info["fr"] or ""
  	local buyRecord = info["br"] or ""
  
  	local freeFlag = string.char(string.getbit(freeRecord, subId))
  	local limitFlag = string.char(string.getbit(buyRecord, subId))
  
  	if freeFlag == "1" and limitFlag == "1" then
  		skynet.error("user already get explore command reward")
  		return 2
  	end
  
  	if flag == 1 and limitFlag == "1" then
  		return 3
  	end
  
37bb4611   liuzujun   付费签到,抽卡阶段奖励,探索指令
384
  	if not role:checkHangPass(config.level) then
51d9d20b   liuzujun   付费签到,应用市场反馈
385
386
387
388
389
390
391
  		return 4
  	end
  
  	local gift = ""
  	if  freeFlag == "0" then
  		gift = config.giftFree
  
c99f08df   liuzujun   探索指令调试完成
392
  		freeRecord = string.setbit(freeRecord, subId)
51d9d20b   liuzujun   付费签到,应用市场反馈
393
394
395
396
397
398
399
400
401
  		info["fr"] = freeRecord
  	end
  
  	if flag == 1 and limitFlag == "0" then
  		if gift ~= "" then
  			gift = gift .. " "
  		end
  		gift = gift .. config.giftLimit
  
c99f08df   liuzujun   探索指令调试完成
402
  		buyRecord = string.setbit(buyRecord, subId)
51d9d20b   liuzujun   付费签到,应用市场反馈
403
404
405
  		info["br"] = buyRecord
  	end
  
c99f08df   liuzujun   探索指令调试完成
406
407
  	bpInfo[id] = info
  	role.storeData:updateProperty({field = "bpInfo", value = bpInfo})
51d9d20b   liuzujun   付费签到,应用市场反馈
408
409
410
411
412
413
414
  	
  	local reward, _ = role:award(gift, {log = {desc = "exploreCommand", int1 = id, int2 = subId}})
  
  	SendPacket(actionCodes.Store_getExploreCommandRewardRpc, MsgPack.pack({reward = reward}))
  	return true
  end
  
4f7cffe5   liuzujun   多队挂机任务取消功能,累充奖励
415
416
417
418
419
  -- 累充奖励
  function _M.getTotalRechargeAwardRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	local index = msg.index		-- 领取的索引id
b8b1c164   liuzujun   扭蛋活动,万能碎片bug
420
  	local totalTwd = role:getProperty("twdC")
4f7cffe5   liuzujun   多队挂机任务取消功能,累充奖励
421
422
  	local totalRechargeRecord = role.storeData:getProperty("totalRR")
  	local flag = string.char(string.getbit(totalRechargeRecord, index))
b8b1c164   liuzujun   扭蛋活动,万能碎片bug
423
  	if flag == "1" then return 1 end
2bc706ab   liuzujun   兑换活动重置,累充功能
424
  	local cfg = csvdb["activity_payRebateCsv"][index]
4f7cffe5   liuzujun   多队挂机任务取消功能,累充奖励
425
  	if not cfg then return 2 end
2bc706ab   liuzujun   兑换活动重置,累充功能
426
  	if cfg.twd > totalTwd then return 3 end
b8b1c164   liuzujun   扭蛋活动,万能碎片bug
427
  
4f7cffe5   liuzujun   多队挂机任务取消功能,累充奖励
428
429
  	totalRechargeRecord = string.setbit(totalRechargeRecord, index)
  	role.storeData:updateProperty({field = "totalRR", value = totalRechargeRecord})
2bc706ab   liuzujun   兑换活动重置,累充功能
430
431
432
433
434
  	local main = cfg.main_reward:toNumMap()
  	local sub = cfg.sub_reward:toNumMap()
  	for k, v in pairs(sub) do
  		main[k] = (main[k] or 0) + v
  	end
4f7cffe5   liuzujun   多队挂机任务取消功能,累充奖励
435
  
2bc706ab   liuzujun   兑换活动重置,累充功能
436
437
  	local reward, change = role:award(main, {log = {desc = "totalRecharge", int1 = index}})
  	SendPacket(actionCodes.Store_getTotalRechargeAwardRpc, MsgPack.pack(role:packReward(reward, change)))
4f7cffe5   liuzujun   多队挂机任务取消功能,累充奖励
438
439
440
  	return true
  end
  
cccc9c70   zhouhaihai   商城
441
  return _M