Merge branch 'bugfix' into tr/publish

* bugfix: 成就参数错误 3星解锁 cg 增加神器标签

Merge branch 'bugfix' into tr/publish
* bugfix: 成就参数错误 3星解锁 cg 增加神器标签
熊润斐
2 parents 32af9da9 3ed95697
Showing 3 changed files with 7 additions and 3 deletions Show diff stats
src/actions/HeroAction.lua
src/adv/AdvPlayer.lua
src/models/RolePlugin.lua
@@ -114,7 +114,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")})
@@ -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
@@ -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