Merge pull request #24 from alturanft/new_version

Fixed bugs
alturanft · Feb 15, 2023 · 9ab0832 · 9ab0832
2 parents c1bd3f4 + fe7df3c
commit 9ab0832
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 120 deletions.
diff --git a/Altura-Sample~/AlturaDemo/resources/AlturaDemoUserInformation.cs b/Altura-Sample~/AlturaDemo/resources/AlturaDemoUserInformation.cs
@@ -294,7 +294,7 @@ public void GetUsersItemFunction()
             GetUsersItems
               .Initialize(destroyAtEnd: true)
               .SetAddress(
-                _address.text.ToString()
+                _Itemaddress.text.ToString()
               ).OnError(error => Debug.Log(error))
               .OnComplete(result => setItemData(result)
               )

diff --git a/Documentation/AlturaNFT.md b/Documentation/AlturaNFT.md
@@ -2,5 +2,13 @@
 
 Using our Unity SDK, you are able to interact with Altura services such as authenticating users using Altura Guard,get Users information and items, get items and collection information.
 
-> <b>In this documentation we only explain the Sample scene and teach you how you can use them, To learn more about the AlturaNFT SDK function, please visit our official documentation:</b> \
+> <b>In this documentation we only explain how you can import the Sample scene to your project, To learn more about the AlturaNFT SDK function, please visit our official documentation:</b> \
 > https://docs.alturanft.com/altura-documentation/unity-sdk-reference/installation
+
+## Import Sample scene
+
+1. Open the Package Manager window (Window > Package Manager)
+2. Select the 'Packages: In Project' tab
+3. Select the 'Altura Web3' package
+4. Under the 'Samples' section of the window, select 'Import'
+5. The sample can then be found under Assets/Samples/Altura Web3/1.0.6/AlturaDemo
diff --git a/Editor/AlturaNFTSettings.cs b/Editor/AlturaNFTSettings.cs
@@ -314,16 +314,12 @@ static void GuiLine( int i_height = 1 )
 
         #region ReadWrite UserPrefs
 
-        private static AlturaUser.UserPrefs _userPrefs = new AlturaUser.UserPrefs();
         private static TextAsset targetFile;
         static void ReadFromUserPrefs()
         {
             targetFile = Resources.Load<TextAsset>("AlturaNFT UserPrefs");
             if (targetFile != null)
             {
-                _userPrefs = JsonConvert.DeserializeObject<AlturaUser.UserPrefs>(targetFile.text);
-                myAPIString = _userPrefs.API_KEY;
-                AlturaUser.SaveNewApi(myAPIString);
                 AlturaUser.Initialise();
                 UserStats();
             }
@@ -338,7 +334,6 @@ static void ReadFromUserPrefs()
         }
         void WriteToUserPrefs()
         {
-            AlturaUser.SaveNewApi(myAPIString);
             base.SaveChanges();
         }
 

diff --git a/Runtime/AuthenticateUser.cs b/Runtime/AuthenticateUser.cs
@@ -38,7 +38,7 @@ public class AuthenticateUser : MonoBehaviour
             public UnityEvent afterError;
 
             [Header("Run Component when this Game Object is Set Active")]
-            [SerializeField] private bool onEnable = true;
+            [SerializeField] private bool onEnable = false;
             public bool debugErrorLog = true;
             public bool debugLogRawApiResponse = true;
 

diff --git a/Runtime/GetCollection.cs b/Runtime/GetCollection.cs
@@ -50,8 +50,6 @@ public class GetCollection : MonoBehaviour
 
         private void Awake()
         {
-            AlturaUser.Initialise();
-            _apiKey = AlturaUser.GetUserApiKey();
 
         }
 

diff --git a/Runtime/GetCollections.cs b/Runtime/GetCollections.cs
@@ -50,7 +50,7 @@ public class GetCollections : MonoBehaviour
             public UnityEvent afterError;
 
             [Header("Run Component when this Game Object is Set Active")]
-            [SerializeField] private bool onEnable = true;
+            [SerializeField] private bool onEnable = false;
             public bool debugErrorLog = true;
             public bool debugLogRawApiResponse = true;
 

