Skip to content

Commit

Permalink
Merge pull request #35 from Azukimochi/develop
Browse files Browse the repository at this point in the history
Update to 2.0.2 from Develop
  • Loading branch information
Azukimochi authored Jan 14, 2024
2 parents b18763b + fc4290c commit 047835a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion Scripts/Util.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ public class Util : UdonSharpBehaviour
{
public static DateTime getJST()
{
TimeZoneInfo jstZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("Tokyo Standard Time");
#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN
var jstZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("Tokyo Standard Time");
#else
var jstZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("Asia/Tokyo");
#endif
return TimeZoneInfo.ConvertTimeFromUtc(DateTime.UtcNow, jstZoneInfo);
}
}
Expand Down
2 changes: 1 addition & 1 deletion TaAGatheringInfoSys.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1789,7 +1789,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "Licence:\n [TaAGatheringListSys]\n(https://github.com/Azukimochi/TaAGatheringListSystem)\n\r\nCopyright
m_Text: "License:\n [TaAGatheringListSys]\n(https://github.com/Azukimochi/TaAGatheringListSystem)\n\r\nCopyright
(c) 2023 Azukimochi\r\n\r\nPermission is hereby granted, free of charge, to any
person obtaining a copy\r\nof this software and associated documentation files
(the \"Software\"), to deal\r\nin the Software without restriction, including
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "io.github.azukimochi.taa-gathering-list-system",
"version": "2.0.1",
"version": "2.0.2",
"displayName": "TaAGatheringListSystem",
"description": "TaAGatheringListSystem provides gathering information to VRChat users",
"author": {
Expand Down

0 comments on commit 047835a

Please sign in to comment.