Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
63d8a08e27
|
@ -234,7 +234,7 @@ function FightPointPassMainPanel:BindEvent()
|
||||||
-- 日常任务
|
-- 日常任务
|
||||||
Util.AddClick(this.btnDailyMission, function ()
|
Util.AddClick(this.btnDailyMission, function ()
|
||||||
FightPointPassManager.isBeginFight = true
|
FightPointPassManager.isBeginFight = true
|
||||||
UIManager.OpenPanel(UIName.MissionDailyPanel,1)
|
UIManager.OpenPanel(UIName.MissionDailyPanel)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
-- 关卡排行
|
-- 关卡排行
|
||||||
|
|
|
@ -85,7 +85,7 @@ function this.RefreshGuildTranscriptInfo(msg)
|
||||||
isKillShowTip = false
|
isKillShowTip = false
|
||||||
if msg.isKill == 1 then
|
if msg.isKill == 1 then
|
||||||
isKillShowTip = true
|
isKillShowTip = true
|
||||||
if attackTypeShotTime == 1 then
|
if attackTypeShotTime == 1 and endBossId ~= oldBossId then
|
||||||
local monsterData = this.GetMonsterConfigDataById(oldBossId)
|
local monsterData = this.GetMonsterConfigDataById(oldBossId)
|
||||||
PopupTipPanel.ShowTip( string.format(Language[12346],monsterData.ReadingName) )
|
PopupTipPanel.ShowTip( string.format(Language[12346],monsterData.ReadingName) )
|
||||||
end
|
end
|
||||||
|
@ -106,7 +106,7 @@ function this.RefreshGuildTranscriptInfo(msg)
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
|
||||||
end
|
end
|
||||||
function this.IsKillShowTip()
|
function this.IsKillShowTip()
|
||||||
if isKillShowTip and attackTypeShotTime == 0 then
|
if isKillShowTip and attackTypeShotTime == 0 and endBossId ~= oldBossId then
|
||||||
local monsterData = this.GetMonsterConfigDataById(oldBossId)
|
local monsterData = this.GetMonsterConfigDataById(oldBossId)
|
||||||
PopupTipPanel.ShowTip( string.format(Language[12346],monsterData.ReadingName) )
|
PopupTipPanel.ShowTip( string.format(Language[12346],monsterData.ReadingName) )
|
||||||
end
|
end
|
||||||
|
|
|
@ -80,7 +80,7 @@ function MissionDailyPanel:OnOpen(popupType,...)
|
||||||
if RedPointManager.GetRedPointMissionDaily() then
|
if RedPointManager.GetRedPointMissionDaily() then
|
||||||
index = 1
|
index = 1
|
||||||
type = 0
|
type = 0
|
||||||
elseif ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
|
elseif ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SUNLONG) then
|
||||||
if QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot() then
|
if QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot() then
|
||||||
index = 2
|
index = 2
|
||||||
type = 1
|
type = 1
|
||||||
|
@ -96,7 +96,6 @@ function MissionDailyPanel:OnOpen(popupType,...)
|
||||||
for i=1,#contentPrefabs do
|
for i=1,#contentPrefabs do
|
||||||
contentPrefabs[i].gameObject:SetActive(false)
|
contentPrefabs[i].gameObject:SetActive(false)
|
||||||
end
|
end
|
||||||
LogGreen("index:"..index.." type:"..type)
|
|
||||||
if index ~=1 and type == 0 then
|
if index ~=1 and type == 0 then
|
||||||
index = 4
|
index = 4
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue