diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 84c6ac00..4bd36c6c 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -370,7 +370,7 @@ function BIReport:postPurchase(price, content, originOrderId, orderId) CS.BF.BFMain.Instance.SDKMgr.BFLoginSDKMgr.FBSdk:LogPurchase(price, "USD", json.encode(fbArgs)) -- 上报付费到adjust - CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:PostAdjustRevenueTrackEvent("qm803c", price, "USD") + CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:PostAdjustRevenueTrackEvent("naoyh8", price, "USD") end -- 上报等级提升事件,单独处理,只上报到AF和FB,不上报数数 diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index e732e494..d4dc8d75 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1168,9 +1168,9 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus) end local hp = self.unitEntity:getHp() local x, y = self.baseObject:fastGetLocalPosition() + local damage = num if num < 0 then -- 伤害 local delayTime = 0 - local damage = num if shieldHpDiff < 0 then damage = damage - shieldHpDiff delayTime = BattleConst.EFFECT_NUMBER_DELAY @@ -1200,13 +1200,13 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus) local hpPercent = self.unitEntity:getHpPercent() self.battleController:refreshHp(self.side, hp, hpPercent) if atker:getIsCentralizedAttack() then - if self.currState == UNIT_STATE.IDLE then + if damage < 0 and self.currState == UNIT_STATE.IDLE then self:playHurt() end else if self.unitEntity:getIsDead() then self:changeState(UNIT_STATE.DEAD) - elseif self.currState == UNIT_STATE.IDLE then + elseif damage < 0 and self.currState == UNIT_STATE.IDLE then self:playHurt() end end diff --git a/lua/app/module/battle/team/battle_team.lua b/lua/app/module/battle/team/battle_team.lua index d753823b..3e51ee44 100644 --- a/lua/app/module/battle/team/battle_team.lua +++ b/lua/app/module/battle/team/battle_team.lua @@ -282,6 +282,16 @@ function BattleTeam:updateBuffState(buff, num) end end end + local fxDisappear = buff:getFxDisappear() + if fxDisappear then + local fxCfg = BattleHelper:getFxConfig() + for k, v in ipairs(fxDisappear) do + local fxInfo = fxCfg[v] + if fxInfo then + self.mainUnit:getEffectAndPlay(fxInfo, false) + end + end + end elseif buffNum == 1 then -- 新添加buff local fxList = buff:getFxContinued() if fxList then diff --git a/lua/app/module/login/login_manager.lua b/lua/app/module/login/login_manager.lua index 20bc371b..36eb9db3 100644 --- a/lua/app/module/login/login_manager.lua +++ b/lua/app/module/login/login_manager.lua @@ -18,7 +18,8 @@ end ---- 登录界面资源加载完毕后调用 function LoginManager:loginGame() - BIReport:postAdjustSimpleTrackEvent("modt3z", {}) + -- adjust 打开应用事件识别码 + BIReport:postAdjustSimpleTrackEvent("xbszrl", {}) CS.BF.BFMain.IsGotServerTime = true ServerDataManager:dataOperate(GConst.ServerDataConst.DATA_OP_BEHAVIOR.SYNC_DATA, GConst.EMPTY_TABLE, function(msgData) diff --git a/lua/app/userdata/battle/skill/battle_buff_entity.lua b/lua/app/userdata/battle/skill/battle_buff_entity.lua index fe7eeee3..8537856e 100644 --- a/lua/app/userdata/battle/skill/battle_buff_entity.lua +++ b/lua/app/userdata/battle/skill/battle_buff_entity.lua @@ -90,4 +90,8 @@ function BattleBuffEntity:getFxTake() return self.buffInfo.fx_take end +function BattleBuffEntity:getFxDisappear() + return self.buffInfo.fx_disappear +end + return BattleBuffEntity \ No newline at end of file