Merge branch 'master' of 120.26.43.151:wasteland/server

suhongyang
2 parents 42f2d1d3 75d16594
Showing 13 changed files with 493 additions and 29 deletions Show diff stats
.luacheckrc
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/CarAction.lua
src/actions/GmAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/csvdata
src/models/Equip.lua
src/models/Hero.lua
src/models/Role.lua
src/models/RolePlugin.lua
src/models/Rune.lua
 std = "max"
 globals = {
+	"R_RUNEIDS",
+	"R_EQUIP_ROOT",
+	"R_EQUIP",
+	"R_RUNE",
 	"DinerTask",
 	"SendPipelining",
 	"AdvEventType",
@@ -23,6 +23,8 @@ actionCodes = {
 	Role_pipelining = 109,
 	Role_saleItemRpc = 110,
 	Role_openItemRpc = 111,
+	Role_updateEquip = 112,
+	Role_updateRune = 113,
  
 	Adv_startAdvRpc = 151,
 	Adv_roleFormatRpc = 152,
@@ -48,6 +50,8 @@ actionCodes = {
 	Hero_loveTaskRpc = 213,
 	Hero_changeSkinRpc = 214,
 	Hero_createHeroRpc = 215,
+	Hero_referEquipsRpc = 216,
+	Hero_referRunesRpc = 217,
  
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -74,6 +78,7 @@ actionCodes = {
  
 	Car_makePotionRpc = 400,
 	Car_equipUpRpc = 401,
+	Car_runeUpRpc = 402,
 }
  
 rpcResponseBegin = 10000
@@ -4,6 +4,10 @@ R_HEROS = &quot;role:%d:heroIds&quot;
 R_HERO 	= "hero:%d:%d"
 R_DAILY = "role:%d:daily"
 R_DINER = "role:%d:diner"		-- 餐厅
+R_EQUIP_ROOT = "role:%d:equip*"       -- 装备根目录
+R_EQUIP = "role:%d:equip:%d:%d"     -- 装备type:level
+R_RUNEIDS = "role:%d:runeIds"      -- 玩家拥有符文自增id
+R_RUNE = "role:%d:rune:%d"       -- 符文详细信息
  
 -- -- role
 -- R_FARM_KEY 		= "role:%d:farm"
@@ -64,8 +64,14 @@ function _M.equipUpRpc( agent, data )
 	local nextEquip = dataSet[nextLv]
 	if not nextEquip then return 23 end
  
-	local own = role:getItemCount(id)
-	if own < count then
+	local ownSet = role.equipBag[typ]
+	if not ownSet then return 31 end
+	local ownData = ownSet[lv]
+	if not ownData then return 32 end
+
+	local own = role:getEquipCount(typ,lv)
+	local costCount = equipData.merge*count
+	if own < costCount then
 		return 3
 	end
  
@@ -77,15 +83,41 @@ function _M.equipUpRpc( agent, data )
 		return 4
 	end
  
-	local merge = {[id]=equipData.merge*count}
-	if not role:checkItemEnough(merge) then
-		return 5
+	role:costItems(cost)
+	role:addEquip({type=typ,level=lv,count=-costCount})
+	role:addEquip({type=typ,level=nextLv,count=count})
+	SendPacket(actionCodes.Car_equipUpRpc, '')
+	return true
+end
+
+function _M.runeUpRpc( agent, data )
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local uid = msg.uid
+	local ownRune = role.runeBag[uid]
+	if not ownRune then return 1 end
+	if ownRune:getProperty("refer") ~= 0 then return 2 end
+
+	local typ = ownRune:getProperty("type")
+	local id = ownRune:getProperty("id")
+	local level = ownRune:getProperty("level")
+
+	local runeSet = csvdb["runeCsv"][typ]
+	if not runeSet then return 4 end
+	local runeData = runeSet[id]
+	if not runeData then return 5 end
+
+	local maxLv = #csvdb["rune_buildCsv"]
+	if level >= maxLv then return 6 end
+	local lvData = csvdb["rune_buildCsv"][level+1]
+	local cost = lvData.cost:toNumMap()
+	if not role:checkItemEnough(cost) then
+		return 7
 	end
  
 	role:costItems(cost)
-	role:costItems(merge)
-	role:addItem({itemId = nextEquip.id,count = count})
-	SendPacket(actionCodes.Car_equipUpRpc, '')
+	ownRune:updateProperty({field = "level",value = level+1})
+	SendPacket(actionCodes.Car_runeUpRpc, '')
 	return true
 end
  
@@ -22,13 +22,36 @@ function _M.hero(role, pms)
 	return "成功"
 end
  
+function _M.equip(role, pms)
+	local typ = tonum(pms.pm1)
+	local level = tonum(pms.pm2)
+	local count = tonum(pms.pm3)
+	role:addEquip({type = typ,level = level,count = count})
+	return "成功"
+end
+
+function _M.rune(role, pms)
+	local typ = tonum(pms.pm1)
+	local id = tonum(pms.pm2)
+	local result = role:addRune({type = typ,id = id})
+	return result
+end
+
 function _M.get(role, pms)
-	local itemId = tonum(pms.pm1)
-	if not csvdb["itemCsv"][itemId] then
-		return "物品不存在"
+	if pms.pm1 == "ALL" then
+		for id,data in pairs(csvdb["itemCsv"]) do
+			if data.type ~= 4 and data.type ~= 5 then
+				role:award({[id] = 10})
+			end
+		end
+	else
+		local itemId = tonum(pms.pm1)
+		if not csvdb["itemCsv"][itemId] then
+			return "物品不存在"
+		end
+		local count = tonum(pms.pm2)
+		role:award({[itemId] = count})
 	end
-	local count = tonum(pms.pm2)
-	role:award({[itemId] = count})
 	return "成功"
 end
  
@@ -483,4 +483,88 @@ function _M.createHeroRpc(agent, data)
 	return true
 end
  
+-- typ 位置，level等级对应唯一装备,level为0时为移除，不为0时无则装备,有则替换
+function _M.referEquipsRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local hero = role.heros[msg.id]
+	if not hero then return 10 end
+	local equips = msg.equips
+	if not equips or not next(equips) then return 11 end
+
+	for typ,level in pairs(equips) do
+		local ownLv = hero:getProperty("equip"):getv(typ,0)
+		if level == 0 then
+			if ownLv == 0 then return 2 end
+		else
+			if role:getEquipCount(typ,level) < 1 then return 3 end
+			local equipSet = csvdb["equipCsv"][typ]
+			if not equipSet then return 4 end
+			local equipData = equipSet[level]
+			if not equipData then return 5 end
+		end
+	end
+
+	for typ,level in pairs(equips) do
+		local ownLv = hero:getProperty("equip"):getv(typ,0)
+		if level == 0 then
+			role:addEquip({type=typ,level=ownLv,count=1,isRefer=true})
+		else
+			role:addEquip({type=typ,level=level,count=-1,isRefer=true})
+			if ownLv > 0 then
+				role:addEquip({type=typ,level=ownLv,count=1,isRefer=true})
+			end
+		end
+		local x = hero:getProperty("equip"):setv(typ, level)
+		hero:updateProperty({field = "equip", value = x})
+	end
+	SendPacket(actionCodes.Hero_referEquipsRpc, "")
+	return true
+end
+
+-- typ 位置，uid对应唯一符文,uid为0时为移除，不为0时无则装备,有则替换
+function _M.referRunesRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local hero = role.heros[msg.id]
+	if not hero then return 10 end
+	local runes = msg.runes
+	if not runes or not next(runes) then return 11 end
+
+	for typ,uid in pairs(runes) do
+		local referUid = hero:getProperty("rune"):getv(typ,0)
+		if uid == 0 then
+			if referUid == 0 then return 2 end
+		else
+			local ownRune = role.runeBag[uid]
+			if not ownRune then return 3 end
+			if ownRune:getProperty("refer") ~= 0 then return 4 end
+
+			local runeSet = csvdb["runeCsv"][typ]
+			if not runeSet then return 5 end
+			local runeData = runeSet[ownRune:getProperty("id")]
+			if not runeData then return 6 end
+		end
+	end
+
+	for typ,uid in pairs(runes) do
+		local referUid = hero:getProperty("rune"):getv(typ,0)
+		if uid == 0 then
+			local referRune = role.runeBag[referUid]
+			referRune:updateProperty({field = "refer",value = 0})
+		else
+			if referUid ~= 0 then
+				local referRune = role.runeBag[referUid]
+				referRune:updateProperty({field = "refer",value = 0})
+			end
+			local ownRune = role.runeBag[uid]
+			ownRune:updateProperty({field = "refer",value = hero:getProperty("id")})
+		end
+		local x = hero:getProperty("rune"):setv(typ,uid)
+		hero:updateProperty({field = "rune", value = x})
+	end
+	SendPacket(actionCodes.Hero_referRunesRpc, "")
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -97,7 +97,7 @@ function _M.loginRpc( agent, data )
 	else
 		role:reloadWhenLogin()
 	end
-	
+
 	if not msg.isGMlogin then
 		local banTime = role:getProperty("banTime")
 		if banTime > now then
@@ -120,7 +120,7 @@ function _M.loginRpc( agent, data )
 	-- 跨天登陆事件
 	role:onCrossDay(now)
 	role:setProperty("ltime", now)
-	
+
  
 	for _, name in ipairs({"dailyData", "dinerData"}) do
 		response[name] = role[name]:data()
@@ -149,10 +149,25 @@ function _M.loginRpc( agent, data )
 		end
 	end
  
-	response.wave = 1 + heroWave
+	response.wave = 3 + heroWave
  
 	SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
  
+	local equipResp = {equipBag = {}}
+	for typ,set in pairs(role.equipBag) do
+		for level,equip in pairs(set) do
+			if not equipResp.equipBag[typ] then equipResp.equipBag[typ] = {} end
+			equipResp.equipBag[typ][level] = equip:data()
+		end
+	end
+	SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(equipResp))
+
+	local runeResp = {runeBag = {}}
+	for _,rune in pairs(role.runeBag) do
+		runeResp.runeBag[rune:getProperty("uid")]=rune:data()
+	end
+	SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(runeResp))
+
 	local heroIndex = 1
 	for index = 2, 1 + heroWave do
 		local heroResponse = {heros = {}}
@@ -177,7 +192,7 @@ function _M.loginRpc( agent, data )
 		gate_serv = agent.gate_serv,
 	})
 	agent.role = role
-	
+
 	start_agent_timer()
 	-- 注册全服广播
 	local channel = math.randomInt(1, 1)
@@ -293,7 +308,7 @@ function _M.openItemRpc(agent, data)
 	end
 	role:costItems({[itemId] = count})
 	reward = role:award(reward)
-	
+
 	SendPacket(actionCodes.Role_openItemRpc, MsgPack.pack({reward = reward}))
 	return true
 end
-Subproject commit c4ec029a5f26392cf6c1471d1db1b58e0bdb5802
+Subproject commit ea8da0fb177c4166bcb7350d8c1932d2b91b8dad
@@ -0,0 +1,52 @@
+local Equip = class("Equip", require("shared.ModelBase"))
+
+Equip.schema = {
+	type 		= {"number"},      		-- 类型
+	level		= {"number"},			-- 等级
+	count		= {"number", 0},		-- 数量
+	refer		= {"number", 0},		-- 已装备英雄数
+}
+
+function Equip:ctor( properties )
+	Equip.super.ctor(self, properties)
+end
+
+function Equip:notifyUpdateProperty(field, newValue, oldValue)
+	local datas = {
+		key = field,
+		newValue = newValue,
+		oldValue = oldValue,
+	}
+	self:notifyUpdateProperties(datas)
+end
+
+function Equip:notifyUpdateProperties(params)
+	local updateData = {
+		type = self:getProperty("type"),
+		level = self:getProperty("level"),
+		datas = params
+	}
+	SendPacket(actionCodes.Role_updateEquip, MsgPack.pack(updateData))
+end
+
+function Equip:updateProperty(params)
+	if not params.field or (not params.delta and not params.value) then
+		return
+	end
+	if params.delta then
+		self:incrProperty(params.field, params.delta)
+	elseif params.value then
+		self:setProperty(params.field, params.value)
+	end
+	self:notifyUpdateProperties(self:data())
+end
+
+function Equip:data()
+	return {
+		type = self:getProperty("type"),
+		level = self:getProperty("level"),
+		count = self:getProperty("count"),
+	}
+end
+
+return Equip
 \ No newline at end of file