diff --git a/Runtime/GetHistory.cs b/Runtime/GetHistory.cs
@@ -43,7 +43,7 @@ public class GetHistory : MonoBehaviour
             public UnityEvent afterError;
 
             [Header("Run Component when this Game Object is Set Active")]
-            [SerializeField] private bool onEnable = true;
+            [SerializeField] private bool onEnable = false;
             public bool debugErrorLog = true;
             public bool debugLogRawApiResponse = true;
 

diff --git a/Runtime/GetHolder.cs b/Runtime/GetHolder.cs
@@ -43,7 +43,7 @@ public class GetHolder : MonoBehaviour
             public UnityEvent afterError;
 
             [Header("Run Component when this Game Object is Set Active")]
-            [SerializeField] private bool onEnable = true;
+            [SerializeField] private bool onEnable = false;
             public bool debugErrorLog = true;
             public bool debugLogRawApiResponse = true;
 

diff --git a/Runtime/GetItem.cs b/Runtime/GetItem.cs
@@ -43,7 +43,7 @@ public class GetItem : MonoBehaviour
             public UnityEvent afterError;
 
             [Header("Run Component when this Game Object is Set Active")]
-            [SerializeField] private bool onEnable = true;
+            [SerializeField] private bool onEnable = false;
             public bool debugErrorLog = true;
             public bool debugLogRawApiResponse = true;
 

diff --git a/Runtime/GetItems.cs b/Runtime/GetItems.cs
@@ -72,7 +72,7 @@ public enum Chains
             public UnityEvent afterError;
 
             [Header("Run Component when this Game Object is Set Active")]
-            [SerializeField] private bool onEnable = true;
+            [SerializeField] private bool onEnable = false;
             public bool debugErrorLog = true;
             public bool debugLogRawApiResponse = true;
 

diff --git a/Runtime/GetUser.cs b/Runtime/GetUser.cs
@@ -40,7 +40,7 @@ public class GetUser : MonoBehaviour
             public UnityEvent afterError;
 
             [Header("Run Component when this Game Object is Set Active")]
-            [SerializeField] private bool onEnable = true;
+            [SerializeField] private bool onEnable = false;
             public bool debugErrorLog = true;
             public bool debugLogRawApiResponse = true;
 
@@ -70,10 +70,18 @@ private void OnEnable()
 
         public static GetUser Initialize(bool destroyAtEnd = true)
             {
-                var _this = new GameObject(AlturaConstants.FeatureName_GetUser).AddComponent<GetUser>();
-                _this.destroyAtEnd = destroyAtEnd;
-                _this.onEnable = false;
-                _this.debugErrorLog = false;
+
+            Debug.Log("Hi");
+            var _this = new GameObject(AlturaConstants.FeatureName_GetUser).AddComponent<GetUser>();
+
+            Debug.Log("Hi2");
+            _this.destroyAtEnd = destroyAtEnd;
+
+            Debug.Log("Hi3");
+            _this.onEnable = false;
+
+            Debug.Log("Hi4");
+            _this.debugErrorLog = false;
                 return _this;
             }
 

diff --git a/Runtime/GetUserBalance.cs b/Runtime/GetUserBalance.cs
@@ -42,7 +42,7 @@ public class GetUserBalance : MonoBehaviour
             public UnityEvent afterError;
 
             [Header("Run Component when this Game Object is Set Active")]
-            [SerializeField] private bool onEnable = true;
+            [SerializeField] private bool onEnable = false;
             public bool debugErrorLog = true;
             public bool debugLogRawApiResponse = true;
 

diff --git a/Runtime/GetUserERC20Balance.cs b/Runtime/GetUserERC20Balance.cs
@@ -43,7 +43,7 @@ public class GetUserERC20Balance : MonoBehaviour
             public UnityEvent afterError;
 
             [Header("Run Component when this Game Object is Set Active")]
-            [SerializeField] private bool onEnable = true;
+            [SerializeField] private bool onEnable = false;
             public bool debugErrorLog = true;
             public bool debugLogRawApiResponse = true;
 

diff --git a/Runtime/GetUserItemBalance.cs b/Runtime/GetUserItemBalance.cs
@@ -45,7 +45,7 @@ public class GetUserItemBalance : MonoBehaviour
             public UnityEvent afterError;
 
             [Header("Run Component when this Game Object is Set Active")]
