Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys

yuanshuai 2020-10-17 20:05:28 +08:00
commit 8735fcf83e
2 changed files with 4 additions and 4 deletions

View File

@ -69,9 +69,6 @@ function XiaoYaoLuckyBossPopup:OnShow()
LogBlue("得到得怪物不存在")
this:ClosePanel()
end
for i = 1, #monsterGroup do
LogYellow("monster.monsterInDex:"..monsterGroup[i].monsterIndex)
end
fightBossIndex = XiaoYaoManager.fightBossIndex
LogYellow("fightBossIndex:"..fightBossIndex)
if fightBossIndex == 0 then
@ -210,6 +207,7 @@ function XiaoYaoLuckyBossPopup:SetSingleReward(id)
rewardPrefabs[i] = SubUIManager.Open(SubUIConfig.ItemView,this.rewardList.transform)
end
rewardPrefabs[i].gameObject:SetActive(true)
LogRed("id:"..data[i][1].." data[i][2]:"..data[i][2])
rewardPrefabs[i]:OnOpen(false, {data[i][1],data[i][2]},0.8,false,false,false)
end
end

View File

@ -38,6 +38,7 @@ function this.OpenXiaoYaoMap(mapId,func)
end)
end
this.fightBossIndex = 0
this.GetHeroIndex = 0
this.InitLuckyTurnTables(msg)
this.InitMonsterData(msg.monsterInfo,1)
this.InitHeroData(msg.goodsInfo,1)
@ -318,6 +319,7 @@ function this.ExecuteFightBattle(id,func)
else
this.UpdateMonsterData(msg.monster)
this.OpenXiaoYaoMap(XiaoYaoManager.curMapId,function()
this.fightBossIndex = id
UIManager.OpenPanel(UIName.XiaoYaoLuckyBossPopup)
end)
end