@@ -15,7 +15,8 @@ Hero.schema = {
 	loveExp		= {"number", 0},		--好感度经验
 	loveL		= {"number", 0},		--好感度等级
 	skin		= {"number", 0},		--皮肤 0 、 1、 2、 3
-	equip       = {"string",""},        --装备 type=level
+	equip       = {"string","1=0 2=0 3=0 4=0"},        --装备 type=level
+	rune       = {"string","1=0 2=0 3=0 4=0 5=0 6=0"},        --零件 type=id
 }
  
 function Hero:ctor( properties )
@@ -76,6 +77,8 @@ function Hero:data()
 		loveExp = self:getProperty("loveExp"),
 		loveL = self:getProperty("loveL"),
 		skin = self:getProperty("skin"),
+		equip = self:getProperty("equip"),
+		rune = self:getProperty("rune"),
 	}
 end
  
@@ -13,6 +13,8 @@ function Role:ctor( properties )
 	Role.super.ctor(self, properties)
 	self.ignoreHeartbeat = false
 	self.heros = {}
+	self.equipBag = {}
+	self.runeBag = {}
 	self.advData = nil
 end
  
@@ -10,6 +10,8 @@ function RolePlugin.bind(Role)
  
 	function Role:loadAll()
 		self:loadDaily()
