Merge branch 'cn/develop-mysql' of 120.26.43.151:wasteland/server into cn/develop-mysql

测试
2 parents ba33bcac 08abd5c8
Showing 5 changed files with 56 additions and 7 deletions Show diff stats
src/ProtocolCode.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/models/Role.lua
src/models/RoleLog.lua
@@ -54,6 +54,7 @@ actionCodes = {
 	Role_loadSparks = 138,		
 	Role_updateSpark = 139,		-- 更新火花
 	Role_diamondConvertRpc = 140, -- 钻石兑换成别的物品
+	Role_getTimeGiftRpc = 141,
  
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -35,10 +35,19 @@ function _M.levelUpRpc( agent, data )
 	local hero = role.heros[msg.id]
 	if not hero then return 1 end
  
-	if hero:getProperty("level") >= hero:getMaxLevel() then return 2 end
-	local curData = csvdb["unit_expCsv"][hero:getProperty("level")]
+	local level = hero:getProperty("level")
+	if level >= hero:getMaxLevel() then return 2 end
+	local curData = csvdb["unit_expCsv"][level]
 	local cost = {[ItemId.Exp] = curData.exp, [ItemId.Gold] = curData.gold}
 	if not role:checkItemEnough(cost) then return 3 end
+
+	-- 通过指定关卡后才能升级英雄等级
+	local pass = globalCsv.unit_exp_level_pass[level + 1]
+	if pass then
+		local hangPass = self:getProperty("hangPass")
+		if not hangPass[pass] then return 4 end
+	end
+
 	role:costItems(cost, {log = {desc = "heroLevelUp", int1 = msg.id, int2 = hero:getProperty("type")}})
  
 	local oldAttr = hero:getTotalAttrs()
@@ -69,12 +78,21 @@ function _M.breakRpc( agent, data )
 	local hero = role.heros[msg.id]
 	if not hero then return 1 end
  
+	local breakL = hero:getProperty("breakL")
 	if hero:getProperty("level") < hero:getMaxLevel() then return 2 end
-	if hero:getProperty("breakL") >= #csvdb["unit_breakCsv"] then return 3 end
-	local curData = csvdb["unit_breakCsv"][hero:getProperty("breakL")]
+	if breakL >= #csvdb["unit_breakCsv"] then return 3 end
+	local curData = csvdb["unit_breakCsv"][breakL]
 	if hero:getProperty("wakeL") < curData["starLimit"] then return 4 end
 	local cost = {[ItemId.BreakCost] = curData.cost, [ItemId.Gold] = curData.gold}
 	if not role:checkItemEnough(cost) then return 4 end
+
+	-- 通过指定关卡后才能突破英雄
+	local pass = globalCsv.unit_break_level_pass[breakL]
+	if pass then
+		local hangPass = self:getProperty("hangPass")
+		if not hangPass[pass] then return 4 end
+	end
+
 	role:costItems(cost, {log = {desc = "heroBreak", int1 = msg.id, int2 = hero:getProperty("type")}})
 	local oldAttr = hero:getTotalAttrs()
 	hero:updateProperty({field = "breakL", delta = 1})
@@ -528,14 +528,19 @@ function _M.saleItemRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local backs = msg.backs
-	if not backs then return end
+	if not backs or not next(backs) then return 0 end
+
+	for itemId, count in pairs(backs) do
+		if math.illegalNum(count, 1, role:getItemCount(itemId)) then return 1 end
+		if globalCsv.unit_paster_ban[itemId] then return 2 end
+		local itemData = csvdb["itemCsv"][itemId]
+		if itemData.sell_effect == "" then return 3 end
+	end
  
 	local reward = {}
 	local fragCount = 0
 	for itemId, count in pairs(backs) do
-		if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
 		local itemData = csvdb["itemCsv"][itemId]
-		if itemData.sell_effect == "" then return end
 		if itemData.type == ItemType.HeroFragment or itemData.type == ItemType.HeroFCommon then
 			fragCount = fragCount + count
 		end
@@ -1521,4 +1526,26 @@ function _M.accuseRpc(agent, data)
 	return true
 end
  
+function _M.getTimeGiftRpc(agent, data)
+	local role = agent.role
+
+	local GiftCsv = csvdb["time_giftCsv"]
+	local timeGift = role:getProperty("timeGift")
+	if timeGift >= #GiftCsv then return 0 end
+
+	local nextL = timeGift + 1
+	local gift = GiftCsv[nextL]
+	if not gift then return 1 end
+
+	local createtime = role:getProperty("ctime")
+	if skynet.timex() - createtime < gift.time then return 2 end
+
+	role:updateProperty({field = "timeGift", value = nextL})
+	local reward, change = role:award(gift.gift, {log = {desc = "giftTime", int1 = nextL}})
+	role:mylog("role_action", {desc = "giftTime", int1 = nextL})
+
+	SendPacket(actionCodes.Role_getTimeGiftRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -78,6 +78,7 @@ Role.schema = {
 	-- loveStatus			= {"string", ""}, --统计角色的最高 好感度等级 类型相关 -- type=loveL type=loveL
 	crown				= {"number", 0},	-- 看伴娘
 	silent				= {"number", 0}, --禁言解禁时间
+	timeGift 			= {"number", 0}, -- 创建角色时间礼包
  
 	bagLimit 			= {"table", globalCsv.store_limit_max},
  
@@ -350,6 +351,7 @@ function Role:data()
 		diamond = self:getAllDiamond(),
 		bagLimit = self:getProperty("bagLimit"),
 		silent = self:getProperty("silent"),
+		timeGift = self:getProperty("timeGift"),
  
 		advPass = self:getProperty("advPass"),
 		advInfo = self:getProperty("advInfo"),
@@ -59,6 +59,7 @@ local ItemReason = {
 	advLevelStage = 143, -- 拾荒活动阶段奖励
 	towerBnous = 144, -- 爬塔到一定层数对某些功能的奖励
 	convert = 145, -- 钻石兑换其他物品
+	giftTime = 146, -- 创角后的时间礼包
  
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