puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xiekaidong 2023-04-25 17:50:44 +08:00
commit 2f2e9b23eb
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/common/bi_report.lua
View File

@ -370,7 +370,7 @@ function BIReport:postPurchase(price, content, originOrderId, orderId)
CS.BF.BFMain.Instance.SDKMgr.BFLoginSDKMgr.FBSdk:LogPurchase(price, "USD", json.encode(fbArgs)) CS.BF.BFMain.Instance.SDKMgr.BFLoginSDKMgr.FBSdk:LogPurchase(price, "USD", json.encode(fbArgs))
-- 上报付费到adjust -- 上报付费到adjust
CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:PostAdjustRevenueTrackEvent("qm803c", price, "USD") CS.BF.BFMain.Instance.SDKMgr.BFThirdReportSDKMgr:PostAdjustRevenueTrackEvent("naoyh8", price, "USD")
end end
-- 上报等级提升事件,单独处理,只上报到AF和FB,不上报数数 -- 上报等级提升事件,单独处理,只上报到AF和FB,不上报数数

6
lua/app/module/battle/component/battle_unit_comp.lua
View File

@ -1168,9 +1168,9 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus)
end end
local hp = self.unitEntity:getHp() local hp = self.unitEntity:getHp()
local x, y = self.baseObject:fastGetLocalPosition() local x, y = self.baseObject:fastGetLocalPosition()
local damage = num
if num < 0 then -- 伤害 if num < 0 then -- 伤害
local delayTime = 0 local delayTime = 0
local damage = num
if shieldHpDiff < 0 then if shieldHpDiff < 0 then
damage = damage - shieldHpDiff damage = damage - shieldHpDiff
delayTime = BattleConst.EFFECT_NUMBER_DELAY delayTime = BattleConst.EFFECT_NUMBER_DELAY
@ -1200,13 +1200,13 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus)
local hpPercent = self.unitEntity:getHpPercent() local hpPercent = self.unitEntity:getHpPercent()
self.battleController:refreshHp(self.side, hp, hpPercent) self.battleController:refreshHp(self.side, hp, hpPercent)
if atker:getIsCentralizedAttack() then if atker:getIsCentralizedAttack() then
if self.currState == UNIT_STATE.IDLE then if damage < 0 and self.currState == UNIT_STATE.IDLE then
self:playHurt() self:playHurt()
end end
else else
if self.unitEntity:getIsDead() then if self.unitEntity:getIsDead() then
self:changeState(UNIT_STATE.DEAD) self:changeState(UNIT_STATE.DEAD)
elseif self.currState == UNIT_STATE.IDLE then elseif damage < 0 and self.currState == UNIT_STATE.IDLE then
self:playHurt() self:playHurt()
end end
end end

10
lua/app/module/battle/team/battle_team.lua
View File

@ -282,6 +282,16 @@ function BattleTeam:updateBuffState(buff, num)
end end
end 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 elseif buffNum == 1 then -- 新添加buff
local fxList = buff:getFxContinued() local fxList = buff:getFxContinued()
if fxList then if fxList then

3
lua/app/module/login/login_manager.lua
View File

@ -18,7 +18,8 @@ end
---- 登录界面资源加载完毕后调用 ---- 登录界面资源加载完毕后调用
function LoginManager:loginGame() function LoginManager:loginGame()
BIReport:postAdjustSimpleTrackEvent("modt3z", {}) -- adjust 打开应用事件识别码
BIReport:postAdjustSimpleTrackEvent("xbszrl", {})
CS.BF.BFMain.IsGotServerTime = true CS.BF.BFMain.IsGotServerTime = true
ServerDataManager:dataOperate(GConst.ServerDataConst.DATA_OP_BEHAVIOR.SYNC_DATA, GConst.EMPTY_TABLE, function(msgData) ServerDataManager:dataOperate(GConst.ServerDataConst.DATA_OP_BEHAVIOR.SYNC_DATA, GConst.EMPTY_TABLE, function(msgData)

4
lua/app/userdata/battle/skill/battle_buff_entity.lua
View File

@ -90,4 +90,8 @@ function BattleBuffEntity:getFxTake()
return self.buffInfo.fx_take return self.buffInfo.fx_take
end end
function BattleBuffEntity:getFxDisappear()
return self.buffInfo.fx_disappear
end
return BattleBuffEntity return BattleBuffEntity