+		self:loadEquips()
+		self:loadRunes()
 		self:loadHeros()
 		self:loadDiner()
 	end
@@ -33,7 +35,7 @@ function RolePlugin.bind(Role)
 		end
 	end
 	function Role:onOfflineEvent()
-		
+
 	end
  
 	local function checkItemCount(self, itemId, count)
@@ -44,11 +46,10 @@ function RolePlugin.bind(Role)
 		if limit and self:getItemCount(itemId) == 0 then
 			local curCount = 0
 			local items = self:getProperty("items"):toNumMap()
-			for _itemId, _count in pairs(items) do
-				local _itemData = csvdb["itemCsv"][itemId]
-				if globalCsv.store_type[_itemData.type] == page then
+			for _,_ in pairs(items) do
+				if globalCsv.store_type[itemData.type] == page then
 					curCount = curCount + 1
-					if curCount >= limit then 
+					if curCount >= limit then
 						count = 0
 						break
 					end
@@ -77,6 +78,17 @@ function RolePlugin.bind(Role)
 					self:addHero(pms)
 				end
 			end,
+			[ItemType.EquipBase] = function()
+				local typ = math.floor((itemId-7000)/100)
+    			local lv = (itemId-7000)%100
+				self:addEquip({type = typ,level = lv,count = count})
+			end,
+			[ItemType.Rune] = function()
+				local typ = math.floor((itemId-2000)/100)
+				for _= 1, count do
+					self:addRune({type = typ,id = itemId})
+				end
+			end,
 			[ItemType.AdvItem] = function()  --冒险道具不会进入 玩家仓库
 				count = 0
 			end,
@@ -135,7 +147,7 @@ function RolePlugin.bind(Role)
 		if not csvdb["player_expCsv"][level + 1] then
 			return
 		end
-		
+
 		local exp = self:getProperty("exp")
 		local newExp = exp + addExp
 		while newExp >= csvdb["player_expCsv"][level].exp do
