Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

lua/app/game.lua

@@ -44,8 +44,6 @@ function Game:initBase()
     BF.exports.RenderManager = require "app/common/render_manager"
     AudioManager:init()
 
-    -- 获取刘海屏数据
-    CS.BF.BFMain.Instance.SDKMgr.DZSDKMgr:CSGetNotchScreenInfo()
     Logger.log("initBase")
 end
 

lua/app/module/battle/battle_const.lua

@@ -85,6 +85,10 @@ BattleConst.MIN_NODE_HEIGHT = {
     [3] = 34
 }
 
+BattleConst.BUFF_TYPE = {
+    DIRECT_HURT = 3
+}
+
 BattleConst.SKILL_MOVE_TYPE = {
     MOVE = 1,           -- 移动到目标跟前使用
     STAND = 2,          -- 原地使用

lua/app/module/battle/component/battle_unit_comp.lua

@@ -1113,7 +1113,9 @@ function BattleUnitComp:onSkillTakeEffect(skill)
 		end
 	end
 	if succ then
-		self.team:addCombo()
+		if skill:getIsHurtType() then
+			self.team:addCombo()
+		end
 	 	if skill:getIsNormalType() then -- 普攻攻击成功的话
 			self:checkPassiveEvent(PASSIVE_EVENT.USE_NORMAL_SKILL, target)
 		elseif skill:getIsActiveType() then

lua/app/ui/ui_manager.lua

@@ -938,7 +938,6 @@ function UIManager:showNotchScreen()
 		self.notchScreen:setActive(true)
 	else
 		-- 创建一个刘海屏
-		local width, height = GFunc.getScreenSize()
 		local notchHeight = SafeAreaManager:getNotchScreenHeight()
 		Logger.log("模拟刘海屏高度:%s", notchHeight)
 		local notchScreen = CS.UnityEngine.GameObject("NotchScreen")

lua/app/userdata/battle/skill/battle_buff_entity.lua

@@ -1,5 +1,8 @@
+local BattleConst = require "app/module/battle/battle_const"
 local BattleBuffEntity = class("BattleBuffEntity", BaseData)
 
+local BUFF_TYPE_DIRECT_HURT = BattleConst.BUFF_TYPE.DIRECT_HURT
+
 function BattleBuffEntity:ctor()
 end
 
@@ -38,6 +41,10 @@ function BattleBuffEntity:getBuffType()
 	return self.buffType
 end
 
+function BattleBuffEntity:getIsHurtType()
+	return self.buffType == BUFF_TYPE_DIRECT_HURT
+end
+
 function BattleBuffEntity:getEffectNum()
 	return self.effectNum
 end

lua/app/userdata/battle/skill/battle_skill_entity.lua

@@ -33,10 +33,14 @@ end
 
 function BattleSkillEntity:initSkillEffect()
 	self.effectList = {}
+	self.isHurtType = false
 	if self.skillInfo.effect then
 		for k, v in ipairs(self.skillInfo.effect) do
 			local buffEntity = BattleBuffEntity:create()
 			buffEntity:init(v, self.owner)
+			if buffEntity:getIsHurtType() then
+				self.isHurtType = true
+			end
 			table.insert(self.effectList, buffEntity)
 		end
 	end
@@ -223,4 +227,8 @@ function BattleSkillEntity:getSlowDownBulletTimeParams()
 	return self.skillInfo.bullet_time
 end
 
+function BattleSkillEntity:getIsHurtType()
+	return self.isHurtType
+end
+
 return BattleSkillEntity