From a4a9f6ed2d3db11bcb8622be7dbb6323a8c5e297 Mon Sep 17 00:00:00 2001 From: James Pacheco Date: Tue, 2 Apr 2024 15:36:05 -0600 Subject: [PATCH 1/2] Add voltstro dependency references --- Packages/link.magic.unity.sdk/Runtime/Magic.Sdk.asmdef | 6 ++++-- Packages/link.magic.unity.sdk/Runtime/Magic.cs | 4 ++-- .../Runtime/Relayer/WebviewController.cs | 1 - .../link.magic.unity.sdk/link.magic.unity.sdk.sln.meta | 7 ------- 4 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 Packages/link.magic.unity.sdk/link.magic.unity.sdk.sln.meta diff --git a/Packages/link.magic.unity.sdk/Runtime/Magic.Sdk.asmdef b/Packages/link.magic.unity.sdk/Runtime/Magic.Sdk.asmdef index e7504a8..acb9e74 100644 --- a/Packages/link.magic.unity.sdk/Runtime/Magic.Sdk.asmdef +++ b/Packages/link.magic.unity.sdk/Runtime/Magic.Sdk.asmdef @@ -2,7 +2,8 @@ "name": "Magic.Sdk", "rootNamespace": "", "references": [ - "unity-webview" + "unity-webview", + "VoltstroStudios.UnityWebBrowser" ], "includePlatforms": [], "excludePlatforms": [], @@ -10,7 +11,8 @@ "overrideReferences": true, "precompiledReferences": [ "Newtonsoft.Json.dll", - "Nethereum.JsonRpc.Client.dll" + "Nethereum.JsonRpc.Client.dll", + "VoltstroStudios.UnityWebBrowser.Shared.dll" ], "autoReferenced": true, "defineConstraints": [], diff --git a/Packages/link.magic.unity.sdk/Runtime/Magic.cs b/Packages/link.magic.unity.sdk/Runtime/Magic.cs index 8018ac2..1cb6daf 100644 --- a/Packages/link.magic.unity.sdk/Runtime/Magic.cs +++ b/Packages/link.magic.unity.sdk/Runtime/Magic.cs @@ -25,12 +25,12 @@ public Magic(string apikey, EthNetwork network = EthNetwork.Mainnet, string loca Auth = new AuthModule(Provider); } - public Magic(string apikey, CustomNodeConfiguration config, string locale = "en-US", GameObject canvas = null) + public Magic(string apikey, CustomNodeConfiguration config, string locale = "en-US", GameObject macCanvas = null) { var urlBuilder = new UrlBuilder(apikey, config, locale); UrlBuilder.Instance = urlBuilder; - Provider = new RpcProvider(urlBuilder, canvas); + Provider = new RpcProvider(urlBuilder, macCanvas); User = new UserModule(Provider); Auth = new AuthModule(Provider); } diff --git a/Packages/link.magic.unity.sdk/Runtime/Relayer/WebviewController.cs b/Packages/link.magic.unity.sdk/Runtime/Relayer/WebviewController.cs index 6277751..eeda88f 100644 --- a/Packages/link.magic.unity.sdk/Runtime/Relayer/WebviewController.cs +++ b/Packages/link.magic.unity.sdk/Runtime/Relayer/WebviewController.cs @@ -5,7 +5,6 @@ using System.Collections; using System.Collections.Generic; using MagicSDK.Provider; -using UnityEngine; using VoltstroStudios.UnityWebBrowser; using VoltstroStudios.UnityWebBrowser.Core; using VoltstroStudios.UnityWebBrowser.Shared.Core; diff --git a/Packages/link.magic.unity.sdk/link.magic.unity.sdk.sln.meta b/Packages/link.magic.unity.sdk/link.magic.unity.sdk.sln.meta deleted file mode 100644 index b8339c1..0000000 --- a/Packages/link.magic.unity.sdk/link.magic.unity.sdk.sln.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9187a6dd1d77c4e1bb0b6a8cfeb25874 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From b6b2e8c01509275e59f7b7dc35f79a1774dfff0e Mon Sep 17 00:00:00 2001 From: James Pacheco Date: Tue, 2 Apr 2024 15:39:38 -0600 Subject: [PATCH 2/2] Bump version --- Packages/link.magic.unity.sdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/link.magic.unity.sdk/package.json b/Packages/link.magic.unity.sdk/package.json index e8925e9..c683efd 100644 --- a/Packages/link.magic.unity.sdk/package.json +++ b/Packages/link.magic.unity.sdk/package.json @@ -2,7 +2,7 @@ "name": "link.magic.unity.sdk", "displayName": "Magic Unity SDK", "description": "The Magic Unity SDK provides access to Magic Key Management System and interact with Blockchain.", - "version": "3.0.0", + "version": "3.1.1", "unity": "2021.3", "author": { "name": "Magic Labs Inc."