Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
ef47e3dfb7
|
@ -8220,8 +8220,15 @@ local passivityList = {
|
|||
local onTurnEnd=function(role)
|
||||
role.Event:RemoveEvent(BattleEventName.RoleKill,onRoleKill,nil,nil,role)
|
||||
if isNoDie then
|
||||
local damage=floor(BattleUtil.FP_Mul(role.curMainTarget:GetRoleData(BattlePropList[p1]),v1))
|
||||
BattleUtil.FinalDamage(nil,role,role.curMainTarget,damage)
|
||||
if role.curMainTarget then
|
||||
local isBoss=BattleUtil.CheckIsBoss(role.curMainTarget)
|
||||
if isBoss then
|
||||
return
|
||||
end
|
||||
local damage=floor(BattleUtil.FP_Mul(role.curMainTarget:GetRoleData(BattlePropList[p1]),v1))
|
||||
BattleUtil.FinalDamage(nil,role,role.curMainTarget,damage)
|
||||
end
|
||||
|
||||
end
|
||||
isNoDie=true
|
||||
end
|
||||
|
|
|
@ -422,14 +422,19 @@ function this.SetHeadShow()
|
|||
local enemy = MonsterManager.GetMonster(1, 100) -- 敌方主角
|
||||
if enemy then
|
||||
this.enemy:SetActive(true)
|
||||
this.enemy:GetComponent("Image").sprite = this.spLoader:LoadSprite(sexIcon[enemy.sex])
|
||||
if enemy.sex then
|
||||
this.enemy:GetComponent("Image").sprite = this.spLoader:LoadSprite(sexIcon[enemy.sex])
|
||||
end
|
||||
else
|
||||
this.enemy:SetActive(false)
|
||||
end
|
||||
local player = MonsterManager.GetMonster(0, 100) -- 我方主角
|
||||
if player then
|
||||
this.player:SetActive(true)
|
||||
this.player:GetComponent("Image").sprite = this.spLoader:LoadSprite(sexIcon[player.sex])
|
||||
if player.sex then
|
||||
this.player:GetComponent("Image").sprite = this.spLoader:LoadSprite(sexIcon[player.sex])
|
||||
end
|
||||
|
||||
else
|
||||
this.player:SetActive(false)
|
||||
end
|
||||
|
|
|
@ -848,15 +848,15 @@ end
|
|||
function this.CheckRedPointPremium()
|
||||
local day = TimeToD(GetTimeStamp())
|
||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.chaozhifanli) then
|
||||
-- if PlayerPrefs.GetInt("chaozhifanli"..PlayerManager.uid) ~= day then
|
||||
-- return true
|
||||
-- else
|
||||
if PlayerPrefs.GetInt("chaozhifanli"..PlayerManager.uid) ~= day then
|
||||
return true
|
||||
else
|
||||
if this.CheckRedPointPremiumSingle(ActivityTypeDef.chaozhifanli) then
|
||||
return true
|
||||
else
|
||||
return this.CheckRedPointPremiumSingle(ActivityTypeDef.chaozhifanli30)
|
||||
end
|
||||
--end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue