Merge branch 'develop' into tr/qa

熊润斐
2 parents ed546a46 7338c805
Showing 6 changed files with 15 additions and 8 deletions Show diff stats
src/actions/RoleAction.lua
src/actions/TowerAction.lua
src/adv/AdvPlayer.lua
src/csvdata
src/models/RolePlugin.lua
src/models/RoleTask.lua
@@ -264,7 +264,8 @@ function _M.loginRpc( agent, data )
  
 	-- 发下缓存的世界消息
 	local worldChatResponse = {worldChats = {}}
-	local ok, msgs = pcall(skynet.call, '.globald', "lua", "getWorldMsg", role._channelIdx)
+	-- local ok, msgs = pcall(skynet.call, '.globald', "lua", "getWorldMsg", role._channelIdx)
+	local ok, msgs = true, {}
 	if not ok then 
 		msgs = {} 
 	end
@@ -945,7 +946,7 @@ function _M.chatRpc(agent, data)
 				end
 			end
 			mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
-			pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
+			-- pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
 			role:mylog("role_action", {desc = "chatWorld", text1 = content})
 		end,
 		-- 私聊
@@ -62,7 +62,7 @@ function _M.startBattleRpc(agent, data)
  
 	if not csvdb["tower_battleCsv"][id] then return end
 	local curCount, nextTime = getUpdateTime(towerInfo.c, towerInfo.t)
-	if curCount < 1 then return end -- 没有次数返回
+	--if curCount < 1 then return end -- 没有次数返回
  
 	--搞起来
 	towerInfo.c = curCount - 1
@@ -136,10 +136,15 @@ end
  
 function _M.bugCountRpc(agent, data)
 	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local buyCount = msg.count
  
 	local towerInfo = role:getProperty("towerInfo")
 	local curCount, nextTime = getUpdateTime(towerInfo.c, towerInfo.t)
 	local needCount = globalCsv.tower_count_limit - curCount
+	if needCount > buyCount then
+		needCount = buyCount
+	end
 	if needCount > 0 then -- 补充
 		local cost = globalCsv.tower_chance_item:toNumMap()
 		for k , v in pairs(cost) do
@@ -147,7 +152,7 @@ function _M.bugCountRpc(agent, data)
 		end
 		if not role:checkItemEnough(cost) then return end
 		role:costItems(cost, {log = {desc = "towerCount"}})
-		curCount = globalCsv.tower_count_limit
+		curCount = curCount + needCount
 	end
 	towerInfo.c = curCount
 	towerInfo.t = nextTime
@@ -670,7 +670,7 @@ function Player:effectBattleBuff()
 	for _, buff in ipairs(self.buffs) do
 		if not buff:isHide() and (buff:getType() == Buff.BATTLE_BUFF or buff:getType() == Buff.BATTLE_PASSIVE) then
 			buff:effect()
-			if not buff.buffData.classify:sismember(7, " ") then -- 神器buff 不会清除
+			if not buff.buffData.classify:sismember(7, " ") and not buff.buffData.classify:sismember(8, " ") then -- 神器buff 不会清除 队长技
 				buff:uncover()
 			end
 		end
-Subproject commit dc9c77c295fa031753140e45dd2d793735c5bdfa
+Subproject commit 4a72b95ffb82eab671c6414aefa23b2e4718646c
@@ -1196,7 +1196,8 @@ function RolePlugin.bind(Role)
 		end
  
 		while newExp >= csvdb["adv_level_fundCsv"][level].exp do
-			if csvdb["adv_level_fundCsv"][level + 1] and self:advChapterIsOpen(100 + csvdb["adv_level_fundCsv"][level + 1].chapter) then -- 有下一级
+			--if csvdb["adv_level_fundCsv"][level + 1] and self:advChapterIsOpen(100 + csvdb["adv_level_fundCsv"][level + 1].chapter) then -- 有下一级
+			if csvdb["adv_level_fundCsv"][level + 1] then -- 有下一级
 				newExp = newExp - csvdb["adv_level_fundCsv"][level].exp
 				level = level + 1
 			else
@@ -245,7 +245,7 @@ local CalendaTaskListener = {
 	listen = {
 		[TaskType.DrawHero] = {{1, 1, f("count")}},
 		[TaskType.BonusPass]= {{2, 1}},
-		[TaskType.AdvPass]= {{3, 1}},
+		[TaskType.AdvStart]= {{3, 1}},
 		[TaskType.DinerLevelUp]= {{4, 2, f("level")}},
 		[TaskType.HeroLvlCollect]= {{5, 3}},		-- x名y级英雄
 		[TaskType.AdvHang]= {{6, 1}},			----