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

熊润斐
2 parents aa84432f 8dc5f0dd
Showing 13 changed files with 178 additions and 56 deletions Show diff stats
config/develop.lua
src/ProtocolCode.lua
src/actions/CarAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/PvpAction.lua
src/actions/RoleAction.lua
src/actions/TowerAction.lua
src/models/Daily.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/shared/ModelBaseMysql.lua
 include("basic.lua")
-logd = 1 -- 是否开启日志
+logd = 0 -- 是否开启日志
 thread = 4
 codeurl = "192.168.0.199:9090"
 servId = 1
@@ -55,6 +55,7 @@ actionCodes = {
 	Role_updateSpark = 139,		-- 更新火花
 	Role_diamondConvertRpc = 140, -- 钻石兑换成别的物品
 	Role_getTimeGiftRpc = 141,
+    Role_runeBuyRpc = 142,   	-- 铭文购买
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -220,6 +220,16 @@ function _M.saleRuneRpc(agent, data )
 		for k ,v in pairs(one) do
 			reward[k] = (reward[k] or 0) + v
 		end
+
+		--分解铭文返还强化所需铭文碎片的60%
+		local level = rune:getProperty("level")
+		for i = 1, level do
+			local lvData = csvdb["rune_buildCsv"][i]
+			local cost = lvData.cost:toNumMap()
+			for k, v in pairs(cost) do
+				reward[k] = (reward[k] or 0) + v*0.6
+			end
+		end
 	end
 	role:delRunes(backs, {log = {desc = "saleRune"}})
@@ -127,12 +127,12 @@ local function checkReward(role, isTreasure, carbonId)
 	--挂机得到的宝藏加入到挂机奖励
 	if isTreasure or false == true then
-		local treasureList= role.dailyData:checkTreasureList(hangInfo.carbonId) or {}
+		local treasureList= role.dailyData:checkTreasureList(carbonId or hangInfo.carbonId) or {}
 		if next(treasureList) ~= nil then
 			for id, val in pairs(treasureList) do
 				local award  = val.award:toNumMap()
 				for k,v in pairs(award) do
-					items[k] = (award[k] or 0) + v
+					items[k] = (items[k] or 0) + v
 				end
 			end
 		end
@@ -513,6 +513,17 @@ function _M.quickRpc(agent , data)
 		end
 	end
+	--宝藏加速
+	local treasureList= role.dailyData:quickTreasureList(hangInfo.carbonId, time) or {}
+	if next(treasureList) then
+		for id, val in pairs(treasureList) do
+			local award  = val.award:toNumMap()
+			for k,v in pairs(award) do
+				reward[k] = (reward[k] or 0) + v
+			end
+		end
+	end
+
 	local change
 	reward, change = role:award(reward, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
 	if reward[ItemId.Gold] then
@@ -865,6 +865,11 @@ function _M.drawHeroRpc(agent, data)
 	local unitPool = csvdb["build_unitCsv"][poolId]
 	if not unitPool then return 7 end
+    -- ssr硬性保底
+    local isSSRup = false
+    if unitPool["rare_"..HeroQuality.SSR] or 0 > 0 then
+        isSSRup = true
+    end
 	-- 开始抽
 	local resultPool = {}
@@ -872,21 +877,38 @@ function _M.drawHeroRpc(agent, data)
 		local condition = {"rare"}
 		local values = {}
+        -- check ssr up
+        if isSSRup then
+            local ssrUpMap = role:getProperty("ssrUp") or {}
+            local ssrFloorCnt = ssrUpMap[poolId] or 0
+            if ssrFloorCnt >= (globalCsv.draw_ssr_guarantee or 40) - 1 then
+                values[1] = HeroQuality.SSR
+                ssrUpMap[poolId] = 0
+            else
+                for idx, field in ipairs(condition) do
+                    if not values[idx] then
+                        local lpool = {}
+                        local curIdx = 1
+                        while unitPool[field .. "_" .. curIdx] do
+                            lpool[curIdx] = {unitPool[field .. "_" .. curIdx]}
+                            curIdx = curIdx + 1
+                        end
+
+                        if next(lpool) then
+                            values[idx] =  math.randWeight(lpool, 1)
+                        end
+                    end
+                end
+                if values[1] == HeroQuality.SSR then
+                    ssrUpMap[poolId] = 0
+                else
+                    ssrUpMap[poolId] = ssrFloorCnt + 1
+                end
+            end
+            role:updateProperty({field="ssrUp", value = ssrUpMap, notNotify = true})
+        end
-		for idx, field in ipairs(condition) do
-			if not values[idx] then
-				local lpool = {}
-				local curIdx = 1
-				while unitPool[field .. "_" .. curIdx] do
-					lpool[curIdx] = {unitPool[field .. "_" .. curIdx]}
-					curIdx = curIdx + 1
-				end
-				if next(lpool) then
-					values[idx] =  math.randWeight(lpool, 1)
-				end
-			end
-		end
 		local weight = 0
 		local up_pool = nil
@@ -1291,7 +1313,11 @@ function _M.changeSparkRpc(agent, data)
 		end
 	end
-	SendPacket(actionCodes.Hero_changeSparkRpc, MsgPack.pack({reward = reward}))
+	local change = {}
+	if next(reward) then
+		reward, change = role:award(reward, {log = {desc = "changeSpark"}})
+	end
+	SendPacket(actionCodes.Hero_changeSparkRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -243,6 +243,12 @@ function _M.buyCountRpc(agent, data)
 	local cost = {[ItemId.Jade] = globalCsv.pvp_buy_cost * count}
 	if not role:checkItemEnough(cost) then return 2 end
+
+	--限制每天购买次数
+	local pvpBought = role.dailyData:getProperty("pvpBought")
+	if count + pvpBought > globalCsv["pvp_buy_max"] then return 3 end
+	role.dailyData:updateProperty({field = "pvpBought", value = count + pvpBought})
+
 	role:costItems(cost, {log = {desc = "buyPvpKey"}})
 	role:award({[ItemId.PvpKey] = count}, {log = {desc = "buyPvpKey"}})
@@ -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
@@ -115,7 +115,7 @@ function _M.endBattleRpc(agent, data)
 		curLevel = curLevel + 1
 		reward, change = role:award(rewardStr, {log = {desc = "towerBattle", int1 = id}})
 		if towerType == 0 then
-			role:checkTaskEnter("TowerPass", {level = towerInfo.l})
+			role:checkTaskEnter("TowerPass", {level = towerInfo.l, type = towerType + 1})
 		end
 	end
@@ -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} -- 每日商城折扣统计
@@ -67,8 +68,12 @@ function Daily:refreshDailyData(notify)
 			end
 		elseif field == "id" then
             -- skip
+		elseif field == "treasureBase" then
+			dataMap[field] = globalCsv.idle_treasure_base
 		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
@@ -100,21 +105,9 @@ function Daily:checkUnlock(treaval)
 	local treasureC = treaval.unlock:toArray(true, "=")
 	local show = false
 	if treasureC[1] == 1 then --通关关卡
-		if  self.owner:checkHangPass(treasureC[2]) then show = true end
+		show = self.owner:checkHangPass(treasureC[2])
 	elseif treasureC[1] == 2 then --通关拾荒章节=x层
-		local chapterId = treasureC[2]
-		local layer = 1
-		local advCsv = csvdb["adv_chapterCsv"][chapterId]
-		if not advCsv then return false end --不存在的章节
-		if math.floor(chapterId / 100) ~= 2 then
-			layer = math.min(layer, advCsv.limitlevel)
-		end
-		local advPass = role:getProperty("advPass")
-		if (advPass[chapterId] or 0) < layer then
-			show = false
-		else
-			show = true
-		end
+		show = role:checkAdvChapterPass(treasureC[2])
 	elseif treasureC[1] == 3 then --拥有指定id的角色时
 		local hero = role:getHeroByID(treasureC[2])
 		if hero then show = true end
@@ -247,9 +240,9 @@ function Daily:checkTreasureChapterId(curInfo, treasureList, chapterId)
 	local treasure = nil
 	if not curInfo then
-		print("curInfo is nil")
 		return treasure
 	end
+	local treasureBase = self:getProperty("treasureBase")
 	--开始挖宝关卡ID=挂机关卡ID
 	if chapterId == curInfo.chapter_id then
@@ -261,8 +254,12 @@ function Daily:checkTreasureChapterId(curInfo, treasureList, chapterId)
 				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
+						if treasureBase >= curInfo["treasure_value"] then
+							treasureBase = treasureBase - curInfo["treasure_value"]
+
+							treasure = treasureList[curInfo.id]
+							curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
+						end
 					else
 						--已经领取宝藏 检索宝藏冷却时间
 						if skynet.timex() >= curInfo["expire_time"] then
@@ -270,8 +267,12 @@ function Daily:checkTreasureChapterId(curInfo, treasureList, chapterId)
 						end
 					end
 				else
-					treasure = treasureList[curInfo.id]
-					treasureList[curInfo.id] = nil
+					if treasureBase >= curInfo["treasure_value"] then
+						treasureBase = treasureBase - curInfo["treasure_value"]
+
+						treasure = treasureList[curInfo.id]
+						treasureList[curInfo.id] = nil
+					end
 				end
 			end
 		end
@@ -282,8 +283,13 @@ function Daily:checkTreasureChapterId(curInfo, treasureList, chapterId)
 				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
+						if treasureBase >= curInfo["treasure_value"] then
+							treasureBase = treasureBase - curInfo["treasure_value"]
+
+							treasure = treasureList[curInfo.id]
+							curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
+						end
+						
 					else
 						--已经领取宝藏 检索宝藏冷却时间
 						if skynet.timex() >= curInfo["expire_time"] then
@@ -291,8 +297,12 @@ function Daily:checkTreasureChapterId(curInfo, treasureList, chapterId)
 						end
 					end
 				else
-					treasure = treasureList[curInfo.id]
-					treasureList[curInfo.id] = nil
+					if treasureBase >= curInfo["treasure_value"] then
+						treasureBase = treasureBase - curInfo["treasure_value"]
+
+						treasure = treasureList[curInfo.id]
+						treasureList[curInfo.id] = nil
+					end
 				end
 			else
 				curInfo["end_time"]	= nil
@@ -306,12 +316,9 @@ function Daily:buyTreasure(treasureList)
 	local boughtTreasurer = {}
 	local treasureBase = self:getProperty("treasureBase")
 	for id, val in pairs(treasureList) do
-		treasureBase = treasureBase - val.treasure_value
-		if treasureBase < 0 then
-			treasureBase = treasureBase + val.treasure_value
-			return
-		else
+		if treasureBase >= val.treasure_value then
 			boughtTreasurer[id] = val
+			treasureBase = treasureBase - val.treasure_value
 		end
 	end
 	self:updateProperty({field = "treasureBase", value = treasureBase})
@@ -366,6 +373,20 @@ function Daily:checkTreasureList(chapterId)
 	return boughtTreasurer
 end
+--宝藏加速
+function Daily:quickTreasureList(chapterId, time)
+	local treasureList = self:getProperty("treasureList") or {}
+	if next(treasureList) then
+		for id, val in pairs(treasureList) do
+			if val["end_time"] and val["chapter_id"] and chapterId == val["chapter_id"] then
+				val["end_time"] = val["end_time"] - time
+			end
+		end
+	end
+	self:updateProperty({field = "treasureList", value = treasureList})
+	return self:checkTreasureList(chapterId)
+end
+
 function Daily:data()
 	return {
 		hangQC = self:getProperty("hangQC"),
@@ -379,12 +400,14 @@ 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"),
 		goldBuyT = self:getProperty("goldBuyT"),
 		unlockPool = self:getProperty("unlockPool"),
 		curPool = self:getProperty("curPool"),
+		treasureBase = self:getProperty("treasureBase"),
 		treasureList = self:getProperty("treasureList"),
 	}
 end
@@ -4,7 +4,7 @@ local logproxy = require &quot;shared.logproxy&quot;
 --[[
 	100	购买/兑换行为			
-	200	交易行为(与其他玩家)			
+	200	交易行为(与其他玩家)
 	300	通过关卡产出或消耗			
 	400	通过任务产出或消耗			
 	500	通过公会产出或消耗			
@@ -62,6 +62,7 @@ local ItemReason = {
 	convert = 146, -- 钻石兑换其他物品
 	giftTime = 147, -- 创角后的时间礼包
 	activityCrisis = 148, -- 物资危机奖励
+    glodConvertRune = 149, -- 金币兑换铭文
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗
@@ -1304,10 +1304,20 @@ function RolePlugin.bind(Role)
 	function Role:advChapterIsOpen(chapterId)
 		local chapterData = csvdb["adv_chapterCsv"][chapterId]
-		if chapterData.prepose ~= 0 and not self:checkHangPass(chapterData.prepose) then return false end
+		if chapterData.prepose == "" then return true end
+		local prepose = chapterData.prepose:toArray(true,"=")
+		if prepose[1] == 1 then
+			if chapterData.prepose ~= 0 and not self:checkHangPass(prepose[2]) then return false end
+		elseif prepose[1] == 2 then
+			return self:checkAdvChapterPass(prepose[2])
+		elseif prepose[1] == 3 then
+			return self:checkOverGuide(prepose[2])
+		end
 		return true
 	end
+
+
 	function Role:advEventOpenStatus()
 		local openStatus = {}
 		for func , data in pairs(csvdb["unlockCsv"]) do
@@ -2038,6 +2048,13 @@ function RolePlugin.bind(Role)
 		return (hangPass[diff] or 0) >= carbonId
 	end
+	function Role:checkAdvChapterPass(chapterId)
+		local chapterData = csvdb["adv_chapterCsv"][chapterId]
+		local advPass = self:getProperty("advPass") or {}
+		local pass = advPass[chapterId] or 0
+		return pass >= chapterData.limitlevel
+	end
+
 	function Role:hangFinish(carbonId)
 		local hangPass = self:getProperty("hangPass")
 		local diff = math.floor(carbonId / 10000)
@@ -194,7 +194,7 @@ local AchievListener = {
 		[TaskType.OverOderTask] = {{14}},
 		[TaskType.FoodSellGold] = {{15, f("count")}},
 		[TaskType.DinerPopular] = {{16, f("count")}},
-		[TaskType.TowerPass] = {{17, f("level")}},
+		[TaskType.TowerPass] = {{17, f("level"), f("type")}},
 		[TaskType.OpenBox] = {{18, f("count")}},
 		[TaskType.DinerLevelUp] = {{19, f("level"), f("type")}},
 		[TaskType.DinerTalentUp] = {{20, 1, f("type")}},
@@ -289,7 +289,7 @@ local CalendaTaskListener = {
 		[TaskType.PvpWin]= {{10, 2, f("score")}},
 		[TaskType.DinerPopular]= {{11, 2, f("count")}},
 		[TaskType.RoleLevelUp]= {{12, 2, f("level")}},
-		[TaskType.TowerPass]= {{13, 2, f("level")}},
+		[TaskType.TowerPass]= {{13, 3, f("level"), f("type")}},
 		[TaskType.HeroTalent]= {{14, 1}},
 		[TaskType.HangPass]= {{15, 3}},
 		[TaskType.HeroStarCollect]= {{16, 3}},
@@ -809,6 +809,10 @@ function RoleTask.bind(Role)
 								if cfg.condition2 == param1 then
 									calTask[id] = (calTask[id] or 0) + 1
 								end
+							elseif cfg.type == 13 then	-- 挑战电波塔主塔
+								if cfg.condition2 == param1 and param2 == 1 then
+									calTask[id] = (calTask[id] or 0) + 1
+								end
 							end
 						end
 					end
@@ -485,6 +485,8 @@ function ModelBaseMysql:updateFields(fields)
             if next(value) then 
                 local result = mysqlproxy:quote_sql_str(MsgPack.pack(value))
                 params[field] = result
+            else
+                params[field] = mysqlproxy:quote_sql_str(MsgPack.pack({}))
             end
         elseif self.class.schema[field][1] == "string" then
             local result = mysqlproxy:quote_sql_str(value)