@@ -207,7 +219,7 @@ function RolePlugin.bind(Role)
 	end
  
 	function Role:getItemCount(itemId)
-		if itemId == ItemId.Diamond then 
+		if itemId == ItemId.Diamond then
 			return self:getAllDiamond()
 		end
 		return self:getProperty("items"):getv(itemId, 0)
@@ -283,7 +295,7 @@ function RolePlugin.bind(Role)
 			id 	= heroId,
 			type= heroType,
 		}
-		
+
 		local newHero = require("models.Hero").new(heroInfo)
 		newHero:create()
 		newHero.owner = self
@@ -352,8 +364,146 @@ function RolePlugin.bind(Role)
 		end
 	end
  
+	function Role:loadEquips()
+		local roleId = self:getProperty("id")
+		self.equipBag = {}
+		local keys = redisproxy:keys(string.format(R_EQUIP_ROOT, roleId))
+		if keys and next(keys) then
+			for _,v in pairs(keys) do
+				local equip = require("models.Equip").new({key = v})
+				equip:load()
+				local typ,lv = equip:getProperty("type"),equip:getProperty("level")
+				equip.owner = self
+				if not self.equipBag[typ] then self.equipBag[typ] = {} end
+				self.equipBag[typ][lv] = equip
+			end
+		end
+	end
+
+	function Role:addEquip(params)
+		if params.type and params.level and params.count then
+			local equipType = params.type
+			local equipLv = params.level
+			local count = params.count
+			-- isRefer为true时count>0为卸载操作,<0为装备操作
+			local isRefer = params.isRefer or false
+			local equip = nil
+			local equipSet = self.equipBag[equipType]
+			if equipSet then
+				equip = self.equipBag[equipType][equipLv]
+			else
+				self.equipBag[equipType] = {}
+			end
+
+			if equip then
+				local originCount = equip:getProperty("count")
+				if isRefer then
+					if count < 0 then
+						if count+originCount<0 then
+							return
+						end
+					else
+						if equip:getProperty("refer")+count<0 then
+							return
+						end
+					end
+				end
+				count = originCount+count
+			else
+				if isRefer then return end
+				local roleId = self:getProperty("id")
+				local data = {
+					key = string.format(R_EQUIP,roleId,equipType,equipLv),
+					type = equipType,
+					level = equipLv,
+				}
+				equip = require("models.Equip").new(data)
+				equip.owner = self
+				equip:create()
+			end
+			equip:updateProperty({field = "count", value = count})
+			if isRefer then
+				equip:updateProperty({field = "refer", value = equip:getProperty("refer")+params.count})
+			end
+			self.equipBag[equipType][equipLv] = equip
+		end
+	end
+
+	function Role:getEquipCount(typ,lv)
+		local equipSet = self.equipBag[typ]
+		if equipSet then
+			local equip = equipSet[lv]
+			if equip then
+				return equip:getProperty("count")
+			else
+				return 0
+			end
+		else
+			return 0
+		end
+	end
+
+	function Role:loadRunes()
+		local roleId = self:getProperty("id")
+		local runeIds = redisproxy:smembers(string.format(R_RUNEIDS, roleId))
+		local redret = redisproxy:pipelining(function (red)
+			for _, runeId in ipairs(runeIds) do
+				red:hgetall(string.format(R_RUNE, roleId, runeId))
+			end
+		end)
+		for index, runeId in ipairs(runeIds) do
+			local rune = require("models.Rune").new({key = string.format(R_RUNE, roleId, runeId)})
+			if rune:load(table.array2Table(redret[index])) then
+				rune.owner = self
+				self.runeBag[tonumber(runeId)] = rune
+			end
+		end
+	end
+
+	-- 0 为操作成功
+	function Role:addRune(params)
+		if params.type and params.id then
+			local set  = csvdb["runeCsv"][params.type]
+			if not set then return 2 end
+			local data = set[params.id]
+			if not data then return 3 end
+
+			local roleId = self:getProperty("id")
+			local runeUid = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "rune", 1))
+
+			redisproxy:sadd(string.format(R_RUNEIDS, roleId), runeUid)
+
+			local heroInfo = {
+				key = string.format(R_RUNE, roleId, runeUid),
+				uid = runeUid,
+				type = params.type,
+				id = params.id,
+			}
+
+			local newRune = require("models.Rune").new(heroInfo)
+			newRune:create()
+			newRune:generateAttrs()
+			newRune.owner = self
+			self.runeBag[runeUid] = newRune
+			newRune:notifyUpdateProperties(newRune:data())
+			return 0
+		else
+			return 1
+		end
+	end
+
+	function Role:getRuneByType(typ)
+		local runeSet = {}
+		for _,v in pairs(self.runeBag) do
+			if v.type == typ then
+				table.insert(runeSet,v)
+			end
+		end
+		return runeSet
+	end
+
 	function Role:getAdvData()
