Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
2da00831ed
|
@ -334,7 +334,8 @@ function this:BindEvent()
|
||||||
|
|
||||||
--六星前往
|
--六星前往
|
||||||
Util.AddClick(this.btnSixStarGo,function()
|
Util.AddClick(this.btnSixStarGo,function()
|
||||||
PlayerManager.isSixStarJump=true
|
--PlayerManager.isSixStarJump=true
|
||||||
|
DynamicActivityManager.SetSelectIndex(DataType.Shop,{1107})
|
||||||
JumpManager.GoJump(36011)
|
JumpManager.GoJump(36011)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
|
@ -174,14 +174,12 @@ function EveryDayGift:RefreshGiftData(isTop,isAni)
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if PlayerManager.isSixStarJump and curindex==0 then
|
-- if PlayerManager.isSixStarJump and curindex==0 then
|
||||||
curindex=7
|
-- curindex = 7
|
||||||
end
|
-- end
|
||||||
if curindex ~= 0 then
|
if curindex ~= 0 then
|
||||||
--LogGreen("curindex:"..curindex)
|
|
||||||
self.scrollView:SetIndex(curindex)
|
self.scrollView:SetIndex(curindex)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function EveryDayGift:isBought()
|
function EveryDayGift:isBought()
|
||||||
|
|
Loading…
Reference in New Issue