Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-26 04:39:51 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #117 from saturday06/fix-typo-epoch

Browse Source 
Fix typo and deprecate it
This commit is contained in:
ousttrue
2019-01-09 23:33:30 +09:00
committed by GitHub
parent d0aecfc630 b3446279f2
commit cd27645176
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/VRM/UniJSON/Scripts/Extensions/DateTimeOffsetExtensions.cs
View File

@@ -6,15 +6,17 @@ namespace UniJSON
public static class DateTimeOffsetExtensions
{
public const long TicksPerSecond = 10000000;
public readonly static DateTimeOffset EpocTime = new DateTimeOffset(1970, 1, 1, 0, 0, 0, 0, TimeSpan.Zero);
public readonly static DateTimeOffset EpochTime = new DateTimeOffset(1970, 1, 1, 0, 0, 0, 0, TimeSpan.Zero);
[Obsolete("Use EpochTime")]
public readonly static DateTimeOffset EpocTime = EpochTime;
#if !NET_4_6 && !NET_STANDARD_2_0
public static long ToUnixTimeSeconds(this DateTimeOffset now)
{
if (now < EpocTime)
if (now < EpochTime)
{
throw new ArgumentOutOfRangeException();
}
return (now - EpocTime).Ticks / TicksPerSecond;
return (now - EpochTime).Ticks / TicksPerSecond;
}
#endif
}

2
Assets/VRM/UniJSON/Scripts/MsgPack/MsgPackValue.cs
View File

@@ -631,7 +631,7 @@ namespace UniJSON
if (GetExtType() == -1)
{
var unixtime = EndianConverter.NetworkByteDWordToUnsignedNativeByteOrder(GetBody());
var dt = new DateTimeOffset(unixtime * DateTimeOffsetExtensions.TicksPerSecond + DateTimeOffsetExtensions.EpocTime.Ticks, TimeSpan.Zero);
var dt = new DateTimeOffset(unixtime * DateTimeOffsetExtensions.TicksPerSecond + DateTimeOffsetExtensions.EpochTime.Ticks, TimeSpan.Zero);
return GenericCast<DateTimeOffset, T>.Cast(dt);
}
break;