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

测试
2 parents a33ade6c 62c5e2f0
Showing 11 changed files with 161 additions and 60 deletions Show diff stats
src/ProtocolCode.lua
src/actions/DinerAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/SeaportAction.lua
src/models/Daily.lua
src/models/Hero.lua
src/models/HeroPlugin.lua
src/models/Role.lua
src/models/RolePlugin.lua
@@ -107,6 +107,7 @@ actionCodes = {
 	Hero_itemComposeRpc = 225,
 	Hero_setWishPoolRpc = 226,
 	Hero_changeSparkRpc = 227,
+	Hero_saveGeniusTreeRpc = 228,
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -747,7 +747,7 @@ function _M.addWantFoodRpc(agent , data)
 		gfood[slot] = {id = itemId, st = skynet.timex()}
 	end
-	role:finishGuide(36)
+	role:finishGuide(30)
 	role:mylog("diner_action", {desc = "wantFood"})
 	role.dinerData:updateProperty({field = "gfood", value = gfood})
@@ -992,16 +992,19 @@ table.insert(helpDes, {&quot;宝藏图鉴&quot;, &quot;treasure&quot;, &quot;list&quot;} )
 function _M.treasure(role, pms)
 	local pm1  = pms.pm1
 	if pm1 == "LIST" then
-		local treasureList= role.dailyData:getTreasrueList(role)
-		for id, val in pairs(treasureList) do
-			print(string.format("%s:%d:%d:%d:%d", val.name, val.weight, val.treasure_value, val.expire_time or 0, val.cool_time or 0))
-		end
+		local treasureList= role.dailyData:getProperty("treasureList")
+		dump(treasureList)
 		return "宝藏图鉴"
+	elseif pm1 == "FLUSH" then
+		local treasureList= role.dailyData:getTreasrueList(role)
+		dump(treasureList)
+		return "宝藏图鉴"	
 	elseif pm1 == "CHECK" then
 		local treasureList = role.dailyData:checkTreasureList(role)
-		for id, val in pairs(treasureList) do
-			print(string.format("%s:%d:%d:%d:%d", val.name, val.weight, val.treasure_value, val.expire_time or 0, val.cool_time or 0))
+		if treasureList == nil then
+			return "未挖到宝藏"
 		end
+		dump(treasureList)
 		return "挖宝成功"
 	elseif pm1 == "RESET" then
 		role.dailyData:resetTreasureList()
@@ -1011,4 +1014,17 @@ function _M.treasure(role, pms)
 	end
 end
+table.insert(helpDes, {"天赋点设置", "savegenius", "heroId", "wakeL", "awake"})
+function _M.savegenius(role, pms)
+	local heroId = pms.pm1
+	local wakeL = pms.pm2
+	local awake = pms.pm3
+	local hero = role.heros[tonumber(heroId)]
+
+	if not hero then return "英雄不存在" end
+	local genius = hero:saveGeniusTree(wakeL, awake)
+	print(genius)
+	return "天赋点设置成功"
+end
+
 return _M
 \ No newline at end of file
@@ -27,7 +27,7 @@ local function getHangTime(role)
 	return nowCoinTime - hangInfo.coinTime
 end
-local function checkReward(role, isTreasure)
+local function checkReward(role, isTreasure, carbonId)
 	local hangInfo = role:getProperty("hangInfo")
 	if not hangInfo.carbonId or not hangInfo.coinTime or not hangInfo.itemTime then
 		return false
@@ -56,7 +56,7 @@ local function checkReward(role, isTreasure)
 	coinCount = (coinCount + coinDoubleCount) * expCoef
 	items[ItemId.Gold] = math.floor((items[ItemId.Gold] or 0) + coinCount * (expCarbonData.money or 0))
 	items[ItemId.Exp] = math.floor((items[ItemId.Exp] or 0) + coinCount * (expCarbonData.exp or 0))
-	items[ItemId.PlayerExp] = math.floor((items[ItemId.PlayerExp] or 0) + (coinCount * expCarbonData.playerExp or 0))
+	items[ItemId.PlayerExp] = math.floor((items[ItemId.PlayerExp] or 0) + coinCount * (expCarbonData.playerExp or 0))
 	local pool = {}
 	for _, temp in pairs(carbonData.item:toArray()) do
@@ -171,7 +171,7 @@ function _M.startRpc( agent, data )
 		end
 	end
-	if checkReward(role) then
+	if checkReward(role, true, carbonId) then
 		role:updateProperty({field = "hangBag", value = role:getProperty("hangBag")})
 	end
@@ -1277,4 +1277,25 @@ function _M.changeSparkRpc(agent, data)
 	return true
 end
+function _M.saveGeniusTreeRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	local awake = msg.awake
+	local wakeL = msg.wakeL
+	local heroId = msg.hero_id
+	local hero = role.heros[tonumber(heroId)]
+
+	if not hero then  print("hero is nil") return 0 end
+	local genius = hero:saveGeniusTree(wakeL, awake)
+	if #genius == 0 then
+		genius = ""
+	end
+	hero:updateProperty({field="genius", value=genius})
+	print("genius:")
+	print(#genius)
+	SendPacket(actionCodes.Hero_saveGeniusTreeRpc, MsgPack.pack({genius = genius}))
+	return true
+end
+
 return _M
@@ -59,6 +59,12 @@ function _M.donateRpc(agent, data)
 		redisproxy:hincrby(SEAPORT_TRADE_TASK_2,id,itemCount)
 	end
+	local seaport = role:getProperty("seaport") or {}
+	if not seaport.join then
+		seaport.join = 1
+		role:updateProperty({field = "seaport", value = seaport})
+	end
+
 	role:costItems({[itemId] = itemCount}, {log = {desc = "seaportDonate", int1 = phase, int2 = id}})
 	local reward, change = role:award(rewards, {log = {desc = "seaportDonate", int1 = ddata.phase, int2 = ddata.id}})
@@ -155,18 +155,20 @@ end
 --资源
 function Daily:checkTreasureBase(treasureList, treasureBase, removeId)
 	local tmptreasure = {}
+	local num = 0
 	for k, val in pairs(treasureList) do
 		if removeId and val.id == removeId then
-			table.remove(treasureList, k)
+			treasureList[k] = nil
 		else
 			if treasureBase >= val.treasure_value then
 				treasureBase = treasureBase - val.treasure_value
 				tmptreasure[val.id] = val
+				num = num + 1
 			end
 		end
 	end
-	return tmptreasure
+	return tmptreasure, num
 end
 --绑定通关关卡
@@ -177,14 +179,9 @@ function Daily:checkChapters()
 	if next(treasureList) ~= nil then
 		for id, curInfo in pairs(treasureList) do
 			if curInfo["end_time"] then
-				if skynet.timex() >= curInfo["end_time"] then
-					curInfo = nil
+				if skynet.timex() < curInfo["end_time"] then
+					tmp_chapters[curInfo.chapter_id] = curInfo
 				end
-			else
-				curInfo = nil
-			end
-			if curInfo ~= nil then
-				tmp_chapters[curInfo.chapter_id] = curInfo
 			end
 		end
 	end
@@ -207,16 +204,26 @@ end
 function Daily:checkTreasureWeight(treasureList, tmptreasure, treasureBase)
 	local removeId
 	local chapters = self:checkChapters()
+	local treasure
 	if next(chapters) == nil then return end
 	while next(tmptreasure) do
-		local tmp = self:checkTreasureBase(tmptreasure, treasureBase, removeId)
-		local id = math.randWeight(tmp, "weight") --宝藏id
-		if not id then
+		local tmp, num = self:checkTreasureBase(tmptreasure, treasureBase, removeId)
+
+		if num == 0 then
 			break
+		elseif num == 1 then
+			for _, val in pairs(tmp) do
+				treasure = val
+			end
+		else
+			local id = math.randWeight(tmp, "weight") --宝藏id
+			if not id then
+				break
+			end
+			treasure = tmp[id]
 		end
-
-		local treasure  = tmp[id]
+	
 		if treasureBase >= treasure.treasure_value  then
 			--扣除资源值
 			treasureBase =  treasureBase - treasure.treasure_value
@@ -229,8 +236,8 @@ function Daily:checkTreasureWeight(treasureList, tmptreasure, treasureBase)
 		end
 		treasure.chapter_id = chapterId
-		treasureList[id] = treasure
-		removeId = id
+		treasureList[treasure.id] = treasure
+		removeId = treasure.id
 	end
 end
@@ -249,49 +256,45 @@ function Daily:checkTreasureChapterId(curInfo, treasureList, chapterId)
 		if not curInfo["end_time"] then
 			curInfo["end_time"] = skynet.timex() + curInfo.working_time
 		else
-			--宝藏冷却时间
-			if not curInfo["expire_time"] then
-				--已挖到
-				if skynet.timex() >= curInfo["end_time"] then
-					treasure = treasureList[curInfo.id]
-					if curInfo.cool_time > 1 then
+			if skynet.timex() >= curInfo["end_time"] then
+				if curInfo.cool_time > 1 then
+					--宝藏冷却时间
+					if not curInfo["expire_time"] then
+						treasure = treasureList[curInfo.id]
 						curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
 					else
-						curInfo["expire_time"] = skynet.timex()
+						--已经领取宝藏 检索宝藏冷却时间
+						if skynet.timex() >= curInfo["expire_time"] then
+							treasureList[curInfo.id] = nil
+						end
 					end
-					if skynet.timex() >= curInfo["expire_time"] then
-						table.remove(treasureList, curInfo.id)
-					end
-				end
-			else
-				--已经领取宝藏 检索宝藏冷却时间
-				if skynet.timex() >= curInfo["expire_time"] then
-					table.remove(treasureList, curInfo.id)
+				else
+					treasure = treasureList[curInfo.id]
+					treasureList[curInfo.id] = nil
 				end
 			end
 		end
 	else
 		--已经开始挖宝
 		if curInfo["end_time"] then
-			if not curInfo["expire_time"] then --宝藏冷却时间
-				if skynet.timex() >= curInfo["end_time"] then --已挖到
-					treasure = treasureList[curInfo.id]
-					if curInfo.cool_time > 1 then
+			if skynet.timex() >= curInfo["end_time"] then
+				if curInfo.cool_time > 1 then
+					--宝藏冷却时间
+					if not curInfo["expire_time"] then
+						treasure = treasureList[curInfo.id]
 						curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
 					else
-						curInfo["expire_time"] = skynet.timex()
-					end
-					if skynet.timex() >= curInfo["expire_time"] then
-						table.remove(treasureList, curInfo.id)
+						--已经领取宝藏 检索宝藏冷却时间
+						if skynet.timex() >= curInfo["expire_time"] then
+							treasureList[curInfo.id] = nil
+						end
 					end
 				else
-					--未挖到直接删除
-					table.remove(treasureList, curInfo.id)
-				end
-			else --已经领取宝藏 检索宝藏冷却时间
-				if skynet.timex() >= curInfo["expire_time"] then
-					table.remove(treasureList, curInfo.id)
+					treasure = treasureList[curInfo.id]
+					treasureList[curInfo.id] = nil
 				end
+			else
+				curInfo["end_time"]	= nil
 			end
 		end
 	end
@@ -310,7 +313,7 @@ function Daily:buyTreasure(treasureList)
 			boughtTreasurer[id] = val
 		end
 	end
-	self:updateProperty({field = "treasureBase", value = treasureBase})
+	--self:updateProperty({field = "treasureBase", value = treasureBase})
 	return boughtTreasurer
 end
@@ -322,7 +325,7 @@ end
 --宝藏图鉴
 function Daily:getTreasrueList()
 	local tmpcsv = csvdb["idle_treasureCsv"]
-	local treasureList = self:getProperty("treasureList") --挖宝列表 过期删除 领取奖励删除 跨天更新
+	local treasureList = self:getProperty("treasureList") or {} --挖宝列表 过期删除 领取奖励删除 跨天更新
 	local tmptreasure = {}
 	local treasureBase = globalCsv.idle_treasure_base
 	for id, val in pairs(tmpcsv) do
@@ -343,7 +346,7 @@ end
 --检索挖宝列表
 function Daily:checkTreasureList(chapterId)
-	local treasureList = self:getProperty("treasureList")
+	local treasureList = self:getProperty("treasureList") or {}
 	local tmptreasure = {}
 	for id, val in pairs(treasureList) do
 		local treasure = self:checkTreasureChapterId(val, treasureList, chapterId)
@@ -353,6 +356,7 @@ function Daily:checkTreasureList(chapterId)
 	end
 	if next(tmptreasure) == nil then
+		self:updateProperty({field = "treasureList", value = treasureList})
 		return nil
 	end
 	local boughtTreasurer = self:buyTreasure(tmptreasure)
@@ -18,6 +18,7 @@ Hero.schema = {
 	rune       = {"string",""},        --零件 type=id
 	faith	   = {"number", 0},			-- 信赖
 	spark		= {"table", {}},		-- 火花属性
+	genius	   = {"string", "" }, --天赋点 4=10201 5=10201 6=10203 7=10204
 }
 function Hero:ctor( properties )
@@ -111,6 +112,7 @@ function Hero:data()
 		rune = self:getProperty("rune"),
 		faith = self:getProperty("faith"),
 		spark = self:getProperty("spark"),
+		genius = self:getProperty("genius"),
 	}
 end
@@ -384,6 +384,57 @@ function HeroPlugin.bind(Hero)
 		self:mylog({desc = "addFaith", int1 = exp})
 	end
+	--检验天赋树是否合理
+	function Hero:checkGeniusTree(genius)
+		local maxWakeL = 0
+		local star = self:getProperty("wakeL")
+		if star < 4 then return maxWakeL end
+		if #genius == 0 then return maxWakeL end
+
+		local geniusTree = genius:toNumMap()
+		local tmpgenius = ""
+		for wakeL, val in pairs(geniusTree) do
+			print("wakeL:")
+			print(wakeL)
+			if wakeL < 4 then return maxWakeL end
+			if wakeL % 2 == 0 then
+				if geniusTree[wakeL+1] and geniusTree[wakeL+1] ~= val then
+					return 0
+				end
+			end
+			maxWakeL = math.max(maxWakeL, wakeL)
+			if #tmpgenius == 0 then
+				tmpgenius = string.format("%s=%s", tostring(wakeL), tostring(val))
+			else
+				tmpgenius = string.format("%s %s=%s", tmpgenius, tostring(wakeL), tostring(val))
+			end
+		end
+		return tonumber(maxWakeL),tmpgenius
+	end
+
+	function Hero:saveGeniusTree(wakeL, awake)
+		local genius = self:getProperty("genius")
+		local tid = self:getProperty("type")
+		if not wakeL and not awake then return "" end
+
+		
+		local heroUnit = csvdb["unitCsv"][tid]
+		if not heroUnit then return genius end
+		if not heroUnit.awake_1 or not heroUnit.awake_2 then return genius end
+
+		if #genius == 0 then
+			genius = string.format("%s=%s", tostring(wakeL), tostring(awake))
+		else
+			genius = string.format("%s %s=%s", genius, tostring(wakeL), tostring(awake))
+		end
+
+		local maxWakeL, genius = self:checkGeniusTree(genius)
+		if maxWakeL ~= wakeL then
+			genius = self:getProperty("genius")
+		end
+		return genius
+	end
+
 end
@@ -198,7 +198,7 @@ Role.schema = {
 	nbTask				= {"table", {}}, -- 新用户活动
 	radioTask			= {"table", {}}, -- 电台任务 {id = {time=end_ts,heros=heros}}	表crusadeCsv
-	seaport 			= {"table", {}}, -- 海岛贸易季 {time = 1234567890, donate = {}, collect = {[1] = {team = "1=2=3", time = 1234567890}}, shop = {}}
+	seaport 			= {"table", {}}, -- 海岛贸易季 {time = 1234567890, donate = {}, collect = {[1] = {team = "1=2=3", time = 1234567890}}, shop = {}, join = 1}
 	returner			= {"table", {}}, -- 回归者 {time = 12334233423, [1] = 1, [2] = 2, status = {[1] = 1}}
@@ -1371,7 +1371,7 @@ function RolePlugin.bind(Role)
 		local function getReward(reset)
 			-- 全服捐赠奖励
 			local donate = seaport.donate or {}
-			if not reset and (not donate[1] or not donate[2]) then
+			if not reset and seaport.join and (not donate[1] or not donate[2]) then
 				local result = self:getSeaportServerProgress()
 				for idx, set in ipairs(csvdb["seaport_purchaseCsv"]) do
 					local done = true