-            [SerializeField] private bool onEnable = true;
+            [SerializeField] private bool onEnable = false;
             public bool debugErrorLog = true;
             public bool debugLogRawApiResponse = true;
 

diff --git a/Runtime/GetUsers.cs b/Runtime/GetUsers.cs
@@ -46,7 +46,7 @@ public class GetUsers : MonoBehaviour
             public UnityEvent afterError;
 
             [Header("Run Component when this Game Object is Set Active")]
-            [SerializeField] private bool onEnable = true;
+            [SerializeField] private bool onEnable = false;
             public bool debugErrorLog = true;
             public bool debugLogRawApiResponse = true;
 

diff --git a/Runtime/Internal/AlturaUser.cs b/Runtime/Internal/AlturaUser.cs
@@ -17,97 +17,17 @@ namespace AlturaNFT.Internal
 
     public static class AlturaUser
     {
-        [System.Serializable]
-        public class UserPrefs {
-            public string API_KEY;
-        }
 
     public static bool _initialised = false;
-    private static UserPrefs _userPrefs = new UserPrefs();
 
     public static void Initialise()
     {
-        if(_initialised == false)
-        {
-            _userPrefs = getUserPrefs();
 #if UNITY_EDITOR
             CheckAlturaPkg.OnListCheckComplete(isUPM => src.UPMImport = isUPM.ToString());
             CheckAlturaPkg.CheckPkgList();
 #endif
-            }
-
-        }
-
-
-        #region Prefs File Write
-#if UNITY_EDITOR
-        public static void SaveNewApi(string newAPI)
-        {
-            _userPrefs.API_KEY = newAPI;
-            SaveUserPrefs();
-        }
-
-
-        public static void SaveUserPrefs()
-        {
-            if (!AssetDatabase.IsValidFolder("Assets/AlturaNFT/Resources")) 
-            {
-                CreateFolder();
-            }
-
-            WriteToUserPrefs();
-        }
-
-        static  void WriteToUserPrefs()
-        {
-            _initialised = false;
-            string json = JsonUtility.ToJson(_userPrefs);
-            System.IO.File.WriteAllText("Assets/AlturaNFT/Resources/" + "AlturaNFT UserPrefs.json", json);
-            AssetDatabase.Refresh();
-            AlturaUser.Initialise();
-        }
-
-
-        static void CreateFolder()
-        {
-            AssetDatabase.CreateFolder("Assets", "AlturaNFT");
-            string guid = AssetDatabase.CreateFolder("Assets/AlturaNFT", "Resources");
-            string newFolderPath = AssetDatabase.GUIDToAssetPath(guid);
         }
-
-#endif
-        #endregion
-
-
-        #region Prefs File Read
-        static UserPrefs getUserPrefs()
-        {
-            string _userfile = LoadUserPrefsTextfile();
-            if (_userfile.Length != 0)
-            {
-                _initialised = true;
-                return JsonConvert.DeserializeObject<UserPrefs>(_userfile);
-            }
-            else
-            {
-                _initialised = false;
-                Debug.LogError("Unable to Initialise, Make sure to input your APIKEYS in AlturaNFT/Home in Unity Editor");
-                return null;
-            }
-        }
-
-        private static TextAsset targetFile;
-
-        public static string LoadUserPrefsTextfile()
-        {
-            targetFile = Resources.Load<TextAsset>("AlturaNFT UserPrefs");;
-            if (targetFile != null)
-                return targetFile.text;
-            else
-                return string.Empty;
-        }
-
-        #endregion
+
 
         #region Get Set Gos
 
@@ -170,21 +90,6 @@ public static string GetSource()
             return json;
         }
 
-        public static string GetUserApiKey()
-        {
-            if (_initialised)
-            {
-                return _userPrefs.API_KEY;
-            }
-            else if(targetFile==null)
-            {
-
-                return String.Empty;
-            }
-            else
-                return " Make sure to input your APIKEYS in AlturaNFT/Home ";
-        }
-
         #endregion
 
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,8 +50,6 @@ public class GetCollection : MonoBehaviour @@
             private void Awake()
             {
-                AlturaUser.Initialise();
-                _apiKey = AlturaUser.GetUserApiKey();
             }
@@ Expand Down @@