-		if not self.advData then 
+		if not self.advData then
 			self.advData = require("adv.Adv").new(self)
 			self.advData:initByInfo()
 		end
@@ -0,0 +1,90 @@
+local Rune = class("Rune", require("shared.ModelBase"))
+Rune.schema = {
+	uid 		= {"number"},      		-- 唯一自增id
+	type 		= {"number"},      		-- 装备位置
+	id 			= {"number"},
+	level		= {"number", 0},		-- 等级
+	refer		= {"number", 0},		-- 已装备英雄id
+	attrs       = {"string",""}         -- 基础属性值 id=value
+}
+
+function Rune:ctor( properties )
+	Rune.super.ctor(self, properties)
+end
+
+function Rune:notifyUpdateProperty(field, newValue, oldValue)
+	local datas = {
+		key = field,
+		newValue = newValue,
+		oldValue = oldValue,
+	}
+	self:notifyUpdateProperties(datas)
+end
+
+function Rune:notifyUpdateProperties(params)
+	local updateData = {
+		uid = self:getProperty("uid"),
+		datas = params
+	}
+	SendPacket(actionCodes.Role_updateRune, MsgPack.pack(updateData))
+end
+
+function Rune:updateProperty(params)
+	if not params.field or (not params.delta and not params.value) then
+		return
+	end
+	if params.delta then
+		self:incrProperty(params.field, params.delta)
+	elseif params.value then
+		self:setProperty(params.field, params.value)
+	end
+	self:notifyUpdateProperties(self:data())
+end
+
+-- types 类型=权重"2=100 3=100 4=100"  value最大值=最小值 "50=100 50=100 100=200"
+local function getRandomValue(types,values)
+	local typeMap = types:toNumMap()
+	local valueArry = values:toArray()
+	if table.nums(typeMap) ~= #valueArry then return nil end
+	local typ,value
+	local typTab,weightSum = {},0
+	for t,w in pairs(typeMap) do
+		weightSum = weightSum + w
+		table.insert(typTab,{t=t,w=weightSum})
+	end
+
+	local tk
+	local tmp = math.random(1,weightSum)
+	for k,v in ipairs(typTab) do
+		if v.w >= tmp then
+			typ = v.t
+			tk = k
+			break
+		end
+	end
+
+	local range = valueArry[tk]:toArray(true,"=")
+	value = math.random(range[1],range[2])
+	return typ,value
+end
+
+function Rune:generateAttrs()
+	local runeData  = csvdb["runeCsv"][self:getProperty("type")][self:getProperty("id")]
+	local attrs = ""
+	attrs = attrs:setv(getRandomValue(runeData.attr1,runeData.range1))
+	attrs = attrs:setv(getRandomValue(runeData.attr2,runeData.range2))
+	self:setProperty("attrs",attrs)
+end
+
+function Rune:data()
+	return {
+		uid = self:getProperty("uid"),
+		type = self:getProperty("type"),
+		id = self:getProperty("id"),
+		refer = self:getProperty("refer"),
+		attrs = self:getProperty("attrs"),
+		level = self:getProperty("level"),
+	}
+end
+
+return Rune
 \ No newline at end of file