Merge branch 'cn/develop' into cn/publish/preview

jiyue
2 parents 5ef0f2c7 af6197fd
Showing 3 changed files with 22 additions and 0 deletions Show diff stats
src/ProtocolCode.lua
src/actions/RoleAction.lua
src/models/RoleLog.lua
@@ -64,6 +64,7 @@ actionCodes = {
 	Role_itemConvertSpecialRpc = 145, -- 兑换月卡/战令探索指令等 特殊道具
 	Role_worldLineRouletteRpc = 146, --世界线抽轮盘
 	Role_worldLineRewardRpc = 147, -- 世界线一键领取奖励
+	Role_itemConvertDevilTicketRpc = 148, -- 兑换魔鬼训练营门票
  
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -1819,4 +1819,24 @@ function _M.worldLineRewardRpc(agent, data)
 	return true
 end
  
+function _M.itemConvertDevilTicketRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local itemId = msg.itemId    --道具id
+	local count = msg.count or 1 --兑换生成的数量
+	local itemData = csvdb["itemCsv"][itemId]
+	if itemData.use_type ~= 11 then return 2 end
+
+	local createCost = globalCsv.moguixunlianying_create_cost[itemId]:toArray(true, "=")
+	if not next(createCost) then return 3 end
+
+    local cost = {[itemId] = createCost[1] * count}
+	if not role:checkItemEnough(cost) then return 4 end
+	role:costItems({cost}, {log = {desc = "itemConvertDevilTicket"}})
+	local reward, change = role:award({[createCost[2]] = count}, {log = {desc = "itemConvertDevilTicket", int1 = itemId, int2 = cost[itemId]}})
+
+	SendPacket(actionCodes.Role_itemConvertDevilTicketRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -73,6 +73,7 @@ local ItemReason = {
 	regularWorldBossReward = 157,	-- 常规世界boss
 	regularWorldBossMilestone = 158,	-- 常规世界boss伤害里程碑
 	regularWorldBossBattle = 159, -- 常规世界boss战斗奖励
+	itemConvertDevilTicket = 160, -- 兑换魔鬼训练营门票