Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
42ed8a1617
|
@ -111,7 +111,7 @@ function DemonSlayerNewPanel:SetPlayer()
|
|||
}
|
||||
npcList[i] = PlayerLiveView:New(livePrefab.transform,2, curPlayerLiveViewData)
|
||||
LogGreen("curPlayerLiveViewData.userMount:"..tostring(curPlayerLiveViewData.userMount))
|
||||
if curPlayerLiveViewData.ride and curPlayerLiveViewData.ride > 0 and curPlayerLiveViewData.ride ~= PlayerRide.YUJIAN then
|
||||
if curPlayerLiveViewData.ride and curPlayerLiveViewData.ride > 0 then
|
||||
npcList[i]:OnOpen(GetPlayerRoleSingleConFig().Scale11,Vector3.New(0,-102.73,0),WALK_DIR.IDLE_LEFT)
|
||||
else
|
||||
npcList[i]:OnOpen(GetPlayerRoleSingleConFig().Scale11,Vector3.New(0,-102.73,0),WALK_DIR.IDLE_FRONT)
|
||||
|
@ -200,7 +200,11 @@ function DemonSlayerNewPanel:SetTime(ActInfo)
|
|||
--设置一进去的时间,不设置的话一进去会不对
|
||||
local time = ActInfo.endTime - GetTimeStamp() - extraTime
|
||||
local timeStr = "距活动结束:%s"
|
||||
this.timeText.text = string.format(timeStr,TimeToFelaxible(time))
|
||||
if time > 3600 then
|
||||
this.timeText.text = string.format(timeStr,TimeToDHM(time))
|
||||
else
|
||||
this.timeText.text = string.format(timeStr,TimeToMS(time))
|
||||
end
|
||||
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
|
|
|
@ -132,7 +132,7 @@ function DemonSlayerPanel:SetRank(ActInfo)
|
|||
}
|
||||
npcList[i] = PlayerLiveView:New(livePrefab.transform,2, curPlayerLiveViewData)
|
||||
|
||||
if curPlayerLiveViewData.ride and curPlayerLiveViewData.ride > 0 and curPlayerLiveViewData.ride ~= PlayerRide.YUJIAN then
|
||||
if curPlayerLiveViewData.ride and curPlayerLiveViewData.ride > 0 then
|
||||
npcList[i]:OnOpen(GetPlayerRoleSingleConFig().Scale11,Vector3.New(0,-102.73,0),WALK_DIR.IDLE_LEFT)
|
||||
else
|
||||
npcList[i]:OnOpen(GetPlayerRoleSingleConFig().Scale11,Vector3.New(0,-102.73,0),WALK_DIR.IDLE_FRONT)
|
||||
|
|
Loading…
Reference in New Issue