Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
a69e92bc75
|
|
@ -458,9 +458,9 @@ end
|
||||||
|
|
||||||
--矩形排列算法(以左上角为原点建立u,v坐标)
|
--矩形排列算法(以左上角为原点建立u,v坐标)
|
||||||
function this.DrawTilePos(u, v)
|
function this.DrawTilePos(u, v)
|
||||||
print(_offsetAngle)
|
-- print(_offsetAngle)
|
||||||
print(_offsetAngleValue)
|
-- print(_offsetAngleValue)
|
||||||
print(_tileSize.x, _tileSize.y)
|
-- print(_tileSize.x, _tileSize.y)
|
||||||
return Quaternion.Euler(0,0, _offsetAngle) * Vector3.New(u * _tileSize.x, v * -_tileSize.y, 0) * _offsetAngleValue
|
return Quaternion.Euler(0,0, _offsetAngle) * Vector3.New(u * _tileSize.x, v * -_tileSize.y, 0) * _offsetAngleValue
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -96,6 +96,14 @@ local TypeUpdateFunc = {
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
table.sort(curData.rewards,function (a,b)
|
||||||
|
if a.state == b.state then
|
||||||
|
return a.missionId < b.missionId
|
||||||
|
else
|
||||||
|
return a.state < b.state
|
||||||
|
end
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -72,11 +72,11 @@ end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
function UpperMonthCard:BindEvent()
|
function UpperMonthCard:BindEvent()
|
||||||
Util.AddClick(self.btnPreview, function()
|
Util.AddOnceClick(self.btnPreview, function()
|
||||||
UIManager.OpenPanel(UIName.MonthRewardPreviewPopup, self.baseType, self.chargerBaseType)
|
UIManager.OpenPanel(UIName.MonthRewardPreviewPopup, self.baseType, self.chargerBaseType)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddClick(self.btnBuy, function()
|
Util.AddOnceClick(self.btnBuy, function()
|
||||||
local isActive = VipManager.GetMonthCardOpenState()
|
local isActive = VipManager.GetMonthCardOpenState()
|
||||||
if not isActive then
|
if not isActive then
|
||||||
MsgPanel.ShowTwo(Language[11387], function()
|
MsgPanel.ShowTwo(Language[11387], function()
|
||||||
|
|
|
||||||
|
|
@ -121,6 +121,7 @@ function EveryDayGift:OnShow(_sortingOrder)
|
||||||
self.titleTip.gameObject:SetActive(true)
|
self.titleTip.gameObject:SetActive(true)
|
||||||
else
|
else
|
||||||
self.titleTip.gameObject:SetActive(false)
|
self.titleTip.gameObject:SetActive(false)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.actConfig.Id == 63 then
|
if self.actConfig.Id == 63 then
|
||||||
|
|
@ -163,6 +164,7 @@ function EveryDayGift:RefreshGiftData(isTop,isAni)
|
||||||
if self.shopData[i].DataType == DynamicActivityManager.selectIndex.dataType then
|
if self.shopData[i].DataType == DynamicActivityManager.selectIndex.dataType then
|
||||||
for j = 1 , #DynamicActivityManager.selectIndex.goodsId do
|
for j = 1 , #DynamicActivityManager.selectIndex.goodsId do
|
||||||
if (self.shopData[i].data.shopData.id or self.shopData[i].data.shopData.goodsId) == DynamicActivityManager.selectIndex.goodsId[j] then
|
if (self.shopData[i].data.shopData.id or self.shopData[i].data.shopData.goodsId) == DynamicActivityManager.selectIndex.goodsId[j] then
|
||||||
|
DynamicActivityManager.SetSelectIndex(0,{})
|
||||||
curindex = i
|
curindex = i
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
|
|
@ -172,10 +174,13 @@ function EveryDayGift:RefreshGiftData(isTop,isAni)
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if curindex ~= 0 then
|
||||||
--LogGreen("curindex:"..curindex)
|
--LogGreen("curindex:"..curindex)
|
||||||
self.scrollView:SetIndex(curindex)
|
self.scrollView:SetIndex(curindex)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
function EveryDayGift:isBought()
|
function EveryDayGift:isBought()
|
||||||
for i = 1, #self.shopData do
|
for i = 1, #self.shopData do
|
||||||
if self.shopData[i].data.boughtNum > 0 then
|
if self.shopData[i].data.boughtNum > 0 then
|
||||||
|
|
|
||||||
|
|
@ -322,9 +322,10 @@ function this:SetData(dataList, updateFunc, noTop, noAnim)
|
||||||
-- 判断是否回到顶部,否则保持不动
|
-- 判断是否回到顶部,否则保持不动
|
||||||
if noTop then
|
if noTop then
|
||||||
local oldPosY = self.dragGOTran.anchoredPosition.y
|
local oldPosY = self.dragGOTran.anchoredPosition.y
|
||||||
|
local oldPosX = self.dragGOTran.anchoredPosition.x
|
||||||
local showIndex = self:CalShowIndex()
|
local showIndex = self:CalShowIndex()
|
||||||
self:SetShow(showIndex)
|
self:SetShow(showIndex)
|
||||||
self.dragGOTran.anchoredPosition = Vector2.New(0, oldPosY)
|
self.dragGOTran.anchoredPosition = Vector2.New(oldPosX, oldPosY)
|
||||||
else
|
else
|
||||||
self:SetShow(1)
|
self:SetShow(1)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue