Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
ZhangBiao 2021-04-27 20:03:48 +08:00
commit a69e92bc75
5 changed files with 22 additions and 8 deletions

View File

@ -458,9 +458,9 @@ end
--矩形排列算法以左上角为原点建立uv坐标
function this.DrawTilePos(u, v)
print(_offsetAngle)
print(_offsetAngleValue)
print(_tileSize.x, _tileSize.y)
-- print(_offsetAngle)
-- print(_offsetAngleValue)
-- print(_tileSize.x, _tileSize.y)
return Quaternion.Euler(0,0, _offsetAngle) * Vector3.New(u * _tileSize.x, v * -_tileSize.y, 0) * _offsetAngleValue
end

View File

@ -96,6 +96,14 @@ local TypeUpdateFunc = {
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
}

View File

@ -72,11 +72,11 @@ end
--绑定事件(用于子类重写)
function UpperMonthCard:BindEvent()
Util.AddClick(self.btnPreview, function()
Util.AddOnceClick(self.btnPreview, function()
UIManager.OpenPanel(UIName.MonthRewardPreviewPopup, self.baseType, self.chargerBaseType)
end)
Util.AddClick(self.btnBuy, function()
Util.AddOnceClick(self.btnBuy, function()
local isActive = VipManager.GetMonthCardOpenState()
if not isActive then
MsgPanel.ShowTwo(Language[11387], function()

View File

@ -121,6 +121,7 @@ function EveryDayGift:OnShow(_sortingOrder)
self.titleTip.gameObject:SetActive(true)
else
self.titleTip.gameObject:SetActive(false)
end
if self.actConfig.Id == 63 then
@ -163,6 +164,7 @@ function EveryDayGift:RefreshGiftData(isTop,isAni)
if self.shopData[i].DataType == DynamicActivityManager.selectIndex.dataType then
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
DynamicActivityManager.SetSelectIndex(0,{})
curindex = i
break
end
@ -172,8 +174,11 @@ function EveryDayGift:RefreshGiftData(isTop,isAni)
break
end
end
--LogGreen("curindex:"..curindex)
self.scrollView:SetIndex(curindex)
if curindex ~= 0 then
--LogGreen("curindex:"..curindex)
self.scrollView:SetIndex(curindex)
end
end
function EveryDayGift:isBought()

View File

@ -322,9 +322,10 @@ function this:SetData(dataList, updateFunc, noTop, noAnim)
-- 判断是否回到顶部,否则保持不动
if noTop then
local oldPosY = self.dragGOTran.anchoredPosition.y
local oldPosX = self.dragGOTran.anchoredPosition.x
local showIndex = self:CalShowIndex()
self:SetShow(showIndex)
self.dragGOTran.anchoredPosition = Vector2.New(0, oldPosY)
self.dragGOTran.anchoredPosition = Vector2.New(oldPosX, oldPosY)
else
self:SetShow(1)
end