神魂特效显示修改,冲榜活动奖励修改
parent
aea73aecec
commit
223fb60204
File diff suppressed because it is too large
Load Diff
|
|
@ -410,6 +410,9 @@ function GuildMap_Pos2UV(pos)
|
|||
end
|
||||
|
||||
function GetStarOrGodSoulLv(index,data)
|
||||
if data.star>11 then
|
||||
return data.star,3
|
||||
end
|
||||
if data.godSoulLv and data.godSoulLv > 0 then
|
||||
return data.godSoulLv,3
|
||||
elseif data.star > 9 then
|
||||
|
|
|
|||
|
|
@ -245,11 +245,15 @@ function this.UpdateRewardInfo(go,data)
|
|||
if not this.itemList[go] then
|
||||
this.itemList[go] = {}
|
||||
end
|
||||
for i = 1, #this.itemList[go] do
|
||||
this.itemList[go][i].gameObject:SetActive(false)
|
||||
end
|
||||
for i = 1, #data.RankingReward do
|
||||
if not this.itemList[go][i] then
|
||||
this.itemList[go][i] = SubUIManager.Open(SubUIConfig.ItemView,reward.transform)
|
||||
end
|
||||
this.itemList[go][i]:OnOpen(false, data.RankingReward[i], 0.8,false,false,false,this.sortingOrder)
|
||||
this.itemList[go][i].gameObject:SetActive(true)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -141,7 +141,6 @@ function this.TabBtnOnClick(btn,config)
|
|||
--this.UpdateLayout(_level)
|
||||
local dataList={}
|
||||
local aa=config.Unlock[1]
|
||||
LogError("aa[1]==="..aa[1].." aa[2]==="..aa[2])
|
||||
local isOpen,tip=CheckGMIsOpen(aa[1],aa[2])
|
||||
if isOpen then
|
||||
this.hint.gameObject:SetActive(false)
|
||||
|
|
@ -170,7 +169,7 @@ function GMChangePanel:SingleTask(go,data)
|
|||
local btnTxt=Util.GetGameObject(go, "btn/Text"):GetComponent("Text")
|
||||
local recharge=rechargeCommodityConfig[data.PackID]
|
||||
name.text=recharge.Name
|
||||
LogError("type=="..recharge.Type.." id=="..recharge.Id)
|
||||
--LogError("type=="..recharge.Type.." id=="..recharge.Id)
|
||||
local leftBuyTime=OperatingManager.GetLeftBuyTime(recharge.Type,recharge.Id)
|
||||
if leftBuyTime==-1 then
|
||||
num.text=""
|
||||
|
|
|
|||
Loading…
Reference in New Issue