Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
commit
8735fcf83e
|
|
@ -69,9 +69,6 @@ function XiaoYaoLuckyBossPopup:OnShow()
|
||||||
LogBlue("得到得怪物不存在")
|
LogBlue("得到得怪物不存在")
|
||||||
this:ClosePanel()
|
this:ClosePanel()
|
||||||
end
|
end
|
||||||
for i = 1, #monsterGroup do
|
|
||||||
LogYellow("monster.monsterInDex:"..monsterGroup[i].monsterIndex)
|
|
||||||
end
|
|
||||||
fightBossIndex = XiaoYaoManager.fightBossIndex
|
fightBossIndex = XiaoYaoManager.fightBossIndex
|
||||||
LogYellow("fightBossIndex:"..fightBossIndex)
|
LogYellow("fightBossIndex:"..fightBossIndex)
|
||||||
if fightBossIndex == 0 then
|
if fightBossIndex == 0 then
|
||||||
|
|
@ -209,7 +206,8 @@ function XiaoYaoLuckyBossPopup:SetSingleReward(id)
|
||||||
if not rewardPrefabs[i] then
|
if not rewardPrefabs[i] then
|
||||||
rewardPrefabs[i] = SubUIManager.Open(SubUIConfig.ItemView,this.rewardList.transform)
|
rewardPrefabs[i] = SubUIManager.Open(SubUIConfig.ItemView,this.rewardList.transform)
|
||||||
end
|
end
|
||||||
rewardPrefabs[i].gameObject:SetActive(true)
|
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)
|
rewardPrefabs[i]:OnOpen(false, {data[i][1],data[i][2]},0.8,false,false,false)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,7 @@ function this.OpenXiaoYaoMap(mapId,func)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
this.fightBossIndex = 0
|
this.fightBossIndex = 0
|
||||||
|
this.GetHeroIndex = 0
|
||||||
this.InitLuckyTurnTables(msg)
|
this.InitLuckyTurnTables(msg)
|
||||||
this.InitMonsterData(msg.monsterInfo,1)
|
this.InitMonsterData(msg.monsterInfo,1)
|
||||||
this.InitHeroData(msg.goodsInfo,1)
|
this.InitHeroData(msg.goodsInfo,1)
|
||||||
|
|
@ -318,6 +319,7 @@ function this.ExecuteFightBattle(id,func)
|
||||||
else
|
else
|
||||||
this.UpdateMonsterData(msg.monster)
|
this.UpdateMonsterData(msg.monster)
|
||||||
this.OpenXiaoYaoMap(XiaoYaoManager.curMapId,function()
|
this.OpenXiaoYaoMap(XiaoYaoManager.curMapId,function()
|
||||||
|
this.fightBossIndex = id
|
||||||
UIManager.OpenPanel(UIName.XiaoYaoLuckyBossPopup)
|
UIManager.OpenPanel(UIName.XiaoYaoLuckyBossPopup)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue