diff --git a/Assets/Plugins/Discord.meta b/Assets/Plugins/Discord.meta deleted file mode 100644 index dd04fd8fa..000000000 --- a/Assets/Plugins/Discord.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5c02948e56fc801488f8e266ae84de7e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins.meta b/Assets/Plugins/Discord/Plugins.meta deleted file mode 100644 index 244b317c5..000000000 --- a/Assets/Plugins/Discord/Plugins.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f9c0f41c6ce6e8d4e9efd06732127f2b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK.meta b/Assets/Plugins/Discord/Plugins/DiscordGameSDK.meta deleted file mode 100644 index f6651cc21..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8a63350dadfa3364ca113259df8a333a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/ActivityManager.cs b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/ActivityManager.cs deleted file mode 100644 index 048e3b4b4..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/ActivityManager.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace Discord -{ - public partial class ActivityManager - { - public void RegisterCommand() - { - RegisterCommand(null); - } - } -} diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/ActivityManager.cs.meta b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/ActivityManager.cs.meta deleted file mode 100644 index 52247252c..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/ActivityManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6247f141a06f4c64bace3428adf1b1c3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/Constants.cs b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/Constants.cs deleted file mode 100644 index 8e77e1ba1..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/Constants.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -namespace Discord -{ - static class Constants - { - public const string DllName = "discord_game_sdk"; - } -} diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/Constants.cs.meta b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/Constants.cs.meta deleted file mode 100644 index 1b3042d4f..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/Constants.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a8beacc6f1e76b94da362fffb1e25e2e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/Core.cs b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/Core.cs deleted file mode 100644 index aa496196b..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/Core.cs +++ /dev/null @@ -1,4421 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using System.Text; - -namespace Discord -{ - public enum Result - { - Ok = 0, - ServiceUnavailable = 1, - InvalidVersion = 2, - LockFailed = 3, - InternalError = 4, - InvalidPayload = 5, - InvalidCommand = 6, - InvalidPermissions = 7, - NotFetched = 8, - NotFound = 9, - Conflict = 10, - InvalidSecret = 11, - InvalidJoinSecret = 12, - NoEligibleActivity = 13, - InvalidInvite = 14, - NotAuthenticated = 15, - InvalidAccessToken = 16, - ApplicationMismatch = 17, - InvalidDataUrl = 18, - InvalidBase64 = 19, - NotFiltered = 20, - LobbyFull = 21, - InvalidLobbySecret = 22, - InvalidFilename = 23, - InvalidFileSize = 24, - InvalidEntitlement = 25, - NotInstalled = 26, - NotRunning = 27, - InsufficientBuffer = 28, - PurchaseCanceled = 29, - InvalidGuild = 30, - InvalidEvent = 31, - InvalidChannel = 32, - InvalidOrigin = 33, - RateLimited = 34, - OAuth2Error = 35, - SelectChannelTimeout = 36, - GetGuildTimeout = 37, - SelectVoiceForceRequired = 38, - CaptureShortcutAlreadyListening = 39, - UnauthorizedForAchievement = 40, - InvalidGiftCode = 41, - PurchaseError = 42, - TransactionAborted = 43, - DrawingInitFailed = 44, - } - - public enum CreateFlags - { - Default = 0, - NoRequireDiscord = 1, - } - - public enum LogLevel - { - Error = 1, - Warn, - Info, - Debug, - } - - public enum UserFlag - { - Partner = 2, - HypeSquadEvents = 4, - HypeSquadHouse1 = 64, - HypeSquadHouse2 = 128, - HypeSquadHouse3 = 256, - } - - public enum PremiumType - { - None = 0, - Tier1 = 1, - Tier2 = 2, - } - - public enum ImageType - { - User, - } - - public enum ActivityPartyPrivacy - { - Private = 0, - Public = 1, - } - - public enum ActivityType - { - Playing, - Streaming, - Listening, - Watching, - } - - public enum ActivityActionType - { - Join = 1, - Spectate, - } - - public enum ActivitySupportedPlatformFlags - { - Desktop = 1, - Android = 2, - iOS = 4, - } - - public enum ActivityJoinRequestReply - { - No, - Yes, - Ignore, - } - - public enum Status - { - Offline = 0, - Online = 1, - Idle = 2, - DoNotDisturb = 3, - } - - public enum RelationshipType - { - None, - Friend, - Blocked, - PendingIncoming, - PendingOutgoing, - Implicit, - } - - public enum LobbyType - { - Private = 1, - Public, - } - - public enum LobbySearchComparison - { - LessThanOrEqual = -2, - LessThan, - Equal, - GreaterThan, - GreaterThanOrEqual, - NotEqual, - } - - public enum LobbySearchCast - { - String = 1, - Number, - } - - public enum LobbySearchDistance - { - Local, - Default, - Extended, - Global, - } - - public enum KeyVariant - { - Normal, - Right, - Left, - } - - public enum MouseButton - { - Left, - Middle, - Right, - } - - public enum EntitlementType - { - Purchase = 1, - PremiumSubscription, - DeveloperGift, - TestModePurchase, - FreePurchase, - UserGift, - PremiumPurchase, - } - - public enum SkuType - { - Application = 1, - DLC, - Consumable, - Bundle, - } - - public enum InputModeType - { - VoiceActivity = 0, - PushToTalk, - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct User - { - public Int64 Id; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)] - public string Username; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8)] - public string Discriminator; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string Avatar; - - public bool Bot; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct OAuth2Token - { - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string AccessToken; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)] - public string Scopes; - - public Int64 Expires; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct ImageHandle - { - public ImageType Type; - - public Int64 Id; - - public UInt32 Size; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct ImageDimensions - { - public UInt32 Width; - - public UInt32 Height; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct ActivityTimestamps - { - public Int64 Start; - - public Int64 End; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct ActivityAssets - { - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string LargeImage; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string LargeText; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string SmallImage; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string SmallText; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct PartySize - { - public Int32 CurrentSize; - - public Int32 MaxSize; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct ActivityParty - { - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string Id; - - public PartySize Size; - - public ActivityPartyPrivacy Privacy; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct ActivitySecrets - { - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string Match; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string Join; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string Spectate; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct Activity - { - public ActivityType Type; - - public Int64 ApplicationId; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string Name; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string State; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string Details; - - public ActivityTimestamps Timestamps; - - public ActivityAssets Assets; - - public ActivityParty Party; - - public ActivitySecrets Secrets; - - public bool Instance; - - public UInt32 SupportedPlatforms; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct Presence - { - public Status Status; - - public Activity Activity; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct Relationship - { - public RelationshipType Type; - - public User User; - - public Presence Presence; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct Lobby - { - public Int64 Id; - - public LobbyType Type; - - public Int64 OwnerId; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)] - public string Secret; - - public UInt32 Capacity; - - public bool Locked; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct ImeUnderline - { - public Int32 From; - - public Int32 To; - - public UInt32 Color; - - public UInt32 BackgroundColor; - - public bool Thick; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct Rect - { - public Int32 Left; - - public Int32 Top; - - public Int32 Right; - - public Int32 Bottom; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct FileStat - { - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)] - public string Filename; - - public UInt64 Size; - - public UInt64 LastModified; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct Entitlement - { - public Int64 Id; - - public EntitlementType Type; - - public Int64 SkuId; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct SkuPrice - { - public UInt32 Amount; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 16)] - public string Currency; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct Sku - { - public Int64 Id; - - public SkuType Type; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)] - public string Name; - - public SkuPrice Price; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct InputMode - { - public InputModeType Type; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)] - public string Shortcut; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct UserAchievement - { - public Int64 UserId; - - public Int64 AchievementId; - - public byte PercentComplete; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)] - public string UnlockedAt; - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct LobbyTransaction - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result SetTypeMethod(IntPtr methodsPtr, LobbyType type); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result SetOwnerMethod(IntPtr methodsPtr, Int64 ownerId); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result SetCapacityMethod(IntPtr methodsPtr, UInt32 capacity); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result SetMetadataMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string key, [MarshalAs(UnmanagedType.LPStr)]string value); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result DeleteMetadataMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string key); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result SetLockedMethod(IntPtr methodsPtr, bool locked); - - internal SetTypeMethod SetType; - - internal SetOwnerMethod SetOwner; - - internal SetCapacityMethod SetCapacity; - - internal SetMetadataMethod SetMetadata; - - internal DeleteMetadataMethod DeleteMetadata; - - internal SetLockedMethod SetLocked; - } - - internal IntPtr MethodsPtr; - - internal Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - public void SetType(LobbyType type) - { - if (MethodsPtr != IntPtr.Zero) - { - var res = Methods.SetType(MethodsPtr, type); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - } - - public void SetOwner(Int64 ownerId) - { - if (MethodsPtr != IntPtr.Zero) - { - var res = Methods.SetOwner(MethodsPtr, ownerId); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - } - - public void SetCapacity(UInt32 capacity) - { - if (MethodsPtr != IntPtr.Zero) - { - var res = Methods.SetCapacity(MethodsPtr, capacity); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - } - - public void SetMetadata(string key, string value) - { - if (MethodsPtr != IntPtr.Zero) - { - var res = Methods.SetMetadata(MethodsPtr, key, value); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - } - - public void DeleteMetadata(string key) - { - if (MethodsPtr != IntPtr.Zero) - { - var res = Methods.DeleteMetadata(MethodsPtr, key); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - } - - public void SetLocked(bool locked) - { - if (MethodsPtr != IntPtr.Zero) - { - var res = Methods.SetLocked(MethodsPtr, locked); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - } - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct LobbyMemberTransaction - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result SetMetadataMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string key, [MarshalAs(UnmanagedType.LPStr)]string value); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result DeleteMetadataMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string key); - - internal SetMetadataMethod SetMetadata; - - internal DeleteMetadataMethod DeleteMetadata; - } - - internal IntPtr MethodsPtr; - - internal Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - public void SetMetadata(string key, string value) - { - if (MethodsPtr != IntPtr.Zero) - { - var res = Methods.SetMetadata(MethodsPtr, key, value); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - } - - public void DeleteMetadata(string key) - { - if (MethodsPtr != IntPtr.Zero) - { - var res = Methods.DeleteMetadata(MethodsPtr, key); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - } - } - - [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)] - public partial struct LobbySearchQuery - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result FilterMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string key, LobbySearchComparison comparison, LobbySearchCast cast, [MarshalAs(UnmanagedType.LPStr)]string value); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result SortMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string key, LobbySearchCast cast, [MarshalAs(UnmanagedType.LPStr)]string value); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result LimitMethod(IntPtr methodsPtr, UInt32 limit); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result DistanceMethod(IntPtr methodsPtr, LobbySearchDistance distance); - - internal FilterMethod Filter; - - internal SortMethod Sort; - - internal LimitMethod Limit; - - internal DistanceMethod Distance; - } - - internal IntPtr MethodsPtr; - - internal Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - public void Filter(string key, LobbySearchComparison comparison, LobbySearchCast cast, string value) - { - if (MethodsPtr != IntPtr.Zero) - { - var res = Methods.Filter(MethodsPtr, key, comparison, cast, value); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - } - - public void Sort(string key, LobbySearchCast cast, string value) - { - if (MethodsPtr != IntPtr.Zero) - { - var res = Methods.Sort(MethodsPtr, key, cast, value); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - } - - public void Limit(UInt32 limit) - { - if (MethodsPtr != IntPtr.Zero) - { - var res = Methods.Limit(MethodsPtr, limit); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - } - - public void Distance(LobbySearchDistance distance) - { - if (MethodsPtr != IntPtr.Zero) - { - var res = Methods.Distance(MethodsPtr, distance); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - } - } - - public partial class ResultException : Exception - { - public readonly Result Result; - - public ResultException(Result result) : base(result.ToString()) - { - } - } - - public partial class Discord : IDisposable - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents - { - - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void DestroyHandler(IntPtr MethodsPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result RunCallbacksMethod(IntPtr methodsPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SetLogHookCallback(IntPtr ptr, LogLevel level, [MarshalAs(UnmanagedType.LPStr)]string message); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SetLogHookMethod(IntPtr methodsPtr, LogLevel minLevel, IntPtr callbackData, SetLogHookCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate IntPtr GetApplicationManagerMethod(IntPtr discordPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate IntPtr GetUserManagerMethod(IntPtr discordPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate IntPtr GetImageManagerMethod(IntPtr discordPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate IntPtr GetActivityManagerMethod(IntPtr discordPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate IntPtr GetRelationshipManagerMethod(IntPtr discordPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate IntPtr GetLobbyManagerMethod(IntPtr discordPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate IntPtr GetNetworkManagerMethod(IntPtr discordPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate IntPtr GetOverlayManagerMethod(IntPtr discordPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate IntPtr GetStorageManagerMethod(IntPtr discordPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate IntPtr GetStoreManagerMethod(IntPtr discordPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate IntPtr GetVoiceManagerMethod(IntPtr discordPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate IntPtr GetAchievementManagerMethod(IntPtr discordPtr); - - internal DestroyHandler Destroy; - - internal RunCallbacksMethod RunCallbacks; - - internal SetLogHookMethod SetLogHook; - - internal GetApplicationManagerMethod GetApplicationManager; - - internal GetUserManagerMethod GetUserManager; - - internal GetImageManagerMethod GetImageManager; - - internal GetActivityManagerMethod GetActivityManager; - - internal GetRelationshipManagerMethod GetRelationshipManager; - - internal GetLobbyManagerMethod GetLobbyManager; - - internal GetNetworkManagerMethod GetNetworkManager; - - internal GetOverlayManagerMethod GetOverlayManager; - - internal GetStorageManagerMethod GetStorageManager; - - internal GetStoreManagerMethod GetStoreManager; - - internal GetVoiceManagerMethod GetVoiceManager; - - internal GetAchievementManagerMethod GetAchievementManager; - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFICreateParams - { - internal Int64 ClientId; - - internal UInt64 Flags; - - internal IntPtr Events; - - internal IntPtr EventData; - - internal IntPtr ApplicationEvents; - - internal UInt32 ApplicationVersion; - - internal IntPtr UserEvents; - - internal UInt32 UserVersion; - - internal IntPtr ImageEvents; - - internal UInt32 ImageVersion; - - internal IntPtr ActivityEvents; - - internal UInt32 ActivityVersion; - - internal IntPtr RelationshipEvents; - - internal UInt32 RelationshipVersion; - - internal IntPtr LobbyEvents; - - internal UInt32 LobbyVersion; - - internal IntPtr NetworkEvents; - - internal UInt32 NetworkVersion; - - internal IntPtr OverlayEvents; - - internal UInt32 OverlayVersion; - - internal IntPtr StorageEvents; - - internal UInt32 StorageVersion; - - internal IntPtr StoreEvents; - - internal UInt32 StoreVersion; - - internal IntPtr VoiceEvents; - - internal UInt32 VoiceVersion; - - internal IntPtr AchievementEvents; - - internal UInt32 AchievementVersion; - } - - [DllImport(Constants.DllName, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)] - private static extern Result DiscordCreate(UInt32 version, ref FFICreateParams createParams, out IntPtr manager); - - public delegate void SetLogHookHandler(LogLevel level, string message); - - private GCHandle SelfHandle; - - private IntPtr EventsPtr; - - private FFIEvents Events; - - private IntPtr ApplicationEventsPtr; - - private ApplicationManager.FFIEvents ApplicationEvents; - - internal ApplicationManager ApplicationManagerInstance; - - private IntPtr UserEventsPtr; - - private UserManager.FFIEvents UserEvents; - - internal UserManager UserManagerInstance; - - private IntPtr ImageEventsPtr; - - private ImageManager.FFIEvents ImageEvents; - - internal ImageManager ImageManagerInstance; - - private IntPtr ActivityEventsPtr; - - private ActivityManager.FFIEvents ActivityEvents; - - internal ActivityManager ActivityManagerInstance; - - private IntPtr RelationshipEventsPtr; - - private RelationshipManager.FFIEvents RelationshipEvents; - - internal RelationshipManager RelationshipManagerInstance; - - private IntPtr LobbyEventsPtr; - - private LobbyManager.FFIEvents LobbyEvents; - - internal LobbyManager LobbyManagerInstance; - - private IntPtr NetworkEventsPtr; - - private NetworkManager.FFIEvents NetworkEvents; - - internal NetworkManager NetworkManagerInstance; - - private IntPtr OverlayEventsPtr; - - private OverlayManager.FFIEvents OverlayEvents; - - internal OverlayManager OverlayManagerInstance; - - private IntPtr StorageEventsPtr; - - private StorageManager.FFIEvents StorageEvents; - - internal StorageManager StorageManagerInstance; - - private IntPtr StoreEventsPtr; - - private StoreManager.FFIEvents StoreEvents; - - internal StoreManager StoreManagerInstance; - - private IntPtr VoiceEventsPtr; - - private VoiceManager.FFIEvents VoiceEvents; - - internal VoiceManager VoiceManagerInstance; - - private IntPtr AchievementEventsPtr; - - private AchievementManager.FFIEvents AchievementEvents; - - internal AchievementManager AchievementManagerInstance; - - private IntPtr MethodsPtr; - - private Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - private GCHandle? setLogHook; - - public Discord(Int64 clientId, UInt64 flags) - { - FFICreateParams createParams; - createParams.ClientId = clientId; - createParams.Flags = flags; - Events = new FFIEvents(); - EventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(Events)); - createParams.Events = EventsPtr; - SelfHandle = GCHandle.Alloc(this); - createParams.EventData = GCHandle.ToIntPtr(SelfHandle); - ApplicationEvents = new ApplicationManager.FFIEvents(); - ApplicationEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(ApplicationEvents)); - createParams.ApplicationEvents = ApplicationEventsPtr; - createParams.ApplicationVersion = 1; - UserEvents = new UserManager.FFIEvents(); - UserEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(UserEvents)); - createParams.UserEvents = UserEventsPtr; - createParams.UserVersion = 1; - ImageEvents = new ImageManager.FFIEvents(); - ImageEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(ImageEvents)); - createParams.ImageEvents = ImageEventsPtr; - createParams.ImageVersion = 1; - ActivityEvents = new ActivityManager.FFIEvents(); - ActivityEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(ActivityEvents)); - createParams.ActivityEvents = ActivityEventsPtr; - createParams.ActivityVersion = 1; - RelationshipEvents = new RelationshipManager.FFIEvents(); - RelationshipEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(RelationshipEvents)); - createParams.RelationshipEvents = RelationshipEventsPtr; - createParams.RelationshipVersion = 1; - LobbyEvents = new LobbyManager.FFIEvents(); - LobbyEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(LobbyEvents)); - createParams.LobbyEvents = LobbyEventsPtr; - createParams.LobbyVersion = 1; - NetworkEvents = new NetworkManager.FFIEvents(); - NetworkEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(NetworkEvents)); - createParams.NetworkEvents = NetworkEventsPtr; - createParams.NetworkVersion = 1; - OverlayEvents = new OverlayManager.FFIEvents(); - OverlayEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(OverlayEvents)); - createParams.OverlayEvents = OverlayEventsPtr; - createParams.OverlayVersion = 2; - StorageEvents = new StorageManager.FFIEvents(); - StorageEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(StorageEvents)); - createParams.StorageEvents = StorageEventsPtr; - createParams.StorageVersion = 1; - StoreEvents = new StoreManager.FFIEvents(); - StoreEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(StoreEvents)); - createParams.StoreEvents = StoreEventsPtr; - createParams.StoreVersion = 1; - VoiceEvents = new VoiceManager.FFIEvents(); - VoiceEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(VoiceEvents)); - createParams.VoiceEvents = VoiceEventsPtr; - createParams.VoiceVersion = 1; - AchievementEvents = new AchievementManager.FFIEvents(); - AchievementEventsPtr = Marshal.AllocHGlobal(Marshal.SizeOf(AchievementEvents)); - createParams.AchievementEvents = AchievementEventsPtr; - createParams.AchievementVersion = 1; - InitEvents(EventsPtr, ref Events); - var result = DiscordCreate(3, ref createParams, out MethodsPtr); - if (result != Result.Ok) - { - Dispose(); - throw new ResultException(result); - } - } - - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) - { - Marshal.StructureToPtr(events, eventsPtr, false); - } - - public void Dispose() - { - if (MethodsPtr != IntPtr.Zero) - { - Methods.Destroy(MethodsPtr); - } - SelfHandle.Free(); - Marshal.FreeHGlobal(EventsPtr); - Marshal.FreeHGlobal(ApplicationEventsPtr); - Marshal.FreeHGlobal(UserEventsPtr); - Marshal.FreeHGlobal(ImageEventsPtr); - Marshal.FreeHGlobal(ActivityEventsPtr); - Marshal.FreeHGlobal(RelationshipEventsPtr); - Marshal.FreeHGlobal(LobbyEventsPtr); - Marshal.FreeHGlobal(NetworkEventsPtr); - Marshal.FreeHGlobal(OverlayEventsPtr); - Marshal.FreeHGlobal(StorageEventsPtr); - Marshal.FreeHGlobal(StoreEventsPtr); - Marshal.FreeHGlobal(VoiceEventsPtr); - Marshal.FreeHGlobal(AchievementEventsPtr); - if (setLogHook.HasValue) { - setLogHook.Value.Free(); - } - } - - public void RunCallbacks() - { - var res = Methods.RunCallbacks(MethodsPtr); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - [MonoPInvokeCallback] - private static void SetLogHookCallbackImpl(IntPtr ptr, LogLevel level, string message) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - SetLogHookHandler callback = (SetLogHookHandler)h.Target; - callback(level, message); - } - - public void SetLogHook(LogLevel minLevel, SetLogHookHandler callback) - { - if (setLogHook.HasValue) { - setLogHook.Value.Free(); - } - setLogHook = GCHandle.Alloc(callback); - Methods.SetLogHook(MethodsPtr, minLevel, GCHandle.ToIntPtr(setLogHook.Value), SetLogHookCallbackImpl); - } - - public ApplicationManager GetApplicationManager() - { - if (ApplicationManagerInstance == null) { - ApplicationManagerInstance = new ApplicationManager( - Methods.GetApplicationManager(MethodsPtr), - ApplicationEventsPtr, - ref ApplicationEvents - ); - } - return ApplicationManagerInstance; - } - - public UserManager GetUserManager() - { - if (UserManagerInstance == null) { - UserManagerInstance = new UserManager( - Methods.GetUserManager(MethodsPtr), - UserEventsPtr, - ref UserEvents - ); - } - return UserManagerInstance; - } - - public ImageManager GetImageManager() - { - if (ImageManagerInstance == null) { - ImageManagerInstance = new ImageManager( - Methods.GetImageManager(MethodsPtr), - ImageEventsPtr, - ref ImageEvents - ); - } - return ImageManagerInstance; - } - - public ActivityManager GetActivityManager() - { - if (ActivityManagerInstance == null) { - ActivityManagerInstance = new ActivityManager( - Methods.GetActivityManager(MethodsPtr), - ActivityEventsPtr, - ref ActivityEvents - ); - } - return ActivityManagerInstance; - } - - public RelationshipManager GetRelationshipManager() - { - if (RelationshipManagerInstance == null) { - RelationshipManagerInstance = new RelationshipManager( - Methods.GetRelationshipManager(MethodsPtr), - RelationshipEventsPtr, - ref RelationshipEvents - ); - } - return RelationshipManagerInstance; - } - - public LobbyManager GetLobbyManager() - { - if (LobbyManagerInstance == null) { - LobbyManagerInstance = new LobbyManager( - Methods.GetLobbyManager(MethodsPtr), - LobbyEventsPtr, - ref LobbyEvents - ); - } - return LobbyManagerInstance; - } - - public NetworkManager GetNetworkManager() - { - if (NetworkManagerInstance == null) { - NetworkManagerInstance = new NetworkManager( - Methods.GetNetworkManager(MethodsPtr), - NetworkEventsPtr, - ref NetworkEvents - ); - } - return NetworkManagerInstance; - } - - public OverlayManager GetOverlayManager() - { - if (OverlayManagerInstance == null) { - OverlayManagerInstance = new OverlayManager( - Methods.GetOverlayManager(MethodsPtr), - OverlayEventsPtr, - ref OverlayEvents - ); - } - return OverlayManagerInstance; - } - - public StorageManager GetStorageManager() - { - if (StorageManagerInstance == null) { - StorageManagerInstance = new StorageManager( - Methods.GetStorageManager(MethodsPtr), - StorageEventsPtr, - ref StorageEvents - ); - } - return StorageManagerInstance; - } - - public StoreManager GetStoreManager() - { - if (StoreManagerInstance == null) { - StoreManagerInstance = new StoreManager( - Methods.GetStoreManager(MethodsPtr), - StoreEventsPtr, - ref StoreEvents - ); - } - return StoreManagerInstance; - } - - public VoiceManager GetVoiceManager() - { - if (VoiceManagerInstance == null) { - VoiceManagerInstance = new VoiceManager( - Methods.GetVoiceManager(MethodsPtr), - VoiceEventsPtr, - ref VoiceEvents - ); - } - return VoiceManagerInstance; - } - - public AchievementManager GetAchievementManager() - { - if (AchievementManagerInstance == null) { - AchievementManagerInstance = new AchievementManager( - Methods.GetAchievementManager(MethodsPtr), - AchievementEventsPtr, - ref AchievementEvents - ); - } - return AchievementManagerInstance; - } - } - - internal partial class MonoPInvokeCallbackAttribute : Attribute - { - - } - - public partial class ApplicationManager - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents - { - - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ValidateOrExitCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ValidateOrExitMethod(IntPtr methodsPtr, IntPtr callbackData, ValidateOrExitCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void GetCurrentLocaleMethod(IntPtr methodsPtr, StringBuilder locale); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void GetCurrentBranchMethod(IntPtr methodsPtr, StringBuilder branch); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void GetOAuth2TokenCallback(IntPtr ptr, Result result, ref OAuth2Token oauth2Token); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void GetOAuth2TokenMethod(IntPtr methodsPtr, IntPtr callbackData, GetOAuth2TokenCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void GetTicketCallback(IntPtr ptr, Result result, [MarshalAs(UnmanagedType.LPStr)]ref string data); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void GetTicketMethod(IntPtr methodsPtr, IntPtr callbackData, GetTicketCallback callback); - - internal ValidateOrExitMethod ValidateOrExit; - - internal GetCurrentLocaleMethod GetCurrentLocale; - - internal GetCurrentBranchMethod GetCurrentBranch; - - internal GetOAuth2TokenMethod GetOAuth2Token; - - internal GetTicketMethod GetTicket; - } - - public delegate void ValidateOrExitHandler(Result result); - - public delegate void GetOAuth2TokenHandler(Result result, ref OAuth2Token oauth2Token); - - public delegate void GetTicketHandler(Result result, ref string data); - - private IntPtr MethodsPtr; - - private Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - internal ApplicationManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) - { - if (eventsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - InitEvents(eventsPtr, ref events); - MethodsPtr = ptr; - if (MethodsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - } - - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) - { - Marshal.StructureToPtr(events, eventsPtr, false); - } - - [MonoPInvokeCallback] - private static void ValidateOrExitCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - ValidateOrExitHandler callback = (ValidateOrExitHandler)h.Target; - h.Free(); - callback(result); - } - - public void ValidateOrExit(ValidateOrExitHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.ValidateOrExit(MethodsPtr, GCHandle.ToIntPtr(wrapped), ValidateOrExitCallbackImpl); - } - - public string GetCurrentLocale() - { - var ret = new StringBuilder(128); - Methods.GetCurrentLocale(MethodsPtr, ret); - return ret.ToString(); - } - - public string GetCurrentBranch() - { - var ret = new StringBuilder(4096); - Methods.GetCurrentBranch(MethodsPtr, ret); - return ret.ToString(); - } - - [MonoPInvokeCallback] - private static void GetOAuth2TokenCallbackImpl(IntPtr ptr, Result result, ref OAuth2Token oauth2Token) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - GetOAuth2TokenHandler callback = (GetOAuth2TokenHandler)h.Target; - h.Free(); - callback(result, ref oauth2Token); - } - - public void GetOAuth2Token(GetOAuth2TokenHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.GetOAuth2Token(MethodsPtr, GCHandle.ToIntPtr(wrapped), GetOAuth2TokenCallbackImpl); - } - - [MonoPInvokeCallback] - private static void GetTicketCallbackImpl(IntPtr ptr, Result result, ref string data) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - GetTicketHandler callback = (GetTicketHandler)h.Target; - h.Free(); - callback(result, ref data); - } - - public void GetTicket(GetTicketHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.GetTicket(MethodsPtr, GCHandle.ToIntPtr(wrapped), GetTicketCallbackImpl); - } - } - - public partial class UserManager - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void CurrentUserUpdateHandler(IntPtr ptr); - - internal CurrentUserUpdateHandler OnCurrentUserUpdate; - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetCurrentUserMethod(IntPtr methodsPtr, ref User currentUser); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void GetUserCallback(IntPtr ptr, Result result, ref User user); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void GetUserMethod(IntPtr methodsPtr, Int64 userId, IntPtr callbackData, GetUserCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetCurrentUserPremiumTypeMethod(IntPtr methodsPtr, ref PremiumType premiumType); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result CurrentUserHasFlagMethod(IntPtr methodsPtr, UserFlag flag, ref bool hasFlag); - - internal GetCurrentUserMethod GetCurrentUser; - - internal GetUserMethod GetUser; - - internal GetCurrentUserPremiumTypeMethod GetCurrentUserPremiumType; - - internal CurrentUserHasFlagMethod CurrentUserHasFlag; - } - - public delegate void GetUserHandler(Result result, ref User user); - - public delegate void CurrentUserUpdateHandler(); - - private IntPtr MethodsPtr; - - private Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - public event CurrentUserUpdateHandler OnCurrentUserUpdate; - - internal UserManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) - { - if (eventsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - InitEvents(eventsPtr, ref events); - MethodsPtr = ptr; - if (MethodsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - } - - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) - { - events.OnCurrentUserUpdate = OnCurrentUserUpdateImpl; - Marshal.StructureToPtr(events, eventsPtr, false); - } - - public User GetCurrentUser() - { - var ret = new User(); - var res = Methods.GetCurrentUser(MethodsPtr, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - [MonoPInvokeCallback] - private static void GetUserCallbackImpl(IntPtr ptr, Result result, ref User user) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - GetUserHandler callback = (GetUserHandler)h.Target; - h.Free(); - callback(result, ref user); - } - - public void GetUser(Int64 userId, GetUserHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.GetUser(MethodsPtr, userId, GCHandle.ToIntPtr(wrapped), GetUserCallbackImpl); - } - - public PremiumType GetCurrentUserPremiumType() - { - var ret = new PremiumType(); - var res = Methods.GetCurrentUserPremiumType(MethodsPtr, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public bool CurrentUserHasFlag(UserFlag flag) - { - var ret = new bool(); - var res = Methods.CurrentUserHasFlag(MethodsPtr, flag, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - [MonoPInvokeCallback] - private static void OnCurrentUserUpdateImpl(IntPtr ptr) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.UserManagerInstance.OnCurrentUserUpdate != null) - { - d.UserManagerInstance.OnCurrentUserUpdate.Invoke(); - } - } - } - - public partial class ImageManager - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents - { - - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void FetchCallback(IntPtr ptr, Result result, ImageHandle handleResult); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void FetchMethod(IntPtr methodsPtr, ImageHandle handle, bool refresh, IntPtr callbackData, FetchCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetDimensionsMethod(IntPtr methodsPtr, ImageHandle handle, ref ImageDimensions dimensions); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetDataMethod(IntPtr methodsPtr, ImageHandle handle, byte[] data, Int32 dataLen); - - internal FetchMethod Fetch; - - internal GetDimensionsMethod GetDimensions; - - internal GetDataMethod GetData; - } - - public delegate void FetchHandler(Result result, ImageHandle handleResult); - - private IntPtr MethodsPtr; - - private Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - internal ImageManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) - { - if (eventsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - InitEvents(eventsPtr, ref events); - MethodsPtr = ptr; - if (MethodsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - } - - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) - { - Marshal.StructureToPtr(events, eventsPtr, false); - } - - [MonoPInvokeCallback] - private static void FetchCallbackImpl(IntPtr ptr, Result result, ImageHandle handleResult) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - FetchHandler callback = (FetchHandler)h.Target; - h.Free(); - callback(result, handleResult); - } - - public void Fetch(ImageHandle handle, bool refresh, FetchHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.Fetch(MethodsPtr, handle, refresh, GCHandle.ToIntPtr(wrapped), FetchCallbackImpl); - } - - public ImageDimensions GetDimensions(ImageHandle handle) - { - var ret = new ImageDimensions(); - var res = Methods.GetDimensions(MethodsPtr, handle, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public void GetData(ImageHandle handle, byte[] data) - { - var res = Methods.GetData(MethodsPtr, handle, data, data.Length); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - } - - public partial class ActivityManager - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ActivityJoinHandler(IntPtr ptr, [MarshalAs(UnmanagedType.LPStr)]string secret); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ActivitySpectateHandler(IntPtr ptr, [MarshalAs(UnmanagedType.LPStr)]string secret); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ActivityJoinRequestHandler(IntPtr ptr, ref User user); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ActivityInviteHandler(IntPtr ptr, ActivityActionType type, ref User user, ref Activity activity); - - internal ActivityJoinHandler OnActivityJoin; - - internal ActivitySpectateHandler OnActivitySpectate; - - internal ActivityJoinRequestHandler OnActivityJoinRequest; - - internal ActivityInviteHandler OnActivityInvite; - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result RegisterCommandMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string command); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result RegisterSteamMethod(IntPtr methodsPtr, UInt32 steamId); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void UpdateActivityCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void UpdateActivityMethod(IntPtr methodsPtr, ref Activity activity, IntPtr callbackData, UpdateActivityCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ClearActivityCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ClearActivityMethod(IntPtr methodsPtr, IntPtr callbackData, ClearActivityCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SendRequestReplyCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SendRequestReplyMethod(IntPtr methodsPtr, Int64 userId, ActivityJoinRequestReply reply, IntPtr callbackData, SendRequestReplyCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SendInviteCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SendInviteMethod(IntPtr methodsPtr, Int64 userId, ActivityActionType type, [MarshalAs(UnmanagedType.LPStr)]string content, IntPtr callbackData, SendInviteCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void AcceptInviteCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void AcceptInviteMethod(IntPtr methodsPtr, Int64 userId, IntPtr callbackData, AcceptInviteCallback callback); - - internal RegisterCommandMethod RegisterCommand; - - internal RegisterSteamMethod RegisterSteam; - - internal UpdateActivityMethod UpdateActivity; - - internal ClearActivityMethod ClearActivity; - - internal SendRequestReplyMethod SendRequestReply; - - internal SendInviteMethod SendInvite; - - internal AcceptInviteMethod AcceptInvite; - } - - public delegate void UpdateActivityHandler(Result result); - - public delegate void ClearActivityHandler(Result result); - - public delegate void SendRequestReplyHandler(Result result); - - public delegate void SendInviteHandler(Result result); - - public delegate void AcceptInviteHandler(Result result); - - public delegate void ActivityJoinHandler(string secret); - - public delegate void ActivitySpectateHandler(string secret); - - public delegate void ActivityJoinRequestHandler(ref User user); - - public delegate void ActivityInviteHandler(ActivityActionType type, ref User user, ref Activity activity); - - private IntPtr MethodsPtr; - - private Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - public event ActivityJoinHandler OnActivityJoin; - - public event ActivitySpectateHandler OnActivitySpectate; - - public event ActivityJoinRequestHandler OnActivityJoinRequest; - - public event ActivityInviteHandler OnActivityInvite; - - internal ActivityManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) - { - if (eventsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - InitEvents(eventsPtr, ref events); - MethodsPtr = ptr; - if (MethodsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - } - - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) - { - events.OnActivityJoin = OnActivityJoinImpl; - events.OnActivitySpectate = OnActivitySpectateImpl; - events.OnActivityJoinRequest = OnActivityJoinRequestImpl; - events.OnActivityInvite = OnActivityInviteImpl; - Marshal.StructureToPtr(events, eventsPtr, false); - } - - public void RegisterCommand(string command) - { - var res = Methods.RegisterCommand(MethodsPtr, command); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - public void RegisterSteam(UInt32 steamId) - { - var res = Methods.RegisterSteam(MethodsPtr, steamId); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - [MonoPInvokeCallback] - private static void UpdateActivityCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - UpdateActivityHandler callback = (UpdateActivityHandler)h.Target; - h.Free(); - callback(result); - } - - public void UpdateActivity(Activity activity, UpdateActivityHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.UpdateActivity(MethodsPtr, ref activity, GCHandle.ToIntPtr(wrapped), UpdateActivityCallbackImpl); - } - - [MonoPInvokeCallback] - private static void ClearActivityCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - ClearActivityHandler callback = (ClearActivityHandler)h.Target; - h.Free(); - callback(result); - } - - public void ClearActivity(ClearActivityHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.ClearActivity(MethodsPtr, GCHandle.ToIntPtr(wrapped), ClearActivityCallbackImpl); - } - - [MonoPInvokeCallback] - private static void SendRequestReplyCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - SendRequestReplyHandler callback = (SendRequestReplyHandler)h.Target; - h.Free(); - callback(result); - } - - public void SendRequestReply(Int64 userId, ActivityJoinRequestReply reply, SendRequestReplyHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.SendRequestReply(MethodsPtr, userId, reply, GCHandle.ToIntPtr(wrapped), SendRequestReplyCallbackImpl); - } - - [MonoPInvokeCallback] - private static void SendInviteCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - SendInviteHandler callback = (SendInviteHandler)h.Target; - h.Free(); - callback(result); - } - - public void SendInvite(Int64 userId, ActivityActionType type, string content, SendInviteHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.SendInvite(MethodsPtr, userId, type, content, GCHandle.ToIntPtr(wrapped), SendInviteCallbackImpl); - } - - [MonoPInvokeCallback] - private static void AcceptInviteCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - AcceptInviteHandler callback = (AcceptInviteHandler)h.Target; - h.Free(); - callback(result); - } - - public void AcceptInvite(Int64 userId, AcceptInviteHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.AcceptInvite(MethodsPtr, userId, GCHandle.ToIntPtr(wrapped), AcceptInviteCallbackImpl); - } - - [MonoPInvokeCallback] - private static void OnActivityJoinImpl(IntPtr ptr, string secret) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.ActivityManagerInstance.OnActivityJoin != null) - { - d.ActivityManagerInstance.OnActivityJoin.Invoke(secret); - } - } - - [MonoPInvokeCallback] - private static void OnActivitySpectateImpl(IntPtr ptr, string secret) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.ActivityManagerInstance.OnActivitySpectate != null) - { - d.ActivityManagerInstance.OnActivitySpectate.Invoke(secret); - } - } - - [MonoPInvokeCallback] - private static void OnActivityJoinRequestImpl(IntPtr ptr, ref User user) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.ActivityManagerInstance.OnActivityJoinRequest != null) - { - d.ActivityManagerInstance.OnActivityJoinRequest.Invoke(ref user); - } - } - - [MonoPInvokeCallback] - private static void OnActivityInviteImpl(IntPtr ptr, ActivityActionType type, ref User user, ref Activity activity) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.ActivityManagerInstance.OnActivityInvite != null) - { - d.ActivityManagerInstance.OnActivityInvite.Invoke(type, ref user, ref activity); - } - } - } - - public partial class RelationshipManager - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void RefreshHandler(IntPtr ptr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void RelationshipUpdateHandler(IntPtr ptr, ref Relationship relationship); - - internal RefreshHandler OnRefresh; - - internal RelationshipUpdateHandler OnRelationshipUpdate; - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate bool FilterCallback(IntPtr ptr, ref Relationship relationship); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void FilterMethod(IntPtr methodsPtr, IntPtr callbackData, FilterCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result CountMethod(IntPtr methodsPtr, ref Int32 count); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetMethod(IntPtr methodsPtr, Int64 userId, ref Relationship relationship); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetAtMethod(IntPtr methodsPtr, UInt32 index, ref Relationship relationship); - - internal FilterMethod Filter; - - internal CountMethod Count; - - internal GetMethod Get; - - internal GetAtMethod GetAt; - } - - public delegate bool FilterHandler(ref Relationship relationship); - - public delegate void RefreshHandler(); - - public delegate void RelationshipUpdateHandler(ref Relationship relationship); - - private IntPtr MethodsPtr; - - private Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - public event RefreshHandler OnRefresh; - - public event RelationshipUpdateHandler OnRelationshipUpdate; - - internal RelationshipManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) - { - if (eventsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - InitEvents(eventsPtr, ref events); - MethodsPtr = ptr; - if (MethodsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - } - - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) - { - events.OnRefresh = OnRefreshImpl; - events.OnRelationshipUpdate = OnRelationshipUpdateImpl; - Marshal.StructureToPtr(events, eventsPtr, false); - } - - [MonoPInvokeCallback] - private static bool FilterCallbackImpl(IntPtr ptr, ref Relationship relationship) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - FilterHandler callback = (FilterHandler)h.Target; - return callback(ref relationship); - } - - public void Filter(FilterHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.Filter(MethodsPtr, GCHandle.ToIntPtr(wrapped), FilterCallbackImpl); - wrapped.Free(); - } - - public Int32 Count() - { - var ret = new Int32(); - var res = Methods.Count(MethodsPtr, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public Relationship Get(Int64 userId) - { - var ret = new Relationship(); - var res = Methods.Get(MethodsPtr, userId, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public Relationship GetAt(UInt32 index) - { - var ret = new Relationship(); - var res = Methods.GetAt(MethodsPtr, index, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - [MonoPInvokeCallback] - private static void OnRefreshImpl(IntPtr ptr) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.RelationshipManagerInstance.OnRefresh != null) - { - d.RelationshipManagerInstance.OnRefresh.Invoke(); - } - } - - [MonoPInvokeCallback] - private static void OnRelationshipUpdateImpl(IntPtr ptr, ref Relationship relationship) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.RelationshipManagerInstance.OnRelationshipUpdate != null) - { - d.RelationshipManagerInstance.OnRelationshipUpdate.Invoke(ref relationship); - } - } - } - - public partial class LobbyManager - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void LobbyUpdateHandler(IntPtr ptr, Int64 lobbyId); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void LobbyDeleteHandler(IntPtr ptr, Int64 lobbyId, UInt32 reason); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void MemberConnectHandler(IntPtr ptr, Int64 lobbyId, Int64 userId); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void MemberUpdateHandler(IntPtr ptr, Int64 lobbyId, Int64 userId); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void MemberDisconnectHandler(IntPtr ptr, Int64 lobbyId, Int64 userId); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void LobbyMessageHandler(IntPtr ptr, Int64 lobbyId, Int64 userId, IntPtr dataPtr, Int32 dataLen); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SpeakingHandler(IntPtr ptr, Int64 lobbyId, Int64 userId, bool speaking); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void NetworkMessageHandler(IntPtr ptr, Int64 lobbyId, Int64 userId, byte channelId, IntPtr dataPtr, Int32 dataLen); - - internal LobbyUpdateHandler OnLobbyUpdate; - - internal LobbyDeleteHandler OnLobbyDelete; - - internal MemberConnectHandler OnMemberConnect; - - internal MemberUpdateHandler OnMemberUpdate; - - internal MemberDisconnectHandler OnMemberDisconnect; - - internal LobbyMessageHandler OnLobbyMessage; - - internal SpeakingHandler OnSpeaking; - - internal NetworkMessageHandler OnNetworkMessage; - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetLobbyCreateTransactionMethod(IntPtr methodsPtr, ref IntPtr transaction); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetLobbyUpdateTransactionMethod(IntPtr methodsPtr, Int64 lobbyId, ref IntPtr transaction); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetMemberUpdateTransactionMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, ref IntPtr transaction); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void CreateLobbyCallback(IntPtr ptr, Result result, ref Lobby lobby); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void CreateLobbyMethod(IntPtr methodsPtr, IntPtr transaction, IntPtr callbackData, CreateLobbyCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void UpdateLobbyCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void UpdateLobbyMethod(IntPtr methodsPtr, Int64 lobbyId, IntPtr transaction, IntPtr callbackData, UpdateLobbyCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void DeleteLobbyCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void DeleteLobbyMethod(IntPtr methodsPtr, Int64 lobbyId, IntPtr callbackData, DeleteLobbyCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ConnectLobbyCallback(IntPtr ptr, Result result, ref Lobby lobby); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ConnectLobbyMethod(IntPtr methodsPtr, Int64 lobbyId, [MarshalAs(UnmanagedType.LPStr)]string secret, IntPtr callbackData, ConnectLobbyCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ConnectLobbyWithActivitySecretCallback(IntPtr ptr, Result result, ref Lobby lobby); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ConnectLobbyWithActivitySecretMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string activitySecret, IntPtr callbackData, ConnectLobbyWithActivitySecretCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void DisconnectLobbyCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void DisconnectLobbyMethod(IntPtr methodsPtr, Int64 lobbyId, IntPtr callbackData, DisconnectLobbyCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetLobbyMethod(IntPtr methodsPtr, Int64 lobbyId, ref Lobby lobby); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetLobbyActivitySecretMethod(IntPtr methodsPtr, Int64 lobbyId, StringBuilder secret); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetLobbyMetadataValueMethod(IntPtr methodsPtr, Int64 lobbyId, [MarshalAs(UnmanagedType.LPStr)]string key, StringBuilder value); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetLobbyMetadataKeyMethod(IntPtr methodsPtr, Int64 lobbyId, Int32 index, StringBuilder key); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result LobbyMetadataCountMethod(IntPtr methodsPtr, Int64 lobbyId, ref Int32 count); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result MemberCountMethod(IntPtr methodsPtr, Int64 lobbyId, ref Int32 count); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetMemberUserIdMethod(IntPtr methodsPtr, Int64 lobbyId, Int32 index, ref Int64 userId); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetMemberUserMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, ref User user); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetMemberMetadataValueMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, [MarshalAs(UnmanagedType.LPStr)]string key, StringBuilder value); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetMemberMetadataKeyMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, Int32 index, StringBuilder key); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result MemberMetadataCountMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, ref Int32 count); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void UpdateMemberCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void UpdateMemberMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, IntPtr transaction, IntPtr callbackData, UpdateMemberCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SendLobbyMessageCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SendLobbyMessageMethod(IntPtr methodsPtr, Int64 lobbyId, byte[] data, Int32 dataLen, IntPtr callbackData, SendLobbyMessageCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetSearchQueryMethod(IntPtr methodsPtr, ref IntPtr query); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SearchCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SearchMethod(IntPtr methodsPtr, IntPtr query, IntPtr callbackData, SearchCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void LobbyCountMethod(IntPtr methodsPtr, ref Int32 count); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetLobbyIdMethod(IntPtr methodsPtr, Int32 index, ref Int64 lobbyId); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ConnectVoiceCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ConnectVoiceMethod(IntPtr methodsPtr, Int64 lobbyId, IntPtr callbackData, ConnectVoiceCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void DisconnectVoiceCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void DisconnectVoiceMethod(IntPtr methodsPtr, Int64 lobbyId, IntPtr callbackData, DisconnectVoiceCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result ConnectNetworkMethod(IntPtr methodsPtr, Int64 lobbyId); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result DisconnectNetworkMethod(IntPtr methodsPtr, Int64 lobbyId); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result FlushNetworkMethod(IntPtr methodsPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result OpenNetworkChannelMethod(IntPtr methodsPtr, Int64 lobbyId, byte channelId, bool reliable); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result SendNetworkMessageMethod(IntPtr methodsPtr, Int64 lobbyId, Int64 userId, byte channelId, byte[] data, Int32 dataLen); - - internal GetLobbyCreateTransactionMethod GetLobbyCreateTransaction; - - internal GetLobbyUpdateTransactionMethod GetLobbyUpdateTransaction; - - internal GetMemberUpdateTransactionMethod GetMemberUpdateTransaction; - - internal CreateLobbyMethod CreateLobby; - - internal UpdateLobbyMethod UpdateLobby; - - internal DeleteLobbyMethod DeleteLobby; - - internal ConnectLobbyMethod ConnectLobby; - - internal ConnectLobbyWithActivitySecretMethod ConnectLobbyWithActivitySecret; - - internal DisconnectLobbyMethod DisconnectLobby; - - internal GetLobbyMethod GetLobby; - - internal GetLobbyActivitySecretMethod GetLobbyActivitySecret; - - internal GetLobbyMetadataValueMethod GetLobbyMetadataValue; - - internal GetLobbyMetadataKeyMethod GetLobbyMetadataKey; - - internal LobbyMetadataCountMethod LobbyMetadataCount; - - internal MemberCountMethod MemberCount; - - internal GetMemberUserIdMethod GetMemberUserId; - - internal GetMemberUserMethod GetMemberUser; - - internal GetMemberMetadataValueMethod GetMemberMetadataValue; - - internal GetMemberMetadataKeyMethod GetMemberMetadataKey; - - internal MemberMetadataCountMethod MemberMetadataCount; - - internal UpdateMemberMethod UpdateMember; - - internal SendLobbyMessageMethod SendLobbyMessage; - - internal GetSearchQueryMethod GetSearchQuery; - - internal SearchMethod Search; - - internal LobbyCountMethod LobbyCount; - - internal GetLobbyIdMethod GetLobbyId; - - internal ConnectVoiceMethod ConnectVoice; - - internal DisconnectVoiceMethod DisconnectVoice; - - internal ConnectNetworkMethod ConnectNetwork; - - internal DisconnectNetworkMethod DisconnectNetwork; - - internal FlushNetworkMethod FlushNetwork; - - internal OpenNetworkChannelMethod OpenNetworkChannel; - - internal SendNetworkMessageMethod SendNetworkMessage; - } - - public delegate void CreateLobbyHandler(Result result, ref Lobby lobby); - - public delegate void UpdateLobbyHandler(Result result); - - public delegate void DeleteLobbyHandler(Result result); - - public delegate void ConnectLobbyHandler(Result result, ref Lobby lobby); - - public delegate void ConnectLobbyWithActivitySecretHandler(Result result, ref Lobby lobby); - - public delegate void DisconnectLobbyHandler(Result result); - - public delegate void UpdateMemberHandler(Result result); - - public delegate void SendLobbyMessageHandler(Result result); - - public delegate void SearchHandler(Result result); - - public delegate void ConnectVoiceHandler(Result result); - - public delegate void DisconnectVoiceHandler(Result result); - - public delegate void LobbyUpdateHandler(Int64 lobbyId); - - public delegate void LobbyDeleteHandler(Int64 lobbyId, UInt32 reason); - - public delegate void MemberConnectHandler(Int64 lobbyId, Int64 userId); - - public delegate void MemberUpdateHandler(Int64 lobbyId, Int64 userId); - - public delegate void MemberDisconnectHandler(Int64 lobbyId, Int64 userId); - - public delegate void LobbyMessageHandler(Int64 lobbyId, Int64 userId, byte[] data); - - public delegate void SpeakingHandler(Int64 lobbyId, Int64 userId, bool speaking); - - public delegate void NetworkMessageHandler(Int64 lobbyId, Int64 userId, byte channelId, byte[] data); - - private IntPtr MethodsPtr; - - private Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - public event LobbyUpdateHandler OnLobbyUpdate; - - public event LobbyDeleteHandler OnLobbyDelete; - - public event MemberConnectHandler OnMemberConnect; - - public event MemberUpdateHandler OnMemberUpdate; - - public event MemberDisconnectHandler OnMemberDisconnect; - - public event LobbyMessageHandler OnLobbyMessage; - - public event SpeakingHandler OnSpeaking; - - public event NetworkMessageHandler OnNetworkMessage; - - internal LobbyManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) - { - if (eventsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - InitEvents(eventsPtr, ref events); - MethodsPtr = ptr; - if (MethodsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - } - - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) - { - events.OnLobbyUpdate = OnLobbyUpdateImpl; - events.OnLobbyDelete = OnLobbyDeleteImpl; - events.OnMemberConnect = OnMemberConnectImpl; - events.OnMemberUpdate = OnMemberUpdateImpl; - events.OnMemberDisconnect = OnMemberDisconnectImpl; - events.OnLobbyMessage = OnLobbyMessageImpl; - events.OnSpeaking = OnSpeakingImpl; - events.OnNetworkMessage = OnNetworkMessageImpl; - Marshal.StructureToPtr(events, eventsPtr, false); - } - - public LobbyTransaction GetLobbyCreateTransaction() - { - var ret = new LobbyTransaction(); - var res = Methods.GetLobbyCreateTransaction(MethodsPtr, ref ret.MethodsPtr); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public LobbyTransaction GetLobbyUpdateTransaction(Int64 lobbyId) - { - var ret = new LobbyTransaction(); - var res = Methods.GetLobbyUpdateTransaction(MethodsPtr, lobbyId, ref ret.MethodsPtr); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public LobbyMemberTransaction GetMemberUpdateTransaction(Int64 lobbyId, Int64 userId) - { - var ret = new LobbyMemberTransaction(); - var res = Methods.GetMemberUpdateTransaction(MethodsPtr, lobbyId, userId, ref ret.MethodsPtr); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - [MonoPInvokeCallback] - private static void CreateLobbyCallbackImpl(IntPtr ptr, Result result, ref Lobby lobby) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - CreateLobbyHandler callback = (CreateLobbyHandler)h.Target; - h.Free(); - callback(result, ref lobby); - } - - public void CreateLobby(LobbyTransaction transaction, CreateLobbyHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.CreateLobby(MethodsPtr, transaction.MethodsPtr, GCHandle.ToIntPtr(wrapped), CreateLobbyCallbackImpl); - transaction.MethodsPtr = IntPtr.Zero; - } - - [MonoPInvokeCallback] - private static void UpdateLobbyCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - UpdateLobbyHandler callback = (UpdateLobbyHandler)h.Target; - h.Free(); - callback(result); - } - - public void UpdateLobby(Int64 lobbyId, LobbyTransaction transaction, UpdateLobbyHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.UpdateLobby(MethodsPtr, lobbyId, transaction.MethodsPtr, GCHandle.ToIntPtr(wrapped), UpdateLobbyCallbackImpl); - transaction.MethodsPtr = IntPtr.Zero; - } - - [MonoPInvokeCallback] - private static void DeleteLobbyCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - DeleteLobbyHandler callback = (DeleteLobbyHandler)h.Target; - h.Free(); - callback(result); - } - - public void DeleteLobby(Int64 lobbyId, DeleteLobbyHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.DeleteLobby(MethodsPtr, lobbyId, GCHandle.ToIntPtr(wrapped), DeleteLobbyCallbackImpl); - } - - [MonoPInvokeCallback] - private static void ConnectLobbyCallbackImpl(IntPtr ptr, Result result, ref Lobby lobby) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - ConnectLobbyHandler callback = (ConnectLobbyHandler)h.Target; - h.Free(); - callback(result, ref lobby); - } - - public void ConnectLobby(Int64 lobbyId, string secret, ConnectLobbyHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.ConnectLobby(MethodsPtr, lobbyId, secret, GCHandle.ToIntPtr(wrapped), ConnectLobbyCallbackImpl); - } - - [MonoPInvokeCallback] - private static void ConnectLobbyWithActivitySecretCallbackImpl(IntPtr ptr, Result result, ref Lobby lobby) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - ConnectLobbyWithActivitySecretHandler callback = (ConnectLobbyWithActivitySecretHandler)h.Target; - h.Free(); - callback(result, ref lobby); - } - - public void ConnectLobbyWithActivitySecret(string activitySecret, ConnectLobbyWithActivitySecretHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.ConnectLobbyWithActivitySecret(MethodsPtr, activitySecret, GCHandle.ToIntPtr(wrapped), ConnectLobbyWithActivitySecretCallbackImpl); - } - - [MonoPInvokeCallback] - private static void DisconnectLobbyCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - DisconnectLobbyHandler callback = (DisconnectLobbyHandler)h.Target; - h.Free(); - callback(result); - } - - public void DisconnectLobby(Int64 lobbyId, DisconnectLobbyHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.DisconnectLobby(MethodsPtr, lobbyId, GCHandle.ToIntPtr(wrapped), DisconnectLobbyCallbackImpl); - } - - public Lobby GetLobby(Int64 lobbyId) - { - var ret = new Lobby(); - var res = Methods.GetLobby(MethodsPtr, lobbyId, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public string GetLobbyActivitySecret(Int64 lobbyId) - { - var ret = new StringBuilder(128); - var res = Methods.GetLobbyActivitySecret(MethodsPtr, lobbyId, ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret.ToString(); - } - - public string GetLobbyMetadataValue(Int64 lobbyId, string key) - { - var ret = new StringBuilder(4096); - var res = Methods.GetLobbyMetadataValue(MethodsPtr, lobbyId, key, ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret.ToString(); - } - - public string GetLobbyMetadataKey(Int64 lobbyId, Int32 index) - { - var ret = new StringBuilder(256); - var res = Methods.GetLobbyMetadataKey(MethodsPtr, lobbyId, index, ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret.ToString(); - } - - public Int32 LobbyMetadataCount(Int64 lobbyId) - { - var ret = new Int32(); - var res = Methods.LobbyMetadataCount(MethodsPtr, lobbyId, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public Int32 MemberCount(Int64 lobbyId) - { - var ret = new Int32(); - var res = Methods.MemberCount(MethodsPtr, lobbyId, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public Int64 GetMemberUserId(Int64 lobbyId, Int32 index) - { - var ret = new Int64(); - var res = Methods.GetMemberUserId(MethodsPtr, lobbyId, index, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public User GetMemberUser(Int64 lobbyId, Int64 userId) - { - var ret = new User(); - var res = Methods.GetMemberUser(MethodsPtr, lobbyId, userId, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public string GetMemberMetadataValue(Int64 lobbyId, Int64 userId, string key) - { - var ret = new StringBuilder(4096); - var res = Methods.GetMemberMetadataValue(MethodsPtr, lobbyId, userId, key, ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret.ToString(); - } - - public string GetMemberMetadataKey(Int64 lobbyId, Int64 userId, Int32 index) - { - var ret = new StringBuilder(256); - var res = Methods.GetMemberMetadataKey(MethodsPtr, lobbyId, userId, index, ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret.ToString(); - } - - public Int32 MemberMetadataCount(Int64 lobbyId, Int64 userId) - { - var ret = new Int32(); - var res = Methods.MemberMetadataCount(MethodsPtr, lobbyId, userId, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - [MonoPInvokeCallback] - private static void UpdateMemberCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - UpdateMemberHandler callback = (UpdateMemberHandler)h.Target; - h.Free(); - callback(result); - } - - public void UpdateMember(Int64 lobbyId, Int64 userId, LobbyMemberTransaction transaction, UpdateMemberHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.UpdateMember(MethodsPtr, lobbyId, userId, transaction.MethodsPtr, GCHandle.ToIntPtr(wrapped), UpdateMemberCallbackImpl); - transaction.MethodsPtr = IntPtr.Zero; - } - - [MonoPInvokeCallback] - private static void SendLobbyMessageCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - SendLobbyMessageHandler callback = (SendLobbyMessageHandler)h.Target; - h.Free(); - callback(result); - } - - public void SendLobbyMessage(Int64 lobbyId, byte[] data, SendLobbyMessageHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.SendLobbyMessage(MethodsPtr, lobbyId, data, data.Length, GCHandle.ToIntPtr(wrapped), SendLobbyMessageCallbackImpl); - } - - public LobbySearchQuery GetSearchQuery() - { - var ret = new LobbySearchQuery(); - var res = Methods.GetSearchQuery(MethodsPtr, ref ret.MethodsPtr); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - [MonoPInvokeCallback] - private static void SearchCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - SearchHandler callback = (SearchHandler)h.Target; - h.Free(); - callback(result); - } - - public void Search(LobbySearchQuery query, SearchHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.Search(MethodsPtr, query.MethodsPtr, GCHandle.ToIntPtr(wrapped), SearchCallbackImpl); - query.MethodsPtr = IntPtr.Zero; - } - - public Int32 LobbyCount() - { - var ret = new Int32(); - Methods.LobbyCount(MethodsPtr, ref ret); - return ret; - } - - public Int64 GetLobbyId(Int32 index) - { - var ret = new Int64(); - var res = Methods.GetLobbyId(MethodsPtr, index, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - [MonoPInvokeCallback] - private static void ConnectVoiceCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - ConnectVoiceHandler callback = (ConnectVoiceHandler)h.Target; - h.Free(); - callback(result); - } - - public void ConnectVoice(Int64 lobbyId, ConnectVoiceHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.ConnectVoice(MethodsPtr, lobbyId, GCHandle.ToIntPtr(wrapped), ConnectVoiceCallbackImpl); - } - - [MonoPInvokeCallback] - private static void DisconnectVoiceCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - DisconnectVoiceHandler callback = (DisconnectVoiceHandler)h.Target; - h.Free(); - callback(result); - } - - public void DisconnectVoice(Int64 lobbyId, DisconnectVoiceHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.DisconnectVoice(MethodsPtr, lobbyId, GCHandle.ToIntPtr(wrapped), DisconnectVoiceCallbackImpl); - } - - public void ConnectNetwork(Int64 lobbyId) - { - var res = Methods.ConnectNetwork(MethodsPtr, lobbyId); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - public void DisconnectNetwork(Int64 lobbyId) - { - var res = Methods.DisconnectNetwork(MethodsPtr, lobbyId); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - public void FlushNetwork() - { - var res = Methods.FlushNetwork(MethodsPtr); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - public void OpenNetworkChannel(Int64 lobbyId, byte channelId, bool reliable) - { - var res = Methods.OpenNetworkChannel(MethodsPtr, lobbyId, channelId, reliable); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - public void SendNetworkMessage(Int64 lobbyId, Int64 userId, byte channelId, byte[] data) - { - var res = Methods.SendNetworkMessage(MethodsPtr, lobbyId, userId, channelId, data, data.Length); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - [MonoPInvokeCallback] - private static void OnLobbyUpdateImpl(IntPtr ptr, Int64 lobbyId) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnLobbyUpdate != null) - { - d.LobbyManagerInstance.OnLobbyUpdate.Invoke(lobbyId); - } - } - - [MonoPInvokeCallback] - private static void OnLobbyDeleteImpl(IntPtr ptr, Int64 lobbyId, UInt32 reason) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnLobbyDelete != null) - { - d.LobbyManagerInstance.OnLobbyDelete.Invoke(lobbyId, reason); - } - } - - [MonoPInvokeCallback] - private static void OnMemberConnectImpl(IntPtr ptr, Int64 lobbyId, Int64 userId) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnMemberConnect != null) - { - d.LobbyManagerInstance.OnMemberConnect.Invoke(lobbyId, userId); - } - } - - [MonoPInvokeCallback] - private static void OnMemberUpdateImpl(IntPtr ptr, Int64 lobbyId, Int64 userId) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnMemberUpdate != null) - { - d.LobbyManagerInstance.OnMemberUpdate.Invoke(lobbyId, userId); - } - } - - [MonoPInvokeCallback] - private static void OnMemberDisconnectImpl(IntPtr ptr, Int64 lobbyId, Int64 userId) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnMemberDisconnect != null) - { - d.LobbyManagerInstance.OnMemberDisconnect.Invoke(lobbyId, userId); - } - } - - [MonoPInvokeCallback] - private static void OnLobbyMessageImpl(IntPtr ptr, Int64 lobbyId, Int64 userId, IntPtr dataPtr, Int32 dataLen) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnLobbyMessage != null) - { - byte[] data = new byte[dataLen]; - Marshal.Copy(dataPtr, data, 0, (int)dataLen); - d.LobbyManagerInstance.OnLobbyMessage.Invoke(lobbyId, userId, data); - } - } - - [MonoPInvokeCallback] - private static void OnSpeakingImpl(IntPtr ptr, Int64 lobbyId, Int64 userId, bool speaking) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnSpeaking != null) - { - d.LobbyManagerInstance.OnSpeaking.Invoke(lobbyId, userId, speaking); - } - } - - [MonoPInvokeCallback] - private static void OnNetworkMessageImpl(IntPtr ptr, Int64 lobbyId, Int64 userId, byte channelId, IntPtr dataPtr, Int32 dataLen) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.LobbyManagerInstance.OnNetworkMessage != null) - { - byte[] data = new byte[dataLen]; - Marshal.Copy(dataPtr, data, 0, (int)dataLen); - d.LobbyManagerInstance.OnNetworkMessage.Invoke(lobbyId, userId, channelId, data); - } - } - } - - public partial class NetworkManager - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void MessageHandler(IntPtr ptr, UInt64 peerId, byte channelId, IntPtr dataPtr, Int32 dataLen); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void RouteUpdateHandler(IntPtr ptr, [MarshalAs(UnmanagedType.LPStr)]string routeData); - - internal MessageHandler OnMessage; - - internal RouteUpdateHandler OnRouteUpdate; - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void GetPeerIdMethod(IntPtr methodsPtr, ref UInt64 peerId); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result FlushMethod(IntPtr methodsPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result OpenPeerMethod(IntPtr methodsPtr, UInt64 peerId, [MarshalAs(UnmanagedType.LPStr)]string routeData); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result UpdatePeerMethod(IntPtr methodsPtr, UInt64 peerId, [MarshalAs(UnmanagedType.LPStr)]string routeData); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result ClosePeerMethod(IntPtr methodsPtr, UInt64 peerId); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result OpenChannelMethod(IntPtr methodsPtr, UInt64 peerId, byte channelId, bool reliable); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result CloseChannelMethod(IntPtr methodsPtr, UInt64 peerId, byte channelId); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result SendMessageMethod(IntPtr methodsPtr, UInt64 peerId, byte channelId, byte[] data, Int32 dataLen); - - internal GetPeerIdMethod GetPeerId; - - internal FlushMethod Flush; - - internal OpenPeerMethod OpenPeer; - - internal UpdatePeerMethod UpdatePeer; - - internal ClosePeerMethod ClosePeer; - - internal OpenChannelMethod OpenChannel; - - internal CloseChannelMethod CloseChannel; - - internal SendMessageMethod SendMessage; - } - - public delegate void MessageHandler(UInt64 peerId, byte channelId, byte[] data); - - public delegate void RouteUpdateHandler(string routeData); - - private IntPtr MethodsPtr; - - private Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - public event MessageHandler OnMessage; - - public event RouteUpdateHandler OnRouteUpdate; - - internal NetworkManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) - { - if (eventsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - InitEvents(eventsPtr, ref events); - MethodsPtr = ptr; - if (MethodsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - } - - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) - { - events.OnMessage = OnMessageImpl; - events.OnRouteUpdate = OnRouteUpdateImpl; - Marshal.StructureToPtr(events, eventsPtr, false); - } - - /// - /// Get the local peer ID for this process. - /// - public UInt64 GetPeerId() - { - var ret = new UInt64(); - Methods.GetPeerId(MethodsPtr, ref ret); - return ret; - } - - /// - /// Send pending network messages. - /// - public void Flush() - { - var res = Methods.Flush(MethodsPtr); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - /// - /// Open a connection to a remote peer. - /// - public void OpenPeer(UInt64 peerId, string routeData) - { - var res = Methods.OpenPeer(MethodsPtr, peerId, routeData); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - /// - /// Update the route data for a connected peer. - /// - public void UpdatePeer(UInt64 peerId, string routeData) - { - var res = Methods.UpdatePeer(MethodsPtr, peerId, routeData); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - /// - /// Close the connection to a remote peer. - /// - public void ClosePeer(UInt64 peerId) - { - var res = Methods.ClosePeer(MethodsPtr, peerId); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - /// - /// Open a message channel to a connected peer. - /// - public void OpenChannel(UInt64 peerId, byte channelId, bool reliable) - { - var res = Methods.OpenChannel(MethodsPtr, peerId, channelId, reliable); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - /// - /// Close a message channel to a connected peer. - /// - public void CloseChannel(UInt64 peerId, byte channelId) - { - var res = Methods.CloseChannel(MethodsPtr, peerId, channelId); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - /// - /// Send a message to a connected peer over an opened message channel. - /// - public void SendMessage(UInt64 peerId, byte channelId, byte[] data) - { - var res = Methods.SendMessage(MethodsPtr, peerId, channelId, data, data.Length); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - [MonoPInvokeCallback] - private static void OnMessageImpl(IntPtr ptr, UInt64 peerId, byte channelId, IntPtr dataPtr, Int32 dataLen) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.NetworkManagerInstance.OnMessage != null) - { - byte[] data = new byte[dataLen]; - Marshal.Copy(dataPtr, data, 0, (int)dataLen); - d.NetworkManagerInstance.OnMessage.Invoke(peerId, channelId, data); - } - } - - [MonoPInvokeCallback] - private static void OnRouteUpdateImpl(IntPtr ptr, string routeData) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.NetworkManagerInstance.OnRouteUpdate != null) - { - d.NetworkManagerInstance.OnRouteUpdate.Invoke(routeData); - } - } - } - - public partial class OverlayManager - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ToggleHandler(IntPtr ptr, bool locked); - - internal ToggleHandler OnToggle; - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void IsEnabledMethod(IntPtr methodsPtr, ref bool enabled); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void IsLockedMethod(IntPtr methodsPtr, ref bool locked); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SetLockedCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SetLockedMethod(IntPtr methodsPtr, bool locked, IntPtr callbackData, SetLockedCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void OpenActivityInviteCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void OpenActivityInviteMethod(IntPtr methodsPtr, ActivityActionType type, IntPtr callbackData, OpenActivityInviteCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void OpenGuildInviteCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void OpenGuildInviteMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string code, IntPtr callbackData, OpenGuildInviteCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void OpenVoiceSettingsCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void OpenVoiceSettingsMethod(IntPtr methodsPtr, IntPtr callbackData, OpenVoiceSettingsCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result InitDrawingDxgiMethod(IntPtr methodsPtr, IntPtr swapchain, bool useMessageForwarding); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void OnPresentMethod(IntPtr methodsPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ForwardMessageMethod(IntPtr methodsPtr, IntPtr message); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void KeyEventMethod(IntPtr methodsPtr, bool down, [MarshalAs(UnmanagedType.LPStr)]string keyCode, KeyVariant variant); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void CharEventMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string character); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void MouseButtonEventMethod(IntPtr methodsPtr, byte down, Int32 clickCount, MouseButton which, Int32 x, Int32 y); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void MouseMotionEventMethod(IntPtr methodsPtr, Int32 x, Int32 y); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ImeCommitTextMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string text); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ImeSetCompositionMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string text, ref ImeUnderline underlines, Int32 from, Int32 to); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ImeCancelCompositionMethod(IntPtr methodsPtr); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SetImeCompositionRangeCallbackCallback(IntPtr ptr, Int32 from, Int32 to, ref Rect bounds); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SetImeCompositionRangeCallbackMethod(IntPtr methodsPtr, IntPtr callbackData, SetImeCompositionRangeCallbackCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SetImeSelectionBoundsCallbackCallback(IntPtr ptr, Rect anchor, Rect focus, bool isAnchorFirst); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SetImeSelectionBoundsCallbackMethod(IntPtr methodsPtr, IntPtr callbackData, SetImeSelectionBoundsCallbackCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate bool IsPointInsideClickZoneMethod(IntPtr methodsPtr, Int32 x, Int32 y); - - internal IsEnabledMethod IsEnabled; - - internal IsLockedMethod IsLocked; - - internal SetLockedMethod SetLocked; - - internal OpenActivityInviteMethod OpenActivityInvite; - - internal OpenGuildInviteMethod OpenGuildInvite; - - internal OpenVoiceSettingsMethod OpenVoiceSettings; - - internal InitDrawingDxgiMethod InitDrawingDxgi; - - internal OnPresentMethod OnPresent; - - internal ForwardMessageMethod ForwardMessage; - - internal KeyEventMethod KeyEvent; - - internal CharEventMethod CharEvent; - - internal MouseButtonEventMethod MouseButtonEvent; - - internal MouseMotionEventMethod MouseMotionEvent; - - internal ImeCommitTextMethod ImeCommitText; - - internal ImeSetCompositionMethod ImeSetComposition; - - internal ImeCancelCompositionMethod ImeCancelComposition; - - internal SetImeCompositionRangeCallbackMethod SetImeCompositionRangeCallback; - - internal SetImeSelectionBoundsCallbackMethod SetImeSelectionBoundsCallback; - - internal IsPointInsideClickZoneMethod IsPointInsideClickZone; - } - - public delegate void SetLockedHandler(Result result); - - public delegate void OpenActivityInviteHandler(Result result); - - public delegate void OpenGuildInviteHandler(Result result); - - public delegate void OpenVoiceSettingsHandler(Result result); - - public delegate void SetImeCompositionRangeCallbackHandler(Int32 from, Int32 to, ref Rect bounds); - - public delegate void SetImeSelectionBoundsCallbackHandler(Rect anchor, Rect focus, bool isAnchorFirst); - - public delegate void ToggleHandler(bool locked); - - private IntPtr MethodsPtr; - - private Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - public event ToggleHandler OnToggle; - - internal OverlayManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) - { - if (eventsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - InitEvents(eventsPtr, ref events); - MethodsPtr = ptr; - if (MethodsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - } - - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) - { - events.OnToggle = OnToggleImpl; - Marshal.StructureToPtr(events, eventsPtr, false); - } - - public bool IsEnabled() - { - var ret = new bool(); - Methods.IsEnabled(MethodsPtr, ref ret); - return ret; - } - - public bool IsLocked() - { - var ret = new bool(); - Methods.IsLocked(MethodsPtr, ref ret); - return ret; - } - - [MonoPInvokeCallback] - private static void SetLockedCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - SetLockedHandler callback = (SetLockedHandler)h.Target; - h.Free(); - callback(result); - } - - public void SetLocked(bool locked, SetLockedHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.SetLocked(MethodsPtr, locked, GCHandle.ToIntPtr(wrapped), SetLockedCallbackImpl); - } - - [MonoPInvokeCallback] - private static void OpenActivityInviteCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - OpenActivityInviteHandler callback = (OpenActivityInviteHandler)h.Target; - h.Free(); - callback(result); - } - - public void OpenActivityInvite(ActivityActionType type, OpenActivityInviteHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.OpenActivityInvite(MethodsPtr, type, GCHandle.ToIntPtr(wrapped), OpenActivityInviteCallbackImpl); - } - - [MonoPInvokeCallback] - private static void OpenGuildInviteCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - OpenGuildInviteHandler callback = (OpenGuildInviteHandler)h.Target; - h.Free(); - callback(result); - } - - public void OpenGuildInvite(string code, OpenGuildInviteHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.OpenGuildInvite(MethodsPtr, code, GCHandle.ToIntPtr(wrapped), OpenGuildInviteCallbackImpl); - } - - [MonoPInvokeCallback] - private static void OpenVoiceSettingsCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - OpenVoiceSettingsHandler callback = (OpenVoiceSettingsHandler)h.Target; - h.Free(); - callback(result); - } - - public void OpenVoiceSettings(OpenVoiceSettingsHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.OpenVoiceSettings(MethodsPtr, GCHandle.ToIntPtr(wrapped), OpenVoiceSettingsCallbackImpl); - } - - public void InitDrawingDxgi(IntPtr swapchain, bool useMessageForwarding) - { - var res = Methods.InitDrawingDxgi(MethodsPtr, swapchain, useMessageForwarding); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - public void OnPresent() - { - Methods.OnPresent(MethodsPtr); - } - - public void ForwardMessage(IntPtr message) - { - Methods.ForwardMessage(MethodsPtr, message); - } - - public void KeyEvent(bool down, string keyCode, KeyVariant variant) - { - Methods.KeyEvent(MethodsPtr, down, keyCode, variant); - } - - public void CharEvent(string character) - { - Methods.CharEvent(MethodsPtr, character); - } - - public void MouseButtonEvent(byte down, Int32 clickCount, MouseButton which, Int32 x, Int32 y) - { - Methods.MouseButtonEvent(MethodsPtr, down, clickCount, which, x, y); - } - - public void MouseMotionEvent(Int32 x, Int32 y) - { - Methods.MouseMotionEvent(MethodsPtr, x, y); - } - - public void ImeCommitText(string text) - { - Methods.ImeCommitText(MethodsPtr, text); - } - - public void ImeSetComposition(string text, ImeUnderline underlines, Int32 from, Int32 to) - { - Methods.ImeSetComposition(MethodsPtr, text, ref underlines, from, to); - } - - public void ImeCancelComposition() - { - Methods.ImeCancelComposition(MethodsPtr); - } - - [MonoPInvokeCallback] - private static void SetImeCompositionRangeCallbackCallbackImpl(IntPtr ptr, Int32 from, Int32 to, ref Rect bounds) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - SetImeCompositionRangeCallbackHandler callback = (SetImeCompositionRangeCallbackHandler)h.Target; - h.Free(); - callback(from, to, ref bounds); - } - - public void SetImeCompositionRangeCallback(SetImeCompositionRangeCallbackHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.SetImeCompositionRangeCallback(MethodsPtr, GCHandle.ToIntPtr(wrapped), SetImeCompositionRangeCallbackCallbackImpl); - } - - [MonoPInvokeCallback] - private static void SetImeSelectionBoundsCallbackCallbackImpl(IntPtr ptr, Rect anchor, Rect focus, bool isAnchorFirst) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - SetImeSelectionBoundsCallbackHandler callback = (SetImeSelectionBoundsCallbackHandler)h.Target; - h.Free(); - callback(anchor, focus, isAnchorFirst); - } - - public void SetImeSelectionBoundsCallback(SetImeSelectionBoundsCallbackHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.SetImeSelectionBoundsCallback(MethodsPtr, GCHandle.ToIntPtr(wrapped), SetImeSelectionBoundsCallbackCallbackImpl); - } - - public bool IsPointInsideClickZone(Int32 x, Int32 y) - { - return Methods.IsPointInsideClickZone(MethodsPtr, x, y); - } - - [MonoPInvokeCallback] - private static void OnToggleImpl(IntPtr ptr, bool locked) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.OverlayManagerInstance.OnToggle != null) - { - d.OverlayManagerInstance.OnToggle.Invoke(locked); - } - } - } - - public partial class StorageManager - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents - { - - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result ReadMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, byte[] data, Int32 dataLen, ref UInt32 read); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ReadAsyncCallback(IntPtr ptr, Result result, IntPtr dataPtr, Int32 dataLen); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ReadAsyncMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, IntPtr callbackData, ReadAsyncCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ReadAsyncPartialCallback(IntPtr ptr, Result result, IntPtr dataPtr, Int32 dataLen); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void ReadAsyncPartialMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, UInt64 offset, UInt64 length, IntPtr callbackData, ReadAsyncPartialCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result WriteMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, byte[] data, Int32 dataLen); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void WriteAsyncCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void WriteAsyncMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, byte[] data, Int32 dataLen, IntPtr callbackData, WriteAsyncCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result DeleteMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result ExistsMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, ref bool exists); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void CountMethod(IntPtr methodsPtr, ref Int32 count); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result StatMethod(IntPtr methodsPtr, [MarshalAs(UnmanagedType.LPStr)]string name, ref FileStat stat); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result StatAtMethod(IntPtr methodsPtr, Int32 index, ref FileStat stat); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetPathMethod(IntPtr methodsPtr, StringBuilder path); - - internal ReadMethod Read; - - internal ReadAsyncMethod ReadAsync; - - internal ReadAsyncPartialMethod ReadAsyncPartial; - - internal WriteMethod Write; - - internal WriteAsyncMethod WriteAsync; - - internal DeleteMethod Delete; - - internal ExistsMethod Exists; - - internal CountMethod Count; - - internal StatMethod Stat; - - internal StatAtMethod StatAt; - - internal GetPathMethod GetPath; - } - - public delegate void ReadAsyncHandler(Result result, byte[] data); - - public delegate void ReadAsyncPartialHandler(Result result, byte[] data); - - public delegate void WriteAsyncHandler(Result result); - - private IntPtr MethodsPtr; - - private Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - internal StorageManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) - { - if (eventsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - InitEvents(eventsPtr, ref events); - MethodsPtr = ptr; - if (MethodsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - } - - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) - { - Marshal.StructureToPtr(events, eventsPtr, false); - } - - public UInt32 Read(string name, byte[] data) - { - var ret = new UInt32(); - var res = Methods.Read(MethodsPtr, name, data, data.Length, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - [MonoPInvokeCallback] - private static void ReadAsyncCallbackImpl(IntPtr ptr, Result result, IntPtr dataPtr, Int32 dataLen) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - ReadAsyncHandler callback = (ReadAsyncHandler)h.Target; - h.Free(); - byte[] data = new byte[dataLen]; - Marshal.Copy(dataPtr, data, 0, (int)dataLen); - callback(result, data); - } - - public void ReadAsync(string name, ReadAsyncHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.ReadAsync(MethodsPtr, name, GCHandle.ToIntPtr(wrapped), ReadAsyncCallbackImpl); - } - - [MonoPInvokeCallback] - private static void ReadAsyncPartialCallbackImpl(IntPtr ptr, Result result, IntPtr dataPtr, Int32 dataLen) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - ReadAsyncPartialHandler callback = (ReadAsyncPartialHandler)h.Target; - h.Free(); - byte[] data = new byte[dataLen]; - Marshal.Copy(dataPtr, data, 0, (int)dataLen); - callback(result, data); - } - - public void ReadAsyncPartial(string name, UInt64 offset, UInt64 length, ReadAsyncPartialHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.ReadAsyncPartial(MethodsPtr, name, offset, length, GCHandle.ToIntPtr(wrapped), ReadAsyncPartialCallbackImpl); - } - - public void Write(string name, byte[] data) - { - var res = Methods.Write(MethodsPtr, name, data, data.Length); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - [MonoPInvokeCallback] - private static void WriteAsyncCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - WriteAsyncHandler callback = (WriteAsyncHandler)h.Target; - h.Free(); - callback(result); - } - - public void WriteAsync(string name, byte[] data, WriteAsyncHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.WriteAsync(MethodsPtr, name, data, data.Length, GCHandle.ToIntPtr(wrapped), WriteAsyncCallbackImpl); - } - - public void Delete(string name) - { - var res = Methods.Delete(MethodsPtr, name); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - public bool Exists(string name) - { - var ret = new bool(); - var res = Methods.Exists(MethodsPtr, name, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public Int32 Count() - { - var ret = new Int32(); - Methods.Count(MethodsPtr, ref ret); - return ret; - } - - public FileStat Stat(string name) - { - var ret = new FileStat(); - var res = Methods.Stat(MethodsPtr, name, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public FileStat StatAt(Int32 index) - { - var ret = new FileStat(); - var res = Methods.StatAt(MethodsPtr, index, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public string GetPath() - { - var ret = new StringBuilder(4096); - var res = Methods.GetPath(MethodsPtr, ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret.ToString(); - } - } - - public partial class StoreManager - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void EntitlementCreateHandler(IntPtr ptr, ref Entitlement entitlement); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void EntitlementDeleteHandler(IntPtr ptr, ref Entitlement entitlement); - - internal EntitlementCreateHandler OnEntitlementCreate; - - internal EntitlementDeleteHandler OnEntitlementDelete; - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void FetchSkusCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void FetchSkusMethod(IntPtr methodsPtr, IntPtr callbackData, FetchSkusCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void CountSkusMethod(IntPtr methodsPtr, ref Int32 count); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetSkuMethod(IntPtr methodsPtr, Int64 skuId, ref Sku sku); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetSkuAtMethod(IntPtr methodsPtr, Int32 index, ref Sku sku); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void FetchEntitlementsCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void FetchEntitlementsMethod(IntPtr methodsPtr, IntPtr callbackData, FetchEntitlementsCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void CountEntitlementsMethod(IntPtr methodsPtr, ref Int32 count); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetEntitlementMethod(IntPtr methodsPtr, Int64 entitlementId, ref Entitlement entitlement); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetEntitlementAtMethod(IntPtr methodsPtr, Int32 index, ref Entitlement entitlement); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result HasSkuEntitlementMethod(IntPtr methodsPtr, Int64 skuId, ref bool hasEntitlement); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void StartPurchaseCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void StartPurchaseMethod(IntPtr methodsPtr, Int64 skuId, IntPtr callbackData, StartPurchaseCallback callback); - - internal FetchSkusMethod FetchSkus; - - internal CountSkusMethod CountSkus; - - internal GetSkuMethod GetSku; - - internal GetSkuAtMethod GetSkuAt; - - internal FetchEntitlementsMethod FetchEntitlements; - - internal CountEntitlementsMethod CountEntitlements; - - internal GetEntitlementMethod GetEntitlement; - - internal GetEntitlementAtMethod GetEntitlementAt; - - internal HasSkuEntitlementMethod HasSkuEntitlement; - - internal StartPurchaseMethod StartPurchase; - } - - public delegate void FetchSkusHandler(Result result); - - public delegate void FetchEntitlementsHandler(Result result); - - public delegate void StartPurchaseHandler(Result result); - - public delegate void EntitlementCreateHandler(ref Entitlement entitlement); - - public delegate void EntitlementDeleteHandler(ref Entitlement entitlement); - - private IntPtr MethodsPtr; - - private Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - public event EntitlementCreateHandler OnEntitlementCreate; - - public event EntitlementDeleteHandler OnEntitlementDelete; - - internal StoreManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) - { - if (eventsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - InitEvents(eventsPtr, ref events); - MethodsPtr = ptr; - if (MethodsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - } - - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) - { - events.OnEntitlementCreate = OnEntitlementCreateImpl; - events.OnEntitlementDelete = OnEntitlementDeleteImpl; - Marshal.StructureToPtr(events, eventsPtr, false); - } - - [MonoPInvokeCallback] - private static void FetchSkusCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - FetchSkusHandler callback = (FetchSkusHandler)h.Target; - h.Free(); - callback(result); - } - - public void FetchSkus(FetchSkusHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.FetchSkus(MethodsPtr, GCHandle.ToIntPtr(wrapped), FetchSkusCallbackImpl); - } - - public Int32 CountSkus() - { - var ret = new Int32(); - Methods.CountSkus(MethodsPtr, ref ret); - return ret; - } - - public Sku GetSku(Int64 skuId) - { - var ret = new Sku(); - var res = Methods.GetSku(MethodsPtr, skuId, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public Sku GetSkuAt(Int32 index) - { - var ret = new Sku(); - var res = Methods.GetSkuAt(MethodsPtr, index, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - [MonoPInvokeCallback] - private static void FetchEntitlementsCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - FetchEntitlementsHandler callback = (FetchEntitlementsHandler)h.Target; - h.Free(); - callback(result); - } - - public void FetchEntitlements(FetchEntitlementsHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.FetchEntitlements(MethodsPtr, GCHandle.ToIntPtr(wrapped), FetchEntitlementsCallbackImpl); - } - - public Int32 CountEntitlements() - { - var ret = new Int32(); - Methods.CountEntitlements(MethodsPtr, ref ret); - return ret; - } - - public Entitlement GetEntitlement(Int64 entitlementId) - { - var ret = new Entitlement(); - var res = Methods.GetEntitlement(MethodsPtr, entitlementId, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public Entitlement GetEntitlementAt(Int32 index) - { - var ret = new Entitlement(); - var res = Methods.GetEntitlementAt(MethodsPtr, index, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public bool HasSkuEntitlement(Int64 skuId) - { - var ret = new bool(); - var res = Methods.HasSkuEntitlement(MethodsPtr, skuId, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - [MonoPInvokeCallback] - private static void StartPurchaseCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - StartPurchaseHandler callback = (StartPurchaseHandler)h.Target; - h.Free(); - callback(result); - } - - public void StartPurchase(Int64 skuId, StartPurchaseHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.StartPurchase(MethodsPtr, skuId, GCHandle.ToIntPtr(wrapped), StartPurchaseCallbackImpl); - } - - [MonoPInvokeCallback] - private static void OnEntitlementCreateImpl(IntPtr ptr, ref Entitlement entitlement) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.StoreManagerInstance.OnEntitlementCreate != null) - { - d.StoreManagerInstance.OnEntitlementCreate.Invoke(ref entitlement); - } - } - - [MonoPInvokeCallback] - private static void OnEntitlementDeleteImpl(IntPtr ptr, ref Entitlement entitlement) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.StoreManagerInstance.OnEntitlementDelete != null) - { - d.StoreManagerInstance.OnEntitlementDelete.Invoke(ref entitlement); - } - } - } - - public partial class VoiceManager - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SettingsUpdateHandler(IntPtr ptr); - - internal SettingsUpdateHandler OnSettingsUpdate; - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetInputModeMethod(IntPtr methodsPtr, ref InputMode inputMode); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SetInputModeCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SetInputModeMethod(IntPtr methodsPtr, InputMode inputMode, IntPtr callbackData, SetInputModeCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result IsSelfMuteMethod(IntPtr methodsPtr, ref bool mute); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result SetSelfMuteMethod(IntPtr methodsPtr, bool mute); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result IsSelfDeafMethod(IntPtr methodsPtr, ref bool deaf); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result SetSelfDeafMethod(IntPtr methodsPtr, bool deaf); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result IsLocalMuteMethod(IntPtr methodsPtr, Int64 userId, ref bool mute); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result SetLocalMuteMethod(IntPtr methodsPtr, Int64 userId, bool mute); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetLocalVolumeMethod(IntPtr methodsPtr, Int64 userId, ref byte volume); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result SetLocalVolumeMethod(IntPtr methodsPtr, Int64 userId, byte volume); - - internal GetInputModeMethod GetInputMode; - - internal SetInputModeMethod SetInputMode; - - internal IsSelfMuteMethod IsSelfMute; - - internal SetSelfMuteMethod SetSelfMute; - - internal IsSelfDeafMethod IsSelfDeaf; - - internal SetSelfDeafMethod SetSelfDeaf; - - internal IsLocalMuteMethod IsLocalMute; - - internal SetLocalMuteMethod SetLocalMute; - - internal GetLocalVolumeMethod GetLocalVolume; - - internal SetLocalVolumeMethod SetLocalVolume; - } - - public delegate void SetInputModeHandler(Result result); - - public delegate void SettingsUpdateHandler(); - - private IntPtr MethodsPtr; - - private Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - public event SettingsUpdateHandler OnSettingsUpdate; - - internal VoiceManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) - { - if (eventsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - InitEvents(eventsPtr, ref events); - MethodsPtr = ptr; - if (MethodsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - } - - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) - { - events.OnSettingsUpdate = OnSettingsUpdateImpl; - Marshal.StructureToPtr(events, eventsPtr, false); - } - - public InputMode GetInputMode() - { - var ret = new InputMode(); - var res = Methods.GetInputMode(MethodsPtr, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - [MonoPInvokeCallback] - private static void SetInputModeCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - SetInputModeHandler callback = (SetInputModeHandler)h.Target; - h.Free(); - callback(result); - } - - public void SetInputMode(InputMode inputMode, SetInputModeHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.SetInputMode(MethodsPtr, inputMode, GCHandle.ToIntPtr(wrapped), SetInputModeCallbackImpl); - } - - public bool IsSelfMute() - { - var ret = new bool(); - var res = Methods.IsSelfMute(MethodsPtr, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public void SetSelfMute(bool mute) - { - var res = Methods.SetSelfMute(MethodsPtr, mute); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - public bool IsSelfDeaf() - { - var ret = new bool(); - var res = Methods.IsSelfDeaf(MethodsPtr, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public void SetSelfDeaf(bool deaf) - { - var res = Methods.SetSelfDeaf(MethodsPtr, deaf); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - public bool IsLocalMute(Int64 userId) - { - var ret = new bool(); - var res = Methods.IsLocalMute(MethodsPtr, userId, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public void SetLocalMute(Int64 userId, bool mute) - { - var res = Methods.SetLocalMute(MethodsPtr, userId, mute); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - public byte GetLocalVolume(Int64 userId) - { - var ret = new byte(); - var res = Methods.GetLocalVolume(MethodsPtr, userId, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public void SetLocalVolume(Int64 userId, byte volume) - { - var res = Methods.SetLocalVolume(MethodsPtr, userId, volume); - if (res != Result.Ok) - { - throw new ResultException(res); - } - } - - [MonoPInvokeCallback] - private static void OnSettingsUpdateImpl(IntPtr ptr) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.VoiceManagerInstance.OnSettingsUpdate != null) - { - d.VoiceManagerInstance.OnSettingsUpdate.Invoke(); - } - } - } - - public partial class AchievementManager - { - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIEvents - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void UserAchievementUpdateHandler(IntPtr ptr, ref UserAchievement userAchievement); - - internal UserAchievementUpdateHandler OnUserAchievementUpdate; - } - - [StructLayout(LayoutKind.Sequential)] - internal partial struct FFIMethods - { - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SetUserAchievementCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void SetUserAchievementMethod(IntPtr methodsPtr, Int64 achievementId, byte percentComplete, IntPtr callbackData, SetUserAchievementCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void FetchUserAchievementsCallback(IntPtr ptr, Result result); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void FetchUserAchievementsMethod(IntPtr methodsPtr, IntPtr callbackData, FetchUserAchievementsCallback callback); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate void CountUserAchievementsMethod(IntPtr methodsPtr, ref Int32 count); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetUserAchievementMethod(IntPtr methodsPtr, Int64 userAchievementId, ref UserAchievement userAchievement); - - [UnmanagedFunctionPointer(CallingConvention.Winapi)] - internal delegate Result GetUserAchievementAtMethod(IntPtr methodsPtr, Int32 index, ref UserAchievement userAchievement); - - internal SetUserAchievementMethod SetUserAchievement; - - internal FetchUserAchievementsMethod FetchUserAchievements; - - internal CountUserAchievementsMethod CountUserAchievements; - - internal GetUserAchievementMethod GetUserAchievement; - - internal GetUserAchievementAtMethod GetUserAchievementAt; - } - - public delegate void SetUserAchievementHandler(Result result); - - public delegate void FetchUserAchievementsHandler(Result result); - - public delegate void UserAchievementUpdateHandler(ref UserAchievement userAchievement); - - private IntPtr MethodsPtr; - - private Object MethodsStructure; - - private FFIMethods Methods - { - get - { - if (MethodsStructure == null) - { - MethodsStructure = Marshal.PtrToStructure(MethodsPtr, typeof(FFIMethods)); - } - return (FFIMethods)MethodsStructure; - } - - } - - public event UserAchievementUpdateHandler OnUserAchievementUpdate; - - internal AchievementManager(IntPtr ptr, IntPtr eventsPtr, ref FFIEvents events) - { - if (eventsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - InitEvents(eventsPtr, ref events); - MethodsPtr = ptr; - if (MethodsPtr == IntPtr.Zero) { - throw new ResultException(Result.InternalError); - } - } - - private void InitEvents(IntPtr eventsPtr, ref FFIEvents events) - { - events.OnUserAchievementUpdate = OnUserAchievementUpdateImpl; - Marshal.StructureToPtr(events, eventsPtr, false); - } - - [MonoPInvokeCallback] - private static void SetUserAchievementCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - SetUserAchievementHandler callback = (SetUserAchievementHandler)h.Target; - h.Free(); - callback(result); - } - - public void SetUserAchievement(Int64 achievementId, byte percentComplete, SetUserAchievementHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.SetUserAchievement(MethodsPtr, achievementId, percentComplete, GCHandle.ToIntPtr(wrapped), SetUserAchievementCallbackImpl); - } - - [MonoPInvokeCallback] - private static void FetchUserAchievementsCallbackImpl(IntPtr ptr, Result result) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - FetchUserAchievementsHandler callback = (FetchUserAchievementsHandler)h.Target; - h.Free(); - callback(result); - } - - public void FetchUserAchievements(FetchUserAchievementsHandler callback) - { - GCHandle wrapped = GCHandle.Alloc(callback); - Methods.FetchUserAchievements(MethodsPtr, GCHandle.ToIntPtr(wrapped), FetchUserAchievementsCallbackImpl); - } - - public Int32 CountUserAchievements() - { - var ret = new Int32(); - Methods.CountUserAchievements(MethodsPtr, ref ret); - return ret; - } - - public UserAchievement GetUserAchievement(Int64 userAchievementId) - { - var ret = new UserAchievement(); - var res = Methods.GetUserAchievement(MethodsPtr, userAchievementId, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - public UserAchievement GetUserAchievementAt(Int32 index) - { - var ret = new UserAchievement(); - var res = Methods.GetUserAchievementAt(MethodsPtr, index, ref ret); - if (res != Result.Ok) - { - throw new ResultException(res); - } - return ret; - } - - [MonoPInvokeCallback] - private static void OnUserAchievementUpdateImpl(IntPtr ptr, ref UserAchievement userAchievement) - { - GCHandle h = GCHandle.FromIntPtr(ptr); - Discord d = (Discord)h.Target; - if (d.AchievementManagerInstance.OnUserAchievementUpdate != null) - { - d.AchievementManagerInstance.OnUserAchievementUpdate.Invoke(ref userAchievement); - } - } - } -} diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/Core.cs.meta b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/Core.cs.meta deleted file mode 100644 index 86b3bafa7..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/Core.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 322f7411488994c4ba05fef35275c9ae -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/ImageManager.cs b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/ImageManager.cs deleted file mode 100644 index 292e23004..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/ImageManager.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Runtime.InteropServices; -#if UNITY_EDITOR || UNITY_STANDALONE -using UnityEngine; -#endif - -namespace Discord -{ - public partial struct ImageHandle - { - static public ImageHandle User(Int64 id) - { - return User(id, 128); - } - - static public ImageHandle User(Int64 id, UInt32 size) - { - return new ImageHandle - { - Type = ImageType.User, - Id = id, - Size = size, - }; - } - } - - public partial class ImageManager - { - public void Fetch(ImageHandle handle, FetchHandler callback) - { - Fetch(handle, false, callback); - } - - public byte[] GetData(ImageHandle handle) - { - var dimensions = GetDimensions(handle); - var data = new byte[dimensions.Width * dimensions.Height * 4]; - GetData(handle, data); - return data; - } - -#if UNITY_EDITOR || UNITY_STANDALONE - public Texture2D GetTexture(ImageHandle handle) - { - var dimensions = GetDimensions(handle); - var texture = new Texture2D((int)dimensions.Width, (int)dimensions.Height, TextureFormat.RGBA32, false, true); - texture.LoadRawTextureData(GetData(handle)); - texture.Apply(); - return texture; - } -#endif - } -} diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/ImageManager.cs.meta b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/ImageManager.cs.meta deleted file mode 100644 index 09ee9e807..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/ImageManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9aaaf736e0538da4d921dda51e049299 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/LobbyManager.cs b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/LobbyManager.cs deleted file mode 100644 index c914ba832..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/LobbyManager.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using System.Collections.Generic; -using System.Text; - -namespace Discord -{ - public partial class LobbyManager - { - public IEnumerable GetMemberUsers(Int64 lobbyID) - { - var memberCount = MemberCount(lobbyID); - var members = new List(); - for (var i = 0; i < memberCount; i++) - { - members.Add(GetMemberUser(lobbyID, GetMemberUserId(lobbyID, i))); - } - return members; - } - - public void SendLobbyMessage(Int64 lobbyID, string data, SendLobbyMessageHandler handler) - { - SendLobbyMessage(lobbyID, Encoding.UTF8.GetBytes(data), handler); - } - } -} diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/LobbyManager.cs.meta b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/LobbyManager.cs.meta deleted file mode 100644 index 27e758448..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/LobbyManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9f595176ca2beab4da4f6473f1a4d102 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/StorageManager.cs b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/StorageManager.cs deleted file mode 100644 index 65cfe72d6..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/StorageManager.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Discord -{ - public partial class StorageManager - { - public IEnumerable Files() - { - var fileCount = Count(); - var files = new List(); - for (var i = 0; i < fileCount; i++) - { - files.Add(StatAt(i)); - } - return files; - } - } -} diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/StorageManager.cs.meta b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/StorageManager.cs.meta deleted file mode 100644 index 61eff1946..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/StorageManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0de83ab0ec089db4eb806d35d6dd9558 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/StoreManager.cs b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/StoreManager.cs deleted file mode 100644 index 48645767c..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/StoreManager.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using System.Collections.Generic; -using System.Text; - -namespace Discord -{ - public partial class StoreManager - { - public IEnumerable GetEntitlements() - { - var count = CountEntitlements(); - var entitlements = new List(); - for (var i = 0; i < count; i++) - { - entitlements.Add(GetEntitlementAt(i)); - } - return entitlements; - } - - public IEnumerable GetSkus() - { - var count = CountSkus(); - var skus = new List(); - for (var i = 0; i < count; i++) - { - skus.Add(GetSkuAt(i)); - } - return skus; - } - } -} diff --git a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/StoreManager.cs.meta b/Assets/Plugins/Discord/Plugins/DiscordGameSDK/StoreManager.cs.meta deleted file mode 100644 index e30d05e17..000000000 --- a/Assets/Plugins/Discord/Plugins/DiscordGameSDK/StoreManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 12e503df03fd6734d8f085997e64656c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/aarch64.meta b/Assets/Plugins/Discord/Plugins/aarch64.meta deleted file mode 100644 index 62886f008..000000000 --- a/Assets/Plugins/Discord/Plugins/aarch64.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 744658200b40eb54595b8aaf092485cc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.bundle b/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.bundle deleted file mode 100644 index 8f086062a..000000000 Binary files a/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.bundle and /dev/null differ diff --git a/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.bundle.meta b/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.bundle.meta deleted file mode 100644 index e80489567..000000000 --- a/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.bundle.meta +++ /dev/null @@ -1,63 +0,0 @@ -fileFormatVersion: 2 -guid: 96fc096f6b288424faf79ea974b7041e -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux64: 1 - Exclude OSXUniversal: 0 - Exclude Win: 1 - Exclude Win64: 1 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: ARM64 - DefaultValueInitialized: true - OS: OSX - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: ARM64 - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: x86_64 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.dylib b/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.dylib deleted file mode 100644 index 8f086062a..000000000 Binary files a/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.dylib and /dev/null differ diff --git a/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.dylib.meta b/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.dylib.meta deleted file mode 100644 index 1a9b6d4b4..000000000 --- a/Assets/Plugins/Discord/Plugins/aarch64/discord_game_sdk.dylib.meta +++ /dev/null @@ -1,63 +0,0 @@ -fileFormatVersion: 2 -guid: 84f8495f7ca76e94c9e4bfe9675f534c -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux64: 1 - Exclude OSXUniversal: 0 - Exclude Win: 1 - Exclude Win64: 1 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: ARM64 - DefaultValueInitialized: true - OS: OSX - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: ARM64 - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: x86_64 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/x64.meta b/Assets/Plugins/Discord/Plugins/x64.meta deleted file mode 100644 index 47f98a35a..000000000 --- a/Assets/Plugins/Discord/Plugins/x64.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e291cd87df3992b40b4cb0fc5f542185 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.bundle b/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.bundle deleted file mode 100644 index 3402426b8..000000000 Binary files a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.bundle and /dev/null differ diff --git a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.bundle.meta b/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.bundle.meta deleted file mode 100644 index 23c30b70c..000000000 --- a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.bundle.meta +++ /dev/null @@ -1,63 +0,0 @@ -fileFormatVersion: 2 -guid: ba4f73ad56fdd254c9406111c6702f84 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux64: 0 - Exclude OSXUniversal: 0 - Exclude Win: 0 - Exclude Win64: 0 - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: AnyOS - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: x86_64 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll b/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll deleted file mode 100644 index be946ea70..000000000 Binary files a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll and /dev/null differ diff --git a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll.lib b/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll.lib deleted file mode 100644 index 562b01cdc..000000000 Binary files a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll.lib and /dev/null differ diff --git a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll.lib.meta b/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll.lib.meta deleted file mode 100644 index 388182ad2..000000000 --- a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll.lib.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0d629049536dd6044b09086f92fc7305 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll.meta b/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll.meta deleted file mode 100644 index e38bd5fb7..000000000 --- a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dll.meta +++ /dev/null @@ -1,52 +0,0 @@ -fileFormatVersion: 2 -guid: ffaf5645d42da1d40b14356395eb1bb8 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: x86_64 - DefaultValueInitialized: true - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dylib b/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dylib deleted file mode 100644 index 3402426b8..000000000 Binary files a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dylib and /dev/null differ diff --git a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dylib.meta b/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dylib.meta deleted file mode 100644 index 541165c79..000000000 --- a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.dylib.meta +++ /dev/null @@ -1,80 +0,0 @@ -fileFormatVersion: 2 -guid: cbdb66c634dc7af4cb711bca303d2c1a -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Android: 0 - Exclude Editor: 0 - Exclude Linux64: 0 - Exclude OSXUniversal: 0 - Exclude Win: 0 - Exclude Win64: 0 - Exclude iOS: 0 - - first: - Android: Android - second: - enabled: 1 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: AnyOS - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.so b/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.so deleted file mode 100644 index 9dacf9461..000000000 Binary files a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.so and /dev/null differ diff --git a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.so.meta b/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.so.meta deleted file mode 100644 index 03dcc2b5d..000000000 --- a/Assets/Plugins/Discord/Plugins/x64/discord_game_sdk.so.meta +++ /dev/null @@ -1,63 +0,0 @@ -fileFormatVersion: 2 -guid: f5327cb3294b2bc46a8451ef4c09a855 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux64: 0 - Exclude OSXUniversal: 1 - Exclude Win: 0 - Exclude Win64: 0 - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: AnyOS - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/x86.meta b/Assets/Plugins/Discord/Plugins/x86.meta deleted file mode 100644 index e6186c0e5..000000000 --- a/Assets/Plugins/Discord/Plugins/x86.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 70173042601fc1846a90b0c8ea926df4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll b/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll deleted file mode 100644 index 45b9bb172..000000000 Binary files a/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll and /dev/null differ diff --git a/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll.lib b/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll.lib deleted file mode 100644 index 02c417e6e..000000000 Binary files a/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll.lib and /dev/null differ diff --git a/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll.lib.meta b/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll.lib.meta deleted file mode 100644 index 641fd20c7..000000000 --- a/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll.lib.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 42267c7ce7eae61448e2ea4ecbf34463 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll.meta b/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll.meta deleted file mode 100644 index 4175cdb33..000000000 --- a/Assets/Plugins/Discord/Plugins/x86/discord_game_sdk.dll.meta +++ /dev/null @@ -1,63 +0,0 @@ -fileFormatVersion: 2 -guid: 7dc43ba202aaeee43b83eda90c7cf67b -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Editor: 1 - Exclude Linux64: 0 - Exclude OSXUniversal: 0 - Exclude Win: 0 - Exclude Win64: 0 - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: Windows - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: x86 - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: None - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/UI/Common/Controllers/controllerSheet.png b/Assets/Resources/Sprites/UI/Common/Controllers/controllerSheet.png index aedd4b72b..f266c0082 100644 Binary files a/Assets/Resources/Sprites/UI/Common/Controllers/controllerSheet.png and b/Assets/Resources/Sprites/UI/Common/Controllers/controllerSheet.png differ diff --git a/Assets/Resources/Sprites/UI/Common/Controllers/controllerSheet.png.meta b/Assets/Resources/Sprites/UI/Common/Controllers/controllerSheet.png.meta index a6b39b844..7fc72784a 100644 --- a/Assets/Resources/Sprites/UI/Common/Controllers/controllerSheet.png.meta +++ b/Assets/Resources/Sprites/UI/Common/Controllers/controllerSheet.png.meta @@ -122,6 +122,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable b/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable index 6af5efa75..acea90dd6 100644 --- a/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable +++ b/Assets/Resources/Sprites/UI/Timeline/JudgementOpen.playable @@ -143,7 +143,6 @@ MonoBehaviour: - {fileID: 4005577975902647507} - {fileID: 2251119349716289747} - {fileID: 3019407148365585604} - - {fileID: 8445470951399354961} - {fileID: -5180983858531340552} --- !u!114 &-5180983858531340552 MonoBehaviour: @@ -333,10 +332,10 @@ MonoBehaviour: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -345,7 +344,7 @@ MonoBehaviour: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -360,24 +359,24 @@ MonoBehaviour: value: 1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 outWeight: 0 - serializedVersion: 3 time: 1 - value: 0 + value: 1 inSlope: 0 outSlope: 0 - tangentMode: 0 + tangentMode: 34 weightedMode: 0 inWeight: 0 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - m_BlendInCurveMode: 0 - m_BlendOutCurveMode: 0 + m_BlendInCurveMode: 1 + m_BlendOutCurveMode: 1 m_ExposedParameterNames: [] m_AnimationCurves: {fileID: 0} m_Recordable: 0 @@ -464,19 +463,3 @@ MonoBehaviour: m_Retroactive: 0 m_EmitOnce: 0 m_Asset: {fileID: 11400000, guid: f5bc62bc9f451ed4a9ed997842113201, type: 2} ---- !u!114 &8445470951399354961 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3} - m_Name: Signal Emitter - m_EditorClassIdentifier: - m_Time: 0 - m_Retroactive: 0 - m_EmitOnce: 0 - m_Asset: {fileID: 11400000, guid: b84f5e43721bc2e408bc902a4e02988d, type: 2} diff --git a/Assets/Scenes/Judgement.unity b/Assets/Scenes/Judgement.unity index cd8e130ab..11efa1d56 100644 --- a/Assets/Scenes/Judgement.unity +++ b/Assets/Scenes/Judgement.unity @@ -362,6 +362,42 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &57158678 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 632, g: 92, b: 84, a: 0} + m_BuildTextureStacks: [] --- !u!1 &98372472 GameObject: m_ObjectHideFlags: 0 @@ -10265,42 +10301,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272774269} m_CullTransparentMesh: 1 ---- !u!21 &353272174 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 652, g: 112, b: 96, a: 0} - m_BuildTextureStacks: [] --- !u!1 &513457786 GameObject: m_ObjectHideFlags: 0 @@ -10483,7 +10483,7 @@ PlayableDirector: m_Enabled: 1 serializedVersion: 3 m_PlayableAsset: {fileID: 11400000, guid: 1cface0e48180cc43954bd1d6d1c6168, type: 2} - m_InitialState: 1 + m_InitialState: 0 m_WrapMode: 0 m_DirectorUpdateMode: 1 m_InitialTime: 0 @@ -10676,7 +10676,7 @@ AudioSource: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -11405,7 +11405,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1805959308} + m_Material: {fileID: 1807253055} m_Color: {r: 0.14901961, g: 0.14901961, b: 0.14901961, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -11558,7 +11558,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 353272174} + m_Material: {fileID: 1929755838} m_Color: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -12012,6 +12012,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1238570285} m_CullTransparentMesh: 1 +--- !u!21 &1364499906 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _WidthHeightRadius: {r: 648, g: 74, b: 80, a: 0} + m_BuildTextureStacks: [] --- !u!1 &1432705147 GameObject: m_ObjectHideFlags: 0 @@ -12063,7 +12099,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2127234886} + m_Material: {fileID: 1364499906} m_Color: {r: 0.11764706, g: 0.11764706, b: 0.11764706, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -12661,7 +12697,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1918595244} + m_Material: {fileID: 57158678} m_Color: {r: 0.09411765, g: 0.09411765, b: 0.09411765, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -13011,7 +13047,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1702256960} m_CullTransparentMesh: 1 ---- !u!21 &1805959308 +--- !u!21 &1807253055 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -13047,7 +13083,7 @@ Material: m_Colors: - _WidthHeightRadius: {r: 632, g: 34.3, b: 80, a: 0} m_BuildTextureStacks: [] ---- !u!21 &1918595244 +--- !u!21 &1929755838 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -13081,7 +13117,7 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _WidthHeightRadius: {r: 632, g: 92, b: 84, a: 0} + - _WidthHeightRadius: {r: 652, g: 112, b: 96, a: 0} m_BuildTextureStacks: [] --- !u!1 &1932988790 GameObject: @@ -13506,39 +13542,3 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2086822065} m_CullTransparentMesh: 1 ---- !u!21 &2127234886 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _WidthHeightRadius: {r: 648, g: 74, b: 80, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Scripts/DiscordController.cs b/Assets/Scripts/DiscordController.cs deleted file mode 100644 index dd090714c..000000000 --- a/Assets/Scripts/DiscordController.cs +++ /dev/null @@ -1,114 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; -using System.Text; -using Discord; -using System; - -namespace HeavenStudio.DiscordRPC -{ - public class DiscordController : MonoBehaviour - { - public Discord.Discord discord; - - public static DiscordController instance { get; set; } - - private long lastStartTime; - - private bool quitting; - - private void Awake() - { - } - - private void Start() - { - DontDestroyOnLoad(this.gameObject); - instance = this; - } - - // private void OnApplicationQuit() - // { - // quitting = true; - // } - - public void Connect() - { - discord = new Discord.Discord(DiscordRPC.clientID, (System.UInt64)Discord.CreateFlags.NoRequireDiscord); - quitting = false; - } - - public void Disconnect() - { - if (discord != null) - { - discord.Dispose(); - quitting = true; - } - } - - public void UpdateActivity(string stateText, string stateDetails, bool updateTime = false) - { - var activityManager = discord.GetActivityManager(); - var activity = new Activity { }; - - - activity = new Activity - { - State = stateText, - Details = stateDetails, - Assets = - { - LargeImage = "logo", - LargeText = "Together now!" - }, - Instance = true, - }; - - if (updateTime == true) - { - lastStartTime = DateTimeOffset.Now.ToUnixTimeSeconds(); - activity.Timestamps.Start = lastStartTime; - } - else - { - activity.Timestamps.Start = lastStartTime; - } - - activityManager.UpdateActivity(activity, (result) => { - if (result == Discord.Result.Ok) - { - Debug.Log("Update Success!"); - } - else - { - Debug.Log("Update Failed"); - } - }); - } - - public void ClearActivity() - { - var activityManager = discord.GetActivityManager(); - activityManager.ClearActivity((result) => { - if (result == Discord.Result.Ok) - { - Debug.Log("Clear Success!"); - } - else - { - Debug.Log("Clear Failed"); - } - }); - } - - void Update() - { - if ((!quitting) && discord != null) - { - discord.RunCallbacks(); - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/DiscordController.cs.meta b/Assets/Scripts/DiscordController.cs.meta deleted file mode 100644 index 0f8d448b4..000000000 --- a/Assets/Scripts/DiscordController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4fda65d1df0676c49913aaa4c138c6f5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: -48 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/DiscordRPC.cs b/Assets/Scripts/DiscordRPC.cs deleted file mode 100644 index 8794b3543..000000000 --- a/Assets/Scripts/DiscordRPC.cs +++ /dev/null @@ -1,39 +0,0 @@ -using UnityEngine; - -namespace HeavenStudio.DiscordRPC -{ - public class DiscordRPC : MonoBehaviour - { - public static long clientID = 945877725984477205; - - private static void DiscordControllerCheck() - { - if (DiscordController.instance == null) - { - var discordController = new GameObject("DiscordController"); - var di = discordController.AddComponent(); - DiscordController.instance = di; - di.Connect(); - } - } - - public static void Connect() - { - DiscordControllerCheck(); - DiscordController.instance.Connect(); - } - - public static void UpdateActivity(string state = null, string details = null, bool updateTime = false) - { - DiscordControllerCheck(); - DiscordController.instance.UpdateActivity(details, state, updateTime); - } - - public static void Disconnect() - { - DiscordControllerCheck(); - DiscordController.instance.Disconnect(); - Destroy(DiscordController.instance.gameObject); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/DiscordRPC.cs.meta b/Assets/Scripts/DiscordRPC.cs.meta deleted file mode 100644 index 4c540bab4..000000000 --- a/Assets/Scripts/DiscordRPC.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 896ff10d4b52e8c42ad72ec0545f8389 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Games/FirstContact/FirstContact.cs b/Assets/Scripts/Games/FirstContact/FirstContact.cs index be4e8bf67..06da55d6e 100644 --- a/Assets/Scripts/Games/FirstContact/FirstContact.cs +++ b/Assets/Scripts/Games/FirstContact/FirstContact.cs @@ -316,17 +316,24 @@ namespace HeavenStudio.Games if (PlayerInput.GetIsAction(InputAction_Press) && !IsExpectingInputNow(InputAction_Press)) { - translator.DoScaledAnimationAsync("translator_eh", 0.5f); if (isSpeaking) { - if (callDiagIndex == 0) + if (noHitOnce || callDiagIndex == 0) + { FailContact(); + } else + { + SoundByte.PlayOneShotGame("firstContact/ALIEN_PLAYER_A", -1, SoundByte.GetPitchFromSemiTones(UnityEngine.Random.Range(-3, 3), false)); TrailingContact(); + ScoreMiss(); + } } else if (!noHitOnce && !missionControl.activeInHierarchy) { + translator.DoScaledAnimationAsync("translator_eh", 0.5f); SoundByte.PlayOneShotGame("firstContact/ALIEN_PLAYER_MISS2_A", -1, SoundByte.GetPitchFromSemiTones(UnityEngine.Random.Range(-2, 1), false)); + ScoreMiss(); } } } @@ -414,7 +421,7 @@ namespace HeavenStudio.Games { var input = inputs[i]; double relativeBeat = input.beat - intervalBeat; - ScheduleInput(beat, length + relativeBeat, InputAction_Press, AlienTapping, AlienOnMiss, AlienEmpty); + ScheduleInput(beat, length + relativeBeat, InputAction_Press, AlienTapping, AlienOnMiss, AlienEmpty, CanAlienTapping); callDiagList.Add((input["dialogue"], input["newline"])); } BeatAction.New(this, new List() @@ -422,6 +429,7 @@ namespace HeavenStudio.Games new BeatAction.Action(beat, delegate { isSpeaking = true; + hasMissed = false; SoundByte.PlayOneShotGame("firstContact/turnover"); alienTextbox.SetActive(false); alien.Play("alien_point", 0, 0); @@ -582,56 +590,38 @@ namespace HeavenStudio.Games hasMissed = true; } + public bool CanAlienTapping() + { + return !(hasMissed || noHitOnce); + } + public void AlienTapping(PlayerActionEvent caller, float state) //OnHit { - if (hasMissed && callDiagIndex == 0) + (string dialogue, bool showNewline) = callDiagList[callDiagIndex]; + translateTextbox.SetActive(true); + if (showNewline) { - caller.isEligible = false; - ScoreMiss(); - return; - }; - - if (noHitOnce) - { - caller.isEligible = false; - FailContact(); - return; + ResetTranslateTextbox(true); } - if (state >= 1f || state <= -1f) { SoundByte.PlayOneShotGame("firstContact/ALIEN_PLAYER_A", -1, SoundByte.GetPitchFromSemiTones(UnityEngine.Random.Range(-3, 3), false)); - translator.DoScaledAnimationAsync("translator_speak", 0.5f); - if (callDiagIndex == 0) return; TrailingContact(); + callDiagIndex++; return; } translator.DoScaledAnimationAsync("translator_speak", 0.5f); SoundByte.PlayOneShotGame("firstContact/ALIEN_PLAYER_A", -1, SoundByte.GetPitchFromSemiTones(UnityEngine.Random.Range(-3, 3), false)); SoundByte.PlayOneShotGame("firstContact/ALIEN_PLAYER_B"); - if (hasMissed) - { - caller.isEligible = false; - return; - } - else - { - (string dialogue, bool showNewline) = callDiagList[callDiagIndex]; - if (showNewline) - { - ResetTranslateTextbox(true); - } - respDiagBuffer += dialogue; - translateTextbox.SetActive(true); - UpdateTranslateTextbox(); - callDiagIndex++; - } + respDiagBuffer += dialogue; + UpdateTranslateTextbox(); + callDiagIndex++; } public void AlienOnMiss(PlayerActionEvent caller) //OnMiss { - if (!noHitOnce) + if (!noHitOnce && !hasMissed) { SoundByte.PlayOneShotGame("firstContact/alienNoHit"); noHitOnce = true; diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index 251191bb2..930b16010 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -20,7 +20,7 @@ namespace HeavenStudio.Games.Loaders if (datamodel == "karateman/hitX") { if (e["type"] == null) return null; - + int newWarning = (int)e["type"]; newWarning = (e["type"] < 7) ? newWarning + 1 : 0; @@ -46,20 +46,21 @@ namespace HeavenStudio.Games.Loaders var toRemove = e.dynamicData.Keys.Where(x => x != "track").ToList(); bool fade = e["type3"] == 3; - e.CreateProperty("presetBg", (int)e["type"]); - e.CreateProperty("startColor", e["colorA"]); - e.CreateProperty("shadowType", (int)e["type2"]); - e.CreateProperty("shadowStart", e["colorB"]); - e.CreateProperty("shadowEnd", e["colorB"]); - e.CreateProperty("textureType", (int)e["type4"]); - e.CreateProperty("autoColor", e["type5"] == (int)KarateMan.ShadowType.Tinted); + e.CreateProperty("presetBg", (int)e["type"]); + e.CreateProperty("startColor", e["colorA"]); + e.CreateProperty("shadowType", (int)e["type2"]); + e.CreateProperty("shadowStart", e["colorB"]); + e.CreateProperty("shadowEnd", e["colorB"]); + e.CreateProperty("textureType", (int)e["type4"]); + e.CreateProperty("autoColor", e["type5"] == (int)KarateMan.ShadowType.Tinted); e.CreateProperty("startTexture", e["colorC"]); - e.CreateProperty("endTexture", e["colorC"]); - e.CreateProperty("endColor", fade ? e["colorD"] : e["colorA"]); - e.CreateProperty("ease", fade ? (int)Util.EasingFunction.Ease.Linear : (int)Util.EasingFunction.Ease.Instant); - e.CreateProperty("fxType", !fade ? (int)e["type3"] : 3); + e.CreateProperty("endTexture", e["colorC"]); + e.CreateProperty("endColor", fade ? e["colorD"] : e["colorA"]); + e.CreateProperty("ease", fade ? (int)Util.EasingFunction.Ease.Linear : (int)Util.EasingFunction.Ease.Instant); + e.CreateProperty("fxType", !fade ? (int)e["type3"] : 3); - foreach (var remove in toRemove) { + foreach (var remove in toRemove) + { e.dynamicData.Remove(remove); } @@ -149,7 +150,7 @@ namespace HeavenStudio.Games.Loaders new Param("colorA", new Color(1f,1f,1f), "Custom Color", "Choose the color to use."), new Param("type2", KarateMan.KarateManFaces.Normal, "Success Expression", "Set the facial expression for Karate Joe to show if he hits the object."), new Param("mute", false, "Mute", "Toggle if the cue should be muted."), - new Param("sfx", KarateMan.LightBulbSfx.Automatic, "SFX", "Choose the type of SFX to use for the bulb.", new List() + new Param("sfx", KarateMan.LightBulbSfx.Automatic, "SFX", "Choose the type of SFX to use for the bulb.", new List() { new Param.CollapseParam((x, _) => (int)x == (int)KarateMan.LightBulbSfx.Custom, new string[] { "throwSfx", "hitSfx" }), }), @@ -175,7 +176,7 @@ namespace HeavenStudio.Games.Loaders new Param("toggle", false, "Ball", "Toggle if the barrel should contain a ball instead of a bomb."), new Param("shouldGlow", true, "Bomb Glow", "Toggle if Joe should be lit up by the bomb in the barrel."), new Param("type", KarateMan.KarateManFaces.Smirk, "Success Expression", "Set the facial expression for Karate Joe to show if he hits the object."), - new Param("pitchVoice", false, "Pitch Voice", "Toggle if the voice should be pitched.", new List() + new Param("pitchVoice", false, "Pitch Voice", "Toggle if the voice should be pitched.", new List() { new Param.CollapseParam((x, _) => (bool)x, new string[] { "forcePitch" }), }), @@ -192,7 +193,7 @@ namespace HeavenStudio.Games.Loaders var e = eventCaller.currentEntity; KarateMan.instance.Combo(e.beat, e["type"], e["pitchVoice"], e["forcePitch"], e["cutOut"], e["disableVoice"]); KarateMan.ComboSFX(); - }, + }, inactiveFunction = delegate { var e = eventCaller.currentEntity; KarateMan.QueueCue(e); @@ -295,7 +296,7 @@ namespace HeavenStudio.Games.Loaders }), new Param("shadowStart", new Color(), "Start Shadow Color", "Set the color at the start of the event."), new Param("shadowEnd", new Color(), "End Shadow Color", "Set the color at the end of the event."), - + new Param("fxType", KarateMan.BackgroundFXType.None, "FX Type", "Set the background effect to be displayed."), new Param("textureType", KarateMan.BackgroundTextureType.Plain, "Texture", "Set the type of background texture to use", new List() @@ -368,7 +369,7 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("force facial expression", "Facial Expression") { - function = delegate { KarateMan.instance.SetFaceExpression(eventCaller.currentEntity["type"]); }, + function = delegate { KarateMan.instance.SetFaceExpression(eventCaller.currentEntity["type"]); }, defaultLength = 0.5f, resizable = true, parameters = new List() @@ -402,9 +403,9 @@ namespace HeavenStudio.Games.Loaders }, }, }, - new List() {"agb", "ntr", "rvl", "ctr", "pco", "normal"}, + new List() { "agb", "ntr", "rvl", "ctr", "pco", "normal" }, "karate", "en", - new List() {"en"} + new List() { "en" } ); } } @@ -503,7 +504,7 @@ namespace HeavenStudio.Games Fire, Rain } - + public enum KarateManFaces { Normal, @@ -595,10 +596,10 @@ namespace HeavenStudio.Games //public static Queue ItemQueue = new Queue(); public static bool WantBop = true; public static bool WantNori = true; - public static int WantNoriType = (int) NoriMode.None; + public static int WantNoriType = (int)NoriMode.None; public static double WantBgChangeStart = double.MinValue; public static float WantBgChangeLength = 0f; - + const int IAAltDownCat = IAMAXCAT; const int IAAltUpCat = IAMAXCAT + 1; @@ -697,7 +698,7 @@ namespace HeavenStudio.Games { instance = this; SetupBopRegion("karateman", "bop", "toggle"); - + KarateManPot.ResetLastCombo(); bgEffectAnimator = BGEffect.GetComponent(); @@ -709,8 +710,6 @@ namespace HeavenStudio.Games TintColor(BackgroundColors[0]), new Color(), }; - - Update(); } private void Start() @@ -721,14 +720,17 @@ namespace HeavenStudio.Games public override void OnGameSwitch(double beat) { // queued objects - if (queuedCues.Count > 0) { - foreach (var e in queuedCues) { - switch (e.datamodel) { - case "karateman/hit" : CreateItem(e.beat, e["type"], e["type2"]); break; - case "karateman/bulb" : CreateBulbSpecial(e.beat, e["type"], e["colorA"], e["type2"], e["sfx"], e["hitSfx"]); break; - case "karateman/kick" : Kick(e.beat, e["toggle"], e["shouldGlow"], e["type"], e["pitchVoice"], e["forcePitch"], e["cutOut"], e["disableVoice"], e["woodColor"], e["hoopColor"]); break; + if (queuedCues.Count > 0) + { + foreach (var e in queuedCues) + { + switch (e.datamodel) + { + case "karateman/hit": CreateItem(e.beat, e["type"], e["type2"]); break; + case "karateman/bulb": CreateBulbSpecial(e.beat, e["type"], e["colorA"], e["type2"], e["sfx"], e["hitSfx"]); break; + case "karateman/kick": Kick(e.beat, e["toggle"], e["shouldGlow"], e["type"], e["pitchVoice"], e["forcePitch"], e["cutOut"], e["disableVoice"], e["woodColor"], e["hoopColor"]); break; case "karateman/combo": Combo(e.beat, e["type"], e["pitchVoice"], e["forcePitch"], e["cutOut"], e["disableVoice"]); break; - default : Debug.LogError($"Karate Man has failed to cue an object with datamodel {e.datamodel} at beat {e.beat}"); break; + default: Debug.LogError($"Karate Man has failed to cue an object with datamodel {e.datamodel} at beat {e.beat}"); break; } } queuedCues.Clear(); @@ -747,29 +749,36 @@ namespace HeavenStudio.Games List prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel.Split(0) == "karateman"); RiqEntity voice = prevEntities.FindLast(c => c.beat < beat && c.datamodel == "karateman/warnings"); - if (wordClearTime > beat && wordStartTime < beat && voice != null) { + if (wordClearTime > beat && wordStartTime < beat && voice != null) + { DoWord(voice.beat, voice.length, voice["whichWarning"], false, 1, voice["customLength"], false); } // init colors RiqEntity bg = prevEntities.FindLast(c => c.beat <= beat && c.datamodel == "karateman/background appearance"); RiqEntity obj = prevEntities.FindLast(c => c.beat <= beat && c.datamodel == "karateman/set object colors"); - - if (bg != null) { + + if (bg != null) + { BackgroundColor( bg.beat, bg.length, bg["fxType"], bg["presetBg"], bg["startColor"], bg["endColor"], bg["ease"], bg["shadowType"], bg["shadowStart"], bg["shadowEnd"], bg["textureType"], bg["autoColor"], bg["startTexture"], bg["endTexture"] ); - } else { + } + else + { var c = new Color(); BackgroundColor(0, 0, 0, 0, c, c, (int)Util.EasingFunction.Ease.Instant, 0, c, c, 0, true, c, c); } - - if (obj != null) { + + if (obj != null) + { UpdateMaterialColour(obj["colorA"], obj["colorB"], obj["colorC"], obj["colorD"], obj["star"]); - } else { + } + else + { UpdateMaterialColour(Color.white, new Color(0.81f, 0.81f, 0.81f), Color.white, Color.white, (int)StarColorOption.ItemColor); } @@ -779,7 +788,8 @@ namespace HeavenStudio.Games ToggleBop(0, 0, false, bop?["toggle"] ?? true); - if (flow != null) { + if (flow != null) + { int fxType = bg == null || flow.beat > bg.beat ? flow["fxType"] : bg["fxType"]; SetGameplayMods(beat, fxType, flow["type"], flow["toggle"]); } @@ -792,19 +802,19 @@ namespace HeavenStudio.Games private void Update() { - var cond = Conductor.instance; - var songPos = cond.songPositionInBeatsAsDouble; + var songPos = conductor.songPositionInBeatsAsDouble; - if (!cond.isPlaying) { + if (conductor != null && !conductor.isPlaying) + { EntityPreCheck(songPos); } - + switch (currentBgEffect) { - case (int) BackgroundFXType.Sunburst: + case (int)BackgroundFXType.Sunburst: bgEffectAnimator.DoNormalizedAnimation("Sunburst", (float)(songPos * 0.5) % 1f); break; - case (int) BackgroundFXType.Rings: + case (int)BackgroundFXType.Rings: bgEffectAnimator.DoNormalizedAnimation("Rings", (float)(songPos * 0.5) % 1f); break; default: @@ -812,7 +822,8 @@ namespace HeavenStudio.Games break; } - if (songPos >= wordClearTime || songPos < wordStartTime) { + if (songPos >= wordClearTime || songPos < wordStartTime) + { Word.Play("NoPose"); } @@ -823,7 +834,7 @@ namespace HeavenStudio.Games float camZ = 0f; if (songPos <= startCamSpecial + cameraReturnLength) { - float prog = cond.GetPositionFromBeat(startCamSpecial, cameraReturnLength); + float prog = conductor.GetPositionFromBeat(startCamSpecial, cameraReturnLength); camX = Util.EasingFunction.EaseOutCubic(CameraPosition[0].position.x, CameraPosition[1].position.x, prog); camY = Util.EasingFunction.EaseOutCubic(CameraPosition[0].position.y, CameraPosition[1].position.y, prog); camZ = Util.EasingFunction.EaseOutCubic(CameraPosition[0].position.z, CameraPosition[1].position.z, prog); @@ -831,7 +842,7 @@ namespace HeavenStudio.Games } else if (songPos >= wantsReturn - cameraReturnLength) { - float prog = cond.GetPositionFromBeat(wantsReturn - cameraReturnLength, cameraReturnLength); + float prog = conductor.GetPositionFromBeat(wantsReturn - cameraReturnLength, cameraReturnLength); camX = Util.EasingFunction.EaseOutQuad(CameraPosition[1].position.x, CameraPosition[0].position.x, prog); camY = Util.EasingFunction.EaseOutQuad(CameraPosition[1].position.y, CameraPosition[0].position.y, prog); camZ = Util.EasingFunction.EaseOutQuad(CameraPosition[1].position.z, CameraPosition[0].position.z, prog); @@ -856,10 +867,12 @@ namespace HeavenStudio.Games private void OnDestroy() { - foreach (var evt in scheduledInputs) { + foreach (var evt in scheduledInputs) + { evt.Disable(); } - if (!Conductor.instance.NotStopped()) { + if (!Conductor.instance.NotStopped()) + { if (queuedCues.Count > 0) queuedCues.Clear(); startCamSpecial = double.MinValue; wantsReturn = double.MinValue; @@ -888,7 +901,8 @@ namespace HeavenStudio.Games public static string DoWordSound(double beat, double length, int type, bool bpmPitch = false, float forcePitch = 1, bool customLength = false, bool doSound = true) { - double clear = type switch { + double clear = type switch + { <= (int)HitThree.HitFour => beat + 4f, <= (int)HitThree.Warning => beat + 1f, _ => beat + 3f, @@ -907,7 +921,8 @@ namespace HeavenStudio.Games } var songPos = Conductor.instance.songPositionInBeatsAsDouble; - if (songPos <= clear && songPos >= beat) { + if (songPos <= clear && songPos >= beat) + { wordClearTime = customLength ? (beat + length) : clear; wordStartTime = beat; } @@ -926,13 +941,15 @@ namespace HeavenStudio.Games public static void CreateBulbSFX(double beat, int type, int sfx, string throwSfx) { - string obj = sfx switch { + string obj = sfx switch + { (int)LightBulbSfx.Automatic => type == (int)LightBulbType.Yellow ? "LightbulbNtr" : "Lightbulb", (int)LightBulbSfx.DS => "LightbulbNtr", (int)LightBulbSfx.Custom => throwSfx, _ => "Lightbulb", }; - if (sfx != (int)LightBulbSfx.Custom) { + if (sfx != (int)LightBulbSfx.Custom) + { obj = (beat % 1.0 == 0.5) ? $"offbeat{obj}Out" : obj.ToLower() + "Out"; } SoundByte.PlayOneShotGame($"karateman/{obj}", forcePlay: true); @@ -942,29 +959,29 @@ namespace HeavenStudio.Games { switch (type) { - case (int) HitType.Pot: + case (int)HitType.Pot: CreateItemInstance(beat, "Item00", expression); break; - case (int) HitType.Lightbulb: + case (int)HitType.Lightbulb: var mobj = CreateItemInstance(beat, "Item01", expression, KarateManPot.ItemType.Bulb); mobj.SetBulbColor(LightBulbColors[0]); break; - case (int) HitType.Rock: + case (int)HitType.Rock: CreateItemInstance(beat, "Item02", expression, KarateManPot.ItemType.Rock); break; - case (int) HitType.Ball: + case (int)HitType.Ball: CreateItemInstance(beat, "Item03", expression, KarateManPot.ItemType.Ball); break; - case (int) HitType.CookingPot: + case (int)HitType.CookingPot: CreateItemInstance(beat, "Item06", expression, KarateManPot.ItemType.Cooking); break; - case (int) HitType.Alien: + case (int)HitType.Alien: CreateItemInstance(beat, "Item07", expression, KarateManPot.ItemType.Alien); break; - case (int) HitType.Bomb: + case (int)HitType.Bomb: CreateItemInstance(beat, "Item04", expression, KarateManPot.ItemType.Bomb); break; - case (int) HitType.TacoBell: + case (int)HitType.TacoBell: CreateItemInstance(beat, "Item99", expression, KarateManPot.ItemType.TacoBell); break; default: @@ -975,7 +992,8 @@ namespace HeavenStudio.Games public void CreateBulbSpecial(double beat, int type, Color color, int expression, int sfx, string hitSfx = "") { - string obj = sfx switch { + string obj = sfx switch + { (int)LightBulbSfx.Automatic => type == (int)LightBulbType.Yellow ? "LightbulbNtr" : "Lightbulb", (int)LightBulbSfx.DS => "LightbulbNtr", (int)LightBulbSfx.Custom => hitSfx, @@ -997,7 +1015,7 @@ namespace HeavenStudio.Games int comboId = KarateManPot.GetNewCombo(); BeatAction.New(this, new List() - { + { new BeatAction.Action(beat, delegate { CreateItemInstance(beat, "Item00", 0, KarateManPot.ItemType.ComboPot1, comboId); }), new BeatAction.Action(beat + 0.25f, delegate { CreateItemInstance(beat + 0.25f, "Item00", 0, KarateManPot.ItemType.ComboPot2, comboId); }), new BeatAction.Action(beat + 0.5f, delegate { CreateItemInstance(beat + 0.5f, "Item00", 0, KarateManPot.ItemType.ComboPot3, comboId); }), @@ -1026,7 +1044,7 @@ namespace HeavenStudio.Games } sounds.ForEach(x => x.pitch = bpmPitch ? Conductor.instance.GetBpmAtBeat(x.beat) / 125 : forcePitch); - + MultiSound.Play(sounds.ToArray(), forcePlay: true); } @@ -1062,7 +1080,7 @@ namespace HeavenStudio.Games } sounds.ForEach(x => x.pitch = bpmPitch ? Conductor.instance.GetBpmAtBeat(x.beat) / 125 : forcePitch); - + MultiSound.Play(sounds.ToArray(), forcePlay: true); } @@ -1080,15 +1098,16 @@ namespace HeavenStudio.Games mobjDat.hitSfxOverride = hitSfxOverride; mobj.SetActive(true); - + return mobjDat; } public void BackgroundColor(double beat, float length, int fxType, int presetBG, Color colorStart, Color colorEnd, int colorEaseSet, int shadowType, Color shadowStart, Color shadowEnd, int textureType, bool autoColor, Color filterStart, Color filterEnd) { currentBgEffect = fxType; - - for (int i = 0; i < colorStarts.Length; i++) { + + for (int i = 0; i < colorStarts.Length; i++) + { colorStartBeats[i] = beat; colorLengths[i] = length; colorEases[i] = (Util.EasingFunction.Ease)colorEaseSet; @@ -1111,7 +1130,8 @@ namespace HeavenStudio.Games autoColor ? TintColor(bgColorEnd) : filterEnd, }; - for (int i = 0; i < BGTextures.Length; i++) { + for (int i = 0; i < BGTextures.Length; i++) + { BGTextures[i].gameObject.SetActive(textureType == (i + 1)); } @@ -1137,7 +1157,8 @@ namespace HeavenStudio.Games func(colorStarts[i].b, colorEnds[i].b, normalizedBeat), }; - foreach (var renderer in spriteRenderers[i]) { + foreach (var renderer in spriteRenderers[i]) + { renderer.color = new Color(color[0], color[1], color[2]); } } @@ -1169,7 +1190,8 @@ namespace HeavenStudio.Games public void SetParticleEffect(double beat, int type, bool instant, float windStrength, float particleStrength) { - if (type == (int) ParticleType.None) { + if (type == (int)ParticleType.None) + { foreach (var eff in Effects) eff.Stop(); return; } diff --git a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs index 9e7ca711f..e05f87070 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs @@ -382,6 +382,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void UpdateJoeColour() { + Material mappingMat = KarateMan.instance.MappingMaterial; + if (mappingMat == null) return; Color mainCol = KarateMan.instance.BodyColor; Color highlightCol = KarateMan.instance.HighlightColor; @@ -391,9 +393,9 @@ namespace HeavenStudio.Games.Scripts_KarateMan mainCol = Color.LerpUnclamped(mainCol, BombGlowTint, bombGlowIntensity * bombGlowRatio); } - KarateMan.instance.MappingMaterial.SetColor("_ColorAlpha", mainCol); - KarateMan.instance.MappingMaterial.SetColor("_ColorBravo", new Color(1, 0, 0, 1)); - KarateMan.instance.MappingMaterial.SetColor("_ColorDelta", highlightCol); + mappingMat.SetColor("_ColorAlpha", mainCol); + mappingMat.SetColor("_ColorBravo", new Color(1, 0, 0, 1)); + mappingMat.SetColor("_ColorDelta", highlightCol); } public void Prepare(double beat, float length) diff --git a/Assets/Scripts/Games/KarateMan/KarateManNoriController.cs b/Assets/Scripts/Games/KarateMan/KarateManNoriController.cs index 9c8a132ea..9aca76f87 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManNoriController.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManNoriController.cs @@ -52,6 +52,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan public void SetNoriMode(double fromBeat, int mode, int startingNori = 0) { + if (GameManager.instance == null) return; float scaleFactor = 0f; //clear all children of the holder if (NoriHolder != null) { @@ -288,6 +289,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan void Update() { + if (Conductor.instance == null) return; Transform target = GameCamera.instance.transform; Vector3 displacement = target.forward * CameraOffset; diff --git a/Assets/Scripts/Games/TheDazzles/TheDazzles.cs b/Assets/Scripts/Games/TheDazzles/TheDazzles.cs index 1051fca43..c1f3a7d46 100644 --- a/Assets/Scripts/Games/TheDazzles/TheDazzles.cs +++ b/Assets/Scripts/Games/TheDazzles/TheDazzles.cs @@ -267,11 +267,15 @@ namespace HeavenStudio.Games } } + public override void OnPlay(double beat) + { + if (queuedPoses.Count > 0) queuedPoses.Clear(); + if (queuedCrouches.Count > 0) queuedCrouches.Clear(); + } + void Update() { - var cond = Conductor.instance; - - if (cond.isPlaying && !cond.isPaused) + if (conductor.isPlaying && !conductor.isPaused) { if (queuedPoses.Count > 0) { @@ -319,33 +323,34 @@ namespace HeavenStudio.Games } shouldHold = false; } - if (PlayerInput.GetIsAction(InputAction_TouchRelease) && !GameManager.instance.autoplay) + if (PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch) { - player.UnPrepare(); - shouldHold = false; - } - if (PlayerInput.GetIsAction(InputAction_BasicRelease) && shouldHold && !GameManager.instance.autoplay) - { - if (doingPoses) - { - player.Pose(false); - SoundByte.PlayOneShotGame("theDazzles/miss"); - foreach (var girl in npcGirls) - { - girl.Ouch(); - } - } - else + if (PlayerInput.GetIsAction(InputAction_TouchRelease) && !gameManager.autoplay) { player.UnPrepare(); + shouldHold = false; + } + } + else + { + if (PlayerInput.GetIsAction(InputAction_BasicRelease) && shouldHold && (!gameManager.autoplay) && !IsExpectingInputNow(InputAction_FlickRelease)) + { + if (doingPoses) + { + player.Pose(false); + SoundByte.PlayOneShotGame("theDazzles/miss"); + foreach (var girl in npcGirls) + { + girl.Ouch(); + } + } + else + { + player.UnPrepare(); + } + shouldHold = false; } - shouldHold = false; } - } - else if (!cond.isPlaying && !cond.isPaused) - { - if (queuedPoses.Count > 0) queuedPoses.Clear(); - if (queuedCrouches.Count > 0) queuedCrouches.Clear(); } } diff --git a/Assets/Scripts/Games/TossBoys/TossBoys.cs b/Assets/Scripts/Games/TossBoys/TossBoys.cs index 4a77582db..fe5c003a0 100644 --- a/Assets/Scripts/Games/TossBoys/TossBoys.cs +++ b/Assets/Scripts/Games/TossBoys/TossBoys.cs @@ -466,8 +466,15 @@ namespace HeavenStudio.Games if (passBallDict.TryGetValue(beat + lastLength, out var e)) { if (e.datamodel == "tossBoys/pop") return; - curReceiver = e["who"]; blurSet = e.datamodel == "tossBoys/blur"; + if (blurSet) + { + curReceiver = (int)WhichTossKid.None; + } + else + { + curReceiver = e["who"]; + } currentLength = e.length; nextIsSpecial = IsSpecialEvent(e.datamodel); eventDatamodel = e.datamodel; diff --git a/Assets/Scripts/GlobalGameManager.cs b/Assets/Scripts/GlobalGameManager.cs index 109843371..16d44ebfe 100644 --- a/Assets/Scripts/GlobalGameManager.cs +++ b/Assets/Scripts/GlobalGameManager.cs @@ -399,20 +399,35 @@ namespace HeavenStudio height = (int)(width / 16f * 9f); } - GameRenderTexture.Release(); + if (GameRenderTexture != null) + { + GameRenderTexture.Release(); - GameRenderTexture.width = width; - GameRenderTexture.height = height; + GameRenderTexture.width = width; + GameRenderTexture.height = height; - GameRenderTexture.Create(); + GameRenderTexture.Create(); + } + else + { + GameRenderTexture = new RenderTexture(width, height, 24); + GameRenderTexture.Create(); + } + if (OverlayRenderTexture != null) + { + OverlayRenderTexture.Release(); - OverlayRenderTexture.Release(); + OverlayRenderTexture.width = (int)(width * 1.5f); + OverlayRenderTexture.height = (int)(height * 1.5f); - OverlayRenderTexture.width = (int)(width * 1.5f); - OverlayRenderTexture.height = (int)(height * 1.5f); - - OverlayRenderTexture.Create(); + OverlayRenderTexture.Create(); + } + else + { + OverlayRenderTexture = new RenderTexture((int)(width * 1.5f), (int)(height * 1.5f), 24); + OverlayRenderTexture.Create(); + } } public static void ChangeMasterVolume(float value) diff --git a/Assets/Scripts/InputSystem/USG.g/InitInputControllers.PlayerInput.ControllerLoaderGenerator.g.cs b/Assets/Scripts/InputSystem/USG.g/InitInputControllers.PlayerInput.ControllerLoaderGenerator.g.cs index 0dece7f9b..c1e067ac9 100644 --- a/Assets/Scripts/InputSystem/USG.g/InitInputControllers.PlayerInput.ControllerLoaderGenerator.g.cs +++ b/Assets/Scripts/InputSystem/USG.g/InitInputControllers.PlayerInput.ControllerLoaderGenerator.g.cs @@ -18,8 +18,10 @@ namespace HeavenStudio public static int InitInputControllers() { + inputDevices = new List(); InputController[] controllers; PlayerInputRefresh = new(); + PlayerInputCleanUp = null; controllers = InputJoyshockInitializer.Initialize(); if (controllers != null) diff --git a/Assets/Scripts/JudgementManager.cs b/Assets/Scripts/JudgementManager.cs index bf93c4b96..21122e566 100644 --- a/Assets/Scripts/JudgementManager.cs +++ b/Assets/Scripts/JudgementManager.cs @@ -13,7 +13,7 @@ using HeavenStudio.InputSystem; namespace HeavenStudio { - [RequireComponent(typeof(PlayableDirector), typeof(AudioSource))] + [RequireComponent(typeof(PlayableDirector), typeof(AudioSource), typeof(PlayableDirector))] public class JudgementManager : MonoBehaviour { enum Rank @@ -113,6 +113,7 @@ namespace HeavenStudio [SerializeField] Animator canvasAnim; AudioSource audioSource; + PlayableDirector director; List usedCategories; float[] categoryInputs; double[] categoryScores; @@ -521,6 +522,9 @@ namespace HeavenStudio private void Start() { audioSource = GetComponent(); + director = GetComponent(); + PrepareJudgement(); + director.Play(); } private IEnumerator WaitAndRank() diff --git a/Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/RatingScreenPropertyDialog.cs b/Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/RatingScreenPropertyDialog.cs index 21318ef97..507d9ce46 100644 --- a/Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/RatingScreenPropertyDialog.cs +++ b/Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/RatingScreenPropertyDialog.cs @@ -282,7 +282,7 @@ namespace HeavenStudio.Editor { Texture2D texture = DownloadHandlerTexture.GetContent(www); rankImages[(int)i] = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f)); - Debug.Log("Uploaded image successfully!"); + Debug.Log($"Downloaded image {resource} successfully!"); } } diff --git a/Assets/Scripts/SourceGenerators/ControllerLoaderGenerator.cs b/Assets/Scripts/SourceGenerators/ControllerLoaderGenerator.cs index 488835cce..e7a8618ed 100644 --- a/Assets/Scripts/SourceGenerators/ControllerLoaderGenerator.cs +++ b/Assets/Scripts/SourceGenerators/ControllerLoaderGenerator.cs @@ -80,8 +80,10 @@ namespace {context.TargetClass.Namespace} sb.IndentLevel(3); sb.Append($@" + inputDevices = new List(); InputController[] controllers; PlayerInputRefresh = new(); + PlayerInputCleanUp = null; "); foreach (var loadRunner in loadRunners) diff --git a/Assets/Scripts/Util/BeatAction.cs b/Assets/Scripts/Util/BeatAction.cs index d9d75c7be..2c6ef0346 100644 --- a/Assets/Scripts/Util/BeatAction.cs +++ b/Assets/Scripts/Util/BeatAction.cs @@ -58,7 +58,14 @@ namespace HeavenStudio.Util if (behaviour == null || !(conductor.isPlaying || conductor.isPaused)) return; - actions[idx].function.Invoke(); + try + { + actions[idx].function.Invoke(); + } + catch (System.Exception e) + { + Debug.LogError($"Exception thrown while executing BeatAction: {e}"); + } idx++; } } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index e775b8ad7..14788200a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -29,7 +29,7 @@ "com.unity.nuget.newtonsoft-json": "3.2.1", "jillejr.newtonsoft.json-for-unity.converters": "1.5.1" }, - "hash": "03264e671d2c1761f3e5ce57c982e75c6d556a60" + "hash": "81516bd0bf64681a829ac2d807fd2180077dd3f8" }, "com.sator-imaging.alt-source-generator": { "version": "https://github.com/sator-imaging/Unity-AltSourceGenerator.git", diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3da6ef642..4f2257a34 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.0.0 + bundleVersion: 1.0.1 preloadedAssets: - {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3} metroInputSource: 0 diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 3fd3d8051..3b88676c1 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -24,5 +24,18 @@ MonoBehaviour: - Assets/Scripts/Games/FanClub/FanClub.cs - Assets/Scripts/GameManager.cs - Assets/Editor/SpritesheetScaler.cs + - Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs + - Assets/Scripts/Games/TheDazzles/TheDazzles.cs + - Assets/Scripts/Games/FirstContact/FirstContact.cs + - Assets/Scripts/SourceGenerators/ControllerLoaderGenerator.cs + - Assets/Scripts/InputSystem/PlayerInput.cs + - Assets/Scripts/JudgementManager.cs + - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/RatingScreenPropertyDialog.cs + - Assets/Scripts/GlobalGameManager.cs + - Assets/Scripts/Games/KarateMan/KarateMan.cs + - Assets/Scripts/Games/KarateMan/KarateManJoe.cs + - Assets/Scripts/Games/KarateMan/KarateManNoriController.cs + - Assets/Scripts/Util/BeatAction.cs + - Assets/Scripts/Games/TossBoys/TossBoys.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []