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

liuzujun · xiongrenfei · xiongrenfei
2 parents 8cd3770f b7e842ac
Showing 8 changed files with 36 additions and 13 deletions Show diff stats
src/actions/AdvAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/adv/AdvPlayer.lua
src/models/RoleChangeStruct.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
@@ -657,7 +657,7 @@ function _M.startBattleRpc(agent, data)
 	if adv:isWaitChooseArtifact() then return end
 	local enemy = adv.battle:getEnemyById(enemyId)
-	if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end
+	if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId or enemy.lock or enemy.isDead then return end
 	local key = tostring(math.random())
 	adv.__battleCache = {
@@ -689,7 +689,7 @@ function _M.endBattleRpc(agent, data)
 	if not adv.__battleCache then return end
 	if adv.__battleCache.enemyId ~= enemyId then return end
 	local enemy = adv.battle:getEnemyById(enemyId)
-	if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end
+	if not enemy or enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end
 	adv.__battleCache = nil
 	-- 打完野猪怪
@@ -116,7 +116,7 @@ function _M.wakeRpc(agent, data)
 	local curLevel = hero:getProperty("wakeL")
 	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel})
-	if curLevel == 4 then -- 解锁cg
+	if curLevel == 3 then -- 解锁cg
 		role:checkTaskEnter("WakeCG", {heroType = typ})
 	end
 	hero:mylog({desc = "wake", int1 = hero:getProperty("wakeL")})
@@ -942,6 +942,7 @@ function _M.chatRpc(agent, data)
 			end
 			mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
 			pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
+			role:mylog("role_action", {desc = "chatWorld", text1 = content})
 		end,
 		-- 私聊
 		[2] = function ()
@@ -670,7 +670,9 @@ 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()
-			buff:uncover()
+			if not buff.buffData.classify:sismember(7, " ") then -- 神器buff 不会清除
+				buff:uncover()
+			end
 		end
 	end
 end
@@ -31,16 +31,33 @@ local awardGift = createVersionFunc(VersionType.Override ,function(role, params)
 	print("awardGift" .. " >>> " .. params)
 end)
+local bugFixSuduku = createVersionFunc(VersionType.DoOnly, function(role, params)
+	local sudoku = role:getProperty("sudoku")
+	local phase = sudoku[-1] or 1
+	local id = 9
+	if phase == 1 then
+		local curData = (csvdb["guide_sudokuCsv"][phase] or {})[id]
+		if role:checkHangPass(curData.con2) then
+			sudoku.task = sudoku.task or {}
+			sudoku.task[phase] = sudoku.task[phase] or {}
+			if (sudoku.task[phase][id] or 0 == 0) then
+				sudoku.task[phase][id] = 1
+				role:setProperty("sudoku", sudoku)
+			end
+		end
+	end
+end)
+
 ---------------------版本方法  end   ----------------------
 -- version 罗列start
 local versionList = {} -- version 列表
-versionList[1] = {clearActivity, {1, 2}}
-versionList[2] = {clearActivity, {5, 7}}
-versionList[3] = {changeStructF, "test1"}
-versionList[4] = {changeStructF, "test2"}
-versionList[5] = {awardGift, "test3"}
-versionList[6] = {awardGift, "test4"}
+versionList[1] = {bugFixSuduku, {}}
+-- versionList[2] = {clearActivity, {5, 7}}
+-- versionList[3] = {changeStructF, "test1"}
+-- versionList[4] = {changeStructF, "test2"}
+-- versionList[5] = {awardGift, "test3"}
+-- versionList[6] = {awardGift, "test4"}
 --version 罗列end
@@ -12,7 +12,7 @@ local server_id = (skynet.getenv(&quot;serverType&quot;) or &quot;localtest&quot;) .. &quot;_&quot; .. serverI
 	1000	其他行为			
 --]]
 local ItemReason = {
-	recharge = 100,
+	recharge = 100, -- 充值获取
 	advWheelSurf = 101, -- 资助
 	advRepayWheelSurf = 102, -- 资助回馈
 	saleEquip = 103, -- 卖装备
@@ -482,6 +482,7 @@ local LogType = {
 	login = "common",
 	logout = "common",
 	guide = "common",
+	newdevice = "common",
 	in_item = "common",
 	out_item = "common",
@@ -444,7 +444,9 @@ function RolePlugin.bind(Role)
 			type= heroType,
 			wakeL = globalCsv.unit_wake_initLevel[unitData.rare],
 		}
-
+		if heroInfo.wakeL == 3 then
+			self:checkTaskEnter("WakeCG", {heroType = heroType})
+		end
 		local newHero = require("models.Hero").new(heroInfo)
 		newHero:create()
 		newHero.owner = self
@@ -555,7 +555,7 @@ function RoleTask.bind(Role)
 				for id , sudikuData in pairs(guide_sudokuData) do
 					local curStatus = sudoku.task[pause][id] or 0
-					if curStatus ~= -1 and sudikuData.type == stype and (sudikuData.unlock == 0 or self:checkHangPass(sudikuData.unlock)) then 
+					if curStatus ~= -1 and sudikuData.type == stype then 
 						if IsFindMax[sudikuData.type] then -- 最大值
 							if sudikuData.con2 == 0 or sudikuData.con2 == cond then
 								if (count or 0) > curStatus then