Merge branch 'cn/develop' into cn/player

liguanghui
2 parents fe994a78 21774ba5
Showing 3 changed files with 32 additions and 6 deletions Show diff stats
src/ProtocolCode.lua
src/actions/RoleAction.lua
src/models/Daily.lua
@@ -55,6 +55,7 @@ actionCodes = {
 	Role_updateSpark = 139,		-- 更新火花
 	Role_diamondConvertRpc = 140, -- 钻石兑换成别的物品
 	Role_getTimeGiftRpc = 141,
+    Role_runeBuyRpc = 142,   	-- 铭文购买
  
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -1332,11 +1332,17 @@ function _M.guideRpc(agent, data)
 	local funcGuide = role:getProperty("funcGuide")
 	if cmdType == 1 then
 		-- 新手引导
-		local master = msg.master or -1
-		local slave = msg.slave or -1
-		if master < 0 or slave < 0 then return end
-
-		role:saveGuide(master, slave)
+		if msg.masters then
+			for _, master in pairs(msg.masters) do
+				role:saveGuide(master,1,true)
+			end		
+		else
+			local master = msg.master or -1
+			local slave = msg.slave or -1
+			if master < 0 or slave < 0 then return end
+			role:saveGuide(master, slave)
+		end
+		
 	elseif cmdType == 2 then
 		-- 系统引导（玩家可选择是否进行）
 		if not msg.skip then return end
@@ -1562,4 +1568,19 @@ function _M.getTimeGiftRpc(agent, data)
 	return true
 end
  
+function _M.runeBuyRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+    local count = msg.count
+
+	local glodCount = globalCsv.rune_exchange * count
+	if not role:checkItemEnough({[ItemId.Gold] = glodCount}) then return end
+	role:costItems({[ItemId.Gold] = glodCount}, {log = {desc = "glodConvertRune", int1 = count, int2 = glodCount}})
+	local reward, change = {}
+	reward[ItemId.RuneFragment] = count
+	reward, change = role:award(reward, {log = {desc = "glodConvertRune"}})
+	SendPacket(actionCodes.Role_runeBuyRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -21,7 +21,8 @@ Daily.schema = {
 	giveFP			= {"table", {}},		-- 给谁送过心心
 	getFP			= {"table", {}},		-- 领过谁的心心
 	pvpFree			= {"number", 0},		-- pvp使用免费次数
-	pvpFreeH		= {"number", 0},		-- 高级pvp使用免费次数
+	pvpFreeH		= {"number", 0},		-- 高级pvp使用免费次
+	pvpBought		= {"number", 0},		-- 门票购买次数
  
 	dailySDC		= {"table", {}},		-- daily shop diamond  count {[id] = count} -- 每日商城购买次数统计
 	dailySDD		= {"table", {}},		-- daily shop diamond  disount {[id] = 1} -- 每日商城折扣统计
@@ -69,6 +70,8 @@ function Daily:refreshDailyData(notify)
             -- skip
 		elseif field == "treasureList" then
 			dataMap[field] = self:getTreasrueList()
+		elseif field == "pvpBought" then
+			dataMap[field] = 0
 		elseif field ~= "key" then
 			local typ, def = table.unpack(schema)
 			dataMap[field] = def
@@ -399,6 +402,7 @@ function Daily:data()
 		getFP = self:getProperty("getFP"),
 		pvpFree = self:getProperty("pvpFree"),
 		pvpFreeH = self:getProperty("pvpFreeH"),
+		pvpBought = self:getProperty("pvpBought"),
 		dailySDC = self:getProperty("dailySDC"),
 		dailySDD = self:getProperty("dailySDD"),
 		advSupRe = self:getProperty("advSupRe"),