diff --git a/src/App.js b/src/App.js index 45b2dd2..43cc764 100755 --- a/src/App.js +++ b/src/App.js @@ -540,11 +540,11 @@ function TimerDisplay(p){ const {timer,eorzeanTime} = p var eorzeanSeconds=Number(eorzeanTime.split(":")[0])*3600+Number(eorzeanTime.split(":")[1])*60 return <> - + {timer.name} {eorzeanSeconds>timer.actual_seconds&&eorzeanSecondstimer.actual_seconds)?timer.actual_seconds+86400-eorzeanSeconds:timer.actual_seconds-eorzeanSeconds)} - - {timer.timer_start} - {timer.timer_end} + + {timer.timer_start} - {timer.timer_end} @@ -698,8 +698,8 @@ function App() { if (nav==="main"){ var date=new Date() var earthH=date.getHours(),earthM=date.getMinutes(),earthS=date.getSeconds() - var earthTime=earthH*3600+earthM*60+earthS - var eorzeanTime=earthTime*20.571428571428571428571428571429 + var earthTime=Number(earthH)*3600+Number(earthM)*60+Number(earthS) + var eorzeanTime=earthTime*20.571428571428571428571428571429+49380 var eorzeanH=Math.floor(eorzeanTime/3600)%24 var eorzeanM=Math.floor(eorzeanTime/60)%60 var eorzeanS=Math.floor(eorzeanTime)%60