【社稷大典】时间弹跳修复,物品边框颜色修改
parent
0a5816a4ec
commit
709dc1a5bd
|
@ -1541,7 +1541,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: 94581a83778227e409056f7b0f7a0228, type: 3}
|
m_Sprite: {fileID: 21300000, guid: acc1c59229c7dc64dbe6e1a1df482ea6, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -18662,7 +18662,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: 3a31523c76b6cf94bb1258f3bdb99199, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 3f37d7ac984537748bf692eddc6b65c8, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -48880,7 +48880,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: acc1c59229c7dc64dbe6e1a1df482ea6, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 94581a83778227e409056f7b0f7a0228, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
|
|
@ -95,7 +95,9 @@ function SheJiDaDian:BindEvent()
|
||||||
Util.AddClick(this.btnGet,function()
|
Util.AddClick(this.btnGet,function()
|
||||||
ActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.Celebration)--活动数据
|
ActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.Celebration)--活动数据
|
||||||
NetManager.GetSheJiRewardRequest(activityId,function (_drop)
|
NetManager.GetSheJiRewardRequest(activityId,function (_drop)
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup, _drop.drop,1)
|
UIManager.OpenPanel(UIName.RewardItemPopup, _drop.drop,1,function()
|
||||||
|
this:Refresh()
|
||||||
|
end)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
@ -135,11 +137,15 @@ function SheJiDaDian:BindEvent()
|
||||||
Util.AddClick(this.btnTeamRank,function()
|
Util.AddClick(this.btnTeamRank,function()
|
||||||
curRankType = RANK_TYPE.CELEBRATION_GUILD
|
curRankType = RANK_TYPE.CELEBRATION_GUILD
|
||||||
this:LeftUpShow(curRankType)
|
this:LeftUpShow(curRankType)
|
||||||
|
this.btnTeamRank:GetComponent("Image").sprite = Util.LoadSprite("r_guanka_sheji_zhenyinganniudi_01")
|
||||||
|
this.btnPersonRank:GetComponent("Image").sprite = Util.LoadSprite("r_guanka_sheji_zhenyinganniudi_02")
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddClick(this.btnPersonRank,function()
|
Util.AddClick(this.btnPersonRank,function()
|
||||||
curRankType = RANK_TYPE.GOLD_EXPER
|
curRankType = RANK_TYPE.GOLD_EXPER
|
||||||
this:LeftUpShow(curRankType)
|
this:LeftUpShow(curRankType)
|
||||||
|
this.btnTeamRank:GetComponent("Image").sprite = Util.LoadSprite("r_guanka_sheji_zhenyinganniudi_02")
|
||||||
|
this.btnPersonRank:GetComponent("Image").sprite = Util.LoadSprite("r_guanka_sheji_zhenyinganniudi_01")
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddOnceClick(this.btnAdd,function ()
|
Util.AddOnceClick(this.btnAdd,function ()
|
||||||
|
@ -209,11 +215,18 @@ end
|
||||||
|
|
||||||
--点击或长按处理升级处理
|
--点击或长按处理升级处理
|
||||||
function this.OnPointerDown(Pointgo,data,i)--按下
|
function this.OnPointerDown(Pointgo,data,i)--按下
|
||||||
|
if PlayerManager.level < 50 then
|
||||||
|
PopupTipPanel.ShowTip("本活动需玩家等级达到五十级!")
|
||||||
|
return
|
||||||
|
end
|
||||||
curItemIndex = i
|
curItemIndex = i
|
||||||
numCount = 1
|
numCount = 1
|
||||||
isPressed = true
|
isPressed = true
|
||||||
end
|
end
|
||||||
function this.OnPointerUp(Pointgo,data)--抬起
|
function this.OnPointerUp(Pointgo,data)--抬起
|
||||||
|
if PlayerManager.level < 50 then
|
||||||
|
return
|
||||||
|
end
|
||||||
if isShortPress then
|
if isShortPress then
|
||||||
numCount = 1
|
numCount = 1
|
||||||
this:RefreshBottom(numCount)
|
this:RefreshBottom(numCount)
|
||||||
|
@ -241,7 +254,7 @@ function this.OnUpdate()
|
||||||
end
|
end
|
||||||
--发送捐献请求
|
--发送捐献请求
|
||||||
function this:RequestDonate(numCount)
|
function this:RequestDonate(numCount)
|
||||||
if numCount == 0 then
|
if numCount <= 0 then
|
||||||
PopupTipPanel.ShowTip(Language[11197])
|
PopupTipPanel.ShowTip(Language[11197])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
@ -274,6 +287,8 @@ function this:LeftUpShow(_curRankType)
|
||||||
this.secendName.text = allRankData[2] and allRankData[2].userName or Language[11073]
|
this.secendName.text = allRankData[2] and allRankData[2].userName or Language[11073]
|
||||||
this.thirdName.text = allRankData[3] and allRankData[3].userName or Language[11073]
|
this.thirdName.text = allRankData[3] and allRankData[3].userName or Language[11073]
|
||||||
local t = myRankData.param1 > 0 and myRankData.param1 or 0
|
local t = myRankData.param1 > 0 and myRankData.param1 or 0
|
||||||
|
-- LogPink("t:"..t)
|
||||||
|
-- LogPink("ActInfo.mission[1].progress :"..ActInfo.mission[1].progress )
|
||||||
this.score.text = curRankType == RANK_TYPE.GOLD_EXPER and t or ActInfo.mission[1].progress
|
this.score.text = curRankType == RANK_TYPE.GOLD_EXPER and t or ActInfo.mission[1].progress
|
||||||
myRank = myRankData.rank
|
myRank = myRankData.rank
|
||||||
end)
|
end)
|
||||||
|
@ -326,19 +341,43 @@ function this:TimeCountDown()
|
||||||
local leftTimeTwo = timeTwo > 0 and timeTwo or timeTwo + 86400--距离下一个二十点的时间
|
local leftTimeTwo = timeTwo > 0 and timeTwo or timeTwo + 86400--距离下一个二十点的时间
|
||||||
local giftTime = leftTimeOne < leftTimeTwo and leftTimeOne or leftTimeTwo--取小的
|
local giftTime = leftTimeOne < leftTimeTwo and leftTimeOne or leftTimeTwo--取小的
|
||||||
|
|
||||||
if GetTimeStamp() > ActInfo.value and GetTimeStamp() < (ActInfo.value + setting.LastTime * 60) then
|
local t1 = GetTimeStamp() - Today_N_OClockTimeStamp(setting.TimePointList[1])
|
||||||
--领过--进入倒计时
|
local t2 = GetTimeStamp() - Today_N_OClockTimeStamp(setting.TimePointList[2])
|
||||||
canGet = false
|
|
||||||
elseif GetTimeStamp() > ActInfo.value and GetTimeStamp() > (ActInfo.value + setting.LastTime * 60) then
|
LogGreen("dao 12 dian:"..t1)
|
||||||
--没到时间--进入倒计时
|
LogGreen("dao 20 dian:"..t2)
|
||||||
canGet = false
|
LogGreen("ActInfo.value:"..ActInfo.value)
|
||||||
|
LogGreen("GetTimeStamp():"..GetTimeStamp())
|
||||||
|
LogGreen("GetTimeStamp() - ActInfo.value"..(GetTimeStamp() - ActInfo.value))
|
||||||
|
LogGreen("giftTime:"..giftTime)
|
||||||
|
|
||||||
|
if ActInfo.value == 0 then
|
||||||
|
if (t1 > 0 and t1 < 1800) or (t2 > 0 and t2 < 1800) then
|
||||||
|
canGet = true
|
||||||
|
else
|
||||||
|
canGet = false
|
||||||
|
end
|
||||||
else
|
else
|
||||||
--可领取
|
if (t1 > 0 and t1 < 1800) or (t2 > 0 and t2 < 1800) then
|
||||||
canGet = true
|
if (GetTimeStamp() - ActInfo.value) < 1800 then
|
||||||
|
canGet = false
|
||||||
|
else
|
||||||
|
canGet = true
|
||||||
|
end
|
||||||
|
else
|
||||||
|
canGet = false
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
-- LogGreen("canGet:"..tostring(canGet))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
this.centerTime.text = canGet == false and TimeToFelaxible(giftTime) or Language[12183]
|
this.centerTime.text = canGet == false and TimeToFelaxible(giftTime) or Language[12183]
|
||||||
|
|
||||||
|
if this.timer1 then
|
||||||
|
this.timer1:Stop()
|
||||||
|
this.timer1 = nil
|
||||||
|
end
|
||||||
this.timer1 = Timer.New(function()
|
this.timer1 = Timer.New(function()
|
||||||
this.leftTime.text = Language[10028]..TimeToFelaxible(actTime)
|
this.leftTime.text = Language[10028]..TimeToFelaxible(actTime)
|
||||||
this.centerTime.text = canGet == false and TimeToFelaxible(giftTime) or Language[12183]
|
this.centerTime.text = canGet == false and TimeToFelaxible(giftTime) or Language[12183]
|
||||||
|
|
Loading…
Reference in New Issue